Date: Wed, 1 Nov 2006 18:48:21 -0500 (EST) From: Greg Larkin <glarkin@sourcehosting.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glarkin@sourcehosting.net Subject: ports/105053: [maintainer] www/webcalendar: update installation directory and misc. cleanups Message-ID: <200611012348.kA1NmLVV020265@ports.entropy.prv> Resent-Message-ID: <200611012350.kA1NoJ6E063456@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105053
>Category: ports
>Synopsis: [maintainer] www/webcalendar: update installation directory and misc. cleanups
>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: Wed Nov 01 23:50:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Greg Larkin
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
SourceHosting.net, LLC
>Environment:
System: FreeBSD ports.entropy.prv 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
As reported by Eric (a FreeBSD user), WebCalendar was installed
into the wrong directory (/usr/local/www/data). This has now been
corrected to /usr/local/www.
>How-To-Repeat:
Install the version 1.0.4 of the port
>Fix:
Upgrade to version 1.0.4_1 of the port
--- webcalendar-1.0.4.patch begins here ---
diff -urN webcalendar.orig/Makefile webcalendar/Makefile
--- webcalendar.orig/Makefile Wed Nov 1 17:59:07 2006
+++ webcalendar/Makefile Wed Nov 1 18:40:01 2006
@@ -6,7 +6,8 @@
#
PORTNAME= WebCalendar
-DISTVERSION= 1.0.4
+PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= webcalendar
@@ -19,11 +20,15 @@
WANT_PHP_WEB= yes
NO_BUILD= yes
-WRKSRC= ${WRKDIR}/WebCalendar-${DISTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WEBWCDIR?= www/data/WebCalendar
+WCURL?= ${PORTNAME:L}
+WCDIR?= www/${WCURL}
PLIST= ${WRKDIR}/pkg-plist
+SUB_FILES= pkg-message
+SUB_LIST= WCURL=${WCURL} WCDIR=${WCDIR}
+
DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME}
DOCS= docs/README \
docs/WebCalendar-Database.html \
@@ -87,26 +92,29 @@
pre-install:
cd ${WRKSRC} && ${FIND} -s * -type f | \
- ${SED} -e 's|^|${WEBWCDIR}/|' > ${PLIST} \
+ ${SED} -e 's|^|${WCDIR}/|' > ${PLIST} \
&& ${FIND} -d * -type d | \
- ${SED} -e 's|^|@dirrm ${WEBWCDIR}/|' >> ${PLIST} \
- && ${ECHO_CMD} @dirrm ${WEBWCDIR} >> ${PLIST}
+ ${SED} -e 's|^|@dirrm ${WCDIR}/|' >> ${PLIST} \
+ && ${ECHO_CMD} @dirrm ${WCDIR} >> ${PLIST}
@${CAT} pkg-plist >> ${PLIST}
@${ECHO_CMD} @dirrmtry www/data-dist >> ${PLIST}
@${ECHO_CMD} @dirrmtry www/data >> ${PLIST}
do-install:
- @${MKDIR} ${PREFIX}/${WEBWCDIR}
- ${CP} -R ${WRKSRC}/* ${PREFIX}/${WEBWCDIR}
- ${CHOWN} -R www:www ${PREFIX}/${WEBWCDIR}
- ${FIND} ${PREFIX}/${WEBWCDIR} -type f | ${XARGS} ${CHMOD} 644
+ @${MKDIR} ${PREFIX}/${WCDIR}
+ ${CP} -R ${WRKSRC}/* ${PREFIX}/${WCDIR}
+ ${CHOWN} -R www:www ${PREFIX}/${WCDIR}
+ ${FIND} ${PREFIX}/${WCDIR} -type f | ${XARGS} ${CHMOD} 644
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
- -e 's|%%WEBWCDIR%%|${WEBWCDIR}|g' -e 's|%%DOCSDIR%%|${DOCSDIR}|g'
+.endif
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -urN webcalendar.orig/files/pkg-message.in webcalendar/files/pkg-message.in
--- webcalendar.orig/files/pkg-message.in Wed Dec 31 19:00:00 1969
+++ webcalendar/files/pkg-message.in Wed Nov 1 18:41:45 2006
@@ -0,0 +1,18 @@
+*************************************************
+Post-installation instructions:
+
+First, Add the following line to your httpd.conf:
+
+Alias /%%WCURL%%/ "%%PREFIX%%/%%WCDIR%%"
+
+Next, to configure WebCalendar, please read
+%%DOCSDIR%%/WebCalendar-SysAdmin.html
+for information about creating the database, installing
+the database tables and other post-installation tasks,
+such as setting up email reminders.
+
+Finally copy
+%%PREFIX%%/%%WCDIR%%/includes/settings.php.orig to
+%%PREFIX%%/%%WCDIR%%/includes/settings.php and edit it
+for your installation.
+*************************************************
diff -urN webcalendar.orig/pkg-message webcalendar/pkg-message
--- webcalendar.orig/pkg-message Wed Nov 1 17:59:07 2006
+++ webcalendar/pkg-message Wed Dec 31 19:00:00 1969
@@ -1,13 +0,0 @@
-
-Post-installation instructions:
-
-To configure WebCalendar, please read
-%%DOCSDIR%%/WebCalendar-SysAdmin.html
-for information about creating the database, installing
-the database tables and other post-installation tasks,
-such as setting up email reminders.
-
-Then copy
-%%PREFIX%%/%%WEBWCDIR%%/includes/settings.php.orig to
-%%PREFIX%%/%%WEBWCDIR%%/includes/settings.php and edit it
-for your installation.
--- webcalendar-1.0.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611012348.kA1NmLVV020265>