aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/gcc47/Makefile48
-rw-r--r--lang/gcc47/distinfo4
-rw-r--r--lang/gcc47/pkg-plist30
3 files changed, 39 insertions, 43 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index ef8deecfc3e6..dc93dccdddfc 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
-PORTVERSION= 4.7.4.20130831
-PORTREVISION= 1
+PORTVERSION= 4.7.4.20131026
CATEGORIES= lang java
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITE_SUBDIR= snapshots/${DISTVERSION}
@@ -11,9 +10,9 @@ MASTER_SITE_SUBDIR= snapshots/${DISTVERSION}
MAINTAINER= gerald@FreeBSD.org
COMMENT= GNU Compiler Collection 4.7
-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
@@ -30,7 +29,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 powerpc powerpc64 sparc64
-USES= bison gmake iconv perl5
+USES= gmake iconv perl5
USE_BINUTILS= yes
USE_BZIP2= yes
USE_PERL5= build
@@ -47,7 +46,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"
@@ -88,11 +86,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 \
@@ -113,31 +106,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=""
@@ -161,13 +129,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/gcc47/distinfo b/lang/gcc47/distinfo
index fcbc6bbcf8c1..51d8810aebb2 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20130831.tar.bz2) = 6a0cc169b93bcdab26406104bf1d80ae9f6789f28938589de0e3d745c6ed41c0
-SIZE (gcc-4.7-20130831.tar.bz2) = 78797213
+SHA256 (gcc-4.7-20131026.tar.bz2) = 63f6e316fdd3d0d4a103e42270c95477de3e2cb0845676c3e79985d997f57b23
+SIZE (gcc-4.7-20131026.tar.bz2) = 78843797
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 52db8b983629..0d906357f936 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -17,6 +17,11 @@ bin/gcc-ranlib%%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
@@ -50,6 +55,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.7.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