Sat Apr 15 15:42:32 2017 UTC ()
Switch to use php-mysqli and remove PHP version restriction.

Bump PKGREVISION.


(taca)
diff -r1.64 -r1.65 pkgsrc/www/mediawiki/Makefile
diff -r1.5 -r1.6 pkgsrc/www/mediawiki/options.mk
cvs diff -r1.64 -r1.65 pkgsrc/www/mediawiki/Makefile (switch to unified diff)

--- pkgsrc/www/mediawiki/Makefile 2017/04/09 01:26:46 1.64
+++ pkgsrc/www/mediawiki/Makefile 2017/04/15 15:42:32 1.65
@@ -1,96 +1,97 @@ @@ -1,96 +1,97 @@
1# $NetBSD: Makefile,v 1.64 2017/04/09 01:26:46 wen Exp $ 1# $NetBSD: Makefile,v 1.65 2017/04/15 15:42:32 taca Exp $
2 2
3DISTNAME= mediawiki-${VER}.${PVER} 3DISTNAME= mediawiki-${VER}.${PVER}
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= https://releases.wikimedia.org/mediawiki/${VER}/ 6MASTER_SITES= https://releases.wikimedia.org/mediawiki/${VER}/
6 7
7MAINTAINER= wenheping@gmail.com 8MAINTAINER= wenheping@gmail.com
8HOMEPAGE= http://www.mediawiki.org/ 9HOMEPAGE= http://www.mediawiki.org/
9COMMENT= Free software wiki package originally written for Wikipedia 10COMMENT= Free software wiki package originally written for Wikipedia
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.5.9:../../graphics/php-gd 13DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.5.9:../../graphics/php-gd
13DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.5.9:../../textproc/php-intl 14DEPENDS+= ${PHP_PKG_PREFIX}-intl>=5.5.9:../../textproc/php-intl
14DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.5.9:../../textproc/php-json 15DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.5.9:../../textproc/php-json
15DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.5.9:../../converters/php-mbstring 16DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.5.9:../../converters/php-mbstring
16 17
17EGDIR= share/examples/mediawiki 18EGDIR= share/examples/mediawiki
18MEDIAWIKI= ${PREFIX}/share/mediawiki 19MEDIAWIKI= ${PREFIX}/share/mediawiki
19INSTALLATION_DIRS= ${EGDIR} share/mediawiki 20INSTALLATION_DIRS= ${EGDIR} share/mediawiki
20 21
21.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
22.include "options.mk" 23.include "options.mk"
23 24
24VER= 1.28 25VER= 1.28
25PVER= 1 26PVER= 1
26 27
27APACHE_USER?= www 28APACHE_USER?= www
28APACHE_GROUP?= www 29APACHE_GROUP?= www
29BUILD_DEFS+= APACHE_USER APACHE_GROUP 30BUILD_DEFS+= APACHE_USER APACHE_GROUP
30 31
31PKG_SYSCONFSUBDIR?= httpd 32PKG_SYSCONFSUBDIR?= httpd
32MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 33MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
33 34
34CONF_FILES= ${PREFIX}/${EGDIR}/mediawiki.conf \ 35CONF_FILES= ${PREFIX}/${EGDIR}/mediawiki.conf \
35 ${PKG_SYSCONFDIR}/mediawiki.conf 36 ${PKG_SYSCONFDIR}/mediawiki.conf
36 37
37NO_CONFIGURE= YES 38NO_CONFIGURE= YES
38NO_BUILD= YES 39NO_BUILD= YES
39 40
40SUBST_CLASSES+= paths 41SUBST_CLASSES+= paths
41SUBST_MESSAGE.paths= Fixing pathnames in configuration file. 42SUBST_MESSAGE.paths= Fixing pathnames in configuration file.
42SUBST_STAGE.paths= post-patch 43SUBST_STAGE.paths= post-patch
43SUBST_FILES.paths= ../mediawiki.conf 44SUBST_FILES.paths= ../mediawiki.conf
44SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g" 45SUBST_SED.paths= -e "s,@MEDIAWIKI@,${MEDIAWIKI},g"
45 46
46SUBST_CLASSES+= sh 47SUBST_CLASSES+= sh
47SUBST_STAGE.sh= post-patch 48SUBST_STAGE.sh= post-patch
48SUBST_MESSAGE.sh= Fixing path to sh 49SUBST_MESSAGE.sh= Fixing path to sh
49SUBST_FILES.sh+= maintenance/storage/make-blobs 50SUBST_FILES.sh+= maintenance/storage/make-blobs
50SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh 51SUBST_FILES.sh+= maintenance/dev/install.sh maintenance/dev/installphp.sh
51SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh 52SUBST_FILES.sh+= maintenance/dev/installmw.sh maintenance/dev/start.sh
52SUBST_FILES.sh+= includes/limit.sh 53SUBST_FILES.sh+= includes/limit.sh
53SUBST_SED.sh= -e "s|/bin/bash|${SH}|" 54SUBST_SED.sh= -e "s|/bin/bash|${SH}|"
54 55
55SUBST_CLASSES+= sh2 56SUBST_CLASSES+= sh2
56SUBST_STAGE.sh2= post-patch 57SUBST_STAGE.sh2= post-patch
57SUBST_MESSAGE.sh2= Fixing path to sh 58SUBST_MESSAGE.sh2= Fixing path to sh
58SUBST_FILES.sh2+= maintenance/mwjsduck-gen 59SUBST_FILES.sh2+= maintenance/mwjsduck-gen
59SUBST_FILES.sh2+= docs/kss/scripts/kss-node-check.sh 60SUBST_FILES.sh2+= docs/kss/scripts/kss-node-check.sh
60SUBST_SED.sh2= -e "s|/usr/bin/env bash|${SH}|" 61SUBST_SED.sh2= -e "s|/usr/bin/env bash|${SH}|"
61 62
62SUBST_CLASSES+= perl 63SUBST_CLASSES+= perl
63SUBST_STAGE.perl= post-patch 64SUBST_STAGE.perl= post-patch
64SUBST_MESSAGE.perl= Fixing path to perl 65SUBST_MESSAGE.perl= Fixing path to perl
65SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl 66SUBST_FILES.perl+= maintenance/postgres/compare_schemas.pl
66SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl 67SUBST_FILES.perl+= maintenance/postgres/mediawiki_mysql2postgres.pl
67SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|" 68SUBST_SED.perl= -e "s|/usr/bin/perl|${PERL5}|"
68 69
69SUBST_CLASSES+= python 70SUBST_CLASSES+= python
70SUBST_STAGE.python= post-patch 71SUBST_STAGE.python= post-patch
71SUBST_MESSAGE.python= Fixing python path 72SUBST_MESSAGE.python= Fixing python path
72SUBST_FILES.python+= extensions/ConfirmEdit/captcha.py 73SUBST_FILES.python+= extensions/ConfirmEdit/captcha.py
73SUBST_SED.python= -e "s,/usr/bin/python,${PYTHONBIN}," 74SUBST_SED.python= -e "s,/usr/bin/python,${PYTHONBIN},"
74 75
75SUBST_CLASSES+= python2 76SUBST_CLASSES+= python2
76SUBST_STAGE.python2= post-patch 77SUBST_STAGE.python2= post-patch
77SUBST_MESSAGE.python2= Fixing python path 78SUBST_MESSAGE.python2= Fixing python path
78SUBST_FILES.python2+= maintenance/language/zhtable/Makefile.py 79SUBST_FILES.python2+= maintenance/language/zhtable/Makefile.py
79SUBST_SED.python2= -e "s,/usr/bin/env python,${PYTHONBIN}," 80SUBST_SED.python2= -e "s,/usr/bin/env python,${PYTHONBIN},"
80 81
81post-extract: 82post-extract:
82 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf 83 ${CP} ${FILESDIR}/mediawiki.conf ${WRKDIR}/mediawiki.conf
83 84
84do-install: 85do-install:
85 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \ 86 cd ${WRKSRC} && ${FIND} . -type d -exec ${INSTALL_DATA_DIR} \
86 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \ 87 ${DESTDIR}${MEDIAWIKI}/{} \; -exec ${CHOWN} \
87 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \; 88 ${APACHE_USER}:${APACHE_GROUP} ${DESTDIR}${MEDIAWIKI}/{} \;
88 cd ${WRKSRC} && ${FIND} . \! -type d \! -name '.git*' \ 89 cd ${WRKSRC} && ${FIND} . \! -type d \! -name '.git*' \
89 -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \ 90 -exec ${INSTALL_DATA} {} ${DESTDIR}${MEDIAWIKI}/{} \; \
90 -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \ 91 -exec ${CHOWN} ${APACHE_USER}:${APACHE_GROUP} \
91 ${DESTDIR}${MEDIAWIKI}/{} \; 92 ${DESTDIR}${MEDIAWIKI}/{} \;
92 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \ 93 ${INSTALL_DATA} ${WRKDIR}/mediawiki.conf \
93 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf 94 ${DESTDIR}${PREFIX}/${EGDIR}/mediawiki.conf
94 95
95.include "../../lang/php/phpversion.mk" 96.include "../../lang/php/phpversion.mk"
96.include "../../mk/bsd.pkg.mk" 97.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/www/mediawiki/options.mk (switch to unified diff)

--- pkgsrc/www/mediawiki/options.mk 2016/09/11 17:03:28 1.5
+++ pkgsrc/www/mediawiki/options.mk 2017/04/15 15:42:32 1.6
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: options.mk,v 1.5 2016/09/11 17:03:28 taca Exp $ 1# $NetBSD: options.mk,v 1.6 2017/04/15 15:42:32 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mediawiki 3PKG_OPTIONS_VAR= PKG_OPTIONS.mediawiki
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+= apache mysql pgsql 8PKG_SUPPORTED_OPTIONS+= apache mysql pgsql
9PKG_SUGGESTED_OPTIONS= apache mysql 9PKG_SUGGESTED_OPTIONS= apache mysql
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13### 13###
14### Use mysql or postgresql backend 14### Use mysql or postgresql backend
15### 15###
16.if !empty(PKG_OPTIONS:Mmysql) 16.if !empty(PKG_OPTIONS:Mmysql)
17DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.10:../../databases/php-mysql 17DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.5.9:../../databases/php-mysqli
18PHP_VERSIONS_ACCEPTED= 56 
19.elif !empty(PKG_OPTIONS:Mpgsql) 18.elif !empty(PKG_OPTIONS:Mpgsql)
20DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=5:../../databases/php-pgsql 19DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=5:../../databases/php-pgsql
21.endif 20.endif
22 21
23.if !empty(PKG_OPTIONS:Mapache) 22.if !empty(PKG_OPTIONS:Mapache)
24.include "../../mk/apache.mk" 23.include "../../mk/apache.mk"
25.endif 24.endif