diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2014-04-13 13:55:21 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2014-04-13 13:55:21 +0000 |
| commit | b2bfd30660e4a64574fa02126095e8f6a2bf4f92 (patch) | |
| tree | 6fc52b4d80603fa51cf922aba2b5194f34dc53e6 /lang | |
| parent | - Update to 2.2.0 [1] (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=351222
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/Makefile | 10 | ||||
| -rw-r--r-- | lang/gcc46/pkg-plist | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index d5f5c4d85d63..8126fae493bc 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -26,17 +26,14 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils 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 diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index 89a7b8a777fd..6ca691fa7a7c 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -46,7 +46,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py %%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/libstdcxx/v6/printers.py %%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 |