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
--- 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,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1984 2013/02/10 13:04:08 obache Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1985 2013/02/15 09:22:50 obache Exp $
#
# This file is in the public domain.
#
@@ -787,8 +787,10 @@
.include "pbulk/pbulk-index.mk"
.endif
-.if ${OPSYS} == "Cygwin" && defined(UAC_REQD_EXECS) && !empty(UAC_REQD_EXECS)
-. include "misc/uac-manifest.mk"
+.if defined(_OPSYS_REQUIRE_UAC_MANIFEST) && !empty(_OPSYS_REQUIRE_UAC_MANIFEST:M[Yy][Ee][Ss])
+. if defined(UAC_REQD_EXECS) && !empty(UAC_REQD_EXECS)
+.include "misc/uac-manifest.mk"
+. endif
.endif
.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no"
--- 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