diff options
| author | dmcmahill <dmcmahill> | 2006-10-22 15:23:27 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2006-10-22 15:23:27 +0000 |
| commit | 9f94f949be0db61d5bafdca620c91ad367d0a45c (patch) | |
| tree | 4e2952dd8f3c29656098cf4549d10b03dd526469 /devel/nspr | |
| parent | 85d1453369e9526694d482eb9c479949ef49c760 (diff) | |
| download | pkgsrc-9f94f949be0db61d5bafdca620c91ad367d0a45c.tar.gz | |
PLIST fixes when on sun4u machines running SunOS. No changes to other
platforms.
Diffstat (limited to 'devel/nspr')
| -rw-r--r-- | devel/nspr/Makefile | 17 | ||||
| -rw-r--r-- | devel/nspr/PLIST | 4 |
2 files changed, 18 insertions, 3 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index b44fb3902c9..6e0bd028218 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/08/05 02:08:32 markd Exp $ +# $NetBSD: Makefile,v 1.17 2006/10/22 15:23:27 dmcmahill Exp $ DISTNAME= nspr-4.6.1 PKGREVISION= 1 @@ -34,10 +34,23 @@ PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} INSTALLATION_DIRS= bin -.if ${OPSYS} == "SunOS" && defined(ABI) && ${ABI} == "64" +# 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. +# That is why we have this specific test and modify the PLIST +.if ${OPSYS} == "SunOS" +. if defined(ABI) && ${ABI} == "64" CONFIGURE_ARGS+= --enable-64bit +. else +HW_CLASS!= ${UNAME} -m +. if ${HW_CLASS} == "sun4u" +SUN4U_32= +. 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 .endif diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST index df7f809afd4..15e50fbfc56 100644 --- a/devel/nspr/PLIST +++ b/devel/nspr/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2006/02/02 05:51:14 ben Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/10/22 15:23:27 dmcmahill Exp $ bin/nspr-config include/nspr/md/_aix.h include/nspr/md/_aix32.cfg @@ -130,6 +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 lib/nspr/libnspr4.a lib/nspr/libnspr4.${SO_SUFFIX} lib/nspr/libplc4.a @@ -141,4 +142,5 @@ lib/pkgconfig/nspr.pc @dirrm include/nspr/obsolete @dirrm include/nspr/md @dirrm include/nspr +${SUN4U_32}@dirrm lib/nspr/cpu/sparcv8plus @dirrm lib/nspr |