diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
commit | 2df76eb0a73bb59d817aa60758a5f10e3e544c3b (patch) | |
tree | 07e10c49034b87755dafb03956ad93c5363e0bb7 /java | |
parent | - Update to 1.7.8 (diff) |
- Remove support for a.out format and PORTOBJFORMAT variable from individual
ports
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=183698
Diffstat (limited to 'java')
-rw-r--r-- | java/jdk11/Makefile | 13 | ||||
-rw-r--r-- | java/jre/Makefile | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile index 10822eeb7943..ddc5b2636c9c 100644 --- a/java/jdk11/Makefile +++ b/java/jdk11/Makefile @@ -10,10 +10,12 @@ PORTVERSION= ${JDK_VERSION} CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nate/JDK1.1 +DISTFILES= jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz MAINTAINER= glewis@FreeBSD.org COMMENT= Java Development Kit 1.1 +LIB_DEPENDS= c.3:${PORTSDIR}/misc/compat3x RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn't allow distribution with fee" @@ -26,15 +28,6 @@ PLIST_SUB+= JDK_VERSION=${JDK_VERSION} WRKSRC= ${WRKDIR}/jdk${JDK_VERSION} NO_BUILD= yes -.include <bsd.port.pre.mk> - -.if ${PORTOBJFORMAT} == "aout" -DISTFILES= jdk${JDK_VERSION}_AOUT.V1999-11-9.tar.gz -.else -LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x -DISTFILES= jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz -.endif - post-patch: ${FIND} ${WRKSRC} -name '*.orig' -delete @@ -48,4 +41,4 @@ do-install: post-install: ${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/java/jre/Makefile b/java/jre/Makefile index b1f8db0e93b5..f8dd3a6f099d 100644 --- a/java/jre/Makefile +++ b/java/jre/Makefile @@ -13,10 +13,12 @@ MASTER_SITES= ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/ \ ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \ http://www.freebsd.org/java/ MASTER_SITE_SUBDIR= patrick +DISTFILES= jre${JRE_VERSION}i_ELF.V1999-11-9.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Standard Java Platform for running Java programs +LIB_DEPENDS= c.3:${PORTSDIR}/misc/compat3x RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper NO_CDROM= "License doesn't allow distribution with fee" @@ -38,15 +40,6 @@ STRIPFILES= bin/i386/green_threads/jre \ lib/i386/green_threads/libsysresource.so \ lib/i386/green_threads/libzip.so -.include <bsd.port.pre.mk> - -.if ${PORTOBJFORMAT} == "aout" -DISTFILES= jre${JRE_VERSION}i_AOUT.V1999-11-9.tar.gz -.else -LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x -DISTFILES= jre${JRE_VERSION}i_ELF.V1999-11-9.tar.gz -.endif - do-build: @for file in ${STRIPFILES}; do \ ${STRIP_CMD} ${WRKSRC}/$$file; \ @@ -67,4 +60,4 @@ do-install: post-install: ${LOCALBASE}/bin/registervm "${PREFIX}/jre${JRE_VERSION}/bin/java # JRE${JRE_VERSION}" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |