summaryrefslogtreecommitdiff
path: root/deskutils/mnemo
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2006-01-06 00:38:13 +0000
committerThierry Thomas <thierry@FreeBSD.org>2006-01-06 00:38:13 +0000
commite23ee358fa1ac94e411715abac088791dc154c19 (patch)
tree2f2d07d89e8f9b0b1bbbaa61fc0a3c53d8b1308c /deskutils/mnemo
parent- Fix SSL option (diff)
- Replace WITH_APACHE2 by USE_APACHE, rename httpd.conf.xxx to
httpd-xxx.conf and fix configuration if APACHE_VERSION > 20. - Don't use the MCAL back-end by default for Kronolith, it is deprecated. - Deinstall bug reported by John Nielsen <john (at) jnielsen.net>: respect LHORDEDIR. - Fix horde-passwd installation / deinstallation. - Don't bump PORTREVISION, because running installations are not concerned.
Notes
Notes: svn path=/head/; revision=152847
Diffstat (limited to 'deskutils/mnemo')
-rw-r--r--deskutils/mnemo/Makefile21
-rw-r--r--deskutils/mnemo/files/pkg-deinstall.in (renamed from deskutils/mnemo/pkg-deinstall)2
-rw-r--r--deskutils/mnemo/pkg-plist2
3 files changed, 16 insertions, 9 deletions
diff --git a/deskutils/mnemo/Makefile b/deskutils/mnemo/Makefile
index 61dc04ee2164..e5e46cdc2342 100644
--- a/deskutils/mnemo/Makefile
+++ b/deskutils/mnemo/Makefile
@@ -24,10 +24,13 @@ COMMENT= Mnemo is the Horde notes and memos application
RUN_DEPENDS= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde
NO_BUILD= yes
-USE_REINPLACE= yes
+USE_APACHE= 1.3+ # needed to test APACHE_VERSION
-PLIST_SUB= MNEMODIR=${LMNEMODIR}
+PLIST_SUB= MNEMODIR=${LMNEMODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
+PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
+SUB_FILES= pkg-message pkg-deinstall
+SUB_LIST= MNEMODIR=${MNEMODIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
docs/RELEASE_NOTES docs/TODO docs/UPGRADING
@@ -40,11 +43,17 @@ LMNEMODIR?= ${LHORDEDIR}/mnemo
MNEMODIR= ${PREFIX}/${LMNEMODIR}
CONFDIR= ${MNEMODIR}/config
+.include <bsd.port.pre.mk>
+
+.if ${APACHE_VERSION} >= 20
+HORDE_INC= ${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}/Includes
+.else
HORDE_INC= ${LOCALBASE}/etc/horde
+.endif
pre-configure:
@${SED} -e "s:/home/httpd/html/horde/mnemo:${MNEMODIR}:g" \
- ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd.conf.mnemo
+ ${FILESDIR}/httpd.conf.mnemo > ${WRKDIR}/httpd-mnemo.conf
do-install:
@${MKDIR} ${MNEMODIR}
@@ -59,7 +68,7 @@ do-install:
.endfor
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${MNEMODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd.conf.mnemo ${HORDE_INC}
+ @${INSTALL_DATA} ${WRKDIR}/httpd-mnemo.conf ${HORDE_INC}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
@@ -69,10 +78,8 @@ do-install:
.endif
post-install:
- @${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \
- < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/mnemo/pkg-deinstall b/deskutils/mnemo/files/pkg-deinstall.in
index b329889878d6..0a40a68d052b 100644
--- a/deskutils/mnemo/pkg-deinstall
+++ b/deskutils/mnemo/files/pkg-deinstall.in
@@ -9,7 +9,7 @@ if [ x$2 != xDEINSTALL ]; then
fi
if [ -z "${PACKAGE_BUILDING}" ]; then
- for cf in `ls ${PKG_PREFIX}/www/horde/mnemo/config/*php`; do
+ for cf in `ls %%MNEMODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist
index cc60dcbc30d1..816549d83396 100644
--- a/deskutils/mnemo/pkg-plist
+++ b/deskutils/mnemo/pkg-plist
@@ -1,4 +1,4 @@
-etc/horde/httpd.conf.mnemo
+%%HORDE_INC%%/httpd-mnemo.conf
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES