Thu Oct 30 18:48:13 2008 UTC ()
Don't filter the PLIST for AIX, at least libtool nowadays also creates
ELF like names. From PR 39387.


(joerg)
diff -r1.37 -r1.38 pkgsrc/mk/plist/plist.mk

cvs diff -r1.37 -r1.38 pkgsrc/mk/plist/plist.mk (expand / switch to unified diff)

--- pkgsrc/mk/plist/plist.mk 2008/04/08 20:52:15 1.37
+++ pkgsrc/mk/plist/plist.mk 2008/10/30 18:48:13 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: plist.mk,v 1.37 2008/04/08 20:52:15 jlam Exp $ 1# $NetBSD: plist.mk,v 1.38 2008/10/30 18:48:13 joerg Exp $
2# 2#
3# This Makefile fragment handles the creation of PLISTs for use by 3# This Makefile fragment handles the creation of PLISTs for use by
4# pkg_create(8). 4# pkg_create(8).
5# 5#
6# The following variables affect the PLIST generation: 6# The following variables affect the PLIST generation:
7# 7#
8# PLIST_TYPE specifies whether the generated PLIST is derived 8# PLIST_TYPE specifies whether the generated PLIST is derived
9# automatically from the installed files, or if the PLIST entries 9# automatically from the installed files, or if the PLIST entries
10# are listed in files. Valid values are "dynamic" and "static", 10# are listed in files. Valid values are "dynamic" and "static",
11# and the default value is "static". 11# and the default value is "static".
12# 12#
13# PLIST_VARS is the list of names corresponding to automatic variables 13# PLIST_VARS is the list of names corresponding to automatic variables
14# generated by plist.mk to simplify having conditionally-present 14# generated by plist.mk to simplify having conditionally-present
@@ -180,27 +180,27 @@ _PLIST_AWK+= -f ${.CURDIR}/../../mk/pli @@ -180,27 +180,27 @@ _PLIST_AWK+= -f ${.CURDIR}/../../mk/pli
180_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-locale.awk 180_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-locale.awk
181_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-info.awk 181_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-info.awk
182_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-man.awk 182_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-man.awk
183_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-libtool.awk 183_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-libtool.awk
184_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-default.awk 184_PLIST_AWK+= -f ${.CURDIR}/../../mk/plist/plist-default.awk
185 185
186_PLIST_INFO_AWK+= -f ${.CURDIR}/../../mk/plist/plist-functions.awk 186_PLIST_INFO_AWK+= -f ${.CURDIR}/../../mk/plist/plist-functions.awk
187_PLIST_INFO_AWK+= -f ${.CURDIR}/../../mk/plist/plist-info.awk 187_PLIST_INFO_AWK+= -f ${.CURDIR}/../../mk/plist/plist-info.awk
188 188
189_PLIST_SHLIB_AWK= -f ${_SHLIB_AWKFILE.${SHLIB_TYPE}} 189_PLIST_SHLIB_AWK= -f ${_SHLIB_AWKFILE.${SHLIB_TYPE}}
190_SHLIB_AWKFILE.ECOFF= ${.CURDIR}/../../mk/plist/shlib-elf.awk 190_SHLIB_AWKFILE.ECOFF= ${.CURDIR}/../../mk/plist/shlib-elf.awk
191_SHLIB_AWKFILE.ELF= ${.CURDIR}/../../mk/plist/shlib-elf.awk 191_SHLIB_AWKFILE.ELF= ${.CURDIR}/../../mk/plist/shlib-elf.awk
192_SHLIB_AWKFILE.SOM= ${.CURDIR}/../../mk/plist/shlib-som.awk 192_SHLIB_AWKFILE.SOM= ${.CURDIR}/../../mk/plist/shlib-som.awk
193_SHLIB_AWKFILE.aixlib= ${.CURDIR}/../../mk/plist/shlib-none.awk 193_SHLIB_AWKFILE.aixlib= ${.CURDIR}/../../mk/plist/shlib-elf.awk
194_SHLIB_AWKFILE.a.out= ${.CURDIR}/../../mk/plist/shlib-aout.awk 194_SHLIB_AWKFILE.a.out= ${.CURDIR}/../../mk/plist/shlib-aout.awk
195_SHLIB_AWKFILE.dylib= ${.CURDIR}/../../mk/plist/shlib-dylib.awk 195_SHLIB_AWKFILE.dylib= ${.CURDIR}/../../mk/plist/shlib-dylib.awk
196_SHLIB_AWKFILE.none= ${.CURDIR}/../../mk/plist/shlib-none.awk 196_SHLIB_AWKFILE.none= ${.CURDIR}/../../mk/plist/shlib-none.awk
197 197
198###################################################################### 198######################################################################
199 199
200# GENERATE_PLIST is a sequence of commands, terminating in a semicolon, 200# GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
201# that outputs contents for a PLIST to stdout and is appended to 201# that outputs contents for a PLIST to stdout and is appended to
202# the contents of ${PLIST_SRC}. 202# the contents of ${PLIST_SRC}.
203# 203#
204.if empty(PLIST_SRC) 204.if empty(PLIST_SRC)
205GENERATE_PLIST?= ${ECHO} "@comment "${PKGNAME:Q}" has no files."; 205GENERATE_PLIST?= ${ECHO} "@comment "${PKGNAME:Q}" has no files.";
206.else 206.else