diff options
author | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
---|---|---|
committer | Alexander Leidinger <netchild@FreeBSD.org> | 2005-06-17 22:59:29 +0000 |
commit | 23b3bc4b0d01608d37199d39bb546c6c9d6a8b1d (patch) | |
tree | fa03305e656151ebe33c7e94eacc947b13d1c273 /java | |
parent | update to 2.1.1 (diff) |
Mega-patch to cleanup the ports infrastructure regarding our linux bits:
- USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
tools to strip binaries anymore, so it's not neccesary anymore to override
STRIP and STRIP_CMD.
- USE_LINUX_PREFIX implies NO_MTREE now.
- In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
instead upon the native FreeBSD libraries.
- The variable LINUX_BASE_PORT contains a string which is suitable as an
item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
instead of a hardcoded reference.
- Change all ports to comply to the "new world order".
- The Ports Collection now allows to override the default linux_base port.
Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
- If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
be marked as IGNORE. [1]
- Readd USE_LINUX knobs into several ports and make several uses of a
conditional dependency ("USE_LINUX?=") into an unconditional one
("USE_LINUX=") which where removed/changed by Trevor to allow the use of
alternative linux_base ports. While this is a nice goal, the implementation
resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
in this commit is supposed to fix the problem while keeping the feature.
Basicaly this includes a backout of Trevor's commit, to prevent confusion
I mention it here explicitely.
- Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
Chase dependencies for this.
- Changes to make linux_devtools installable on amd64, remove some stray
device nodes (they don't work on recent OS versions and aren't really
needed).
- Make linux_base-8 PREFIX clean and remove some stray device nodes.
Additionally tell a little bit more about how to setup NIS/YP [2].
- Update the PGSQL dependency in the linux-opengroupware port to a recent
version (the old one isn't available anymore), I don't know if this
works (at least it isn't more broken than before).
- Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
ports, the former path exists already and gets populated by other
packages too (PREFIX=LINUXPREFIX!).
- Fix some obvious (non-linuxolator) bugs in some linux ports while being
there.
- Bump PORTREVISION where neccesary.
Requested by: portmgr (linimon) [1]
Submittted by: Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by: portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on: ports cluster (kris)
Reviewed by: silence on emulation@
Superseedes PR: 69997
Maintainer approval from:
chris@chrisburkert.de
cracauer@cons.org
des
girgen
jamie@bishopston.net
mezz
mi
nivit@users.sf.net
pat
simond@irrelevant.org
riggs@rrr.de
Udo.Schweigert@Siemens.com
Notes
Notes:
svn path=/head/; revision=137660
Diffstat (limited to 'java')
-rw-r--r-- | java/linux-blackdown-jdk12/Makefile | 9 | ||||
-rw-r--r-- | java/linux-blackdown-jdk13/Makefile | 9 | ||||
-rw-r--r-- | java/linux-blackdown-jdk14/Makefile | 9 | ||||
-rw-r--r-- | java/linux-blackdown-jre11/Makefile | 9 | ||||
-rw-r--r-- | java/linux-ibm-jdk13/Makefile | 9 | ||||
-rw-r--r-- | java/linux-ibm-jdk14/Makefile | 9 | ||||
-rw-r--r-- | java/linux-sun-jdk12/Makefile | 9 | ||||
-rw-r--r-- | java/linux-sun-jdk13/Makefile | 11 | ||||
-rw-r--r-- | java/linux-sun-jdk14/Makefile | 11 | ||||
-rw-r--r-- | java/linux-sun-jdk15/Makefile | 10 | ||||
-rw-r--r-- | java/linux-sun-jdk16/Makefile | 10 |
11 files changed, 70 insertions, 35 deletions
diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile index 6c0c7e7ae315..68a241f49a86 100644 --- a/java/linux-blackdown-jdk12/Makefile +++ b/java/linux-blackdown-jdk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= 1.2.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java devel MASTER_SITES= ftp://ftp.tux.org/pub/java/JDK-${PORTVERSION}/${ARCH}/FCS/ \ ${MASTER_SITE_LOCAL} @@ -18,8 +18,7 @@ DISTNAME= j2sdk-${PORTVERSION}-FCS-linux-${ARCH}-glibc-2.1.3 MAINTAINER= java@FreeBSD.org COMMENT= Blackdown Java Development Kit 1.2 for Linux -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee" NO_PACKAGE= "License doesn\'t allow binary distributions" @@ -28,6 +27,8 @@ LATEST_LINK= linux-blackdown-jdk12 ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= YES +USE_LINUX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} NO_BUILD= YES APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} @@ -37,6 +38,8 @@ post-patch: ${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \ | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-blackdown-jdk13/Makefile b/java/linux-blackdown-jdk13/Makefile index de20e61c79c5..419cf5f8d23f 100644 --- a/java/linux-blackdown-jdk13/Makefile +++ b/java/linux-blackdown-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 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}/ \ @@ -21,13 +21,14 @@ COMMENT= Blackdown Java Development Kit 1.3 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes LATEST_LINK= linux-blackdown-jdk13 ONLY_FOR_ARCHS= i386 amd64 @@ -52,6 +53,8 @@ post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f @${ECHO} " [ DONE ]" +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile index d1ab4947ff21..95e2d4e3ee6b 100644 --- a/java/linux-blackdown-jdk14/Makefile +++ b/java/linux-blackdown-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \ ftp://ftp.tux.org/pub/java/${DOWNLOAD_DIR}/ @@ -18,13 +18,14 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Blackdown Java Development Kit 1.4 for Linux -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper EXTRACT_CMD= ${TAIL} EXTRACT_BEFORE_ARGS= +564 EXTRACT_AFTER_ARGS= | ${BZIP2_CMD} -dc | ${TAR} xf - USE_BZIP2= yes +USE_LINUX= yes +USE_XLIB= yes LATEST_LINK= linux-blackdown-jdk14 WRKSRC= ${WRKDIR}/j2sdk${PORTVERSION} @@ -53,6 +54,8 @@ post-patch: @${RM} -rf ${WRKSRC}/demo/plugin/jfc/SwingSet2/resources @${ECHO} " [ DONE ]" +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-blackdown-jre11/Makefile b/java/linux-blackdown-jre11/Makefile index b8f18a6f881c..bca155764490 100644 --- a/java/linux-blackdown-jre11/Makefile +++ b/java/linux-blackdown-jre11/Makefile @@ -7,7 +7,7 @@ PORTNAME= jre PORTVERSION= ${JRE_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= ftp://gd.tuwien.ac.at/opsys/linux/java/JDK-${PORTVERSION}/${ARCH}/v3/ \ ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-${PORTVERSION}/i386/v3/ \ @@ -20,8 +20,7 @@ DISTNAME= jre118_v3-glibc-2.1.3 MAINTAINER= sime@logos.hr COMMENT= Blackdown Linux Java Runtime Environment 1.1.8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn\'t allow distribution with fee" NO_PACKAGE= "License doesn\'t allow binary distributions" @@ -29,6 +28,8 @@ NO_PACKAGE= "License doesn\'t allow binary distributions" ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= YES +USE_LINUX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/jre118_v3 JRE_VERSION= 1.1.8 PLIST_SUB+= JRE_VERSION=${JRE_VERSION} @@ -42,6 +43,8 @@ post-patch: ${CHMOD} a+rx ${WRKSRC}/bin/arch ${CHMOD} a+r ${WRKSRC}/README.linux +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-ibm-jdk13/Makefile b/java/linux-ibm-jdk13/Makefile index 0d560586a354..ee4647760f3c 100644 --- a/java/linux-ibm-jdk13/Makefile +++ b/java/linux-ibm-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 9 # SR7 +PORTREVISION= 10 # SR7 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-ibm- @@ -19,13 +19,14 @@ COMMENT= IBM Java Development Kit 1.3 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${DISTNAME:S/-SDK//} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.3.1 LATEST_LINK= linux-ibm-jdk13 ONLY_FOR_ARCHS= i386 amd64 @@ -60,6 +61,8 @@ post-patch: fi \ done +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . \ diff --git a/java/linux-ibm-jdk14/Makefile b/java/linux-ibm-jdk14/Makefile index aa07c205a41b..c45b1fff51db 100644 --- a/java/linux-ibm-jdk14/Makefile +++ b/java/linux-ibm-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java PKGNAMEPREFIX= linux-ibm- DISTNAME= IBMJava2-SDK-${JDK_VERSION:S/.//g} @@ -18,8 +18,7 @@ COMMENT= IBM Java Development Kit 1.4 for Linux FORBIDDEN= Vulnerabilities in the browser plugin -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${DISTNAME:S/-SDK//} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} @@ -28,6 +27,8 @@ PLIST_SUB+= PORTREVISION=${PORTREVISION} NO_BUILD= yes USE_REINPLACE= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.4.2 ONLY_FOR_ARCHS= i386 amd64 APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION} @@ -54,6 +55,8 @@ post-patch: ${REINPLACE_CMD} -e "s:%%APP_HOME%%:${APP_HOME}:g" ${WRKSRC}/bin/java-rmi.cgi @${RM} -f ${WRKSRC}/bin/java-rmi.cgi.* +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . \ diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile index 6d8829eddc48..21b6daf9b76e 100644 --- a/java/linux-sun-jdk12/Makefile +++ b/java/linux-sun-jdk12/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -16,14 +16,15 @@ DISTNAME= ${PORTNAME}-${JDK_VERSION:S/./_/g}-linux-i586 MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.2 for Linux -RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} LATEST_LINK= linux-sun-jdk12 NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.2.2.017 ONLY_FOR_ARCHS= i386 amd64 @@ -42,6 +43,8 @@ IGNORE=You must manually fetch the Sun Java 2 Standard Edition SDK ${JDK_VERSION post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: @${ECHO_CMD} -n ">> Creating destination directory ${APP_HOME}..." @${MKDIR} ${APP_HOME} diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index 344c269e06bc..c830d138d231 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${JDK_VERSION}.${JDK_REVISION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -17,9 +17,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.3 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +29,8 @@ PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///} \ JDK_VERSION=${JDK_VERSION} NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.3.1 JDK_REVISION= 15 ONLY_FOR_ARCHS= i386 amd64 @@ -64,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 0263e7d9f954..76588e750681 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= jdk PORTVERSION= ${INSTALL_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= linux-sun- @@ -17,9 +17,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.4 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +29,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.4.2 JDK_REVISION= 08 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -60,6 +61,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile index cee762130cd5..3d6e42457341 100644 --- a/java/linux-sun-jdk15/Makefile +++ b/java/linux-sun-jdk15/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${DL_JDK_VERSION:S/_/./g} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= java devel MASTER_SITES= # @@ -17,9 +18,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.5 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +30,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.5.0 JDK_REVISION= 03 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -63,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile index cee762130cd5..3d6e42457341 100644 --- a/java/linux-sun-jdk16/Makefile +++ b/java/linux-sun-jdk16/Makefile @@ -7,6 +7,7 @@ PORTNAME= jdk PORTVERSION= ${DL_JDK_VERSION:S/_/./g} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= java devel MASTER_SITES= # @@ -17,9 +18,8 @@ EXTRACT_SUFX= .bin MAINTAINER= java@FreeBSD.org COMMENT= Sun Java Development Kit 1.5 for Linux -EXTRACT_DEPENDS=${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base-8 -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs +EXTRACT_DEPENDS=${LINUX_BASE_PORT} +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License does not allow distribution with fee" RESTRICTED= "Redistribution of repackaged binaries not permitted" @@ -30,6 +30,8 @@ PLIST_SUB+= T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION} PKGINSTALL= ${WRKDIR}/pkg-install NO_BUILD= yes +USE_LINUX= yes +USE_XLIB= yes JDK_VERSION= 1.5.0 JDK_REVISION= 03 DL_JDK_VERSION= ${JDK_VERSION}_${JDK_REVISION} @@ -63,6 +65,8 @@ do-extract: post-patch: @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f +# XXX: This is missing a "${BRANDELF} -t Linux <executables>". + do-install: ${MKDIR} ${APP_HOME} cd ${WRKSRC} && ${FIND} . -print \ |