Sat Feb 23 05:41:04 2013 UTC ()
prefer native X11 on Cygwin.


(obache)
diff -r1.6 -r1.7 pkgsrc/mk/platform/Cygwin.mk
cvs diff -r1.6 -r1.7 pkgsrc/mk/platform/Cygwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Cygwin.mk 2013/02/22 13:39:31 1.6
+++ pkgsrc/mk/platform/Cygwin.mk 2013/02/23 05:41:04 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Cygwin.mk,v 1.6 2013/02/22 13:39:31 obache Exp $ 1# $NetBSD: Cygwin.mk,v 1.7 2013/02/23 05:41:04 obache Exp $
2# 2#
3# Variable definitions for the Windows with Cygwin. 3# Variable definitions for the Windows with Cygwin.
4 4
5### 5###
6### Overrides to standard BSD .mk files 6### Overrides to standard BSD .mk files
7### 7###
8 8
9# "catinstall" not yet supported as there's no shipped [gn]roff 9# "catinstall" not yet supported as there's no shipped [gn]roff
10MANINSTALL= maninstall 10MANINSTALL= maninstall
11MAKE_FLAGS+= MKCATPAGES=no NOLINT=1 11MAKE_FLAGS+= MKCATPAGES=no NOLINT=1
12 12
13### 13###
14### Alternate defaults to global pkgsrc settings, to help avoid 14### Alternate defaults to global pkgsrc settings, to help avoid
@@ -51,26 +51,28 @@ MOTIF_TYPE_DEFAULT?= motif # default 2.0 @@ -51,26 +51,28 @@ MOTIF_TYPE_DEFAULT?= motif # default 2.0
51NOLOGIN?= /bin/false 51NOLOGIN?= /bin/false
52PKG_TOOLS_BIN?= ${LOCALBASE}/sbin 52PKG_TOOLS_BIN?= ${LOCALBASE}/sbin
53PKGDIRMODE?= 775 53PKGDIRMODE?= 775
54# ROOT_USER might be numeric in the special case of Administrator; canonify it: 54# ROOT_USER might be numeric in the special case of Administrator; canonify it:
55ROOT_CMD?= ${SU} - "$$(${ID} -un ${ROOT_USER})" -c 55ROOT_CMD?= ${SU} - "$$(${ID} -un ${ROOT_USER})" -c
56ROOT_USER?= ${BINOWN} 56ROOT_USER?= ${BINOWN}
57ROOT_GROUP?= Administrators 57ROOT_GROUP?= Administrators
58_IS_ROOT_CMD?= ( ${ID} -nG | ${GREP} -q 'Administrators' ) 58_IS_ROOT_CMD?= ( ${ID} -nG | ${GREP} -q 'Administrators' )
59TOUCH_FLAGS?= 59TOUCH_FLAGS?=
60ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` 60ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
61ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` 61ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
62ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v` 62ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v`
63 63
 64X11_TYPE?= native
 65
64_OPSYS_HAS_INET6= yes # IPv6 is standard 66_OPSYS_HAS_INET6= yes # IPv6 is standard
65_OPSYS_HAS_JAVA= no # Java is not standard 67_OPSYS_HAS_JAVA= no # Java is not standard
66_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages 68_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
67_OPSYS_HAS_OSSAUDIO= no # libossaudio is available 69_OPSYS_HAS_OSSAUDIO= no # libossaudio is available
68_OPSYS_PERL_REQD= 5.8.3nb1 # base version of perl required 70_OPSYS_PERL_REQD= 5.8.3nb1 # base version of perl required
69_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 71_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
70_OPSYS_SHLIB_TYPE= PEwin # shared lib type 72_OPSYS_SHLIB_TYPE= PEwin # shared lib type
71_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 73_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
72_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix 74_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
73_USE_RPATH= no # add rpath to LDFLAGS 75_USE_RPATH= no # add rpath to LDFLAGS
74 76
75# flags passed to the linker to extract all symbols from static archives. 77# flags passed to the linker to extract all symbols from static archives.
76# this is GNU ld. 78# this is GNU ld.