CVS commit: pkgsrc/mk/plist

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 25 21:57:23 UTC 2016

Modified Files:
        pkgsrc/mk/plist: print-plist.mk

Log Message:
Remove special PRINT_PLIST_AWK for a couple of variables.

In particular:
OS_VERSION
MACHINE_GNU_PLATFORM
MACHINE_ARCH
MACHINE_GNU_ARCH
LOWER_OS_VERSION

Reason: Only very few packages really need these, many other have false
positives.

Ok jperkin@


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/plist/print-plist.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/plist/print-plist.mk
diff -u pkgsrc/mk/plist/print-plist.mk:1.31 pkgsrc/mk/plist/print-plist.mk:1.32
--- pkgsrc/mk/plist/print-plist.mk:1.31 Fri Jun  3 14:32:30 2016
+++ pkgsrc/mk/plist/print-plist.mk      Mon Jul 25 21:57:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.31 2016/06/03 14:32:30 joerg Exp $
+# $NetBSD: print-plist.mk,v 1.32 2016/07/25 21:57:23 wiz Exp $
 
 ###
 ### Automatic PLIST generation
@@ -13,15 +13,6 @@
 ###
 
 _PRINT_PLIST_AWK_SUBST={
-.if !defined(EMUL_PLATFORMS)
-_PRINT_PLIST_AWK_SUBST+=                                               \
-       gsub(/${OS_VERSION:S/./\./g}/, "$${OS_VERSION}");               \
-       gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}");    \
-       gsub(/${MACHINE_ARCH}/, "$${MACHINE_ARCH}");                    \
-       gsub(/${MACHINE_GNU_ARCH}/, "$${MACHINE_GNU_ARCH}");
-_PRINT_PLIST_AWK_SUBST+=                                               \
-       gsub(/${LOWER_OS_VERSION:S/./\./g}/, "$${LOWER_OS_VERSION}");
-.endif
 _PRINT_PLIST_AWK_SUBST+=                                               \
        gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}");                        \
        gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\