diff options
Diffstat (limited to 'java/openjdk6/Makefile')
| -rw-r--r-- | java/openjdk6/Makefile | 89 |
1 files changed, 4 insertions, 85 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index e17fcccd7687..e98cef1bfbfa 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b27 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \ http://download.java.net/jaxp/openjdk/jdk6/:jaxp \ @@ -39,84 +39,6 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ OPENJDK_BUILDDATE= 26_oct_2012 -EXTRA_PATCHES= ${FILESDIR}/icedtea/jaxp.patch \ - ${FILESDIR}/icedtea/jaxws.patch \ - ${FILESDIR}/icedtea/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \ - ${FILESDIR}/icedtea/security/20130201/7201068.patch \ - ${FILESDIR}/icedtea/security/20130201/6563318.patch \ - ${FILESDIR}/icedtea/security/20130201/6664509.patch \ - ${FILESDIR}/icedtea/security/20130201/6776941.patch \ - ${FILESDIR}/icedtea/security/20130201/7141694.patch \ - ${FILESDIR}/icedtea/security/20130201/7173145.patch \ - ${FILESDIR}/icedtea/security/20130201/7186945.patch \ - ${FILESDIR}/icedtea/security/20130201/7186948.patch \ - ${FILESDIR}/icedtea/security/20130201/7186952.patch \ - ${FILESDIR}/icedtea/security/20130201/7186954.patch \ - ${FILESDIR}/icedtea/security/20130201/7192392.patch \ - ${FILESDIR}/icedtea/security/20130201/7192393.patch \ - ${FILESDIR}/icedtea/security/20130201/7192977.patch \ - ${FILESDIR}/icedtea/security/20130201/7197546.patch \ - ${FILESDIR}/icedtea/security/20130201/7200491.patch \ - ${FILESDIR}/icedtea/security/20130201/7200500.patch \ - ${FILESDIR}/icedtea/security/20130201/7201064.patch \ - ${FILESDIR}/icedtea/security/20130201/7201066.patch \ - ${FILESDIR}/icedtea/security/20130201/7201070.patch \ - ${FILESDIR}/icedtea/security/20130201/7201071.patch \ - ${FILESDIR}/icedtea/security/20130201/8000210.patch \ - ${FILESDIR}/icedtea/security/20130201/8000537.patch \ - ${FILESDIR}/icedtea/security/20130201/8000540.patch \ - ${FILESDIR}/icedtea/security/20130201/8000631.patch \ - ${FILESDIR}/icedtea/security/20130201/8001242.patch \ - ${FILESDIR}/icedtea/security/20130201/8001307.patch \ - ${FILESDIR}/icedtea/security/20130201/8001972.patch \ - ${FILESDIR}/icedtea/security/20130201/8002325.patch \ - ${FILESDIR}/icedtea/security/20130219/8006446.patch \ - ${FILESDIR}/icedtea/security/20130219/8006777.patch \ - ${FILESDIR}/icedtea/security/20130219/8007688.patch \ - ${FILESDIR}/icedtea/security/20130304/8007014.patch \ - ${FILESDIR}/icedtea/security/20130304/8007675.patch \ - ${FILESDIR}/icedtea/openjdk/7036559-concurrenthashmap_improvements.patch \ - ${FILESDIR}/icedtea/security/20130416/8009063.patch \ - ${FILESDIR}/icedtea/openjdk/8004302-soap_test_failure.patch \ - ${FILESDIR}/icedtea/security/20130416/6657673.patch \ - ${FILESDIR}/icedtea/security/20130416/6657673-fixup.patch \ - ${FILESDIR}/icedtea/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \ - ${FILESDIR}/icedtea/security/20130416/6657673-factory_finder.patch \ - ${FILESDIR}/icedtea/openjdk/6669869-queries_per_appcontext.patch \ - ${FILESDIR}/icedtea/openjdk/5102804-memory_leak.patch \ - ${FILESDIR}/icedtea/openjdk/6963811-deadlock_fix.patch \ - ${FILESDIR}/icedtea/openjdk/7064279-resource_release.patch \ - ${FILESDIR}/icedtea/openjdk/7064279-fixup.patch \ - ${FILESDIR}/icedtea/security/20130416/7200507.patch \ - ${FILESDIR}/icedtea/security/20130416/8000724.patch \ - ${FILESDIR}/icedtea/security/20130416/8004986.patch \ - ${FILESDIR}/icedtea/openjdk/6501644-icu_sync.patch \ - ${FILESDIR}/icedtea/openjdk/6886358-layout_update.patch \ - ${FILESDIR}/icedtea/security/20130416/8001031.patch \ - ${FILESDIR}/icedtea/openjdk/7017324-kerning_crash.patch \ - ${FILESDIR}/icedtea/security/20130416/8001040.patch \ - ${FILESDIR}/icedtea/security/20130416/8001322.patch \ - ${FILESDIR}/icedtea/security/20130416/8001329.patch \ - ${FILESDIR}/icedtea/security/20130416/8003335.patch \ - ${FILESDIR}/icedtea/security/20130416/8003445.patch \ - ${FILESDIR}/icedtea/security/20130416/8003543.patch \ - ${FILESDIR}/icedtea/security/20130416/8004261.patch \ - ${FILESDIR}/icedtea/security/20130416/8004336.patch \ - ${FILESDIR}/icedtea/security/20130416/8005432.patch \ - ${FILESDIR}/icedtea/security/20130416/8005943.patch \ - ${FILESDIR}/icedtea/security/20130416/8006309.patch \ - ${FILESDIR}/icedtea/security/20130416/8006435.patch \ - ${FILESDIR}/icedtea/security/20130416/8006790.patch \ - ${FILESDIR}/icedtea/security/20130416/8006795.patch \ - ${FILESDIR}/icedtea/security/20130416/8007406.patch \ - ${FILESDIR}/icedtea/security/20130416/8007617.patch \ - ${FILESDIR}/icedtea/security/20130416/8007667.patch \ - ${FILESDIR}/icedtea/security/20130416/8007918.patch \ - ${FILESDIR}/icedtea/security/20130416/8009305.patch \ - ${FILESDIR}/icedtea/security/20130416/8009699.patch \ - ${FILESDIR}/icedtea/security/20130416/8009814.patch \ - ${FILESDIR}/icedtea/security/20130416/8009857.patch - OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE ICEDTEA_DESC= Apply additional patches from IcedTea @@ -134,6 +56,9 @@ TEST_DESC= Add support for running regression test USES= gmake motif .include <bsd.port.options.mk> +.include "${.CURDIR}/Makefile.icedtea" + +EXTRA_PATCHES= ${ICEDTEA_PATCHES} # java extracts directly to the cwd WRKSRC= ${WRKDIR} @@ -231,12 +156,6 @@ MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true .endif -.if ${PORT_OPTIONS:MICEDTEA} -EXTRA_PATCHES+= ${FILESDIR}/icedtea/openjdk/7032388-work_without_cmov_instruction.patch \ - ${FILESDIR}/icedtea/applet_hole.patch \ - ${FILESDIR}/icedtea/jpegclasses.patch -.endif - .if empty(PORT_OPTIONS:MIPV6) MAKE_ENV+= DONT_ENABLE_IPV6="YES" .endif |