Sat Apr 6 13:02:34 2013 UTC ()
Set EXTRACT_SUFX here intead of Makefile.common, so it's overridden in
fewer places.


(rodent)
diff -r1.19 -r1.20 pkgsrc/multimedia/php-ming/Makefile
diff -r1.9 -r1.10 pkgsrc/www/php-phrasea2/Makefile

cvs diff -r1.19 -r1.20 pkgsrc/multimedia/php-ming/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/php-ming/Makefile 2013/02/16 11:23:40 1.19
+++ pkgsrc/multimedia/php-ming/Makefile 2013/04/06 13:02:33 1.20
@@ -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"
4PKGREVISION= 1 4PKGREVISION= 1
5PECL_VERSION= ${MING_VERSION} 5PECL_VERSION= ${MING_VERSION}
6MODNAME= ming 6MODNAME= ming
7CATEGORIES+= multimedia 7CATEGORIES+= multimedia
8DIST_SUBDIR?= #empty 8DIST_SUBDIR?= #empty
 9EXTRACT_SUFX= .tar.gz
9 10
10MAINTAINER= obache@NetBSD.org 11MAINTAINER= obache@NetBSD.org
11HOMEPAGE= http://www.libming.org/ 12HOMEPAGE= http://www.libming.org/
12COMMENT= PHP extension for Ming library 13COMMENT= PHP extension for Ming library
13LICENSE= php 14LICENSE= php
14 15
15CONFLICTS= php-ming-[0-9]* 16CONFLICTS= php-ming-[0-9]*
16 17
17CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming} 18CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.ming}
18PHPSETUPSUBDIR= php_ext 19PHPSETUPSUBDIR= php_ext
19MODULESDIR= ${WRKSRC}/${PHPSETUPSUBDIR}/modules 20MODULESDIR= ${WRKSRC}/${PHPSETUPSUBDIR}/modules
20CONFIGURE_DIRS= ${PHPSETUPSUBDIR} 21CONFIGURE_DIRS= ${PHPSETUPSUBDIR}
21 22

cvs diff -r1.9 -r1.10 pkgsrc/www/php-phrasea2/Makefile (expand / switch to unified diff)

--- pkgsrc/www/php-phrasea2/Makefile 2013/03/02 20:33:34 1.9
+++ pkgsrc/www/php-phrasea2/Makefile 2013/04/06 13:02:33 1.10
@@ -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
6MODNAME= phrasea2 6MODNAME= phrasea2
7PKGREVISION= 2 7PKGREVISION= 2
8PECL_VERSION= ${VERS} 8PECL_VERSION= ${VERS}
9PECL_LEGACY_VERSION_SCHEME= yes 9PECL_LEGACY_VERSION_SCHEME= yes
10EXTRACT_ELEMENTS= ${DISTNAME}/bin/src/php_phrasea2 10EXTRACT_ELEMENTS= ${DISTNAME}/bin/src/php_phrasea2
 11EXTRACT_SUFX= .tar.gz
11USE_LANGUAGES= c c++ 12USE_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
17DISTNAME= phraseanet-v${VERS}-linux 18DISTNAME= phraseanet-v${VERS}-linux
18DIST_SUBDIR= #empty 19DIST_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...
21WRKSRC=${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2 22WRKSRC=${WRKDIR}/${DISTNAME}/bin/src/php_phrasea2
22 23
23.include "../../mk/mysql.buildlink3.mk" 24.include "../../mk/mysql.buildlink3.mk"