Update to the 20131020 snapshot of GCC 4.9.0.

STAGEify.

3 files changed, 33 insertions, 36 deletions

diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index ac0f899792de..f3a68cbe4c8a 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.9.0.20131013
+PORTVERSION=	4.9.0.20131020
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${DISTVERSION}
@@ -46,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"
@@ -69,7 +68,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 .if empty(PORT_OPTIONS:MBOOTSTRAP)
 CONFIGURE_ARGS+=--disable-bootstrap
 .else
-ALL_TARGET=	bootstrap-lean
+ALL_TARGET=	bootstrap
 .endif
 CONFIGURE_ARGS+=--disable-nls \
 		--libdir=${TARGLIB} \
@@ -87,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 \
@@ -112,28 +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
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
@@ -157,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/gcc49/distinfo b/lang/gcc49/distinfo
index d9317fb6ddae..556db45c2338 100644
--- a/lang/gcc49/distinfo
+++ b/lang/gcc49/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.9-20131013.tar.bz2) = f9947c73a3e9b40242d7c6e054b4a5a549bef43ffff26d3e327f82a9d4fb3b2d
-SIZE (gcc-4.9-20131013.tar.bz2) = 83204790
+SHA256 (gcc-4.9-20131020.tar.bz2) = dbb42ac3de84d0f05f07d0fbb34238e8463a2129521b3a165b5117c17ff9ae74
+SIZE (gcc-4.9-20131020.tar.bz2) = 83332124
diff --git a/lang/gcc49/pkg-plist b/lang/gcc49/pkg-plist
index 99d3b29edfa8..64c5e8169f81 100644
--- a/lang/gcc49/pkg-plist
+++ b/lang/gcc49/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,28 @@ 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.9.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%%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