diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2004-03-14 21:33:57 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2004-03-14 21:33:57 +0000 |
| commit | 7fb421e760ff98718ddeb11d47bfbd82d680bf16 (patch) | |
| tree | 43b49ad9f1f609123ea2cda2099db2fd2aa5a9d0 /lang | |
| parent | Add detail about recent autotools changes. (diff) | |
Add a WITHOUT_LIBJAVA know, which disables building libgcj and thus saves
quite some build time and also disk. Make this the default on sparc64 and
ia64 where libgcj has not been ported to and thus fix long-standing packaging
issues on these two platforms.
On the way, update to the 20040310 snapshot of GCC 3.4.0.
PR: 63427 (mostly)
Notes
Notes:
svn path=/head/; revision=104016
Diffstat (limited to 'lang')
39 files changed, 650 insertions, 481 deletions
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc-ooo/distinfo +++ b/lang/gcc-ooo/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc-ooo/pkg-plist +++ b/lang/gcc-ooo/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc34/distinfo +++ b/lang/gcc34/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc34/pkg-plist +++ b/lang/gcc34/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc35/Makefile +++ b/lang/gcc35/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc35/distinfo +++ b/lang/gcc35/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc35/pkg-plist +++ b/lang/gcc35/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc40/distinfo +++ b/lang/gcc40/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc40/pkg-plist +++ b/lang/gcc40/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc41/distinfo +++ b/lang/gcc41/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc41/pkg-plist +++ b/lang/gcc41/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc43/distinfo +++ b/lang/gcc43/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc43/pkg-plist +++ b/lang/gcc43/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc44/pkg-plist +++ b/lang/gcc44/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc45/pkg-plist +++ b/lang/gcc45/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc47/pkg-plist +++ b/lang/gcc47/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index a72dee387e01..c07880a55db3 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ # -SNAPDATE= 2004-02-18 +SNAPDATE= 2004-03-10 PORTNAME= gcc PORTVERSION= 3.4.0 @@ -47,6 +47,11 @@ BROKEN= "Configure broken due to renaming this architecture from x86_84." .if ${ARCH} == sparc64 BROKEN= "libgcj is not supported/packaging is broken on this platform" +WITHOUT_LIBJAVA= yes +.endif + +.if ${ARCH} == ia64 +WITHOUT_LIBJAVA= yes .endif CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} @@ -93,6 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals g77 gcc gccinstall gccint gcj fastjar +.if defined(WITHOUT_LIBJAVA) +CONFIGURE_ARGS+= --disable-libgcj +PLIST_SUB+= LIBJAVA="@comment " +.else +PLIST_SUB+= LIBJAVA="" +.endif + pre-everything:: @${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}" @@ -118,9 +130,10 @@ post-install: fake-manpages # gij and jv-convert, for example, are not built on all platforms. if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \ ${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \ - ( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \ - || ${MV} -f ${PREFIX}/man/man1/${f}.1 \ - ${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \ + fi + if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \ + ${MV} -f ${PREFIX}/man/man1/${f}.1 \ + ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor ${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX} diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index e9eff98a9b5c..0e8ce9c0789e 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,12 +1,12 @@ -MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1 -SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236 -MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a -SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243 -MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1 -SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723 -MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05 -SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909 -MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b -SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650 -MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0 -SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093 +MD5 (gcc-core-3.4-20040310.tar.bz2) = b04a71c77f13b8ea3040db9df2370866 +SIZE (gcc-core-3.4-20040310.tar.bz2) = 10503458 +MD5 (gcc-g++-3.4-20040310.tar.bz2) = 7d667491a395a7f98683f0c012ec2628 +SIZE (gcc-g++-3.4-20040310.tar.bz2) = 2348769 +MD5 (gcc-g77-3.4-20040310.tar.bz2) = a72829743616c3d3e3859e04fbf5aa23 +SIZE (gcc-g77-3.4-20040310.tar.bz2) = 891274 +MD5 (gcc-java-3.4-20040310.tar.bz2) = adb00021522d7dfb3df0e48d97dac2c6 +SIZE (gcc-java-3.4-20040310.tar.bz2) = 4545184 +MD5 (gcc-objc-3.4-20040310.tar.bz2) = f21454ec6d25eac35a0a80bdc0a0d05d +SIZE (gcc-objc-3.4-20040310.tar.bz2) = 148644 +MD5 (gcc-testsuite-3.4-20040310.tar.bz2) = 11d32cf4e740dbf5c18f20ebf277b55d +SIZE (gcc-testsuite-3.4-20040310.tar.bz2) = 2592631 diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist index a25a199e218e..e12444fdd305 100644 --- a/lang/gcc48/pkg-plist +++ b/lang/gcc48/pkg-plist @@ -14,30 +14,30 @@ bin/%%GNU_HOST%%-gcjh34 bin/gccbug34 bin/gcj34 bin/gcjh34 -bin/gij34 +%%LIBJAVA%%bin/gij34 bin/jv-scan34 bin/jcf-dump34 -bin/jv-convert34 +%%LIBJAVA%%bin/jv-convert34 bin/jar34 bin/grepjar34 -bin/rmic34 -bin/rmiregistry34 -bin/addr2name.awk34 -include/ffi.h -include/jni.h -include/jvmpi.h -lib/libffi.la -lib/libffi.a -lib/logging.properties -lib/pkgconfig/libgcj.pc -@dirrm lib/pkgconfig -lib/security/classpath.security -lib/security/libgcj.security -@dirrm lib/security -lib/lib-org-xml-sax.la -lib/lib-org-xml-sax.a -lib/lib-org-w3c-dom.la -lib/lib-org-w3c-dom.a +%%LIBJAVA%%bin/rmic34 +%%LIBJAVA%%bin/rmiregistry34 +%%LIBJAVA%%bin/addr2name.awk34 +%%LIBJAVA%%include/ffi.h +%%LIBJAVA%%include/jni.h +%%LIBJAVA%%include/jvmpi.h +%%LIBJAVA%%lib/libffi.la +%%LIBJAVA%%lib/libffi.a +%%LIBJAVA%%lib/logging.properties +%%LIBJAVA%%lib/pkgconfig/libgcj.pc +%%LIBJAVA%%@dirrm lib/pkgconfig +%%LIBJAVA%%lib/security/classpath.security +%%LIBJAVA%%lib/security/libgcj.security +%%LIBJAVA%%@dirrm lib/security +%%LIBJAVA%%lib/lib-org-xml-sax.la +%%LIBJAVA%%lib/lib-org-xml-sax.a +%%LIBJAVA%%lib/lib-org-w3c-dom.la +%%LIBJAVA%%lib/lib-org-w3c-dom.a libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771 @@ -50,7 +50,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -share/java/libgcj-%%GCC_VER%%.jar +%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- |