Wed Feb 21 12:26:45 2018 UTC ()
horde: set PHP_VERSIONS_ACCEPTED to 56

The default-on mysql option pulls in php-mysql, which is restricted to 56.


(wiz)
diff -r1.82 -r1.83 pkgsrc/www/horde/Makefile
cvs diff -r1.82 -r1.83 pkgsrc/www/horde/Makefile (switch to unified diff)

--- pkgsrc/www/horde/Makefile 2017/08/16 20:21:16 1.82
+++ pkgsrc/www/horde/Makefile 2018/02/21 12:26:45 1.83
@@ -1,128 +1,130 @@ @@ -1,128 +1,130 @@
1# $NetBSD: Makefile,v 1.82 2017/08/16 20:21:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.83 2018/02/21 12:26:45 wiz Exp $
2 2
3DISTNAME= horde-3.3.13 3DISTNAME= horde-3.3.13
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://ftp.horde.org/pub/horde/ 6MASTER_SITES= http://ftp.horde.org/pub/horde/
7MASTER_SITES+= ftp://ftp.horde.org/pub/horde/ 7MASTER_SITES+= ftp://ftp.horde.org/pub/horde/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.horde.org/ 10HOMEPAGE= https://www.horde.org/
11COMMENT= PHP application framework 11COMMENT= PHP application framework
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14CONFLICTS+= horde-2.* 14CONFLICTS+= horde-2.*
15 15
 16PHP_VERSIONS_ACCEPTED= 56 # php-mysql, default-on option
 17
16.include "../../lang/php/phpversion.mk" 18.include "../../lang/php/phpversion.mk"
17 19
18DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext 20DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=4.3.3:../../devel/php-gettext
19DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt 21DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=4.3.3:../../security/php-mcrypt
20DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv 22DEPENDS+= ${PHP_PKG_PREFIX}-iconv>=4.3.3:../../converters/php-iconv
21DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd 23DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.3:../../graphics/php-gd
22DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log 24DEPENDS+= ${PHP_PKG_PREFIX}-pear-Log-[0-9]*:../../sysutils/pear-Log
23DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime 25DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime-[0-9]*:../../mail/pear-Mail_Mime
24DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB 26DEPENDS+= ${PHP_PKG_PREFIX}-pear-DB-[0-9]*:../../databases/pear-DB
25DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php 27DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.3:../../www/ap-php
26DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib 28DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=4.3.3:../../archivers/php-zlib
27DEPENDS+= ${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table 29DEPENDS+= ${PHP_PKG_PREFIX}-pear-Console_Table-[0-9]*:../../textproc/pear-Console_Table
28DEPENDS+= ${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find 30DEPENDS+= ${PHP_PKG_PREFIX}-pear-File_Find-[0-9]*:../../textproc/pear-File_Find
29DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request-[0-9]*:../../www/pear-HTTP_Request 31DEPENDS+= ${PHP_PKG_PREFIX}-pear-HTTP_Request-[0-9]*:../../www/pear-HTTP_Request
30 32
31USE_TOOLS+= pax 33USE_TOOLS+= pax
32 34
33.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
34 36
35DOCDIR= ${PREFIX}/share/doc/horde 37DOCDIR= ${PREFIX}/share/doc/horde
36EGDIR= ${PREFIX}/share/examples/horde 38EGDIR= ${PREFIX}/share/examples/horde
37HORDEDIR= ${PREFIX}/share/horde 39HORDEDIR= ${PREFIX}/share/horde
38PAXDIRS= js lib locale po scripts services templates themes util admin \ 40PAXDIRS= js lib locale po scripts services templates themes util admin \
39 rpc 41 rpc
40SENDMAIL?= /usr/sbin/sendmail 42SENDMAIL?= /usr/sbin/sendmail
41PKG_USERS_VARS+=APACHE_USER 43PKG_USERS_VARS+=APACHE_USER
42 44
43PKG_SYSCONFSUBDIR?= httpd 45PKG_SYSCONFSUBDIR?= httpd
44MESSAGE_SUBST+= HORDEDIR=${HORDEDIR} 46MESSAGE_SUBST+= HORDEDIR=${HORDEDIR}
45 47
46REPLACE_INTERPRETER+= php 48REPLACE_INTERPRETER+= php
47REPLACE.php.old= .*/bin/php 49REPLACE.php.old= .*/bin/php
48REPLACE.php.new= ${PREFIX}/bin/php 50REPLACE.php.new= ${PREFIX}/bin/php
49REPLACE_FILES.php= po/translation.php \ 51REPLACE_FILES.php= po/translation.php \
50 scripts/upgrades/migrate_user_categories.php \ 52 scripts/upgrades/migrate_user_categories.php \
51 scripts/upgrades/move_history_out_of_datatree.php \ 53 scripts/upgrades/move_history_out_of_datatree.php \
52 scripts/alarms.php \ 54 scripts/alarms.php \
53 scripts/import_squirrelmail_prefs.php \ 55 scripts/import_squirrelmail_prefs.php \
54 scripts/upgrades/convert_datatree_groups_to_sql.php \ 56 scripts/upgrades/convert_datatree_groups_to_sql.php \
55 scripts/upgrades/convert_datatree_perms_to_sql.php \ 57 scripts/upgrades/convert_datatree_perms_to_sql.php \
56 scripts/import_squirrelmail_file_prefs.php \ 58 scripts/import_squirrelmail_file_prefs.php \
57 scripts/import_squirrelmail_sql_prefs.php 59 scripts/import_squirrelmail_sql_prefs.php
58 60
59CONF_FILES+= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf 61CONF_FILES+= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
60OWN_DIRS_PERMS+= ${HORDEDIR}/config \ 62OWN_DIRS_PERMS+= ${HORDEDIR}/config \
61 ${APACHE_USER} ${REAL_ROOT_GROUP} 0750 63 ${APACHE_USER} ${REAL_ROOT_GROUP} 0750
62CONF_FILES_PERMS+= ${EGDIR}/config/conf.php \ 64CONF_FILES_PERMS+= ${EGDIR}/config/conf.php \
63 ${HORDEDIR}/config/conf.php \ 65 ${HORDEDIR}/config/conf.php \
64 ${APACHE_USER} ${REAL_ROOT_GROUP} 0640 66 ${APACHE_USER} ${REAL_ROOT_GROUP} 0640
65CONF_FILES_PERMS+= ${EGDIR}/config/conf.xml \ 67CONF_FILES_PERMS+= ${EGDIR}/config/conf.xml \
66 ${HORDEDIR}/config/conf.xml \ 68 ${HORDEDIR}/config/conf.xml \
67 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 69 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
68CONF_FILES_PERMS+= ${EGDIR}/config/mime_drivers.php \ 70CONF_FILES_PERMS+= ${EGDIR}/config/mime_drivers.php \
69 ${HORDEDIR}/config/mime_drivers.php \ 71 ${HORDEDIR}/config/mime_drivers.php \
70 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 72 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
71CONF_FILES_PERMS+= ${EGDIR}/config/motd.php \ 73CONF_FILES_PERMS+= ${EGDIR}/config/motd.php \
72 ${HORDEDIR}/config/motd.php \ 74 ${HORDEDIR}/config/motd.php \
73 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 75 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
74CONF_FILES_PERMS+= ${EGDIR}/config/nls.php \ 76CONF_FILES_PERMS+= ${EGDIR}/config/nls.php \
75 ${HORDEDIR}/config/nls.php \ 77 ${HORDEDIR}/config/nls.php \
76 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 78 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
77CONF_FILES_PERMS+= ${EGDIR}/config/prefs.php \ 79CONF_FILES_PERMS+= ${EGDIR}/config/prefs.php \
78 ${HORDEDIR}/config/prefs.php \ 80 ${HORDEDIR}/config/prefs.php \
79 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 81 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
80CONF_FILES_PERMS+= ${EGDIR}/config/registry.php \ 82CONF_FILES_PERMS+= ${EGDIR}/config/registry.php \
81 ${HORDEDIR}/config/registry.php \ 83 ${HORDEDIR}/config/registry.php \
82 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 84 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
83CONF_FILES_PERMS+= ${EGDIR}/config/hooks.php \ 85CONF_FILES_PERMS+= ${EGDIR}/config/hooks.php \
84 ${HORDEDIR}/config/hooks.php \ 86 ${HORDEDIR}/config/hooks.php \
85 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440 87 ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
86 88
87SUBST_CLASSES+= files 89SUBST_CLASSES+= files
88SUBST_STAGE.files= post-build 90SUBST_STAGE.files= post-build
89SUBST_FILES.files= horde.conf.dist config/conf.xml config/conf.xml.dist \ 91SUBST_FILES.files= horde.conf.dist config/conf.xml config/conf.xml.dist \
90 scripts/set_perms.sh 92 scripts/set_perms.sh
91SUBST_SED.files= -e "s|@HORDEDIR@|${HORDEDIR}|g" 93SUBST_SED.files= -e "s|@HORDEDIR@|${HORDEDIR}|g"
92SUBST_SED.files+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g" 94SUBST_SED.files+= -e "s|/usr/lib/sendmail|${SENDMAIL}|g"
93SUBST_SED.files+= -e "s|/bin/sh|${SH}|g" 95SUBST_SED.files+= -e "s|/bin/sh|${SH}|g"
94SUBST_MESSAGE.files= Fixing configuration files. 96SUBST_MESSAGE.files= Fixing configuration files.
95 97
96.include "options.mk" 98.include "options.mk"
97.include "../../mk/apache.mk" 99.include "../../mk/apache.mk"
98 100
99do-build: 101do-build:
100 ${RM} ${WRKSRC}/lib/Horde/Auth/login.php.orig 102 ${RM} ${WRKSRC}/lib/Horde/Auth/login.php.orig
101 ${CP} ${FILESDIR}/horde.conf.dist ${WRKSRC}/horde.conf.dist 103 ${CP} ${FILESDIR}/horde.conf.dist ${WRKSRC}/horde.conf.dist
102 ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist 104 ${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
103 ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f 105 ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
104 ${CHMOD} 0750 ${WRKSRC}/scripts/set_perms.sh 106 ${CHMOD} 0750 ${WRKSRC}/scripts/set_perms.sh
105 107
106INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}/config ${HORDEDIR}/config 108INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}/config ${HORDEDIR}/config
107 109
108do-install: 110do-install:
109 ${INSTALL_DATA} ${WRKSRC}/horde.conf.dist ${DESTDIR}${EGDIR}/horde.conf 111 ${INSTALL_DATA} ${WRKSRC}/horde.conf.dist ${DESTDIR}${EGDIR}/horde.conf
110 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR} 112 ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}
111 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} 113 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
112 ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${DOCDIR} 114 ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${DOCDIR}
113.for d in ${PAXDIRS} 115.for d in ${PAXDIRS}
114 ${INSTALL_DATA_DIR} ${DESTDIR}${HORDEDIR}/${d} 116 ${INSTALL_DATA_DIR} ${DESTDIR}${HORDEDIR}/${d}
115.endfor 117.endfor
116.for d in ${PAXDIRS} 118.for d in ${PAXDIRS}
117 cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d} 119 cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d}
118.endfor 120.endfor
119 cd ${WRKSRC}/config && for f in *.dist; do \ 121 cd ${WRKSRC}/config && for f in *.dist; do \
120 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$${f%.dist}; \ 122 ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$${f%.dist}; \
121 done 123 done
122 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${HORDEDIR} 124 ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${HORDEDIR}
123 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${HORDEDIR} 125 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${HORDEDIR}
124 ${FIND} ${DESTDIR}${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 126 ${FIND} ${DESTDIR}${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
125 ${FIND} ${DESTDIR}${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 127 ${FIND} ${DESTDIR}${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
126 128
127.include "../../mk/apache.mk" 129.include "../../mk/apache.mk"
128.include "../../mk/bsd.pkg.mk" 130.include "../../mk/bsd.pkg.mk"