diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-10-19 16:43:58 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2006-10-19 16:43:58 +0000 |
| commit | 0dbe60dd3dfc24c13c83af5b9dbc0d6d6dfd2230 (patch) | |
| tree | 0361199766da6c3a9b945c4b66d91bf7f38fe208 /lang | |
| parent | 5667504a846f1822a2a9ecd6c3d1ff0f375d17aa (diff) | |
| download | ports-0dbe60dd3dfc24c13c83af5b9dbc0d6d6dfd2230.tar.gz ports-0dbe60dd3dfc24c13c83af5b9dbc0d6d6dfd2230.zip | |
Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a
version number to libdata/pkgconfig/libgcj.pc. Fix packaging on amd64
on the way (enabling Java actually was a noop, except for pkg-plist).
Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2.
These changes allow us to remove the CONFLICT between lang/gcc41 and
lang/gcc42 when building with Java support (the default on i386).
Approved by: portmgr (erwin)
Notes
Notes:
svn path=/head/; revision=175407
Diffstat (limited to 'lang')
34 files changed, 227 insertions, 236 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc/files/java-patch-hier b/lang/gcc/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc/files/java-patch-hier +++ b/lang/gcc/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index 24bfa76b6252..29895ac4b9a0 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.2 -PORTREVISION= 20061006 +PORTREVISION= 20061013 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -101,7 +101,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.2.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier # FIXME: we are currently getting weird build failures with libjava on diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo index 4217f23bd0ef..e1cc957f302d 100644 --- a/lang/gcc41/distinfo +++ b/lang/gcc41/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.1-20061006.tar.bz2) = e2ac304f5623834c4fda4701eba9ca2e -SHA256 (gcc-core-4.1-20061006.tar.bz2) = d9447c6b13b6f422e0e51615050bf733ab06843abc24deb0440633f57980db87 -SIZE (gcc-core-4.1-20061006.tar.bz2) = 14982444 -MD5 (gcc-g++-4.1-20061006.tar.bz2) = fc4a6f289602c99c4668f66858a8ef4a -SHA256 (gcc-g++-4.1-20061006.tar.bz2) = 45bd6b7ab89454b10232a6047515f8363ed3b779c508188a11f9322a0589ac5d -SIZE (gcc-g++-4.1-20061006.tar.bz2) = 3836846 -MD5 (gcc-objc-4.1-20061006.tar.bz2) = 78b416613a6f74d2e1fcf3197ead2d78 -SHA256 (gcc-objc-4.1-20061006.tar.bz2) = fa2ffb6bd9dcf6d2fba7a9c8b6c1a31569f866e29e5b530c818bddca3478efb3 -SIZE (gcc-objc-4.1-20061006.tar.bz2) = 191066 -MD5 (gcc-testsuite-4.1-20061006.tar.bz2) = b6c53f33dd6ad3c54a8d59d957171acf -SHA256 (gcc-testsuite-4.1-20061006.tar.bz2) = d25941c71026092ea4e092eebdb005b51d6857dce8d9ba61dffe9a85e9f5f6e1 -SIZE (gcc-testsuite-4.1-20061006.tar.bz2) = 3579146 -MD5 (gcc-fortran-4.1-20061006.tar.bz2) = 0c504d057bd0985b440a55e9dc9862fb -SHA256 (gcc-fortran-4.1-20061006.tar.bz2) = f13eb8f1835adac970d7149dbcebe1e5e170ea04c955940d30a60015b4da4d1b -SIZE (gcc-fortran-4.1-20061006.tar.bz2) = 789387 -MD5 (gcc-java-4.1-20061006.tar.bz2) = da17f06740ceaf42a9e6417e954d667b -SHA256 (gcc-java-4.1-20061006.tar.bz2) = a94a525383f2392a5318d60a8e2a622c8ff0c0c6a88ba16527da14ab177c198f -SIZE (gcc-java-4.1-20061006.tar.bz2) = 9085936 +MD5 (gcc-core-4.1-20061013.tar.bz2) = 26d830b62c0c7277460255b2050d5c62 +SHA256 (gcc-core-4.1-20061013.tar.bz2) = a5ff147453675b79015c41b49aca25767250f8146af10f21d69d512a30b06a8d +SIZE (gcc-core-4.1-20061013.tar.bz2) = 14981732 +MD5 (gcc-g++-4.1-20061013.tar.bz2) = d00b4d9bbd9787671cbdeb9b64b8c897 +SHA256 (gcc-g++-4.1-20061013.tar.bz2) = 200a0f15b049a202a3815de2dde2fc6f713aafbbbf822db21fc102a8a6deae77 +SIZE (gcc-g++-4.1-20061013.tar.bz2) = 3838637 +MD5 (gcc-objc-4.1-20061013.tar.bz2) = b4b0c0b623aa9fa56cbf9544f08595b3 +SHA256 (gcc-objc-4.1-20061013.tar.bz2) = db63cfca31544c0bbb890c7a35fdf5a8ada0a33df78d975fb0db15cb5a97a0d1 +SIZE (gcc-objc-4.1-20061013.tar.bz2) = 191082 +MD5 (gcc-testsuite-4.1-20061013.tar.bz2) = cde22fd89e92bdb7940c706c1f19ffaa +SHA256 (gcc-testsuite-4.1-20061013.tar.bz2) = af96c227d9b02de9e6fd7c77c488a22dbdcc838b170a884dd98de64e6c662a6b +SIZE (gcc-testsuite-4.1-20061013.tar.bz2) = 3580052 +MD5 (gcc-fortran-4.1-20061013.tar.bz2) = fd4d018f694b9cbbe3515f6a3e37d2e5 +SHA256 (gcc-fortran-4.1-20061013.tar.bz2) = 76731fd4df564f0226d955be0270b3c0a1804a9cc8c5e191293a12f3206a4313 +SIZE (gcc-fortran-4.1-20061013.tar.bz2) = 789451 +MD5 (gcc-java-4.1-20061013.tar.bz2) = cdeff725d28773e21c020a97da5be4a7 +SHA256 (gcc-java-4.1-20061013.tar.bz2) = f4581e55467b1eeee292aef9b8f11219ebb51bb018f3ec70d706eacfd840ea61 +SIZE (gcc-java-4.1-20061013.tar.bz2) = 9086007 diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc42/files/java-patch-hier b/lang/gcc42/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc42/files/java-patch-hier +++ b/lang/gcc42/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc43/distinfo +++ b/lang/gcc43/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc43/files/java-patch-hier b/lang/gcc43/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc43/files/java-patch-hier +++ b/lang/gcc43/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc43/pkg-plist +++ b/lang/gcc43/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc44/files/java-patch-hier b/lang/gcc44/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc44/files/java-patch-hier +++ b/lang/gcc44/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc44/pkg-plist +++ b/lang/gcc44/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc45/files/java-patch-hier b/lang/gcc45/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc45/files/java-patch-hier +++ b/lang/gcc45/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc45/pkg-plist +++ b/lang/gcc45/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc46/files/java-patch-hier +++ b/lang/gcc46/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc47/files/java-patch-hier b/lang/gcc47/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc47/files/java-patch-hier +++ b/lang/gcc47/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc47/pkg-plist +++ b/lang/gcc47/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 1dd2abd5e9d3..3e0007c818a5 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060923 +PORTREVISION= 20061014 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -51,7 +51,7 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4 CONFIGURE_ARGS+= --disable-libgomp .endif -.if ${ARCH} != i386 && ${ARCH} != amd64 +.if ${ARCH} != i386 WITHOUT_JAVA= yes .endif @@ -102,7 +102,6 @@ PLIST_SUB+= FORTRAN="@comment " .endif .if ! defined(WITHOUT_JAVA) -CONFLICTS+= gcc-4.1.* DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index c61f2a58ee02..5d506fa441db 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,18 +1,18 @@ -MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d -SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798 -SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768 -MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d -SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151 -SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312 -MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d -SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e -SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007 -MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034 -SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a -SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282 -MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166 -SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b -SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319 -MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a -SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0 -SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140 +MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874 +SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0 +SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090 +MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971 +SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874 +SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518 +MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb +SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769 +SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828 +MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01 +SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed +SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298 +MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08 +SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789 +SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940 +MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0 +SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196 +SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012 diff --git a/lang/gcc48/files/java-patch-hier b/lang/gcc48/files/java-patch-hier index 43a39deb09a5..edb122b087b8 100644 --- a/lang/gcc48/files/java-patch-hier +++ b/lang/gcc48/files/java-patch-hier @@ -1,13 +1,13 @@ Index: libjava/Makefile.in =================================================================== ---- libjava/Makefile.in (revision 114994) +--- libjava/Makefile.in (revision 117734) +++ libjava/Makefile.in (working copy) -@@ -667,7 +667,7 @@ - toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +@@ -712,7 +712,7 @@ + $(am__append_2) $(am__append_3) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java - jar_DATA = libgcj-$(gcc_version).jar + jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar + @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist index 505428d8b648..f4209b2a688a 100644 --- a/lang/gcc48/pkg-plist +++ b/lang/gcc48/pkg-plist @@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj.pc +%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar @comment Insert PLIST.lib here |