diff options
author | jlam <jlam@pkgsrc.org> | 2005-08-19 18:12:36 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-08-19 18:12:36 +0000 |
commit | bd2788d930980fb7fff304fa568751d0f69d819b (patch) | |
tree | 41d5fc337098f380e5f2c0106fb2d4d88fd977eb /lang | |
parent | e956158a4eb6d5a4d218d8ed22d012b1f05a74c6 (diff) | |
download | pkgsrc-bd2788d930980fb7fff304fa568751d0f69d819b.tar.gz |
Merge CONF_FILES/SUPPORT_FILES and CONF_FILES_PERMS/SUPPORT_FILES_PERMS
as the INSTALL and DEINSTALL scripts no longer distinguish between
the two types of files. Drop SUPPORT_FILES{,_PERMS} and modify the
packages in pkgsrc accordingly.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/blackdown-jre13/Makefile | 6 | ||||
-rw-r--r-- | lang/jdk/Makefile | 6 | ||||
-rw-r--r-- | lang/kaffe/Makefile | 4 | ||||
-rw-r--r-- | lang/sun-jre13/Makefile | 6 | ||||
-rw-r--r-- | lang/sun-jre14/Makefile | 6 | ||||
-rw-r--r-- | lang/sun-jre15/Makefile | 8 |
6 files changed, 18 insertions, 18 deletions
diff --git a/lang/blackdown-jre13/Makefile b/lang/blackdown-jre13/Makefile index f79d7704d4a..9760b88e1ab 100644 --- a/lang/blackdown-jre13/Makefile +++ b/lang/blackdown-jre13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/15 11:53:20 veego Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $ # BD_BASENAME= j2re @@ -36,9 +36,9 @@ SFILES+= font.properties font.properties.ja SFILES+= font.properties.zh jvm.cfg SFILES+= images/cursors/cursors.properties psfont.properties.ja SFILES+= psfontj2d.properties security/java.security -SUPPORT_FILES= # empty +CONF_FILES= # empty .for FILE in ${SFILES} -SUPPORT_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE} +CONF_FILES+= ${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE} .endfor do-configure: diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index c201373919e..c7fda342552 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/04/11 21:46:14 tv Exp $ +# $NetBSD: Makefile,v 1.44 2005/08/19 18:12:37 jlam Exp $ # VERSION= 1.1.8 @@ -57,9 +57,9 @@ SFILES+= font.properties.tr font.properties.zh_EUC_CN SFILES+= font.properties.zh_TW_Big5 font.properties.zh_TW_EUC_TW SFILES+= psfont.properties.ja serialver.properties SFILES+= security/java.security -SUPPORT_FILES= # empty +CONF_FILES= # empty .for FILE in ${SFILES} -SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} +CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} .endfor do-configure: diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index fe7a7150858..54ea1406d2f 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/01/30 23:18:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.59 2005/08/19 18:12:37 jlam Exp $ # .include "Makefile.common" @@ -10,7 +10,7 @@ CONFLICTS+= kaffe-nox11-[0-9]* JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \ javap jdb rmic rmiregistry serialver -SUPPORT_FILES= ${JAVA_HOME}/jre/lib/security/java.security.default \ +CONF_FILES= ${JAVA_HOME}/jre/lib/security/java.security.default \ ${JAVA_HOME}/jre/lib/security/java.security .include "../../mk/bsd.prefs.mk" diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile index 32e4657a180..d53a3159ecb 100644 --- a/lang/sun-jre13/Makefile +++ b/lang/sun-jre13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/01/30 23:18:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.40 2005/08/19 18:12:37 jlam Exp $ DISTNAME= j2re-1_3_1_15-linux-i586 PKGNAME= sun-jre13-1.0.15 @@ -22,9 +22,9 @@ SFILES+= font.properties font.properties.ja SFILES+= font.properties.zh images/cursors/cursors.properties SFILES+= jvm.cfg psfont.properties.ja SFILES+= psfontj2d.properties security/java.security -SUPPORT_FILES= # empty +CONF_FILES= # empty .for FILE in ${SFILES} -SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} +CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} .endfor do-configure: diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index 2e3c4458827..ea1972a58ee 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/08/14 10:15:55 dillo Exp $ +# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:37 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -29,9 +29,9 @@ SFILES+= font.properties.ja font.properties.zh.Turbo SFILES+= images/cursors/cursors.properties i386/jvm.cfg SFILES+= logging.properties psfont.properties.ja SFILES+= psfontj2d.properties security/java.security -SUPPORT_FILES= # empty +CONF_FILES= # empty .for FILE in ${SFILES} -SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} +CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} .endfor PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre14 diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index d1f265d0f73..7eb26596334 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/08/14 10:15:55 dillo Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:37 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -20,10 +20,10 @@ OWN_DIRS+= ${JAVA_HOME}/lib/applet OWN_DIRS+= ${JAVA_HOME}/lib/images OWN_DIRS+= ${JAVA_HOME}/lib/images/cursors OWN_DIRS+= ${JAVA_HOME}/lib/security -SUPPORT_FILES= # empty +CONF_FILES= # empty .sinclude "sfiles.mk" .for FILE in ${SFILES} -SUPPORT_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} +CONF_FILES+= ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE} .endfor PKG_OPTIONS_VAR= PKG_OPTIONS.sun-jre15 @@ -54,7 +54,7 @@ do-configure: cd ${WRKSRC}/lib; for file in ${SFILES}; do \ ${MV} -f $$file $$file.default; \ done - @${ECHO} 'SUPPORT_FILES="${SUPPORT_FILES}"' >${HEADER_EXTRA_TMPL} + @${ECHO} 'CONF_FILES="${CONF_FILES}"' >${HEADER_EXTRA_TMPL} .if !empty(PKG_OPTIONS:Msun-jre-jce) cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC} |