Date: Sun, 25 Mar 2007 12:06:48 -0800 From: "Beech Rintoul" <beech@alaskaparadise.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: infofarmer@FreeBSD.org Subject: ports/110823: [Maintainer Update] deskutils/kronolith - Makefile Message-ID: <1174853208.41237@stargate.alaskaparadise.com> Resent-Message-ID: <200703252010.l2PKAGLB017898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110823
>Category: ports
>Synopsis: [Maintainer Update] deskutils/kronolith - Makefile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 25 20:10:16 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Beech Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
Alaska Paradise
>Environment:
System: FreeBSD 7.0-CURRENT #111: Sat Mar 24 08:52:58 AKDT 2007
root@stargate.alaskaparadise.com:/usr/obj/usr/src/sys/STARGATE
>Description:
Makefile & PORTDOCS cleanup.
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/deskutils/kronolith.orig/Makefile /usr/ports/deskutils/kronolith/Makefile
--- /usr/ports/deskutils/kronolith.orig/Makefile Sat Feb 24 23:35:31 2007
+++ /usr/ports/deskutils/kronolith/Makefile Sun Mar 25 12:00:10 2007
@@ -7,9 +7,9 @@
PORTNAME= kronolith
PORTVERSION= 2.1.4
+DISTVERSIONPREFIX= h3-
CATEGORIES= deskutils www
MASTER_SITES= HORDE
-DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= beech@alaskaparadise.com
COMMENT= Kronolith is the Horde calendar application
@@ -22,8 +22,8 @@
USE_GETTEXT= yes
REINPLACE_ARGS= -i ""
-DOCS= README docs/CHANGES docs/CREDITS docs/INSTALL \
- docs/RELEASE_NOTES docs/TODO docs/UPGRADING
+PORTDOCS= README CHANGES CREDITS INSTALL \
+ RELEASE_NOTES TODO UPGRADING
CONFFILE= keywords.php menu.php prefs.php
SUB_DIRS= config js lib locale po scripts templates themes
@@ -47,6 +47,9 @@
HORDE_INC= ${LOCALBASE}/etc/horde
.endif
+post-extract:
+ @${MV} ${WRKSRC}/README ${WRKSRC}/docs/
+
pre-configure:
@(cd ${WRKSRC}/scripts && \
${FIND} . -name "*.php" -exec \
@@ -55,20 +58,16 @@
${FILESDIR}/httpd.conf.kronolith > ${WRKDIR}/httpd-kronolith.conf
do-install:
- @${MKDIR} ${KRONOLITHDIR}
-.for REP in ${SUB_DIRS}
- @${CP} -Rp ${WRKSRC}/${REP} ${KRONOLITHDIR}
-.endfor
- @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}
-
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}
- @${CHMOD} -R o-rwx ${CONFDIR}
- @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}
+ @${INSTALL} -d ${KRONOLITHDIR}/
+ @${CP} -Rp ${SUB_DIRS:S|^|${WRKSRC}/|} ${KRONOLITHDIR}/
+ @${CP} -p ${WRKSRC}/*.php ${KRONOLITHDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR}/
+ @${INSTALL_DATA} ${WRKDIR}/httpd-kronolith.conf ${HORDE_INC}/
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${KRONOLITHDIR}/
+ @${CHMOD} -R o-rwx ${CONFDIR}/
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
+ @${INSTALL} -d ${DOCSDIR}/
+ @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR}/
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
diff -ruN --exclude=CVS /usr/ports/deskutils/kronolith.orig/pkg-plist /usr/ports/deskutils/kronolith/pkg-plist
--- /usr/ports/deskutils/kronolith.orig/pkg-plist Thu Dec 7 23:08:39 2006
+++ /usr/ports/deskutils/kronolith/pkg-plist Sun Mar 25 11:46:31 2007
@@ -1,10 +1,3 @@
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%KRONOLITHDIR%%/addevent.php
%%KRONOLITHDIR%%/addeventaction.php
%%KRONOLITHDIR%%/attend.php
@@ -216,7 +209,6 @@
%%KRONOLITHDIR%%/workweek.php
%%KRONOLITHDIR%%/year.php
%%HORDE_INC%%/httpd-kronolith.conf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%KRONOLITHDIR%%/themes/simplex
@dirrm %%KRONOLITHDIR%%/themes/print
@dirrm %%KRONOLITHDIR%%/themes/mozilla
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1174853208.41237>