Mon Aug 22 18:12:25 2016 UTC ()
Bump revision for previous commit


(morr)
diff -r1.58 -r1.59 pkgsrc/www/wordpress/Makefile
cvs diff -r1.58 -r1.59 pkgsrc/www/wordpress/Makefile (switch to unified diff)

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