Fri Mar 2 14:21:46 2012 UTC ()
Update drupal6 package to 6.25.

Drupal 6.25, 2012-02-29
----------------------
- Fixed regressions introduced in Drupal 6.24 only.


(taca)
diff -r1.32 -r1.33 pkgsrc/www/drupal6/Makefile
diff -r1.23 -r1.24 pkgsrc/www/drupal6/distinfo
cvs diff -r1.32 -r1.33 pkgsrc/www/drupal6/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/drupal6/Attic/Makefile 2012/02/19 16:30:17 1.32
+++ pkgsrc/www/drupal6/Attic/Makefile 2012/03/02 14:21:46 1.33
@@ -1,93 +1,93 @@ @@ -1,93 +1,93 @@
1# $NetBSD: Makefile,v 1.32 2012/02/19 16:30:17 taca Exp $ 1# $NetBSD: Makefile,v 1.33 2012/03/02 14:21:46 taca Exp $
2 2
3DISTNAME= drupal-6.24 3DISTNAME= drupal-6.25
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
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14.include "../../lang/php/phpversion.mk" 14.include "../../lang/php/phpversion.mk"
15 15
16.if ${PKG_PHP_VERSION} == "5" 16.if ${PKG_PHP_VERSION} == "5"
17DEPENDS+= php>=5.2.0<5.3:../../lang/php5 17DEPENDS+= php>=5.2.0<5.3:../../lang/php5
18.endif 18.endif
19DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd 19DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd
20 20
21NO_BUILD= YES 21NO_BUILD= YES
22DRUPAL= share/drupal 22DRUPAL= share/drupal
23PAX_DIRS= includes misc modules scripts themes 23PAX_DIRS= includes misc modules scripts themes
24DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \ 24DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \
25 INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \ 25 INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \
26 MAINTAINERS.txt UPGRADE.txt 26 MAINTAINERS.txt UPGRADE.txt
27 27
28PKG_GROUPS_VARS+= WWW_GROUP 28PKG_GROUPS_VARS+= WWW_GROUP
29PKG_USERS_VARS+= WWW_USER 29PKG_USERS_VARS+= WWW_USER
30 30
31BUILD_DEFS+= WWW_USER WWW_GROUP 31BUILD_DEFS+= WWW_USER WWW_GROUP
32USE_TOOLS+= perl:run pax 32USE_TOOLS+= perl:run pax
33REPLACE_PERL= scripts/code-style.pl 33REPLACE_PERL= scripts/code-style.pl
34 34
35OWN_DIRS_PERMS+= ${DRUPAL}/sites/default \ 35OWN_DIRS_PERMS+= ${DRUPAL}/sites/default \
36 ${WWW_USER} ${WWW_GROUP} 0750 36 ${WWW_USER} ${WWW_GROUP} 0750
37OWN_DIRS_PERMS+= ${DRUPAL}/files \ 37OWN_DIRS_PERMS+= ${DRUPAL}/files \
38 ${WWW_USER} ${WWW_GROUP} 0750 38 ${WWW_USER} ${WWW_GROUP} 0750
39 39
40CONF_FILES= share/examples/drupal/drupal.conf \ 40CONF_FILES= share/examples/drupal/drupal.conf \
41 ${PKG_SYSCONFDIR}/drupal.conf \ 41 ${PKG_SYSCONFDIR}/drupal.conf \
42 share/examples/drupal/default.profile \ 42 share/examples/drupal/default.profile \
43 ${DRUPAL}/profiles/default/default.profile \ 43 ${DRUPAL}/profiles/default/default.profile \
44 share/examples/drupal/default.settings.php \ 44 share/examples/drupal/default.settings.php \
45 ${DRUPAL}/sites/default/default.settings.php 45 ${DRUPAL}/sites/default/default.settings.php
46 46
47REPLACE_INTERPRETER+= php 47REPLACE_INTERPRETER+= php
48REPLACE.php.old= .*php[^ ]* 48REPLACE.php.old= .*php[^ ]*
49REPLACE.php.new= ${PREFIX}/bin/php 49REPLACE.php.new= ${PREFIX}/bin/php
50REPLACE_FILES.php= scripts/drupal.sh 50REPLACE_FILES.php= scripts/drupal.sh
51 51
52SUBST_CLASSES+= conf 52SUBST_CLASSES+= conf
53SUBST_STAGE.conf= pre-install 53SUBST_STAGE.conf= pre-install
54SUBST_FILES.conf= drupal.conf 54SUBST_FILES.conf= drupal.conf
55SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" 55SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
56SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g" 56SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g"
57SUBST_MESSAGE.conf= Fixing configuration files. 57SUBST_MESSAGE.conf= Fixing configuration files.
58 58
59INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \ 59INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \
60 share/doc/drupal share/examples/drupal 60 share/doc/drupal share/examples/drupal
61 61
62.include "options.mk" 62.include "options.mk"
63 63
64OWN_DIRS= share/drupal/sites/default 64OWN_DIRS= share/drupal/sites/default
65OWN_DIRS+= share/drupal/profiles 65OWN_DIRS+= share/drupal/profiles
66OWN_DIRS+= share/drupal/profiles/default 66OWN_DIRS+= share/drupal/profiles/default
67 67
68post-extract: 68post-extract:
69 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} 69 ${CP} ${FILESDIR}/drupal.conf ${WRKSRC}
70 70
71do-install: 71do-install:
72 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL} 72 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL}
73 ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \ 73 ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \
74 ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all 74 ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all
75 ${INSTALL_DATA} ${WRKSRC}/drupal.conf \ 75 ${INSTALL_DATA} ${WRKSRC}/drupal.conf \
76 ${DESTDIR}${PREFIX}/share/examples/drupal 76 ${DESTDIR}${PREFIX}/share/examples/drupal
77 ${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \ 77 ${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
78 ${DESTDIR}${PREFIX}/share/examples/drupal 78 ${DESTDIR}${PREFIX}/share/examples/drupal
79 ${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \ 79 ${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \
80 ${DESTDIR}${PREFIX}/share/examples/drupal 80 ${DESTDIR}${PREFIX}/share/examples/drupal
81 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/${DRUPAL} 81 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/${DRUPAL}
82.for i in ${PAX_DIRS} 82.for i in ${PAX_DIRS}
83 cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${DRUPAL}/${i} 83 cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${DRUPAL}/${i}
84.endfor 84.endfor
85.for i in ${DOCS} 85.for i in ${DOCS}
86 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/drupal 86 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/drupal
87.endfor 87.endfor
88 88
89post-install: 89post-install:
90 ${FIND} ${DESTDIR}${PREFIX}/${DRUPAL} \ 90 ${FIND} ${DESTDIR}${PREFIX}/${DRUPAL} \
91 \( -name '*.jpg' -o -name '*.png' \) | ${XARGS} ${CHMOD} 0644 91 \( -name '*.jpg' -o -name '*.png' \) | ${XARGS} ${CHMOD} 0644
92 92
93.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/www/drupal6/Attic/distinfo (switch to unified diff)

--- pkgsrc/www/drupal6/Attic/distinfo 2012/02/19 16:30:17 1.23
+++ pkgsrc/www/drupal6/Attic/distinfo 2012/03/02 14:21:46 1.24
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.23 2012/02/19 16:30:17 taca Exp $ 1$NetBSD: distinfo,v 1.24 2012/03/02 14:21:46 taca Exp $
2 2
3SHA1 (drupal-6.24.tar.gz) = aadbac0691fe56ea4e0c7dc7dc85ac17c622d52d 3SHA1 (drupal-6.25.tar.gz) = 2eeaf0fd239b4a2c6c97b33f26e6a2be52c13303
4RMD160 (drupal-6.24.tar.gz) = 9fbb8f061c51c4b1532c64ba70a56ce5e456a109 4RMD160 (drupal-6.25.tar.gz) = 8fb31c2c3fa530c35b4c02e51ccf40db3294ed55
5Size (drupal-6.24.tar.gz) = 1104440 bytes 5Size (drupal-6.25.tar.gz) = 1104514 bytes