svn commit: r351222 - head/lang/gcc46

[Gerald Pfeifer]

Author: gerald
Date: Sun Apr 13 13:55:21 2014
New Revision: 351222
URL: http://svnweb.freebsd.org/changeset/ports/351222
QAT: https://qat.redports.org/buildarchive/r351222/

Log:
  Remove an (obsolete) CONFLICTS with a former state of lang/gcc.
  
  Replace USE_BZIP2 by USES=tar:bzip2.
  
  Extend full-regression-test by running contrib/test_summary.
  
  No longer install rebuild-gcj-db46 (which requires bash among others)
  and its man page.

Modified:
  head/lang/gcc46/Makefile
  head/lang/gcc46/pkg-plist

Modified: head/lang/gcc46/Makefile
==============================================================================
--- head/lang/gcc46/Makefile	Sun Apr 13 13:44:24 2014	(r351221)
+++ head/lang/gcc46/Makefile	Sun Apr 13 13:55:21 2014	(r351222)
@@ -26,17 +26,14 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORT
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-CONFLICTS=	gcc-4.6.*
-
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.
 DISTVERSION=	${PORTVERSION}
 GCC_VERSION=	${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
-USES=		gmake iconv perl5
+USES=		gmake iconv perl5 tar:bzip2
 USE_BINUTILS=	yes
-USE_BZIP2=	yes
 USE_PERL5=	build
 SSP_UNSAFE=	yes
 
@@ -124,12 +121,15 @@ pre-configure:
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
-	cd ${WRKSRC}; ${GMAKE} -sk check
+	cd ${WRKSRC}; ${GMAKE} -sk check \
+	; ${SRCDIR}/contrib/test_summary
 .endif
 
 post-install:
 	${RM} -f ${STAGEDIR}${TARGLIB}/*.la
 	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# 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

Modified: head/lang/gcc46/pkg-plist
==============================================================================
--- head/lang/gcc46/pkg-plist	Sun Apr 13 13:44:24 2014	(r351221)
+++ head/lang/gcc46/pkg-plist	Sun Apr 13 13:55:21 2014	(r351222)
@@ -46,7 +46,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%JAVA%%bin/gtnameserv%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%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
@@ -69,7 +68,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%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