diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-19 06:48:45 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-19 06:48:45 +0800 |
| commit | 6f0d2d4e47b6e033155c6c4a90bece8123b14075 (patch) | |
| tree | ce7d7daeec24a433640bb983922dace38d3afe98 /java/linux-oracle-jdk18 | |
| parent | 52bc4849f1134973cb48ee309fb6e3dc39c75ffc (diff) | |
| download | freebsd-ports-gnome-6f0d2d4e47b6e033155c6c4a90bece8123b14075.tar.gz freebsd-ports-gnome-6f0d2d4e47b6e033155c6c4a90bece8123b14075.tar.zst freebsd-ports-gnome-6f0d2d4e47b6e033155c6c4a90bece8123b14075.zip | |
Reduce diff between Orcle/Sun Java ports and clean up.
Diffstat (limited to 'java/linux-oracle-jdk18')
| -rw-r--r-- | java/linux-oracle-jdk18/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile index ea242931471b..b02b19df2b15 100644 --- a/java/linux-oracle-jdk18/Makefile +++ b/java/linux-oracle-jdk18/Makefile @@ -4,7 +4,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION} CATEGORIES= java devel MASTER_SITES= # -PKGNAMEPREFIX= linux-oracle- +PKGNAMEPREFIX= linux-${JDK_VENDOR}- DISTNAME= jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586 MAINTAINER= java@FreeBSD.org @@ -20,7 +20,7 @@ RESTRICTED= Redistribution of repackaged binaries not permitted PKGNAMESUFFIX= 1${JDK_VERSION} WRKSRC= ${WRKDIR}/jdk${DL_JDK_VERSION} -PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} +PLIST_SUB= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} NO_BUILD= yes USE_LINUX= yes @@ -28,6 +28,7 @@ USE_LINUX_APPS= xorglibs USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 +JDK_VENDOR= oracle JDK_VERSION= 8 JDK_INTERNAL_VERSION= 1.${JDK_VERSION}.0 JDK_UPDATE_VERSION= 5 @@ -42,7 +43,8 @@ DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.htm APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_INTERNAL_VERSION} BIN_DIRS= bin jre/bin -SHEBANG_FILES= bin/jcontrol jre/bin/jcontrol +LIB_DIRS= ${BIN_DIRS:S|bin$|lib|} +SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|} bash_CMD= ${SH} .include <bsd.port.pre.mk> @@ -73,8 +75,7 @@ PLIST_SUB+= DEMO="@comment " .if ${PORT_OPTIONS:MDEMO} && ${DEMO_WRKSRC} != ${WRKSRC} post-extract: - @${MV} ${DEMO_WRKSRC}/demo ${WRKSRC}/ - @${MV} ${DEMO_WRKSRC}/sample ${WRKSRC}/ + @cd ${DEMO_WRKSRC} && ${MV} demo sample ${WRKSRC} .endif post-patch: @@ -83,11 +84,7 @@ post-patch: do-install: @${MKDIR} ${STAGEDIR}${APP_HOME} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME} \ - "-not ( -type d -name bin -prune )" - @cd ${WRKSRC} && ${COPYTREE_BIN} "${BIN_DIRS}" ${STAGEDIR}${APP_HOME} - @${INSTALL_SCRIPT} ${WRKSRC}/jre/lib/jexec \ - ${STAGEDIR}${APP_HOME}/jre/lib - @${INSTALL_SCRIPT} ${WRKSRC}/lib/jexec ${STAGEDIR}${APP_HOME}/lib + @cd ${STAGEDIR}${APP_HOME} && \ + ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|} .include <bsd.port.post.mk> |