diff options
-rw-r--r-- | lang/gcc/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc41/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc41/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc41/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc42/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc42/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc42/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc43/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc43/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc43/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc44/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc44/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc44/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc45/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc45/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc45/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc46/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc46/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc46/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc47/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc47/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc47/pkg-plist | 13 | ||||
-rw-r--r-- | lang/gcc48/Makefile | 33 | ||||
-rw-r--r-- | lang/gcc48/distinfo | 22 | ||||
-rw-r--r-- | lang/gcc48/pkg-plist | 13 |
27 files changed, 243 insertions, 369 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc41/distinfo +++ b/lang/gcc41/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc41/pkg-plist +++ b/lang/gcc41/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc42/distinfo +++ b/lang/gcc42/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc42/pkg-plist +++ b/lang/gcc42/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc43/distinfo +++ b/lang/gcc43/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc43/pkg-plist +++ b/lang/gcc43/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc44/distinfo +++ b/lang/gcc44/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc44/pkg-plist +++ b/lang/gcc44/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc45/pkg-plist +++ b/lang/gcc45/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc47/distinfo +++ b/lang/gcc47/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc47/pkg-plist +++ b/lang/gcc47/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index a5be84c9fabb..8b409004c74f 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.1.0 -PORTREVISION= 20050508 +PORTREVISION= 20050515 CATEGORIES= lang java VERSIONSTRING= 4.1-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -30,7 +30,7 @@ COMMENT= GNU Compiler Collection 4.1 LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4 .endif -CONFLICTS= gcc-3.3.* gcc-4.0.* +CONFLICTS= gcc-3.3.* gcc-3.4.* gcc-4.0.* LATEST_LINK?= gcc41${PKGNAMESUFFIX} NOT_FOR_ARCHS= alpha USE_BISON= yes @@ -75,7 +75,7 @@ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} -EXTRA_SHLIB= libgcc_s +EXTRA_LIBS= libgcc_s .else CONFIGURE_ARGS+= --disable-shared .endif @@ -98,13 +98,13 @@ MAN1= cpp${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \ rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1 -MAN7= fsf-funding.7 gfdl.7 gpl.7 INFO= cpp cppinternals gcc gccinstall gccint gcj fastjar .if defined(WITHOUT_LIBJAVA) CONFIGURE_ARGS+= --disable-libgcj PLIST_SUB+= LIBJAVA="@comment " .else +EXTRA_LIBS+= libffi libgcj libgij PLIST_SUB+= LIBJAVA="" .endif @@ -152,14 +152,13 @@ post-install: fake-manpages .endfor # These libraries are moved from PREFIX/lib to avoid conflicts with # the stock compiler. -.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB} +.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS} ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} .endfor - -${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - ${RM} -f ${PREFIX}/lib/lib-org-*.la - # Handle target libraries, libexec binaries, and GCJ include files. + ${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la + ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ + ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 + # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ @@ -168,15 +167,11 @@ post-install: fake-manpages | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - (${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script - ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre - cd ${WRKDIR} ; ex < ex.script + ${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST} cklatest: .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/ diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo index 4d40523f8330..4f74a94d3a98 100644 --- a/lang/gcc48/distinfo +++ b/lang/gcc48/distinfo @@ -1,12 +1,10 @@ -MD5 (gcc-core-4.1-20050508.tar.bz2) = 18ae35fad10b30f8156b2f09efa9b2a5 -SIZE (gcc-core-4.1-20050508.tar.bz2) = 13567663 -MD5 (gcc-g++-4.1-20050508.tar.bz2) = 836be854fe21c91dfa71233e2a3e8748 -SIZE (gcc-g++-4.1-20050508.tar.bz2) = 2661482 -MD5 (gcc-java-4.1-20050508.tar.bz2) = 18a644f32878ba0d569e43fb7452afd8 -SIZE (gcc-java-4.1-20050508.tar.bz2) = 6045354 -MD5 (gcc-objc-4.1-20050508.tar.bz2) = 3ce414181728e91090d1ed88795b4299 -SIZE (gcc-objc-4.1-20050508.tar.bz2) = 178875 -MD5 (gcc-testsuite-4.1-20050508.tar.bz2) = 2b5beb9d5230d27cd7759367351bba9d -SIZE (gcc-testsuite-4.1-20050508.tar.bz2) = 3080624 -MD5 (gcc-fortran-4.1-20050508.tar.bz2) = 01908f9710103501351e2c133391b6b4 -SIZE (gcc-fortran-4.1-20050508.tar.bz2) = 578547 +MD5 (gcc-core-4.1-20050515.tar.bz2) = 77409afc64edb58696e3c300e6f2060c +SIZE (gcc-core-4.1-20050515.tar.bz2) = 13663648 +MD5 (gcc-g++-4.1-20050515.tar.bz2) = dcb62f071a259f16b24681da0c287335 +SIZE (gcc-g++-4.1-20050515.tar.bz2) = 2662927 +MD5 (gcc-java-4.1-20050515.tar.bz2) = 4aaad51eecd87ed4e9124058ceb69cba +SIZE (gcc-java-4.1-20050515.tar.bz2) = 6059003 +MD5 (gcc-objc-4.1-20050515.tar.bz2) = bafaaa6ef5f9dcc510a912017961e97b +SIZE (gcc-objc-4.1-20050515.tar.bz2) = 178869 +MD5 (gcc-testsuite-4.1-20050515.tar.bz2) = a99ebee17c508e2817da290c42cae778 +SIZE (gcc-testsuite-4.1-20050515.tar.bz2) = 3085128 diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist index 43c7c4fcb376..b4b20b8f79ed 100644 --- a/lang/gcc48/pkg-plist +++ b/lang/gcc48/pkg-plist @@ -18,6 +18,7 @@ bin/gjnih41 bin/grepjar41 bin/jv-scan41 bin/jcf-dump41 +include/mf-runtime.h %%FORTRAN%%bin/gfortran41 %%FORTRAN%%lib/libgfortran.a %%FORTRAN%%lib/libgfortranbegin.a @@ -30,18 +31,10 @@ bin/jcf-dump41 %%LIBJAVA%%bin/grmiregistry41 %%LIBJAVA%%bin/jv-convert41 %%LIBJAVA%%include/ffi.h -%%LIBJAVA%%lib/libffi.a -%%LIBJAVA%%lib/libffi.la -%%LIBJAVA%%lib/libgij.a -%%LIBJAVA%%lib/libgij.la %%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%%libdata/pkgconfig/libgcj.pc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar -include/mf-runtime.h +%%LIBJAVA%%@dirrm lib/security @comment Insert PLIST.lib here -@comment -=[ begin PLIST.lib ]=- -@comment -=[ end PLIST.lib ]=- |