diff options
| author | Ernst de Haan <znerd@FreeBSD.org> | 2002-12-04 07:33:36 +0000 |
|---|---|---|
| committer | Ernst de Haan <znerd@FreeBSD.org> | 2002-12-04 07:33:36 +0000 |
| commit | 06f3700a2cd27e466511af2bf9b5fb9734daa3c8 (patch) | |
| tree | 3b81ccb29f892d70b8ceb01506af9c765dc5c390 | |
| parent | cbb56ccae8144f3ae197b41843ebabe8173b8009 (diff) | |
| download | ports-06f3700a2cd27e466511af2bf9b5fb9734daa3c8.tar.gz ports-06f3700a2cd27e466511af2bf9b5fb9734daa3c8.zip | |
Now extracts non-interactive. Bumped PORTREVISION.
Reviewed by: glewis, kris
Approved by: kris
Notes
Notes:
svn path=/head/; revision=71358
| -rw-r--r-- | java/linux-blackdown-jdk13/Makefile | 14 | ||||
| -rw-r--r-- | java/linux-sun-jdk13/Makefile | 13 |
2 files changed, 15 insertions, 12 deletions
diff --git a/java/linux-blackdown-jdk13/Makefile b/java/linux-blackdown-jdk13/Makefile index 7949b8dac776..cef676e68430 100644 --- a/java/linux-blackdown-jdk13/Makefile +++ b/java/linux-blackdown-jdk13/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} +PORTREVISION= 1 CATEGORIES= java MASTER_SITES= ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/${DOWNLOAD_DIR}/ \ ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \ @@ -20,10 +21,6 @@ MAINTAINER= znerd@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper -EXTRACT_CMD= # empty -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= # empty - WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} @@ -41,8 +38,9 @@ APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION} .include <bsd.port.pre.mk> -post-fetch: - @${CHMOD} +x ${DISTDIR}/${DISTFILES} +do-extract: + @${MKDIR} ${WRKDIR} + @cd ${WRKDIR} && ${TAIL} +400 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${BZIP2_CMD} -dc | ${TAR} xf - post-patch: @${ECHO} -n ">> Removing unneeded files..." @@ -62,4 +60,8 @@ do-install: @${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Blackdown-JDK${PORTVERSION}_${PORTREVISION}" @${ECHO} " [ DONE ]" +post-install: + @${ECHO} "Please read the license carefully before using this software." + @${ECHO} "See: ${APP_HOME}/LICENSE" + .include <bsd.port.post.mk> diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index 247efc0f21be..4802c0ba0450 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -21,10 +22,6 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" -EXTRACT_CMD= # empty -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= # empty - WRKSRC= ${WRKDIR}/${PORTNAME}${JDK_VERSION}_${JDK_REVISION} PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} @@ -57,8 +54,12 @@ pre-extract: };\ fi -post-fetch: - @${CHMOD} +x ${DISTDIR}/${DISTFILES} +do-extract: + @${MKDIR} ${WRKDIR} + @cd ${WRKDIR} \ + && ${TAIL} +291 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \ + && ${CHMOD} +x ${WRKDIR}/install.sfx \ + && ${WRKDIR}/install.sfx > /dev/null post-patch: @find ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f |