diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/Makefile | 53 | ||||
| -rw-r--r-- | java/openjdk6/distinfo | 6 |
2 files changed, 30 insertions, 29 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 335770fa0878..0339ffe7a76c 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -16,14 +16,14 @@ DISTFILES= ${DISTNAME}.zip ${CUSTOM_PATCH_NAME}.zip MAINTAINER= brian@experts-exchange.com COMMENT= Sun\'s java 6 virtual machine release under the GNUV2 license -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper PATCHVERSION= 0.2.1 OPENJDK_BUILDDATE=10-feb-2009 CUSTOM_PATCHES_PREFIX= jdk7_bsd_changes_20090203 CUSTOM_PATCH_NAME= patch-${PORTNAME}-freebsd-${PATCHVERSION} CUSTOM_UNZIPPED_PATCH_NAME= patch_${PORTNAME}_freebsd_${PATCHVERSION} -CUSTOM_PATCH_WRKSRC= $(WRKDIR)/$(CUSTOM_UNZIPPED_PATCH_NAME) +CUSTOM_PATCH_WRKSRC= ${WRKDIR}/${CUSTOM_UNZIPPED_PATCH_NAME} OPTIONS= DEBUG "Enable debugging support" off \ IPV6 "Enable IPv6 support" off \ @@ -31,28 +31,26 @@ OPTIONS= DEBUG "Enable debugging support" off \ POLICY "Install the Unlimited Strength Policy Files" off \ # java extracts directly to the cwd -WRKSRC= $(WRKDIR) +WRKSRC= ${WRKDIR} USE_GMAKE= yes USE_JAVA= yes JAVA_VENDOR= freebsd bsdjava JAVA_VERSION= 1.6 -USE_ANT= yes USE_MOTIF= yes -USE_XLIB= yes +USE_XORG= xtst xi xt x11 LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant +BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS+= $(LOCALBASE)/include/X11/Xlib.h:${PORTSDIR}/x11/xorg-libraries -BUILD_DEPENDS+= $(JAVAJARDIR)/jdk-7-icedtea-plugs/jre/lib/rt-closed.jar:${PORTSDIR}/java/icedtea6-stubs +BUILD_DEPENDS+= ${JAVAJARDIR}/jdk-7-icedtea-plugs/jre/lib/rt-closed.jar:${PORTSDIR}/java/icedtea6-stubs .include <bsd.port.pre.mk> .if defined(WITH_IPV6) -CATEGORIES+= ipv6 +CATEGORIES+= ipv6 .endif # we set the arch to i586 to simulate linux. @@ -63,7 +61,7 @@ ARCH= i586 OPENJDK_OSARCH= bsd-${ARCH} -ONLY_FOR_ARCHS= amd64 i586 +ONLY_FOR_ARCHS= amd64 i586 BOOTSTRAP_JDKS= ${LOCALBASE}/diablo-jdk1.6.0 @@ -72,25 +70,26 @@ MAKE_ENV= LANG=C LC_ALL=C ALT_BOOTDIR=${BOOTSTRAP_JDKS} \ ALT_JDK_IMPORT_PATH=${BOOTSTRAP_JDKS} \ ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \ ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \ - ALT_BINARY_PLUGS_PATH=$(JAVAJARDIR)/jdk-7-icedtea-plugs \ + ALT_X11_PATH=${LOCALBASE} \ + ALT_BINARY_PLUGS_PATH=${JAVAJARDIR}/jdk-7-icedtea-plugs \ ANT_HOME=${LOCALBASE} NO_DOCS=true ALT_CUPS_HEADERS_PATH=${LOCALBASE}/include .if !defined(WITH_IPV6) -MAKE_ENV+= DONT_ENABLE_IPV6="YES" +MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif .if defined(WITH_DEBUG) -MAKE_ENV+= SKIP_DEBUG_BUILD="false" +MAKE_ENV+= SKIP_DEBUG_BUILD="false" .endif # perhaps we could check to see how many processors are availble and set this equivelent to that -MAKE_ENV+= HOTSPOT_BUILD_JOBS=4 +MAKE_ENV+= HOTSPOT_BUILD_JOBS=4 -JDK_MAJOR_VERSION= 6 -POLICYFILE= jce_policy-${JDK_MAJOR_VERSION}.zip +JDK_MAJOR_VERSION= 6 +POLICYFILE= jce_policy-${JDK_MAJOR_VERSION}.zip .if defined(WITH_POLICY) -DISTFILES+= ${POLICYFILE} +DISTFILES+= ${POLICYFILE} .endif .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{ @@ -109,19 +108,19 @@ pre-fetch: .endif pre-patch: - (cd $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).newfiles/ && ${CP} -Rp ./ $(WRKSRC)) - (cd $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).linuxfiles/ && ${CP} -Rp ./ $(WRKSRC)) - (cd $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).linuxmakefiles/ && ${CP} -Rp ./ $(WRKSRC)) + (cd ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.newfiles/ && ${CP} -Rp ./ ${WRKSRC}) + (cd ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.linuxfiles/ && ${CP} -Rp ./ ${WRKSRC}) + (cd ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.linuxmakefiles/ && ${CP} -Rp ./ ${WRKSRC}) # these are expected to fail - ((cd $(WRKSRC) && ${CAT} $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).makepatches/*.patch | ${PATCH} -p1) || true) - ((cd $(WRKSRC) && ${CAT} $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).linuxpatches/*.patch | ${PATCH} -p1) || true) - ((cd $(WRKSRC) && ${CAT} $(CUSTOM_PATCH_WRKSRC)/$(CUSTOM_PATCHES_PREFIX).patches/*.patch | ${PATCH} -p1) || true) + ((cd ${WRKSRC} && ${CAT} ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.makepatches/*.patch | ${PATCH} -p1) || true) + ((cd ${WRKSRC} && ${CAT} ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.linuxpatches/*.patch | ${PATCH} -p1) || true) + ((cd ${WRKSRC} && ${CAT} ${CUSTOM_PATCH_WRKSRC}/${CUSTOM_PATCHES_PREFIX}.patches/*.patch | ${PATCH} -p1) || true) # these patches should apply cleanly - ((cd $(WRKSRC) && ${CAT} $(CUSTOM_PATCH_WRKSRC)/custom_patches_$(PATCHVERSION)/*.patch | ${PATCH} -p1) || true) + ((cd ${WRKSRC} && ${CAT} ${CUSTOM_PATCH_WRKSRC}/custom_patches_${PATCHVERSION}/*.patch | ${PATCH} -p1) || true) do-install: - $(MKDIR) ${PREFIX}/openjdk6/ - ${CP} -Rp $(WRKSRC)/build/$(OPENJDK_OSARCH)/j2sdk-image/ ${PREFIX}/openjdk6/ + ${MKDIR} ${PREFIX}/openjdk6/ + ${CP} -Rp ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/ ${PREFIX}/openjdk6/ ${INSTALL_DATA} ${FILESDIR}/cacerts \ ${PREFIX}/openjdk6/jre/lib/security/cacerts .if defined(WITH_POLICY) @@ -129,5 +128,7 @@ do-install: .endif @${FIND} -s ${PREFIX}/openjdk6 -not -type d | \ ${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST} + @${FIND} ${PREFIX}/openjdk6 -type d | ${SORT} -r | \ + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo index ea5485f3f8ac..d3adedc7cc64 100644 --- a/java/openjdk6/distinfo +++ b/java/openjdk6/distinfo @@ -1,6 +1,6 @@ -MD5 (openjdk-6-src-b14-10-feb-2009.zip) = 81293479575ff7ad101b76135e28cf1c -SHA256 (openjdk-6-src-b14-10-feb-2009.zip) = cbdc14995c1a9aaa569cf24b3f9bd32e031cd199d0715deb9bcebfd3d25bc3d8 -SIZE (openjdk-6-src-b14-10-feb-2009.zip) = 211790484 +MD5 (openjdk-6-src-b14-10-feb-2009.zip) = d6e05b5dbbf10a0a4cb69c97cf05c15f +SHA256 (openjdk-6-src-b14-10-feb-2009.zip) = b2c7034f18fc427085c51351752f2d71447c3daf44b4fe34d47fa6365f59873f +SIZE (openjdk-6-src-b14-10-feb-2009.zip) = 79888740 MD5 (patch-openjdk6-freebsd-0.2.1.zip) = b29c4d2e86693623e4d62fa8f5b4627e SHA256 (patch-openjdk6-freebsd-0.2.1.zip) = bdaff8de3f7823b610c10bff4c2b48316aefe87112a2c2db88290b6767138a61 SIZE (patch-openjdk6-freebsd-0.2.1.zip) = 951855 |