diff options
| author | sbd <sbd@pkgsrc.org> | 2013-04-18 07:58:33 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2013-04-18 07:58:33 +0000 |
| commit | d78d7e09d8f61a9d528d3c5eeb1d941742fcedbd (patch) | |
| tree | ad185d23a6a267938ddc1e2930c6eea3ed603db6 /lang | |
| parent | a5d5c575fbe5557e1b27522394a51384d51ae4d5 (diff) | |
| download | pkgsrc-d78d7e09d8f61a9d528d3c5eeb1d941742fcedbd.tar.gz | |
Rename GCC_DIST_VERSION to GCC47_DIST_VERSION in lang/gcc47 and lang/gcc47-libs.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc47-libs/Makefile | 14 | ||||
| -rw-r--r-- | lang/gcc47/Makefile | 8 | ||||
| -rw-r--r-- | lang/gcc47/version.mk | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lang/gcc47-libs/Makefile b/lang/gcc47-libs/Makefile index c1e1efea07b..e4f078e244c 100644 --- a/lang/gcc47-libs/Makefile +++ b/lang/gcc47-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2013/04/08 11:17:15 rodent Exp $ +# $NetBSD: Makefile,v 1.13 2013/04/18 07:58:33 sbd Exp $ GCC_PKGNAME= gcc47 .include "../../lang/${GCC_PKGNAME}/version.mk" -DISTNAME= gcc-${GCC_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-libs-${GCC_DIST_VERSION} +DISTNAME= gcc-${GCC47_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-libs-${GCC47_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc47 package so that with the dependence pattern ## '{gcc47,gcc47-libs}>=4.7.*' pkg_all will choose gcc47-libs over gcc47. @@ -22,12 +22,12 @@ USE_TOOLS+= pax NO_BUILD= yes -## Depend on exactly ${GCC_DIST_VERSION}. -BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc47 +## Depend on exactly ${GCC47_DIST_VERSION}. +BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc47 .include "../../mk/bsd.prefs.mk" -FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC_DIST_VERSION}* +FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC47_DIST_VERSION}* .include "../../mk/find-prefix.mk" GCC_SUBPREFIX= ${GCC_PKGNAME} @@ -50,7 +50,7 @@ GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \ ${ECHO} '@pkgdir ${GCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ; ${LIBRARY_FILES}: - ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC_DIST_VERSION}*' | \ + ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC47_DIST_VERSION}*' | \ ${SED} -n -e's,^${GCC_PREFIX}/,,' -e'/libexec\//d' \ -e'/libgij/d;/libgcj/d;/libjvm/d' \ -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES} diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index b1a1fcc0573..470248e2804 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.20 2013/04/02 09:57:51 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2013/04/18 07:58:33 sbd Exp $ GCC_PKGNAME= gcc47 .include "version.mk" -DISTNAME= gcc-${GCC_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION} +DISTNAME= gcc-${GCC47_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-${GCC47_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc47-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! PKGREVISION= 3 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/} +MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= sbd@NetBSD.org diff --git a/lang/gcc47/version.mk b/lang/gcc47/version.mk index 486d2a7be37..a04cee291b8 100644 --- a/lang/gcc47/version.mk +++ b/lang/gcc47/version.mk @@ -1,2 +1,2 @@ -# $NetBSD: version.mk,v 1.2 2012/12/01 02:29:32 sbd Exp $ -GCC_DIST_VERSION:= 4.7.2 +# $NetBSD: version.mk,v 1.3 2013/04/18 07:58:33 sbd Exp $ +GCC47_DIST_VERSION:= 4.7.2 |