From owner-svn-ports-head@FreeBSD.ORG Mon Oct 28 00:26:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A75FE33A; Mon, 28 Oct 2013 00:26:29 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8459E2685; Mon, 28 Oct 2013 00:26:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9S0QTiO001214; Mon, 28 Oct 2013 00:26:29 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9S0QT5m001212; Mon, 28 Oct 2013 00:26:29 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201310280026.r9S0QT5m001212@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 28 Oct 2013 00:26:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331816 - head/lang/gcc46 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 00:26:29 -0000 Author: gerald Date: Mon Oct 28 00:26:28 2013 New Revision: 331816 URL: http://svnweb.freebsd.org/changeset/ports/331816 Log: Remove a (long) obsolete dependency on bison. [1] Migrate to the new LIB_DEPENDS standard. STAGEify. Reported by: marino [1] Modified: head/lang/gcc46/Makefile head/lang/gcc46/pkg-plist Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Mon Oct 28 00:06:49 2013 (r331815) +++ head/lang/gcc46/Makefile Mon Oct 28 00:26:28 2013 (r331816) @@ -12,9 +12,9 @@ MASTER_SITE_SUBDIR= releases/gcc-${DISTV 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] 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 .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}/lan 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 ;\ Modified: head/lang/gcc46/pkg-plist ============================================================================== --- head/lang/gcc46/pkg-plist Mon Oct 28 00:06:49 2013 (r331815) +++ head/lang/gcc46/pkg-plist Mon Oct 28 00:26:28 2013 (r331816) @@ -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/libstdc %%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