From 911568c679b59255a7e26cac5a7638632bc38d5f Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Fri, 15 Feb 2013 09:22:50 +0000
Subject: check requirement of uac manifest, it is required for Windows Vista
 (aka NT-6.0) and later.

---
 mk/bsd.pkg.mk         | 8 +++++---
 mk/platform/Cygwin.mk | 8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 22150739334..4e8a9f8a9c3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR}
 .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"
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk
index 7267b55a6f9..7934dc3b0cc 100644
--- a/mk/platform/Cygwin.mk
+++ b/mk/platform/Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Cygwin.mk,v 1.1 2013/02/10 12:25:18 obache Exp $
+# $NetBSD: Cygwin.mk,v 1.2 2013/02/15 09:22:50 obache Exp $
 #
 # Variable definitions for the Windows with Cygwin.
 
@@ -87,3 +87,9 @@ _OPSYS_CAN_CHECK_SHLIBS=	no # can't use readelf in check/bsd.check-vars.mk
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD=	${ECHO} 262144
+
+# check for requirement of uac-manifest.
+.if !empty(OS_VARIANT:MCYGWIN_NT-[6-9].*)
+_OPSYS_REQUIRE_UAC_MANIFEST=	yes
+.endif
+
-- 
cgit v1.2.3