Date: Fri, 18 Apr 2014 22:48:46 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351572 - in head/java: linux-oracle-jdk18 linux-oracle-jre18 linux-sun-jdk17 linux-sun-jre17 Message-ID: <201404182248.s3IMmkO0000633@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Apr 18 22:48:45 2014 New Revision: 351572 URL: http://svnweb.freebsd.org/changeset/ports/351572 QAT: https://qat.redports.org/buildarchive/r351572/ Log: Reduce diff between Orcle/Sun Java ports and clean up. Modified: head/java/linux-oracle-jdk18/Makefile head/java/linux-oracle-jre18/Makefile head/java/linux-sun-jdk17/Makefile head/java/linux-sun-jre17/Makefile Modified: head/java/linux-oracle-jdk18/Makefile ============================================================================== --- head/java/linux-oracle-jdk18/Makefile Fri Apr 18 22:37:29 2014 (r351571) +++ head/java/linux-oracle-jdk18/Makefile Fri Apr 18 22:48:45 2014 (r351572) @@ -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 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/tec 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> Modified: head/java/linux-oracle-jre18/Makefile ============================================================================== --- head/java/linux-oracle-jre18/Makefile Fri Apr 18 22:37:29 2014 (r351571) +++ head/java/linux-oracle-jre18/Makefile Fri Apr 18 22:48:45 2014 (r351572) @@ -4,7 +4,7 @@ PORTNAME= jre PORTVERSION= ${JRE_VERSION}.${JRE_UPDATE_VERSION} CATEGORIES= java MASTER_SITES= # -PKGNAMEPREFIX= linux-oracle- +PKGNAMEPREFIX= linux-${JRE_VENDOR}- DISTNAME= jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586 MAINTAINER= java@FreeBSD.org @@ -17,7 +17,7 @@ RESTRICTED= Redistribution of repackaged PKGNAMESUFFIX= 1${JRE_VERSION} WRKSRC= ${WRKDIR}/jre${DL_JRE_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 @@ -25,6 +25,7 @@ USE_LINUX_APPS= xorglibs USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 +JRE_VENDOR= oracle JRE_VERSION= 8 JRE_INTERNAL_VERSION= 1.${JRE_VERSION}.0 JRE_UPDATE_VERSION= 5 @@ -39,7 +40,8 @@ DOWNLOAD_URL= http://www.oracle.com/tec APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JRE_INTERNAL_VERSION} BIN_DIRS= bin -SHEBANG_FILES= bin/jcontrol +LIB_DIRS= ${BIN_DIRS:S|bin$|lib|} +SHEBANG_FILES= ${BIN_DIRS:S|$|/jcontrol|} bash_CMD= ${SH} .include <bsd.port.pre.mk> @@ -51,9 +53,7 @@ IGNORE?=You must manually fetch the J2SE 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}/lib/jexec ${STAGEDIR}${APP_HOME}/lib + @cd ${STAGEDIR}${APP_HOME} && \ + ${CHMOD} ${BINMODE} ${BIN_DIRS:S|$|/*|} ${LIB_DIRS:S|$|/jexec|} .include <bsd.port.post.mk> Modified: head/java/linux-sun-jdk17/Makefile ============================================================================== --- head/java/linux-sun-jdk17/Makefile Fri Apr 18 22:37:29 2014 (r351571) +++ head/java/linux-sun-jdk17/Makefile Fri Apr 18 22:48:45 2014 (r351572) @@ -5,11 +5,11 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION} CATEGORIES= java devel MASTER_SITES= # -PKGNAMEPREFIX= linux-sun- -DISTNAME= jdk-7u${JDK_UPDATE_VERSION}-linux-i586 +PKGNAMEPREFIX= linux-${JDK_VENDOR}- +DISTNAME= jdk-${JDK_VERSION}u${JDK_UPDATE_VERSION}-linux-i586 MAINTAINER= java@FreeBSD.org -COMMENT= Oracle Java 7 Development Kit for Linux +COMMENT= Oracle Java ${JDK_VERSION} Development Kit for Linux RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper @@ -18,10 +18,10 @@ DEMO_DESC= Install demos and samples NO_CDROM= License does not allow distribution with fee RESTRICTED= Redistribution of repackaged binaries not permitted -PKGNAMESUFFIX= 17 +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 @@ -29,8 +29,9 @@ USE_LINUX_APPS= xorglibs USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 +JDK_VENDOR= sun JDK_VERSION= 7 -JDK_INTERNAL_VERSION= 1.7.0 +JDK_INTERNAL_VERSION= 1.${JDK_VERSION}.0 JDK_UPDATE_VERSION= 55 DL_JDK_VERSION= ${JDK_INTERNAL_VERSION}_${JDK_UPDATE_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html @@ -52,7 +53,7 @@ IGNORE?=You must manually fetch the J2SE .if ${PORT_OPTIONS:MDEMO} DEMO_UPDATE_VERSION= ${JDK_UPDATE_VERSION} .if ${DEMO_UPDATE_VERSION} != ${JDK_UPDATE_VERSION} -DEMO_DISTNAME= jdk-7u${DEMO_UPDATE_VERSION}-linux-i586-demos +DEMO_DISTNAME= jdk-${JDK_VERSION}u${DEMO_UPDATE_VERSION}-linux-i586-demos DEMO_WRKSRC= ${WRKDIR}/jdk${JDK_INTERNAL_VERSION}_${DEMO_UPDATE_VERSION} .else DEMO_DISTNAME= ${DISTNAME}-demos @@ -67,17 +68,13 @@ PLIST_SUB+= DEMO="" PLIST_SUB+= DEMO="@comment " .endif -pre-everything:: - @${CAT} ${PKGMESSAGE} - .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: - @(cd ${WRKSRC}/include; ${LN} -s linux freebsd) + @cd ${WRKSRC}/include && ${LN} -s linux freebsd do-install: @${MKDIR} ${STAGEDIR}${APP_HOME} Modified: head/java/linux-sun-jre17/Makefile ============================================================================== --- head/java/linux-sun-jre17/Makefile Fri Apr 18 22:37:29 2014 (r351571) +++ head/java/linux-sun-jre17/Makefile Fri Apr 18 22:48:45 2014 (r351572) @@ -4,20 +4,20 @@ PORTNAME= jre PORTVERSION= ${JRE_VERSION}.${JRE_UPDATE_VERSION} CATEGORIES= java MASTER_SITES= # -PKGNAMEPREFIX= linux-sun- -DISTNAME= jre-7u${JRE_UPDATE_VERSION}-linux-i586 +PKGNAMEPREFIX= linux-${JRE_VENDOR}- +DISTNAME= jre-${JRE_VERSION}u${JRE_UPDATE_VERSION}-linux-i586 MAINTAINER= java@FreeBSD.org -COMMENT= Oracle Java 7 Runtime Environment for Linux +COMMENT= Oracle Java ${JRE_VERSION} Runtime Environment for Linux RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= License does not allow distribution with fee RESTRICTED= Redistribution of repackaged binaries not permitted -PKGNAMESUFFIX= 17 +PKGNAMESUFFIX= 1${JRE_VERSION} WRKSRC= ${WRKDIR}/jre${DL_JRE_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 @@ -25,8 +25,9 @@ USE_LINUX_APPS= xorglibs USES= shebangfix ONLY_FOR_ARCHS= i386 amd64 +JRE_VENDOR= sun JRE_VERSION= 7 -JRE_INTERNAL_VERSION= 1.7.0 +JRE_INTERNAL_VERSION= 1.${JRE_VERSION}.0 JRE_UPDATE_VERSION= 55 DL_JRE_VERSION= ${JRE_INTERNAL_VERSION}_${JRE_UPDATE_VERSION} DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html @@ -43,9 +44,6 @@ bash_CMD= ${SH} IGNORE?=You must manually fetch the J2SE RE download for the Linux platform (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again .endif -pre-everything:: - @${CAT} ${PKGMESSAGE} - do-install: @${MKDIR} ${STAGEDIR}${APP_HOME} @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${APP_HOME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404182248.s3IMmkO0000633>