diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /devel/nspr | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'devel/nspr')
| -rw-r--r-- | devel/nspr/Makefile | 8 | ||||
| -rw-r--r-- | devel/nspr/PLIST | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 230750f9018..14a8b755360 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/01/29 11:37:35 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2008/04/12 22:43:00 jlam Exp $ DISTNAME= nspr-4.6.7 PKGREVISION= 1 @@ -38,6 +38,7 @@ SO_SUFFIX= so.1.0 PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} INSTALLATION_DIRS= bin +PLIST_VARS+= sun4u_32 # see ${WRKSRC}/nspr-4.6.1/mozilla/nsprpub/pr/src/md/unix/Makefile.in # for the bit about 32-bit sun4u machines installing an extra file. @@ -48,14 +49,11 @@ CONFIGURE_ARGS+= --enable-64bit . else HW_CLASS!= ${UNAME} -m . if ${HW_CLASS} == "sun4u" -SUN4U_32= +PLIST.sun4u_32= yes . endif . endif .endif -SUN4U_32?= "@comment " -PLIST_SUBST+= SUN4U_32=${SUN4U_32} - .if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) BUILDLINK_PASSTHRU_DIRS+= /Developer/Headers/FlatCarbon diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST index 15e50fbfc56..62b65858ee5 100644 --- a/devel/nspr/PLIST +++ b/devel/nspr/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/10/22 15:23:27 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:00 jlam Exp $ bin/nspr-config include/nspr/md/_aix.h include/nspr/md/_aix32.cfg @@ -130,7 +130,7 @@ include/nspr/prtrace.h include/nspr/prtypes.h include/nspr/prvrsion.h include/nspr/prwin16.h -${SUN4U_32}lib/nspr/cpu/sparcv8plus/libnspr_flt4.so +${PLIST.sun4u_32}lib/nspr/cpu/sparcv8plus/libnspr_flt4.so lib/nspr/libnspr4.a lib/nspr/libnspr4.${SO_SUFFIX} lib/nspr/libplc4.a @@ -142,5 +142,5 @@ lib/pkgconfig/nspr.pc @dirrm include/nspr/obsolete @dirrm include/nspr/md @dirrm include/nspr -${SUN4U_32}@dirrm lib/nspr/cpu/sparcv8plus +${PLIST.sun4u_32}@dirrm lib/nspr/cpu/sparcv8plus @dirrm lib/nspr |