diff options
| -rw-r--r-- | lang/gcc48-libs/Makefile | 14 | ||||
| -rw-r--r-- | lang/gcc48/Makefile | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile index 9f95063b0de..b32b05feac8 100644 --- a/lang/gcc48-libs/Makefile +++ b/lang/gcc48-libs/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/04/04 11:12:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2013/04/17 17:40:33 adam Exp $ GCC_PKGNAME= gcc48 .include "../../lang/${GCC_PKGNAME}/version.mk" -DISTNAME= gcc-${GCC48_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION} +DISTNAME= gcc-${GCC_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-libs-${GCC_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc48 package so that with the dependence pattern ## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48. @@ -22,12 +22,12 @@ USE_TOOLS+= pax NO_BUILD= yes -## Depend on exactly ${GCC48_DIST_VERSION}. -BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48 +## Depend on exactly ${GCC_DIST_VERSION}. +BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48 .include "../../mk/bsd.prefs.mk" -FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}* +FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC_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}-${GCC48_DIST_VERSION}*' | \ + ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC_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/gcc48/Makefile b/lang/gcc48/Makefile index e6542098191..4a9f2a7e58c 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.2 2013/04/03 13:30:12 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/04/17 17:46:36 adam Exp $ GCC_PKGNAME= gcc48 .include "version.mk" -DISTNAME= gcc-${GCC48_DIST_VERSION} -PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} +DISTNAME= gcc-${GCC_DIST_VERSION} +PKGNAME= ${GCC_PKGNAME}-${GCC_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc48-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! PKGREVISION= 0 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} +MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org |