[pkgsrc/trunk]: pkgsrc/devel/nspr PLIST fixes when on sun4u machines running ...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c816a19b4ee7
branches:  trunk
changeset: 520497:c816a19b4ee7
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Sun Oct 22 15:23:27 2006 +0000

description:
PLIST fixes when on sun4u machines running SunOS.  No changes to other
platforms.

diffstat:

 devel/nspr/Makefile |  17 +++++++++++++++--
 devel/nspr/PLIST    |   4 +++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r d1e52387ebad -r c816a19b4ee7 devel/nspr/Makefile
--- a/devel/nspr/Makefile       Sun Oct 22 14:27:00 2006 +0000
+++ b/devel/nspr/Makefile       Sun Oct 22 15:23:27 2006 +0000
@@ -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 @@
 
 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 -r d1e52387ebad -r c816a19b4ee7 devel/nspr/PLIST
--- a/devel/nspr/PLIST  Sun Oct 22 14:27:00 2006 +0000
+++ b/devel/nspr/PLIST  Sun Oct 22 15:23:27 2006 +0000
@@ -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/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 @@
 @dirrm include/nspr/obsolete
 @dirrm include/nspr/md
 @dirrm include/nspr
+${SUN4U_32}@dirrm lib/nspr/cpu/sparcv8plus
 @dirrm lib/nspr