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/sun-jre15 | |
| 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/sun-jre15')
| -rw-r--r-- | lang/sun-jre15/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
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} |