diff options
| -rw-r--r-- | www/horde/Makefile | 31 | ||||
| -rw-r--r-- | www/horde/PLIST | 26 |
2 files changed, 26 insertions, 31 deletions
diff --git a/www/horde/Makefile b/www/horde/Makefile index 7109deec4c1..15531719795 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2010/02/15 17:52:01 joerg Exp $ +# $NetBSD: Makefile,v 1.66 2010/02/16 16:08:59 joerg Exp $ DISTNAME= horde-3.3.6 +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://ftp.horde.org/pub/horde/ \ ftp://ftp.horde.org/pub/horde/ @@ -9,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.horde.org/ COMMENT= PHP application framework -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS+= horde-2.*{,nb*} @@ -62,28 +63,30 @@ REPLACE_FILES.php= po/translation.php \ scripts/import_squirrelmail_sql_prefs.php CONF_FILES+= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf -CONF_FILES_PERMS+= ${HORDEDIR}/config/conf.php.dist \ +OWN_DIRS_PERMS+= ${HORDEDIR}/config \ + ${APACHE_USER} ${ROOT_GROUP} 0750 +CONF_FILES_PERMS+= ${EGDIR}/config/conf.php \ ${HORDEDIR}/config/conf.php \ ${APACHE_USER} ${ROOT_GROUP} 0640 -CONF_FILES_PERMS+= ${HORDEDIR}/config/conf.xml.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/conf.xml \ ${HORDEDIR}/config/conf.xml \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/mime_drivers.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/mime_drivers.php \ ${HORDEDIR}/config/mime_drivers.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/motd.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/motd.php \ ${HORDEDIR}/config/motd.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/nls.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/nls.php \ ${HORDEDIR}/config/nls.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/prefs.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/prefs.php \ ${HORDEDIR}/config/prefs.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/registry.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/registry.php \ ${HORDEDIR}/config/registry.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -CONF_FILES_PERMS+= ${HORDEDIR}/config/hooks.php.dist \ +CONF_FILES_PERMS+= ${EGDIR}/config/hooks.php \ ${HORDEDIR}/config/hooks.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 @@ -123,7 +126,7 @@ do-build: ${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f ${CHMOD} 0750 ${WRKSRC}/scripts/set_perms.sh -INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} ${HORDEDIR}/config +INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}/config ${HORDEDIR}/config do-install: ${INSTALL_DATA} ${WRKSRC}/horde.conf.dist ${DESTDIR}${EGDIR}/horde.conf @@ -139,13 +142,13 @@ do-install: cd ${WRKSRC}/${d} && pax -rwpam . ${DESTDIR}${HORDEDIR}/${d} . endfor - ${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${HORDEDIR}/config + cd ${WRKSRC}/config && for f in *.dist; do \ + ${INSTALL_DATA} $$f ${DESTDIR}${EGDIR}/config/$${f%.dist}; \ + done ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${HORDEDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${HORDEDIR} ${FIND} ${DESTDIR}${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} ${FIND} ${DESTDIR}${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} - ${CHOWN} ${APACHE_USER}:${SHAREGRP} ${DESTDIR}${HORDEDIR}/config - ${CHMOD} 0750 ${DESTDIR}${HORDEDIR}/config .include "../../mk/apachever.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/horde/PLIST b/www/horde/PLIST index 915b123863c..f58ff3650cb 100644 --- a/www/horde/PLIST +++ b/www/horde/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2009/12/20 22:15:13 tonnerre Exp $ +@comment $NetBSD: PLIST,v 1.24 2010/02/16 16:08:59 joerg Exp $ share/doc/horde/CHANGES share/doc/horde/CODING_STANDARDS share/doc/horde/CONTRIBUTING @@ -13,6 +13,14 @@ share/doc/horde/SECURITY share/doc/horde/TODO share/doc/horde/TRANSLATIONS share/doc/horde/UPGRADING +share/examples/horde/config/conf.php +share/examples/horde/config/conf.xml +share/examples/horde/config/hooks.php +share/examples/horde/config/mime_drivers.php +share/examples/horde/config/motd.php +share/examples/horde/config/nls.php +share/examples/horde/config/prefs.php +share/examples/horde/config/registry.php share/examples/horde/horde.conf share/horde/admin/alarms.php share/horde/admin/cmdshell.php @@ -36,22 +44,6 @@ share/horde/admin/setup/scripts.php share/horde/admin/signup_confirm.php share/horde/admin/sqlshell.php share/horde/admin/user.php -share/horde/config/conf.php -share/horde/config/conf.php.dist -share/horde/config/conf.xml -share/horde/config/conf.xml.dist -share/horde/config/hooks.php -share/horde/config/hooks.php.dist -share/horde/config/mime_drivers.php -share/horde/config/mime_drivers.php.dist -share/horde/config/motd.php -share/horde/config/motd.php.dist -share/horde/config/nls.php -share/horde/config/nls.php.dist -share/horde/config/prefs.php -share/horde/config/prefs.php.dist -share/horde/config/registry.php -share/horde/config/registry.php.dist share/horde/index.php share/horde/js/QuickFinder.js share/horde/js/accesskeys.js |