diff options
| author | sbd <sbd@pkgsrc.org> | 2011-12-30 07:12:23 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-12-30 07:12:23 +0000 |
| commit | 4d9142aa1408d3ee015e5293e6ccdc9940002e8d (patch) | |
| tree | ebbbeeed5313c590d8e429dd90d149c45917f7a1 /lang | |
| parent | 8375f33a3195b1c3aa9bcd9c59528a94a367acf3 (diff) | |
| download | pkgsrc-4d9142aa1408d3ee015e5293e6ccdc9940002e8d.tar.gz | |
Use JAVA_ARCH not EMUL_ARCH in the de-install script.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/sun-jre6/DEINSTALL | 6 | ||||
| -rw-r--r-- | lang/sun-jre6/Makefile | 3 | ||||
| -rw-r--r-- | lang/sun-jre6/Makefile.common | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lang/sun-jre6/DEINSTALL b/lang/sun-jre6/DEINSTALL index ce5f9413ea3..c0eff233250 100644 --- a/lang/sun-jre6/DEINSTALL +++ b/lang/sun-jre6/DEINSTALL @@ -1,8 +1,8 @@ -# $NetBSD: DEINSTALL,v 1.3 2011/12/04 02:46:07 sbd Exp $ +# $NetBSD: DEINSTALL,v 1.4 2011/12/30 07:12:23 sbd Exp $ case ${STAGE} in DEINSTALL) - ${RM} -f @JAVA_HOME@/lib/@EMUL_ARCH@/client/classes.jsa - ${RM} -f @JAVA_HOME@/lib/@EMUL_ARCH@/server/classes.jsa + ${RM} -f @JAVA_HOME@/lib/@JAVA_ARCH@/client/classes.jsa + ${RM} -f @JAVA_HOME@/lib/@JAVA_ARCH@/server/classes.jsa ;; esac diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile index 839161ad570..679fa93c423 100644 --- a/lang/sun-jre6/Makefile +++ b/lang/sun-jre6/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.33 2011/10/20 12:28:09 obache Exp $ +# $NetBSD: Makefile,v 1.34 2011/12/30 07:12:23 sbd Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version DISTNAME= jre-6u29-linux-${DIST_ARCH} PKGNAME= sun-jre6-6.0.29 +PKGREVISION= 1 MASTER_SITES= # empty LICENSE= sun-jre6-license diff --git a/lang/sun-jre6/Makefile.common b/lang/sun-jre6/Makefile.common index e09c2b6f2c3..1389cc5b07a 100644 --- a/lang/sun-jre6/Makefile.common +++ b/lang/sun-jre6/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2011/08/25 10:32:52 sbd Exp $ +# $NetBSD: Makefile.common,v 1.17 2011/12/30 07:12:23 sbd Exp $ # used by lang/sun-jre6/Makefile # used by lang/sun-jdk6/Makefile @@ -43,6 +43,7 @@ JAVA_ARCH= ${JAVA_ARCH.${EMUL_ARCH}} .else JAVA_ARCH= ${EMUL_ARCH} .endif +FILES_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q} INTERACTIVE_STAGE= fetch BUILD_DIRS= # empty |