Fri Jul 5 15:31:54 2013 UTC ()
Fix print-PLIST with a custom PKGGNUDIR.


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

--- pkgsrc/mk/plist/print-plist.mk 2013/02/20 09:19:08 1.23
+++ pkgsrc/mk/plist/print-plist.mk 2013/07/05 15:31:54 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: print-plist.mk,v 1.23 2013/02/20 09:19:08 wiz Exp $ 1# $NetBSD: print-plist.mk,v 1.24 2013/07/05 15:31:54 jperkin 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
@@ -16,27 +16,27 @@ _PRINT_PLIST_AWK_SUBST={ @@ -16,27 +16,27 @@ _PRINT_PLIST_AWK_SUBST={
16.if !defined(EMUL_PLATFORMS) 16.if !defined(EMUL_PLATFORMS)
17_PRINT_PLIST_AWK_SUBST+= \ 17_PRINT_PLIST_AWK_SUBST+= \
18 gsub(/${OS_VERSION:S/./\./g}/, "$${OS_VERSION}"); \ 18 gsub(/${OS_VERSION:S/./\./g}/, "$${OS_VERSION}"); \
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}", "gnu/"); \ 29 gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/"); \
30 gsub("^${PKGINFODIR}/", "info/"); \ 30 gsub("^${PKGINFODIR}/", "info/"); \
31 gsub("^${PKGMANDIR}/", "man/"); 31 gsub("^${PKGMANDIR}/", "man/");
32_PRINT_PLIST_AWK_SUBST+=} 32_PRINT_PLIST_AWK_SUBST+=}
33 33
34_PRINT_PLIST_AWK_IGNORE= ($$0 ~ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}\//) 34_PRINT_PLIST_AWK_IGNORE= ($$0 ~ /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}\//)
35_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /emul\/linux\/proc/) 35_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /emul\/linux\/proc/)
36.if defined(INFO_FILES) 36.if defined(INFO_FILES)
37_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/dir$$/) 37_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/dir$$/)
38_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/[^\/]+(-[0-9]+)(\.gz)?$$/) 38_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^${PKGINFODIR:S|/|\\/|g}\/[^\/]+(-[0-9]+)(\.gz)?$$/)
39_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^([^\/]*\/)*(info\/[^\/]+|[^\/]+\.info)(-[0-9]+)(\.gz)?$$/) 39_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^([^\/]*\/)*(info\/[^\/]+|[^\/]+\.info)(-[0-9]+)(\.gz)?$$/)
40.endif 40.endif
41.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*)) 41.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
42_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/encodings\.dir/) 42_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/encodings\.dir/)
@@ -165,27 +165,26 @@ print-PLIST: @@ -165,27 +165,26 @@ print-PLIST:
165 sub("\\.[0-9]+$$", ""); \ 165 sub("\\.[0-9]+$$", ""); \
166 if ('$$genlinks') print $$0; \ 166 if ('$$genlinks') print $$0; \
167 next; \ 167 next; \
168 } \ 168 } \
169 { print $$0; }' 169 { print $$0; }'
170 ${RUN}\ 170 ${RUN}\
171 for i in `${_PRINT_PLIST_DIRS_CMD} \ 171 for i in `${_PRINT_PLIST_DIRS_CMD} \
172 | ${SORT} -r \ 172 | ${SORT} -r \
173 | ${AWK} ' \ 173 | ${AWK} ' \
174 /emul\/linux\/proc/ { next; } \ 174 /emul\/linux\/proc/ { next; } \
175 /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \ 175 /${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; } \
176 /${PKG_DBDIR:S|/|\\/|g}\// { next; } \ 176 /${PKG_DBDIR:S|/|\\/|g}\// { next; } \
177 { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \ 177 { sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); } \
178 { sub("^${PKGGNUDIR}", "gnu/"); } \ 
179 { sub("^${PKGINFODIR}/", "info/"); } \ 178 { sub("^${PKGINFODIR}/", "info/"); } \
180 { sub("^${PKGMANDIR}/", "man/"); } \ 179 { sub("^${PKGMANDIR}/", "man/"); } \
181 /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \ 180 /^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \
182 /^${PKGINFODIR:S|/|\\/|g}$$/ { next; } \ 181 /^${PKGINFODIR:S|/|\\/|g}$$/ { next; } \
183 ${_PRINT_PLIST_COMMON_DIRS}'` ; \ 182 ${_PRINT_PLIST_COMMON_DIRS}'` ; \
184 do \ 183 do \
185 if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \ 184 if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \
186 ${ECHO} @pkgdir $$i | ${AWK} ' \ 185 ${ECHO} @pkgdir $$i | ${AWK} ' \
187 ${PRINT_PLIST_AWK} \ 186 ${PRINT_PLIST_AWK} \
188 { print $$0; }' ; \ 187 { print $$0; }' ; \
189 fi ; \ 188 fi ; \
190 done \ 189 done \
191 | ${AWK} '${_PRINT_PLIST_AWK_SUBST} { print $$0; }' 190 | ${AWK} '${_PRINT_PLIST_AWK_SUBST} { print $$0; }'