Fri Feb 15 09:22:50 2013 UTC ()
check requirement of uac manifest, it is required for Windows Vista
(aka NT-6.0) and later.


(obache)
diff -r1.1984 -r1.1985 pkgsrc/mk/bsd.pkg.mk
diff -r1.1 -r1.2 pkgsrc/mk/platform/Cygwin.mk
cvs diff -r1.1984 -r1.1985 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2013/02/10 13:04:08 1.1984
+++ pkgsrc/mk/bsd.pkg.mk 2013/02/15 09:22:50 1.1985
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.1984 2013/02/10 13:04:08 obache Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.1985 2013/02/15 09:22:50 obache Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -777,28 +777,30 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR} @@ -777,28 +777,30 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
777 ${CAT} ${.TARGET}.tmp; \ 777 ${CAT} ${.TARGET}.tmp; \
778 ${ECHO} ""; \ 778 ${ECHO} ""; \
779 ${ECHO} ".endif # _MAKEVARS_MK"; \ 779 ${ECHO} ".endif # _MAKEVARS_MK"; \
780 ) > ${.TARGET}; \ 780 ) > ${.TARGET}; \
781 ${RM} -f ${.TARGET}.tmp; \ 781 ${RM} -f ${.TARGET}.tmp; \
782 fi 782 fi
783 ${RUN}${TOUCH} ${TOUCH_FLAGS} ${.TARGET} 783 ${RUN}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
784.endfor 784.endfor
785 785
786.if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir) 786.if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir)
787.include "pbulk/pbulk-index.mk" 787.include "pbulk/pbulk-index.mk"
788.endif 788.endif
789 789
790.if ${OPSYS} == "Cygwin" && defined(UAC_REQD_EXECS) && !empty(UAC_REQD_EXECS) 790.if defined(_OPSYS_REQUIRE_UAC_MANIFEST) && !empty(_OPSYS_REQUIRE_UAC_MANIFEST:M[Yy][Ee][Ss])
791. include "misc/uac-manifest.mk" 791. if defined(UAC_REQD_EXECS) && !empty(UAC_REQD_EXECS)
 792.include "misc/uac-manifest.mk"
 793. endif
792.endif 794.endif
793 795
794.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" 796.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
795. include "misc/developer.mk" 797. include "misc/developer.mk"
796.endif 798.endif
797.include "misc/show.mk" 799.include "misc/show.mk"
798.if make(debug) 800.if make(debug)
799. include "bsd.pkg.debug.mk" 801. include "bsd.pkg.debug.mk"
800.endif 802.endif
801.include "misc/warnings.mk" 803.include "misc/warnings.mk"
802.if make(import) 804.if make(import)
803.include "misc/import.mk" 805.include "misc/import.mk"
804.endif 806.endif
cvs diff -r1.1 -r1.2 pkgsrc/mk/platform/Cygwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Cygwin.mk 2013/02/10 12:25:18 1.1
+++ pkgsrc/mk/platform/Cygwin.mk 2013/02/15 09:22:50 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Cygwin.mk,v 1.1 2013/02/10 12:25:18 obache Exp $ 1# $NetBSD: Cygwin.mk,v 1.2 2013/02/15 09:22:50 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
@@ -77,13 +77,19 @@ _OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-a @@ -77,13 +77,19 @@ _OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-a
77_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive 77_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
78 78
79_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip 79_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
80_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip 80_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
81 81
82DEFAULT_SERIAL_DEVICE?= /dev/ttyS0 82DEFAULT_SERIAL_DEVICE?= /dev/ttyS0
83SERIAL_DEVICES?= /dev/ttyS0 /dev/ttyS1 /dev/ttyS2 /dev/ttyS3 83SERIAL_DEVICES?= /dev/ttyS0 /dev/ttyS1 /dev/ttyS2 /dev/ttyS3
84 84
85_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk 85_OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk
86 86
87# check for maximum command line length and set it in configure's environment, 87# check for maximum command line length and set it in configure's environment,
88# to avoid a test required by the libtool script that takes forever. 88# to avoid a test required by the libtool script that takes forever.
89_OPSYS_MAX_CMDLEN_CMD= ${ECHO} 262144 89_OPSYS_MAX_CMDLEN_CMD= ${ECHO} 262144
 90
 91# check for requirement of uac-manifest.
 92.if !empty(OS_VARIANT:MCYGWIN_NT-[6-9].*)
 93_OPSYS_REQUIRE_UAC_MANIFEST= yes
 94.endif
 95