Date: Tue, 30 Nov 2010 00:17:23 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: java@FreeBSD.org Subject: [PATCH] java/openjdk6: use apache-ant 1.8.1 Message-ID: <20101129161723.A10002AEC8C0@sunpoet.net>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Sunpoet Po-Chuan Hsieh
>Organization: The FreeBSD Project
>Confidential: no
>Synopsis: [PATCH] java/openjdk6: use apache-ant 1.8.1
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 8.1-STABLE amd64
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Tue Nov 23 00:07:29 CST 2010
>Description:
- Use apache-ant 1.8.1 while devel/apache-ant was updated
- Pet portlint: use tab instead of space
Port maintainer (java@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- openjdk6-b20_5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/openjdk6/Makefile,v
retrieving revision 1.34
diff -u -u -r1.34 Makefile
--- Makefile 24 Nov 2010 23:35:31 -0000 1.34
+++ Makefile 29 Nov 2010 16:15:42 -0000
@@ -70,7 +70,7 @@
# do not depend on devel/apache-ant to avoid circular dependency, but
# use .tar.bz2 distfile to avoid duplicated downloads
-ANTVERSION= 1.7.1
+ANTVERSION= 1.8.1
ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2
# rely on bsdtar ability to extract .gz, .bz2 and .zip archives
@@ -148,7 +148,7 @@
DISTFILES+= ${ICEDTEAFILE}:icedtea
EXTRACT_ONLY+= ${ICEDTEAFILE}
EXTRA_PATCHES+= ${FILESDIR}/icedtea.patch ${FILESDIR}/plugin.patch
-BUILD_DEPENDS+= ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config \
+BUILD_DEPENDS+= ${LOCALBASE}/bin/pkg-config:${PORTSDIR}/devel/pkg-config \
${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20 \
${LOCALBASE}/libdata/pkgconfig/gtk+-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20 \
${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/openjdk6/distinfo,v
retrieving revision 1.14
diff -u -u -r1.14 distinfo
--- distinfo 24 Nov 2010 23:35:32 -0000 1.14
+++ distinfo 29 Nov 2010 16:15:42 -0000
@@ -6,8 +6,8 @@
SIZE (jdk6-jaxws-b20.zip) = 5513069
SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
SIZE (jdk6-jaf-b20.zip) = 71243
-SHA256 (apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
-SIZE (apache-ant-1.7.1-bin.tar.bz2) = 7641928
+SHA256 (apache-ant-1.8.1-bin.tar.bz2) = e0c4e1133b0cb80dc4b29fc48f11b8f57e845e16474472f2749625be5cc66ca9
+SIZE (apache-ant-1.8.1-bin.tar.bz2) = 6702817
SHA256 (icedtea6-1.9.2.tar.gz) = abed4d2258fd6f047b08926fa9dbde86bdf7f47b08c82c195abb7244163cf99b
SIZE (icedtea6-1.9.2.tar.gz) = 6438043
SHA256 (jtreg-4_0-bin-b03-31_mar_2009.zip) = 919b3da574a8bfb96a53d9550a0cb2482dc08df6ce3e7042235e0e9067c832e6
--- openjdk6-b20_5.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101129161723.A10002AEC8C0>