Mon Mar 15 16:48:53 2010 UTC ()
Remove the case of PKG_PHP_VERSION is 4.

No functional change.


(taca)
diff -r1.23 -r1.24 pkgsrc/mail/roundcube/Makefile
diff -r1.10 -r1.11 pkgsrc/net/php-xmlrpc/Makefile
diff -r1.14 -r1.15 pkgsrc/textproc/php-wddx/Makefile
diff -r1.44 -r1.45 pkgsrc/www/drupal/Makefile
diff -r1.3 -r1.4 pkgsrc/www/drupal/options.mk
diff -r1.19 -r1.20 pkgsrc/www/drupal6/Makefile
diff -r1.3 -r1.4 pkgsrc/www/drupal6/options.mk
diff -r1.66 -r1.67 pkgsrc/www/horde/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/wordpress/options.mk
cvs diff -r1.23 -r1.24 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2009/12/31 16:56:18 1.23
+++ pkgsrc/mail/roundcube/Makefile 2010/03/15 16:48:53 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2009/12/31 16:56:18 abs Exp $ 1# $NetBSD: Makefile,v 1.24 2010/03/15 16:48:53 taca Exp $
2# 2#
3 3
4DISTNAME= roundcubemail-${RCVERSION}-dep 4DISTNAME= roundcubemail-${RCVERSION}-dep
5PKGREVISION= 1 5PKGREVISION= 1
6PKGNAME= ${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/} 6PKGNAME= ${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://roundcube.net/ 11HOMEPAGE= http://roundcube.net/
12COMMENT= Browser-based multilingual IMAP client 12COMMENT= Browser-based multilingual IMAP client
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -19,32 +19,27 @@ RCVERSION= 0.3.1 @@ -19,32 +19,27 @@ RCVERSION= 0.3.1
19VERSION= ${RCVERSION:S/-//} 19VERSION= ${RCVERSION:S/-//}
20 20
21PKG_DESTDIR_SUPPORT= user-destdir 21PKG_DESTDIR_SUPPORT= user-destdir
22INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins 22INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
23INSTALLATION_DIRS+= ${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin 23INSTALLATION_DIRS+= ${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26.include "../../lang/php/phpversion.mk" 26.include "../../lang/php/phpversion.mk"
27 27
28DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP 28DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP
29DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime 29DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime
30DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2 30DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2
31DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL 31DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
32 
33.if ${PKG_PHP_VERSION} == "4" 
34DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml 
35.elif ${PKG_PHP_VERSION} == "5" 
36DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom 32DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
37.endif 
38 33
39PKG_SYSCONFSUBDIR?= roundcube 34PKG_SYSCONFSUBDIR?= roundcube
40 35
41WWW_USER?= ${APACHE_USER} 36WWW_USER?= ${APACHE_USER}
42WWW_GROUP?= ${APACHE_GROUP} 37WWW_GROUP?= ${APACHE_GROUP}
43 38
44PKG_GROUPS_VARS+= WWW_GROUP 39PKG_GROUPS_VARS+= WWW_GROUP
45PKG_USERS_VARS+= WWW_USER 40PKG_USERS_VARS+= WWW_USER
46BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP 41BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
47 42
48RCDIR= ${PREFIX}/share/roundcube 43RCDIR= ${PREFIX}/share/roundcube
49EGDIR= ${PREFIX}/share/examples/roundcube 44EGDIR= ${PREFIX}/share/examples/roundcube
50DOCDIR= ${PREFIX}/share/doc/roundcube 45DOCDIR= ${PREFIX}/share/doc/roundcube
cvs diff -r1.10 -r1.11 pkgsrc/net/php-xmlrpc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/php-xmlrpc/Makefile 2008/06/12 02:14:41 1.10
+++ pkgsrc/net/php-xmlrpc/Makefile 2010/03/15 16:48:53 1.11
@@ -1,49 +1,37 @@ @@ -1,49 +1,37 @@
1# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:41 joerg Exp $ 1# $NetBSD: Makefile,v 1.11 2010/03/15 16:48:53 taca Exp $
2 2
3MODNAME= xmlrpc 3MODNAME= xmlrpc
4CATEGORIES+= net 4CATEGORIES+= net
5COMMENT= PHP extension for XML-RPC support 5COMMENT= PHP extension for XML-RPC support
6 6
7PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
8 8
9CONFLICTS= php-xmlrpc-[0-9]* 9CONFLICTS= php-xmlrpc-[0-9]*
10 10
11HOMEPAGE= http://xmlrpc-epi.sourceforge.net/ 11HOMEPAGE= http://xmlrpc-epi.sourceforge.net/
12 12
13CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} 13CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
14 14
15.include "../../lang/php/phpversion.mk" 15.include "../../lang/php/phpversion.mk"
16 16
17.if ${PKG_PHP_VERSION} == 5 
18# the extension has been changed in PHP 5.1 to require libxml2; while 
19# there is some "compatibility" expat configure setting, it doesn't build 
20# with that 
21CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2} 17CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_PREFIX.libxml2}
22.else 
23CONFIGURE_ARGS+= --with-expat-dir=${BUILDLINK_PREFIX.expat} 
24.endif 
25 18
26.include "../../converters/libiconv/buildlink3.mk" 19.include "../../converters/libiconv/buildlink3.mk"
27 20
28# This is necessary so that PHP would find either the libc iconv 21# This is necessary so that PHP would find either the libc iconv
29# or use the packaged iconv, as appropriate; using 22# or use the packaged iconv, as appropriate; using
30# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists 23# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists
31# 24#
32CHECK_BUILTIN.iconv:= yes 25CHECK_BUILTIN.iconv:= yes
33.include "../../converters/libiconv/builtin.mk" 26.include "../../converters/libiconv/builtin.mk"
34CHECK_BUILTIN.iconv:= no 27CHECK_BUILTIN.iconv:= no
35 28
36.if !empty(USE_BUILTIN.iconv:M[nN][oO]) 29.if !empty(USE_BUILTIN.iconv:M[nN][oO])
37CONFIGURE_ARGS+= --with-iconv-dir=${BUILDLINK_PREFIX.iconv} 30CONFIGURE_ARGS+= --with-iconv-dir=${BUILDLINK_PREFIX.iconv}
38.else 31.else
39CONFIGURE_ARGS+= --with-iconv-dir 32CONFIGURE_ARGS+= --with-iconv-dir
40.endif 33.endif
41 34
42.if ${PKG_PHP_VERSION} == 5 
43.include "../../textproc/libxml2/buildlink3.mk" 35.include "../../textproc/libxml2/buildlink3.mk"
44.else 
45.include "../../textproc/expat/buildlink3.mk" 
46.endif 
47 
48.include "../../lang/php/ext.mk" 36.include "../../lang/php/ext.mk"
49.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/textproc/php-wddx/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/php-wddx/Makefile 2008/06/12 02:14:51 1.14
+++ pkgsrc/textproc/php-wddx/Makefile 2010/03/15 16:48:53 1.15
@@ -1,31 +1,23 @@ @@ -1,31 +1,23 @@
1# $NetBSD: Makefile,v 1.14 2008/06/12 02:14:51 joerg Exp $ 1# $NetBSD: Makefile,v 1.15 2010/03/15 16:48:53 taca Exp $
2 2
3MODNAME= wddx 3MODNAME= wddx
4CATEGORIES+= textproc 4CATEGORIES+= textproc
5COMMENT= PHP extension for WDDX support 5COMMENT= PHP extension for WDDX support
6 6
7PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
8 8
9CONFLICTS= php-wddx-[0-9]* 9CONFLICTS= php-wddx-[0-9]*
10 10
11CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} 11CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR}
 12CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_DIR}
12 13
13USE_PHP_EXT_PATCHES= # defined 14USE_PHP_EXT_PATCHES= # defined
14 15
15# appease some PHP build assumpsions 16# appease some PHP build assumpsions
16CFLAGS+= -I${BUILDLINK_DIR}/include/libxml2 \ 17CFLAGS+= -I${BUILDLINK_DIR}/include/libxml2 \
17 -I${BUILDLINK_DIR}/include/php/ext/date/lib 18 -I${BUILDLINK_DIR}/include/php/ext/date/lib
18 19
19 
20.include "../../lang/php/phpversion.mk" 20.include "../../lang/php/phpversion.mk"
21 
22# link against libxml2 on PHP5 
23.if ${PKG_PHP_VERSION} == 5 
24CONFIGURE_ARGS+= --with-libxml-dir=${BUILDLINK_DIR} 
25.include "../../textproc/libxml2/buildlink3.mk" 21.include "../../textproc/libxml2/buildlink3.mk"
26.else 
27.include "../../textproc/expat/buildlink3.mk" 
28.endif 
29 
30.include "../../lang/php/ext.mk" 22.include "../../lang/php/ext.mk"
31.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.44 -r1.45 pkgsrc/www/drupal/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/drupal/Attic/Makefile 2010/03/04 01:29:39 1.44
+++ pkgsrc/www/drupal/Attic/Makefile 2010/03/15 16:48:53 1.45
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.44 2010/03/04 01:29:39 taca Exp $ 1# $NetBSD: Makefile,v 1.45 2010/03/15 16:48:53 taca Exp $
2 2
3DISTNAME= drupal-5.22 3DISTNAME= drupal-5.22
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://drupal.org/files/projects/ 5MASTER_SITES= http://drupal.org/files/projects/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://drupal.org/ 8HOMEPAGE= http://drupal.org/
9COMMENT= Open source content management system 9COMMENT= Open source content management system
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12CONFLICTS+= drupal-6.*{,nb*} 12CONFLICTS+= drupal-6.*{,nb*}
13 13
14DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php 14DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
 16DEPENDS+= php>=5.2.4:../../lang/php5
16 17
17NO_BUILD= YES 18NO_BUILD= YES
18DRUPAL= ${PREFIX}/share/drupal 19DRUPAL= ${PREFIX}/share/drupal
19PAX_DIRS= includes misc modules scripts themes 20PAX_DIRS= includes misc modules scripts themes
20 21
21PKG_GROUPS_VARS+= APACHE_GROUP 22PKG_GROUPS_VARS+= APACHE_GROUP
22PKG_USERS_VARS+= APACHE_USER 23PKG_USERS_VARS+= APACHE_USER
23 24
24BUILD_DEFS+= APACHE_USER APACHE_GROUP 25BUILD_DEFS+= APACHE_USER APACHE_GROUP
25USE_TOOLS+= perl:run pax 26USE_TOOLS+= perl:run pax
26REPLACE_PERL= scripts/code-style.pl 27REPLACE_PERL= scripts/code-style.pl
27 28
28#OWN_DIRS+= ${DRUPAL}/sites/default 29#OWN_DIRS+= ${DRUPAL}/sites/default
@@ -38,30 +39,26 @@ CONF_FILES_PERMS+= ${PREFIX}/share/examp @@ -38,30 +39,26 @@ CONF_FILES_PERMS+= ${PREFIX}/share/examp
38 ${APACHE_USER} ${APACHE_GROUP} 0640 39 ${APACHE_USER} ${APACHE_GROUP} 0640
39 40
40SUBST_CLASSES+= conf 41SUBST_CLASSES+= conf
41SUBST_STAGE.conf= pre-install 42SUBST_STAGE.conf= pre-install
42SUBST_FILES.conf= drupal.conf 43SUBST_FILES.conf= drupal.conf
43SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" 44SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
44SUBST_MESSAGE.conf= Fixing configuration files. 45SUBST_MESSAGE.conf= Fixing configuration files.
45 46
46PKG_DESTDIR_SUPPORT= user-destdir 47PKG_DESTDIR_SUPPORT= user-destdir
47 48
48.include "../../mk/apachever.mk" 49.include "../../mk/apachever.mk"
49.include "../../lang/php/phpversion.mk" 50.include "../../lang/php/phpversion.mk"
50 51
51.if ${PKG_PHP_VERSION} == "5" 
52DEPENDS+= php>=5.2.4:../../lang/php5 
53.endif 
54 
55.include "options.mk" 52.include "options.mk"
56 53
57post-extract: 54post-extract:
58 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} 55 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
59 56
60INSTALLATION_DIRS+= share/doc/drupal share/examples/drupal 57INSTALLATION_DIRS+= share/doc/drupal share/examples/drupal
61INSTALLATION_DIRS+= share/drupal share/drupal/files 58INSTALLATION_DIRS+= share/drupal share/drupal/files
62INSTALLATION_DIRS+= share/drupal/profiles share/drupal/profiles/default 59INSTALLATION_DIRS+= share/drupal/profiles share/drupal/profiles/default
63INSTALLATION_DIRS+= share/drupal/sites share/drupal/sites/all 60INSTALLATION_DIRS+= share/drupal/sites share/drupal/sites/all
64INSTALLATION_DIRS+= share/drupal/sites/default 61INSTALLATION_DIRS+= share/drupal/sites/default
65 62
66do-install: 63do-install:
67 ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/drupal 64 ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/drupal
cvs diff -r1.3 -r1.4 pkgsrc/www/drupal/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/drupal/Attic/options.mk 2006/06/02 18:28:00 1.3
+++ pkgsrc/www/drupal/Attic/options.mk 2010/03/15 16:48:53 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2006/06/02 18:28:00 joerg Exp $ 1# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.drupal 3PKG_OPTIONS_VAR= PKG_OPTIONS.drupal
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db 5PKG_OPTIONS_REQUIRED_GROUPS= db
6PKG_OPTIONS_GROUP.db= mysql pgsql 6PKG_OPTIONS_GROUP.db= mysql pgsql
7 7
8PKG_SUPPORTED_OPTIONS= drupal-xmlservices 8PKG_SUPPORTED_OPTIONS= drupal-xmlservices
9PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices 9PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13### 13###
14### Use PostgreSQL for storing Drupal data 14### Use PostgreSQL for storing Drupal data
@@ -19,19 +19,15 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]* @@ -19,19 +19,15 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*
19.elif !empty(PKG_OPTIONS:Mmysql) 19.elif !empty(PKG_OPTIONS:Mmysql)
20### 20###
21### Use MySQL for storing Drupal data 21### Use MySQL for storing Drupal data
22### 22###
23. include "../../mk/mysql.buildlink3.mk" 23. include "../../mk/mysql.buildlink3.mk"
24DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql 24DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
25.endif 25.endif
26 26
27### 27###
28### Enable XML-based services such as the Blogger API, Jabber and RSS 28### Enable XML-based services such as the Blogger API, Jabber and RSS
29### syndication. 29### syndication.
30### 30###
31.if !empty(PKG_OPTIONS:Mdrupal-xmlservices) 31.if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
32. if ${PKG_PHP_VERSION} == "4" 
33DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml 
34. elif ${PKG_PHP_VERSION} == "5" 
35DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom 32DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
36. endif 
37.endif 33.endif
cvs diff -r1.19 -r1.20 pkgsrc/www/drupal6/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/drupal6/Attic/Makefile 2010/03/04 01:29:58 1.19
+++ pkgsrc/www/drupal6/Attic/Makefile 2010/03/15 16:48:53 1.20
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.19 2010/03/04 01:29:58 taca Exp $ 1# $NetBSD: Makefile,v 1.20 2010/03/15 16:48:53 taca Exp $
2 2
3DISTNAME= drupal-6.16 3DISTNAME= drupal-6.16
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://drupal.org/files/projects/ 5MASTER_SITES= http://drupal.org/files/projects/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://drupal.org/ 8HOMEPAGE= http://drupal.org/
9COMMENT= Open source content management system 9COMMENT= Open source content management system
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12CONFLICTS+= drupal-5.*{,nb*} 12CONFLICTS+= drupal-5.*{,nb*}
13 13
 14DEPENDS+= php>=5.2.0:../../lang/php5
14DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd 15DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd
15 16
16NO_BUILD= YES 17NO_BUILD= YES
17DRUPAL= share/drupal 18DRUPAL= share/drupal
18PAX_DIRS= includes misc modules scripts themes 19PAX_DIRS= includes misc modules scripts themes
19DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \ 20DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \
20 INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \ 21 INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \
21 MAINTAINERS.txt UPGRADE.txt 22 MAINTAINERS.txt UPGRADE.txt
22 23
23PKG_GROUPS_VARS+= WWW_GROUP 24PKG_GROUPS_VARS+= WWW_GROUP
24PKG_USERS_VARS+= WWW_USER 25PKG_USERS_VARS+= WWW_USER
25 26
26BUILD_DEFS+= WWW_USER WWW_GROUP 27BUILD_DEFS+= WWW_USER WWW_GROUP
@@ -47,30 +48,26 @@ REPLACE_FILES.php= scripts/drupal.sh @@ -47,30 +48,26 @@ REPLACE_FILES.php= scripts/drupal.sh
47SUBST_CLASSES+= conf 48SUBST_CLASSES+= conf
48SUBST_STAGE.conf= pre-install 49SUBST_STAGE.conf= pre-install
49SUBST_FILES.conf= drupal.conf 50SUBST_FILES.conf= drupal.conf
50SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" 51SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
51SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" 52SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g"
52SUBST_MESSAGE.conf= Fixing configuration files. 53SUBST_MESSAGE.conf= Fixing configuration files.
53 54
54INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \ 55INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \
55 share/doc/drupal share/examples/drupal 56 share/doc/drupal share/examples/drupal
56PKG_DESTDIR_SUPPORT= user-destdir 57PKG_DESTDIR_SUPPORT= user-destdir
57 58
58.include "../../lang/php/phpversion.mk" 59.include "../../lang/php/phpversion.mk"
59 60
60.if ${PKG_PHP_VERSION} == "5" 
61DEPENDS+= php>=5.2.0:../../lang/php5 
62.endif 
63 
64.include "options.mk" 61.include "options.mk"
65 62
66OWN_DIRS= share/drupal/sites/default 63OWN_DIRS= share/drupal/sites/default
67OWN_DIRS+= share/drupal/profiles 64OWN_DIRS+= share/drupal/profiles
68OWN_DIRS+= share/drupal/profiles/default 65OWN_DIRS+= share/drupal/profiles/default
69 66
70post-extract: 67post-extract:
71 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} 68 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
72 69
73do-install: 70do-install:
74 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL} 71 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL}
75 ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \ 72 ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \
76 ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all 73 ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all
cvs diff -r1.3 -r1.4 pkgsrc/www/drupal6/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/drupal6/Attic/options.mk 2009/02/16 21:02:26 1.3
+++ pkgsrc/www/drupal6/Attic/options.mk 2010/03/15 16:48:53 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2009/02/16 21:02:26 adrianp Exp $ 1# $NetBSD: options.mk,v 1.4 2010/03/15 16:48:53 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.drupal 3PKG_OPTIONS_VAR= PKG_OPTIONS.drupal
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= db 5PKG_OPTIONS_REQUIRED_GROUPS= db
6PKG_OPTIONS_GROUP.db= mysql pgsql 6PKG_OPTIONS_GROUP.db= mysql pgsql
7 7
8PKG_SUPPORTED_OPTIONS= drupal-xmlservices apache unicode 8PKG_SUPPORTED_OPTIONS= drupal-xmlservices apache unicode
9PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices apache 9PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices apache
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13### 13###
14### Use PostgreSQL for storing Drupal data 14### Use PostgreSQL for storing Drupal data
@@ -19,31 +19,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]* @@ -19,31 +19,27 @@ DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*
19.elif !empty(PKG_OPTIONS:Mmysql) 19.elif !empty(PKG_OPTIONS:Mmysql)
20### 20###
21### Use MySQL for storing Drupal data 21### Use MySQL for storing Drupal data
22### 22###
23. include "../../mk/mysql.buildlink3.mk" 23. include "../../mk/mysql.buildlink3.mk"
24DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql 24DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
25.endif 25.endif
26 26
27### 27###
28### Enable XML-based services such as the Blogger API, Jabber and RSS 28### Enable XML-based services such as the Blogger API, Jabber and RSS
29### syndication. 29### syndication.
30### 30###
31.if !empty(PKG_OPTIONS:Mdrupal-xmlservices) 31.if !empty(PKG_OPTIONS:Mdrupal-xmlservices)
32. if ${PKG_PHP_VERSION} == "4" 
33DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml 
34. elif ${PKG_PHP_VERSION} == "5" 
35DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom 32DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
36. endif 
37.endif 33.endif
38 34
39### 35###
40### Support for unicode 36### Support for unicode
41### 37###
42.if !empty(PKG_OPTIONS:Municode) 38.if !empty(PKG_OPTIONS:Municode)
43DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring 39DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
44.endif 40.endif
45 41
46### 42###
47### Drupal can run on a number of web servers, we support apache by default 43### Drupal can run on a number of web servers, we support apache by default
48### 44###
49.if !empty(PKG_OPTIONS:Mapache) 45.if !empty(PKG_OPTIONS:Mapache)
cvs diff -r1.66 -r1.67 pkgsrc/www/horde/Makefile (expand / switch to unified diff)

--- pkgsrc/www/horde/Makefile 2010/02/16 16:08:59 1.66
+++ pkgsrc/www/horde/Makefile 2010/03/15 16:48:53 1.67
@@ -1,44 +1,40 @@ @@ -1,44 +1,40 @@
1# $NetBSD: Makefile,v 1.66 2010/02/16 16:08:59 joerg Exp $ 1# $NetBSD: Makefile,v 1.67 2010/03/15 16:48:53 taca Exp $
2 2
3DISTNAME= horde-3.3.6 3DISTNAME= horde-3.3.6
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://ftp.horde.org/pub/horde/ \ 6MASTER_SITES= http://ftp.horde.org/pub/horde/ \
7 ftp://ftp.horde.org/pub/horde/ 7 ftp://ftp.horde.org/pub/horde/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.horde.org/ 10HOMEPAGE= http://www.horde.org/
11COMMENT= PHP application framework 11COMMENT= PHP application framework
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15CONFLICTS+= horde-2.*{,nb*} 15CONFLICTS+= horde-2.*{,nb*}
16 16
17.include "../../lang/php/phpversion.mk" 17.include "../../lang/php/phpversion.mk"
18 18
19DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext 19DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt 20DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt
21DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv 21DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
22DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd 22DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
23DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log 23DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
24DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime 24DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
25DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB 25DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
26DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php 26DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
27.if ${PKG_PHP_VERSION} == "4" 
28DEPENDS+= ${PHP_PKG_PREFIX}-domxml>=4.3.3:../../textproc/php4-domxml 
29.elif ${PKG_PHP_VERSION} == "5" 
30DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom 27DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php5-dom
31.endif 
32DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib 28DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
33DEPENDS+= ${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table 29DEPENDS+= ${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table
34DEPENDS+= ${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find 30DEPENDS+= ${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find
35DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request-[0-9]*:../../www/pear-HTTP_Request 31DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request-[0-9]*:../../www/pear-HTTP_Request
36 32
37USE_TOOLS+= pax 33USE_TOOLS+= pax
38 34
39.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
40 36
41DOCDIR= ${PREFIX}/share/doc/horde 37DOCDIR= ${PREFIX}/share/doc/horde
42EGDIR= ${PREFIX}/share/examples/horde 38EGDIR= ${PREFIX}/share/examples/horde
43HORDEDIR= ${PREFIX}/share/horde 39HORDEDIR= ${PREFIX}/share/horde
44PAXDIRS= js lib locale po scripts services templates themes util admin \ 40PAXDIRS= js lib locale po scripts services templates themes util admin \
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/wordpress/options.mk (expand / switch to unified diff)

--- pkgsrc/www/wordpress/options.mk 2009/04/06 11:31:02 1.1.1.1
+++ pkgsrc/www/wordpress/options.mk 2010/03/15 16:48:53 1.2
@@ -1,24 +1,19 @@ @@ -1,24 +1,19 @@
1# $NetBSD: options.mk,v 1.1.1.1 2009/04/06 11:31:02 adrianp Exp $ 1# $NetBSD: options.mk,v 1.2 2010/03/15 16:48:53 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.wordpress 3PKG_OPTIONS_VAR= PKG_OPTIONS.wordpress
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= wordpress 5PKG_OPTIONS_REQUIRED_GROUPS= wordpress
6PKG_OPTIONS_GROUP.wordpress= php-cgi ap-php 6PKG_OPTIONS_GROUP.wordpress= php-cgi ap-php
7 7
8PKG_SUGGESTED_OPTIONS= ap-php 8PKG_SUGGESTED_OPTIONS= ap-php
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12.if !empty(PKG_OPTIONS:Mphp-cgi) 12.if !empty(PKG_OPTIONS:Mphp-cgi)
13. if ${PKG_PHP_VERSION} == "4" 
14DEPENDS+= php>=4.4.7:../../www/php4 
15. endif 
16. if ${PKG_PHP_VERSION} == "5" 
17DEPENDS+= php>=5.2.4:../../lang/php5 13DEPENDS+= php>=5.2.4:../../lang/php5
18. endif 
19.endif 14.endif
20 15
21.if !empty(PKG_OPTIONS:Map-php) 16.if !empty(PKG_OPTIONS:Map-php)
22. include "../../mk/apachever.mk" 17. include "../../mk/apachever.mk"
23DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php 18DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php
24.endif 19.endif