Sat Jan 18 19:48:57 2014 UTC ()
Improve support for python-3.3.


(wiz)
diff -r1.24 -r1.25 pkgsrc/mk/plist/print-plist.mk
cvs diff -r1.24 -r1.25 pkgsrc/mk/plist/print-plist.mk (expand / switch to unified diff)

--- pkgsrc/mk/plist/print-plist.mk 2013/07/05 15:31:54 1.24
+++ pkgsrc/mk/plist/print-plist.mk 2014/01/18 19:48:57 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: print-plist.mk,v 1.24 2013/07/05 15:31:54 jperkin Exp $ 1# $NetBSD: print-plist.mk,v 1.25 2014/01/18 19:48:57 wiz Exp $
2 2
3### 3###
4### Automatic PLIST generation 4### Automatic PLIST generation
5### - files & symlinks first 5### - files & symlinks first
6### - empty directories are handled properly 6### - empty directories are handled properly
7### - dirs from mtree files are excluded 7### - dirs from mtree files are excluded
8### - substitute for platform or package specifics substrings 8### - substitute for platform or package specifics substrings
9### 9###
10### Usage: 10### Usage:
11### - make install 11### - make install
12### - make print-PLIST | brain >PLIST 12### - make print-PLIST | brain >PLIST
13### 13###
14 14
@@ -19,26 +19,30 @@ _PRINT_PLIST_AWK_SUBST+= \ @@ -19,26 +19,30 @@ _PRINT_PLIST_AWK_SUBST+= \
19 gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \ 19 gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
20 gsub(/${MACHINE_ARCH}/, "$${MACHINE_ARCH}"); \ 20 gsub(/${MACHINE_ARCH}/, "$${MACHINE_ARCH}"); \
21 gsub(/${MACHINE_GNU_ARCH}/, "$${MACHINE_GNU_ARCH}"); 21 gsub(/${MACHINE_GNU_ARCH}/, "$${MACHINE_GNU_ARCH}");
22_PRINT_PLIST_AWK_SUBST+= \ 22_PRINT_PLIST_AWK_SUBST+= \
23 gsub(/${LOWER_OS_VERSION:S/./\./g}/, "$${LOWER_OS_VERSION}"); 23 gsub(/${LOWER_OS_VERSION:S/./\./g}/, "$${LOWER_OS_VERSION}");
24.endif 24.endif
25_PRINT_PLIST_AWK_SUBST+= \ 25_PRINT_PLIST_AWK_SUBST+= \
26 gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}"); \ 26 gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}"); \
27 gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\ 27 gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\
28 gsub(/^${PKGLOCALEDIR}\/locale/, "share/locale"); \ 28 gsub(/^${PKGLOCALEDIR}\/locale/, "share/locale"); \
29 gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/"); \ 29 gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/"); \
30 gsub("^${PKGINFODIR}/", "info/"); \ 30 gsub("^${PKGINFODIR}/", "info/"); \
31 gsub("^${PKGMANDIR}/", "man/"); 31 gsub("^${PKGMANDIR}/", "man/");
 32# for Python packages
 33_PRINT_PLIST_AWK_SUBST+= gsub(/__pycache__\//, "");
 34_PRINT_PLIST_AWK_SUBST+= gsub(/\.cpython-[0-9]+/, "")
 35
32_PRINT_PLIST_AWK_SUBST+=} 36_PRINT_PLIST_AWK_SUBST+=}
33 37
34_PRINT_PLIST_AWK_IGNORE= ($$0 ~ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}\//) 38_PRINT_PLIST_AWK_IGNORE= ($$0 ~ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}\//)
35_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /emul\/linux\/proc/) 39_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /emul\/linux\/proc/)
36.if defined(INFO_FILES) 40.if defined(INFO_FILES)
37_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/dir$$/) 41_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/dir$$/)
38_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/[^\/]+(-[0-9]+)(\.gz)?$$/) 42_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/[^\/]+(-[0-9]+)(\.gz)?$$/)
39_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^([^\/]*\/)*(info\/[^\/]+|[^\/]+\.info)(-[0-9]+)(\.gz)?$$/) 43_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^([^\/]*\/)*(info\/[^\/]+|[^\/]+\.info)(-[0-9]+)(\.gz)?$$/)
40.endif 44.endif
41.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*)) 45.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
42_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/encodings\.dir/) 46_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/encodings\.dir/)
43_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.dir/) 47_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.dir/)
44.endif 48.endif