diff options
| -rw-r--r-- | www/wordpress/Makefile | 30 | ||||
| -rw-r--r-- | www/wordpress/PLIST | 4 | ||||
| -rw-r--r-- | www/wordpress/files/wordpress.conf | 14 | ||||
| -rw-r--r-- | www/wordpress/options.mk | 6 |
4 files changed, 38 insertions, 16 deletions
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile index 74dec2c583f..aee0cbe13d9 100644 --- a/www/wordpress/Makefile +++ b/www/wordpress/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2016/08/21 20:04:57 jklos Exp $ +# $NetBSD: Makefile,v 1.58 2016/08/22 18:11:04 morr Exp $ DISTNAME= wordpress-${VERSION} VERSION= 4.6 @@ -37,20 +37,36 @@ OWN_DIRS_PERMS+= ${WPHOME}/wp-content/uploads \ INSTALLATION_DIRS+= ${DOCDIR} ${WPHOME} ${EGDIR} -DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql - -PHP_VERSIONS_ACCEPTED= 55 56 +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.6.0:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.6.0:../../graphics/php-gd +DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.6.0:../../www/php-curl +DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.6.0:../../archivers/php-zip +DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib +PHP_VERSIONS_ACCEPTED= 56 + +SUBST_CLASSES+= conf +SUBST_MESSAGE.conf= Fixing pathnames in configuration file. +SUBST_STAGE.conf= post-patch +SUBST_FILES.conf= ../wordpress.conf +SUBST_SED.conf= -e "s,@WPHOME@,${WPHOME},g" +.if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24" +SUBST_SED.conf+= -e "/Order allow,deny/d" +SUBST_SED.conf+= -e "s,Allow from all,Require all granted,g" +.endif + +post-extract: + ${CP} ${FILESDIR}/wordpress.conf ${WRKDIR}/wordpress.conf do-install: ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${FILESDIR}/wordpress.conf ${DESTDIR}${EGDIR} +# ${INSTALL_DATA} ${WRKSRC}/wp-config-sample.php ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/wordpress.conf ${DESTDIR}${EGDIR} ${RM} ${WRKSRC}/readme.html ${RM} ${WRKSRC}/license.txt - ${RM} ${WRKSRC}/wp-config-sample.php +# ${RM} ${WRKSRC}/wp-config-sample.php cd ${WRKSRC} && pax -rw -pmp . ${DESTDIR}${WPHOME} ${TOUCH} ${DESTDIR}${WPHOME}/wp-content/plugins/index.html diff --git a/www/wordpress/PLIST b/www/wordpress/PLIST index 40f5bb32c36..9a5c1a97381 100644 --- a/www/wordpress/PLIST +++ b/www/wordpress/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.29 2016/08/21 20:04:57 jklos Exp $ +@comment $NetBSD: PLIST,v 1.30 2016/08/22 18:11:04 morr Exp $ share/doc/wordpress/license.txt share/doc/wordpress/readme.html share/examples/wordpress/wordpress.conf -share/examples/wordpress/wp-config-sample.php share/wordpress/index.php share/wordpress/wp-activate.php share/wordpress/wp-admin/about.php @@ -512,6 +511,7 @@ share/wordpress/wp-admin/users.php share/wordpress/wp-admin/widgets.php share/wordpress/wp-blog-header.php share/wordpress/wp-comments-post.php +share/wordpress/wp-config-sample.php share/wordpress/wp-content/index.php share/wordpress/wp-content/plugins/akismet/.htaccess share/wordpress/wp-content/plugins/akismet/LICENSE.txt diff --git a/www/wordpress/files/wordpress.conf b/www/wordpress/files/wordpress.conf index f5876093f1d..c3b45bd02a4 100644 --- a/www/wordpress/files/wordpress.conf +++ b/www/wordpress/files/wordpress.conf @@ -1,11 +1,17 @@ -# $NetBSD: wordpress.conf,v 1.1.1.1 2009/04/06 11:31:02 adrianp Exp $ +# $NetBSD: wordpress.conf,v 1.2 2016/08/22 18:11:04 morr Exp $ # # WordPress configuration file fragment for Apache +<IfModule mod_alias.c> + Alias /wp/ "@WPHOME@/" +</IfModule> + <Directory "@WPHOME@"> -# -# Insert any custom directives here -# + Options Indexes + DirectoryIndex index.php index.html + AllowOverride None + Order allow,deny + Allow from all </Directory> # diff --git a/www/wordpress/options.mk b/www/wordpress/options.mk index b35ed7cc8f8..a3c2595a749 100644 --- a/www/wordpress/options.mk +++ b/www/wordpress/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2012/04/14 16:25:11 adam Exp $ +# $NetBSD: options.mk,v 1.5 2016/08/22 18:11:04 morr Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wordpress @@ -10,10 +10,10 @@ PKG_SUGGESTED_OPTIONS= ap-php .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mphp-cgi) -DEPENDS+= php>=5.2.4:${PHPPKGSRCDIR} +DEPENDS+= php>=5.6.0:${PHPPKGSRCDIR} .endif .if !empty(PKG_OPTIONS:Map-php) . include "../../mk/apache.mk" -DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.6.0:../../www/ap-php .endif |