[pkgsrc/trunk]: pkgsrc/lang/sun-jre15 Too many SUPPORT_FILES must have overfl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/122d30ea8995
branches:  trunk
changeset: 481511:122d30ea8995
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Oct 06 01:42:34 2004 +0000

description:
Too many SUPPORT_FILES must have overflowed shell args somewhere or similar
(on NetBSD 2.0_RC*, the generated .INSTALL ends up with an empty definition
of SUPPORT_FILES).  Trim out the fontconfig.* files, for now.

diffstat:

 lang/sun-jre15/Makefile  |  10 +++++-----
 lang/sun-jre15/PLIST     |  48 +++++++++++++++++++++---------------------------
 lang/sun-jre15/sfiles.mk |  22 +---------------------
 3 files changed, 27 insertions(+), 53 deletions(-)

diffs (152 lines):

diff -r 1b61d5051dcc -r 122d30ea8995 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Wed Oct 06 00:18:40 2004 +0000
+++ b/lang/sun-jre15/Makefile   Wed Oct 06 01:42:34 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/05 22:09:23 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/06 01:42:34 tv Exp $
 
 DISTNAME=      jre-1_5_0-linux-i586
 PKGNAME=       sun-jre15-5.0
-PKGREVISION=   1
+PKGREVISION=   2
 MASTER_SITES=  # empty
 
 COMMENT=       Sun's Java(tm) 2 Runtime Environment 1.5.0
@@ -54,9 +54,9 @@
        ${ECHO} >> sfiles.mk '# Created with "make makesfiles"'
        ${ECHO} >> sfiles.mk '# Do not edit this file manually!'
        ${ECHO} >> sfiles.mk '#'
-       cd ${WRKSRC}/lib && ${FIND} * -name \*.properties\*             \
-               -o -name \*.cfg -o -name fontconfig.\*                  \
-               -o -name \*.security |                                  \
+       cd ${WRKSRC}/lib && ${FIND} *                                   \
+               -name \*.properties -o -name \*.properties.\?\? -o      \
+               -name \*.cfg -o -name \*.security |                     \
        ${SED} 's/^/SFILES+=    /' >>../../../sfiles.mk
 
 .include "../../lang/sun-jre15/Makefile.common"
diff -r 1b61d5051dcc -r 122d30ea8995 lang/sun-jre15/PLIST
--- a/lang/sun-jre15/PLIST      Wed Oct 06 00:18:40 2004 +0000
+++ b/lang/sun-jre15/PLIST      Wed Oct 06 01:42:34 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/05 22:09:23 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/10/06 01:42:35 tv Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -8,7 +8,6 @@
 bin/sun15-rmiregistry
 bin/sun15-servertool
 bin/sun15-tnameserv
-java/sun-1.5/.pkgsrc
 java/sun-1.5/.systemPrefs/.system.lock
 java/sun-1.5/.systemPrefs/.systemRootModFile
 java/sun-1.5/CHANGES
@@ -34,8 +33,6 @@
 java/sun-1.5/bin/tnameserv
 java/sun-1.5/bin/unpack200
 java/sun-1.5/javaws/javaws
-java/sun-1.5/lib/.pkgsrc
-java/sun-1.5/lib/applet/.pkgsrc
 java/sun-1.5/lib/audio/soundbank.gm
 java/sun-1.5/lib/charsets.jar
 java/sun-1.5/lib/classlist
@@ -51,26 +48,26 @@
 java/sun-1.5/lib/ext/sunjce_provider.jar
 java/sun-1.5/lib/ext/sunpkcs11.jar
 java/sun-1.5/lib/flavormap.properties.default
-java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.3.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.3.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.8.0.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.8.0.properties.src.default
-java/sun-1.5/lib/fontconfig.RedHat.bfc.default
-java/sun-1.5/lib/fontconfig.RedHat.properties.src.default
-java/sun-1.5/lib/fontconfig.SuSE.bfc.default
-java/sun-1.5/lib/fontconfig.SuSE.properties.src.default
-java/sun-1.5/lib/fontconfig.Sun.2003.bfc.default
-java/sun-1.5/lib/fontconfig.Sun.2003.properties.src.default
-java/sun-1.5/lib/fontconfig.Sun.bfc.default
-java/sun-1.5/lib/fontconfig.Sun.properties.src.default
-java/sun-1.5/lib/fontconfig.Turbo.8.0.bfc.default
-java/sun-1.5/lib/fontconfig.Turbo.8.0.properties.src.default
-java/sun-1.5/lib/fontconfig.Turbo.bfc.default
-java/sun-1.5/lib/fontconfig.Turbo.properties.src.default
-java/sun-1.5/lib/fontconfig.bfc.default
-java/sun-1.5/lib/fontconfig.properties.src.default
+java/sun-1.5/lib/fontconfig.RedHat.2.1.bfc
+java/sun-1.5/lib/fontconfig.RedHat.2.1.properties.src
+java/sun-1.5/lib/fontconfig.RedHat.3.bfc
+java/sun-1.5/lib/fontconfig.RedHat.3.properties.src
+java/sun-1.5/lib/fontconfig.RedHat.8.0.bfc
+java/sun-1.5/lib/fontconfig.RedHat.8.0.properties.src
+java/sun-1.5/lib/fontconfig.RedHat.bfc
+java/sun-1.5/lib/fontconfig.RedHat.properties.src
+java/sun-1.5/lib/fontconfig.SuSE.bfc
+java/sun-1.5/lib/fontconfig.SuSE.properties.src
+java/sun-1.5/lib/fontconfig.Sun.2003.bfc
+java/sun-1.5/lib/fontconfig.Sun.2003.properties.src
+java/sun-1.5/lib/fontconfig.Sun.bfc
+java/sun-1.5/lib/fontconfig.Sun.properties.src
+java/sun-1.5/lib/fontconfig.Turbo.8.0.bfc
+java/sun-1.5/lib/fontconfig.Turbo.8.0.properties.src
+java/sun-1.5/lib/fontconfig.Turbo.bfc
+java/sun-1.5/lib/fontconfig.Turbo.properties.src
+java/sun-1.5/lib/fontconfig.bfc
+java/sun-1.5/lib/fontconfig.properties.src
 java/sun-1.5/lib/fonts/LucidaBrightDemiBold.ttf
 java/sun-1.5/lib/fonts/LucidaBrightDemiItalic.ttf
 java/sun-1.5/lib/fonts/LucidaBrightItalic.ttf
@@ -127,8 +124,6 @@
 java/sun-1.5/lib/${MACHINE_ARCH}/xawt/libmawt.so
 java/sun-1.5/lib/im/indicim.jar
 java/sun-1.5/lib/im/thaiim.jar
-java/sun-1.5/lib/images/.pkgsrc
-java/sun-1.5/lib/images/cursors/.pkgsrc
 java/sun-1.5/lib/images/cursors/cursors.properties.default
 java/sun-1.5/lib/images/cursors/invalid32x32.gif
 java/sun-1.5/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -186,7 +181,6 @@
 java/sun-1.5/lib/psfont.properties.ja.default
 java/sun-1.5/lib/psfontj2d.properties.default
 java/sun-1.5/lib/rt.jar
-java/sun-1.5/lib/security/.pkgsrc
 java/sun-1.5/lib/security/US_export_policy.jar
 java/sun-1.5/lib/security/cacerts
 java/sun-1.5/lib/security/java.policy
diff -r 1b61d5051dcc -r 122d30ea8995 lang/sun-jre15/sfiles.mk
--- a/lang/sun-jre15/sfiles.mk  Wed Oct 06 00:18:40 2004 +0000
+++ b/lang/sun-jre15/sfiles.mk  Wed Oct 06 01:42:34 2004 +0000
@@ -1,30 +1,10 @@
-#      $NetBSD: sfiles.mk,v 1.1.1.1 2004/09/30 22:11:53 rh Exp $
+#      $NetBSD: sfiles.mk,v 1.2 2004/10/06 01:42:35 tv Exp $
 #
 # Created with "make makesfiles"
 # Do not edit this file manually!
 #
 SFILES+=       content-types.properties
 SFILES+=       flavormap.properties
-SFILES+=       fontconfig.RedHat.2.1.bfc
-SFILES+=       fontconfig.RedHat.2.1.properties.src
-SFILES+=       fontconfig.RedHat.3.bfc
-SFILES+=       fontconfig.RedHat.3.properties.src
-SFILES+=       fontconfig.RedHat.8.0.bfc
-SFILES+=       fontconfig.RedHat.8.0.properties.src
-SFILES+=       fontconfig.RedHat.bfc
-SFILES+=       fontconfig.RedHat.properties.src
-SFILES+=       fontconfig.SuSE.bfc
-SFILES+=       fontconfig.SuSE.properties.src
-SFILES+=       fontconfig.Sun.2003.bfc
-SFILES+=       fontconfig.Sun.2003.properties.src
-SFILES+=       fontconfig.Sun.bfc
-SFILES+=       fontconfig.Sun.properties.src
-SFILES+=       fontconfig.Turbo.8.0.bfc
-SFILES+=       fontconfig.Turbo.8.0.properties.src
-SFILES+=       fontconfig.Turbo.bfc
-SFILES+=       fontconfig.Turbo.properties.src
-SFILES+=       fontconfig.bfc
-SFILES+=       fontconfig.properties.src
 SFILES+=       i386/jvm.cfg
 SFILES+=       images/cursors/cursors.properties
 SFILES+=       javaws/messages.properties