Set EXTRACT_SUFX here intead of Makefile.common, so it's overridden in fewer places.diff -r1.19 -r1.20 pkgsrc/multimedia/php-ming/Makefile
(rodent)
@@ -1,21 +1,22 @@ | @@ -1,21 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2013/02/16 11:23:40 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2013/04/06 13:02:33 rodent Exp $ | |
2 | 2 | |||
3 | .include "../../multimedia/ming/Makefile.common" | 3 | .include "../../multimedia/ming/Makefile.common" | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 1 | |
5 | PECL_VERSION= ${MING_VERSION} | 5 | PECL_VERSION= ${MING_VERSION} | |
6 | MODNAME= ming | 6 | MODNAME= ming | |
7 | CATEGORIES+= multimedia | 7 | CATEGORIES+= multimedia | |
8 | DIST_SUBDIR?= #empty | 8 | DIST_SUBDIR?= #empty | |
9 | EXTRACT_SUFX= .tar.gz | |||
9 | 10 | |||
10 | MAINTAINER= obache@NetBSD.org | 11 | MAINTAINER= obache@NetBSD.org | |
11 | HOMEPAGE= http://www.libming.org/ | 12 | HOMEPAGE= http://www.libming.org/ | |
12 | COMMENT= PHP extension for Ming library | 13 | COMMENT= PHP extension for Ming library | |
13 | LICENSE= php | 14 | LICENSE= php | |
14 | 15 | |||
15 | CONFLICTS= php-ming-[0-9]* | 16 | CONFLICTS= php-ming-[0-9]* | |
16 | 17 | |||
17 | CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming} | 18 | CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming} | |
18 | PHPSETUPSUBDIR= php_ext | 19 | PHPSETUPSUBDIR= php_ext | |
19 | MODULESDIR= ${WRKSRC}/${PHPSETUPSUBDIR}/modules | 20 | MODULESDIR= ${WRKSRC}/${PHPSETUPSUBDIR}/modules | |
20 | CONFIGURE_DIRS= ${PHPSETUPSUBDIR} | 21 | CONFIGURE_DIRS= ${PHPSETUPSUBDIR} | |
21 | 22 |
@@ -1,23 +1,24 @@ | @@ -1,23 +1,24 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2013/03/02 20:33:34 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2013/04/06 13:02:33 rodent Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | .include "../../www/phraseanet/Makefile.common" | 4 | .include "../../www/phraseanet/Makefile.common" | |
5 | 5 | |||
6 | MODNAME= phrasea2 | 6 | MODNAME= phrasea2 | |
7 | PKGREVISION= 2 | 7 | PKGREVISION= 2 | |
8 | PECL_VERSION= ${VERS} | 8 | PECL_VERSION= ${VERS} | |
9 | PECL_LEGACY_VERSION_SCHEME= yes | 9 | PECL_LEGACY_VERSION_SCHEME= yes | |
10 | EXTRACT_ELEMENTS= ${DISTNAME}/bin/src/php_phrasea2 | 10 | EXTRACT_ELEMENTS= ${DISTNAME}/bin/src/php_phrasea2 | |
11 | EXTRACT_SUFX= .tar.gz | |||
11 | USE_LANGUAGES= c c++ | 12 | USE_LANGUAGES= c c++ | |
12 | 13 | |||
13 | .include "../../lang/php/ext.mk" | 14 | .include "../../lang/php/ext.mk" | |
14 | 15 | |||
15 | # php/ext.mk trashes these, preventing the package from building, | 16 | # php/ext.mk trashes these, preventing the package from building, | |
16 | # so set them back again afterwards. grr | 17 | # so set them back again afterwards. grr | |
17 | DISTNAME= phraseanet-v${VERS}-linux | 18 | DISTNAME= phraseanet-v${VERS}-linux | |
18 | DIST_SUBDIR= #empty | 19 | DIST_SUBDIR= #empty | |
19 | 20 | |||
20 | # This seems to now be needed though it wasn't before... | 21 | # This seems to now be needed though it wasn't before... | |
21 | WRKSRC=${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2 | 22 | WRKSRC=${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2 | |
22 | 23 | |||
23 | .include "../../mk/mysql.buildlink3.mk" | 24 | .include "../../mk/mysql.buildlink3.mk" |