diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/Makefile | 45 | ||||
| -rw-r--r-- | lang/gcc46/pkg-plist | 30 |
2 files changed, 36 insertions, 39 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 75f3d0293a08..e503b0ecb13c 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -12,9 +12,9 @@ MASTER_SITE_SUBDIR= releases/gcc-${DISTVERSION} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.6 -LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ - mpfr:${PORTSDIR}/math/mpfr \ - mpc:${PORTSDIR}/math/mpc +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ + libmpfr.so:${PORTSDIR}/math/mpfr \ + libmpc.so:${PORTSDIR}/math/mpc BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils @@ -31,7 +31,7 @@ GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX} ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64 -USES= bison gmake iconv perl5 +USES= gmake iconv perl5 USE_BINUTILS= yes USE_BZIP2= yes USE_PERL5= build @@ -47,7 +47,6 @@ OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA BOOTSTRAP_DESC= Build using a full bootstrap -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" @@ -84,11 +83,6 @@ USE_LDCONFIG= ${TARGLIB} PLIST_SUB= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} -MAN1= cpp${SUFFIX}.1 \ - g++${SUFFIX}.1 \ - gcc${SUFFIX}.1 \ - gcov${SUFFIX}.1 \ - gfortran${SUFFIX}.1 INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/cppinternals \ gcc${SUFFIX}/gcc \ @@ -109,31 +103,6 @@ RUN_DEPENDS+= ${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR} LANGUAGES:= ${LANGUAGES},java -MAN1+= aot-compile${SUFFIX}.1 \ - gappletviewer${SUFFIX}.1 \ - gc-analyze${SUFFIX}.1 \ - gcj${SUFFIX}.1 \ - gcj-dbtool${SUFFIX}.1 \ - gcjh${SUFFIX}.1 \ - gij${SUFFIX}.1 \ - gjar${SUFFIX}.1 \ - gjarsigner${SUFFIX}.1 \ - gjavah${SUFFIX}.1 \ - gjdoc${SUFFIX}.1 \ - gkeytool${SUFFIX}.1 \ - gnative2ascii${SUFFIX}.1 \ - gorbd${SUFFIX}.1 \ - grmic${SUFFIX}.1 \ - grmid${SUFFIX}.1 \ - grmiregistry${SUFFIX}.1 \ - gserialver${SUFFIX}.1 \ - gtnameserv${SUFFIX}.1 \ - jcf-dump${SUFFIX}.1 \ - jv-convert${SUFFIX}.1 \ - rebuild-gcj-db${SUFFIX}.1 -MAN3= ffi${SUFFIX}.3 \ - ffi_call${SUFFIX}.3 \ - ffi_prep_cif${SUFFIX}.3 INFO+= gcc${SUFFIX}/cp-tools \ gcc${SUFFIX}/gcj PLIST_SUB+= JAVA="" @@ -157,13 +126,11 @@ full-regression-test: build .endif post-install: - ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ - ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 - ${RM} -f ${TARGLIB}/*.la + ${RM} -f ${STAGEDIR}${TARGLIB}/*.la # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax - cd ${PREFIX} ; if [ -d $d ]; then \ + cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index 01837937cbfe..1d1432a263dd 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -11,6 +11,11 @@ bin/gcc%%SUFFIX%% bin/gcov%%SUFFIX%% bin/gfortran%%SUFFIX%% info/gcc%%SUFFIX%%/dir +man/man1/cpp%%SUFFIX%%.1.gz +man/man1/g++%%SUFFIX%%.1.gz +man/man1/gcc%%SUFFIX%%.1.gz +man/man1/gcov%%SUFFIX%%.1.gz +man/man1/gfortran%%SUFFIX%%.1.gz %%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py %%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py %%JAVA%%@dirrm share/gcc-%%GCC_VERSION%%/python/libjava @@ -44,6 +49,31 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py %%JAVA%%bin/jv-convert%%SUFFIX%% %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%% %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc +%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gcj%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gcj-dbtool%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gcjh%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gij%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gjar%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gjarsigner%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gjavah%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gjdoc%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gkeytool%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gnative2ascii%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gorbd%%SUFFIX%%.1.gz +%%JAVA%%man/man1/grmic%%SUFFIX%%.1.gz +%%JAVA%%man/man1/grmid%%SUFFIX%%.1.gz +%%JAVA%%man/man1/grmiregistry%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gserialver%%SUFFIX%%.1.gz +%%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz +%%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz +%%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz +%%JAVA%%man/man1/rebuild-gcj-db%%SUFFIX%%.1.gz +%%JAVA%%man/man3/ffi%%SUFFIX%%.3.gz +%%JAVA%%man/man3/ffi_call%%SUFFIX%%.3.gz +%%JAVA%%man/man3/ffi_prep_cif%%SUFFIX%%.3.gz %%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi |