Mon Aug 22 18:11:04 2016 UTC ()
pkgsrc changes to package:

- Add missing php modules
- Limit work with php-5.6
- Improve the wordpress.conf
- Install wp-config-sample.php to WPHOME but not EGDIR

Patch from wen heping.


(morr)
diff -r1.57 -r1.58 pkgsrc/www/wordpress/Makefile
diff -r1.29 -r1.30 pkgsrc/www/wordpress/PLIST
diff -r1.4 -r1.5 pkgsrc/www/wordpress/options.mk
diff -r1.1.1.1 -r1.2 pkgsrc/www/wordpress/files/wordpress.conf
cvs diff -r1.57 -r1.58 pkgsrc/www/wordpress/Makefile (expand / switch to unified diff)

--- pkgsrc/www/wordpress/Makefile 2016/08/21 20:04:57 1.57
+++ pkgsrc/www/wordpress/Makefile 2016/08/22 18:11:04 1.58
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.57 2016/08/21 20:04:57 jklos Exp $ 1# $NetBSD: Makefile,v 1.58 2016/08/22 18:11:04 morr Exp $
2 2
3DISTNAME= wordpress-${VERSION} 3DISTNAME= wordpress-${VERSION}
4VERSION= 4.6 4VERSION= 4.6
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://wordpress.org/ 6MASTER_SITES= http://wordpress.org/
7 7
8MAINTAINER= morr@NetBSD.org 8MAINTAINER= morr@NetBSD.org
9HOMEPAGE= http://wordpress.org/ 9HOMEPAGE= http://wordpress.org/
10COMMENT= Blogging tool written in php 10COMMENT= Blogging tool written in php
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13USE_TOOLS+= pax 13USE_TOOLS+= pax
14 14
@@ -27,36 +27,52 @@ PKG_USERS_VARS= WWW_USER @@ -27,36 +27,52 @@ PKG_USERS_VARS= WWW_USER
27BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP 27BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
28EGDIR= ${PREFIX}/share/examples/wordpress 28EGDIR= ${PREFIX}/share/examples/wordpress
29DOCDIR= ${PREFIX}/share/doc/wordpress 29DOCDIR= ${PREFIX}/share/doc/wordpress
30WPHOME= ${PREFIX}/share/wordpress 30WPHOME= ${PREFIX}/share/wordpress
31FILES_SUBST+= WPHOME=${WPHOME} 31FILES_SUBST+= WPHOME=${WPHOME}
32MESSAGE_SUBST+= DOCDIR=${DOCDIR} 32MESSAGE_SUBST+= DOCDIR=${DOCDIR}
33 33
34CONF_FILES+= ${EGDIR}/wordpress.conf ${PKG_SYSCONFDIR}/wordpress.conf 34CONF_FILES+= ${EGDIR}/wordpress.conf ${PKG_SYSCONFDIR}/wordpress.conf
35OWN_DIRS_PERMS+= ${WPHOME}/wp-content/uploads \ 35OWN_DIRS_PERMS+= ${WPHOME}/wp-content/uploads \
36 ${WWW_USER} ${WWW_GROUP} 0750 36 ${WWW_USER} ${WWW_GROUP} 0750
37 37
38INSTALLATION_DIRS+= ${DOCDIR} ${WPHOME} ${EGDIR} 38INSTALLATION_DIRS+= ${DOCDIR} ${WPHOME} ${EGDIR}
39 39
40DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql 40DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.6.0:../../databases/php-mysql
 41DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd
 42DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl
 43DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.6.0:../../archivers/php-zip
 44DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib
 45PHP_VERSIONS_ACCEPTED= 56
 46
 47SUBST_CLASSES+= conf
 48SUBST_MESSAGE.conf= Fixing pathnames in configuration file.
 49SUBST_STAGE.conf= post-patch
 50SUBST_FILES.conf= ../wordpress.conf
 51SUBST_SED.conf= -e "s,@WPHOME@,${WPHOME},g"
 52.if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24"
 53SUBST_SED.conf+= -e "/Order allow,deny/d"
 54SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g"
 55.endif
41 56
42PHP_VERSIONS_ACCEPTED= 55 56 57post-extract:
 58 ${CP} ${FILESDIR}/wordpress.conf ${WRKDIR}/wordpress.conf
43 59
44do-install: 60do-install:
45 ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR} 61 ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR}
46 ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${DOCDIR} 62 ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${DOCDIR}
47 63
48 ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR} 64# ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR}
49 ${INSTALL_DATA} ${FILESDIR}/wordpress.conf ${DESTDIR}${EGDIR} 65 ${INSTALL_DATA} ${WRKDIR}/wordpress.conf ${DESTDIR}${EGDIR}
50 66
51 ${RM} ${WRKSRC}/readme.html 67 ${RM} ${WRKSRC}/readme.html
52 ${RM} ${WRKSRC}/license.txt 68 ${RM} ${WRKSRC}/license.txt
53 ${RM} ${WRKSRC}/wp-config-sample.php 69# ${RM} ${WRKSRC}/wp-config-sample.php
54 70
55 cd ${WRKSRC} && pax -rw -pmp . ${DESTDIR}${WPHOME} 71 cd ${WRKSRC} && pax -rw -pmp . ${DESTDIR}${WPHOME}
56 ${TOUCH} ${DESTDIR}${WPHOME}/wp-content/plugins/index.html 72 ${TOUCH} ${DESTDIR}${WPHOME}/wp-content/plugins/index.html
57 ${FIND} ${DESTDIR}${WPHOME} \ 73 ${FIND} ${DESTDIR}${WPHOME} \
58 -type d -exec ${CHMOD} ${PKGDIRMODE} "{}" \; 74 -type d -exec ${CHMOD} ${PKGDIRMODE} "{}" \;
59 ${FIND} ${DESTDIR}${WPHOME} \ 75 ${FIND} ${DESTDIR}${WPHOME} \
60 -type f -exec ${CHMOD} ${SHAREMODE} "{}" \; 76 -type f -exec ${CHMOD} ${SHAREMODE} "{}" \;
61 77
62.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/www/wordpress/PLIST (expand / switch to unified diff)

--- pkgsrc/www/wordpress/PLIST 2016/08/21 20:04:57 1.29
+++ pkgsrc/www/wordpress/PLIST 2016/08/22 18:11:04 1.30
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1@comment $NetBSD: PLIST,v 1.29 2016/08/21 20:04:57 jklos Exp $ 1@comment $NetBSD: PLIST,v 1.30 2016/08/22 18:11:04 morr Exp $
2share/doc/wordpress/license.txt 2share/doc/wordpress/license.txt
3share/doc/wordpress/readme.html 3share/doc/wordpress/readme.html
4share/examples/wordpress/wordpress.conf 4share/examples/wordpress/wordpress.conf
5share/examples/wordpress/wp-config-sample.php 
6share/wordpress/index.php 5share/wordpress/index.php
7share/wordpress/wp-activate.php 6share/wordpress/wp-activate.php
8share/wordpress/wp-admin/about.php 7share/wordpress/wp-admin/about.php
9share/wordpress/wp-admin/admin-ajax.php 8share/wordpress/wp-admin/admin-ajax.php
10share/wordpress/wp-admin/admin-footer.php 9share/wordpress/wp-admin/admin-footer.php
11share/wordpress/wp-admin/admin-functions.php 10share/wordpress/wp-admin/admin-functions.php
12share/wordpress/wp-admin/admin-header.php 11share/wordpress/wp-admin/admin-header.php
13share/wordpress/wp-admin/admin-post.php 12share/wordpress/wp-admin/admin-post.php
14share/wordpress/wp-admin/admin.php 13share/wordpress/wp-admin/admin.php
15share/wordpress/wp-admin/async-upload.php 14share/wordpress/wp-admin/async-upload.php
16share/wordpress/wp-admin/comment.php 15share/wordpress/wp-admin/comment.php
17share/wordpress/wp-admin/credits.php 16share/wordpress/wp-admin/credits.php
18share/wordpress/wp-admin/css/about-rtl.css 17share/wordpress/wp-admin/css/about-rtl.css
@@ -502,26 +501,27 @@ share/wordpress/wp-admin/user-edit.php @@ -502,26 +501,27 @@ share/wordpress/wp-admin/user-edit.php
502share/wordpress/wp-admin/user-new.php 501share/wordpress/wp-admin/user-new.php
503share/wordpress/wp-admin/user/about.php 502share/wordpress/wp-admin/user/about.php
504share/wordpress/wp-admin/user/admin.php 503share/wordpress/wp-admin/user/admin.php
505share/wordpress/wp-admin/user/credits.php 504share/wordpress/wp-admin/user/credits.php
506share/wordpress/wp-admin/user/freedoms.php 505share/wordpress/wp-admin/user/freedoms.php
507share/wordpress/wp-admin/user/index.php 506share/wordpress/wp-admin/user/index.php
508share/wordpress/wp-admin/user/menu.php 507share/wordpress/wp-admin/user/menu.php
509share/wordpress/wp-admin/user/profile.php 508share/wordpress/wp-admin/user/profile.php
510share/wordpress/wp-admin/user/user-edit.php 509share/wordpress/wp-admin/user/user-edit.php
511share/wordpress/wp-admin/users.php 510share/wordpress/wp-admin/users.php
512share/wordpress/wp-admin/widgets.php 511share/wordpress/wp-admin/widgets.php
513share/wordpress/wp-blog-header.php 512share/wordpress/wp-blog-header.php
514share/wordpress/wp-comments-post.php 513share/wordpress/wp-comments-post.php
 514share/wordpress/wp-config-sample.php
515share/wordpress/wp-content/index.php 515share/wordpress/wp-content/index.php
516share/wordpress/wp-content/plugins/akismet/.htaccess 516share/wordpress/wp-content/plugins/akismet/.htaccess
517share/wordpress/wp-content/plugins/akismet/LICENSE.txt 517share/wordpress/wp-content/plugins/akismet/LICENSE.txt
518share/wordpress/wp-content/plugins/akismet/_inc/akismet.css 518share/wordpress/wp-content/plugins/akismet/_inc/akismet.css
519share/wordpress/wp-content/plugins/akismet/_inc/akismet.js 519share/wordpress/wp-content/plugins/akismet/_inc/akismet.js
520share/wordpress/wp-content/plugins/akismet/_inc/form.js 520share/wordpress/wp-content/plugins/akismet/_inc/form.js
521share/wordpress/wp-content/plugins/akismet/_inc/img/logo-full-2x.png 521share/wordpress/wp-content/plugins/akismet/_inc/img/logo-full-2x.png
522share/wordpress/wp-content/plugins/akismet/akismet.php 522share/wordpress/wp-content/plugins/akismet/akismet.php
523share/wordpress/wp-content/plugins/akismet/class.akismet-admin.php 523share/wordpress/wp-content/plugins/akismet/class.akismet-admin.php
524share/wordpress/wp-content/plugins/akismet/class.akismet-widget.php 524share/wordpress/wp-content/plugins/akismet/class.akismet-widget.php
525share/wordpress/wp-content/plugins/akismet/class.akismet.php 525share/wordpress/wp-content/plugins/akismet/class.akismet.php
526share/wordpress/wp-content/plugins/akismet/index.php 526share/wordpress/wp-content/plugins/akismet/index.php
527share/wordpress/wp-content/plugins/akismet/readme.txt 527share/wordpress/wp-content/plugins/akismet/readme.txt
cvs diff -r1.4 -r1.5 pkgsrc/www/wordpress/options.mk (expand / switch to unified diff)

--- pkgsrc/www/wordpress/options.mk 2012/04/14 16:25:11 1.4
+++ pkgsrc/www/wordpress/options.mk 2016/08/22 18:11:04 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.4 2012/04/14 16:25:11 adam Exp $ 1# $NetBSD: options.mk,v 1.5 2016/08/22 18:11:04 morr 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)
13DEPENDS+= php>=5.2.4:${PHPPKGSRCDIR} 13DEPENDS+= php>=5.6.0:${PHPPKGSRCDIR}
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Map-php) 16.if !empty(PKG_OPTIONS:Map-php)
17. include "../../mk/apache.mk" 17. include "../../mk/apache.mk"
18DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php 18DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.6.0:../../www/ap-php
19.endif 19.endif
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/wordpress/files/wordpress.conf (expand / switch to unified diff)

--- pkgsrc/www/wordpress/files/wordpress.conf 2009/04/06 11:31:02 1.1.1.1
+++ pkgsrc/www/wordpress/files/wordpress.conf 2016/08/22 18:11:04 1.2
@@ -1,19 +1,25 @@ @@ -1,19 +1,25 @@
1# $NetBSD: wordpress.conf,v 1.1.1.1 2009/04/06 11:31:02 adrianp Exp $ 1# $NetBSD: wordpress.conf,v 1.2 2016/08/22 18:11:04 morr Exp $
2# 2#
3# WordPress configuration file fragment for Apache 3# WordPress configuration file fragment for Apache
4 4
 5<IfModule mod_alias.c>
 6 Alias /wp/ "@WPHOME@/"
 7</IfModule>
 8
5<Directory "@WPHOME@"> 9<Directory "@WPHOME@">
6# 10 Options Indexes
7# Insert any custom directives here 11 DirectoryIndex index.php index.html
8# 12 AllowOverride None
 13 Order allow,deny
 14 Allow from all
9</Directory> 15</Directory>
10 16
11# 17#
12# For security, don't serve pages from the WordPress admin interface to  18# For security, don't serve pages from the WordPress admin interface to
13# the entire web. 19# the entire web.
14# 20#
15#<Directory "@WPHOME@/wp-admin"> 21#<Directory "@WPHOME@/wp-admin">
16# Order deny,allow 22# Order deny,allow
17# Allow from x.x.x.x 23# Allow from x.x.x.x
18# Deny from all 24# Deny from all
19#</Directory> 25#</Directory>