ports/115862: maintainer update: devel/flyspray-0.9.9.2

[Nick Hilliard]

>Number:         115862
>Category:       ports
>Synopsis:       maintainer update: devel/flyspray-0.9.9.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 27 12:10:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Nick Hilliard
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
Network Ability Ltd
>Environment:
System: FreeBSD xx 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Wed May 17 11:38:53 IST 2006 nick at xxx:/data/src/usr.src/src-6.1/src/sys/i386/compile/xxx i386

>Description:

update to flyspray to make it more package friendly.  There are no changes
to the installation, so PORTREVISION not bumped.

suggested by Ion-Mihai Tetcu.

>How-To-Repeat:
>Fix:

diff -bNur flyspray.orig/Makefile flyspray/Makefile
--- flyspray.orig/Makefile	Sun Aug 26 08:15:40 2007
+++ flyspray/Makefile	Mon Aug 27 13:04:43 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	flyspray
 PORTVERSION=	0.9.9.2
-CATEGORIES=	devel
+CATEGORIES=	devel www
 MASTER_SITES=	http://www.flyspray.org/
 
 MAINTAINER=	nick at foobar.org
@@ -35,12 +35,19 @@
 		licences/NuvolaIcons.licence.txt \
 		licences/jsCalendar.licence.txt
 
-FLYSPRAY_FILES=	cache docs/licences/gnu_lgpl.html \
-		favicon.ico feed.php header.php htaccess.dist includes \
-		index.php javascript lang plugins robots.txt schedule.php \
-		scripts setup templates themes
-
-SUB_FILES=	pkg-message
+FLYSPRAY_FILES=	cache docs/licences/gnu_lgpl.html favicon.ico \
+		flyspray.conf.php-dist feed.php header.php htaccess.dist \
+		includes index.php javascript lang plugins robots.txt \
+		schedule.php scripts setup templates themes
+
+SUB_FILES+=	pkg-message pkg-install
+SUB_LIST+=	FLYSPRAYDIR="${FLYSPRAYDIR}" \
+		ATTACHMENTDIR="${ATTACHMENTDIR}" \
+		MKDIR="${MKDIR}" \
+		CHOWN="${CHOWN}" \
+		CHMOD="${CHMOD}" \
+		WWWGRP="${WWWGRP}" \
+		WWWOWN="${WWWOWN}"
 
 .include <bsd.port.pre.mk>
 
@@ -56,19 +63,16 @@
 	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} '{}' ';'
 
 do-install:
-	@${MKDIR} ${FLYSPRAYDIR}
+	${MKDIR} ${FLYSPRAYDIR}
 	${CHMOD} 755 ${FLYSPRAYDIR}
-	${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php
+	${CP} ${WRKSRC}/setup/upgrade/${PORTVERSION}/flyspray.conf.php ${WRKSRC}/flyspray.conf.php-dist
 	cd ${WRKSRC} && \
 		${TAR} cf - ${FLYSPRAY_FILES} | \
 		(cd ${FLYSPRAYDIR} && ${TAR} -xf -)
 	${LN} -s ${ATTACHMENTDIR} ${FLYSPRAYDIR}/attachments
 	${LN} -s ${PREFIX}/share/adodb ${FLYSPRAYDIR}
-	@${MKDIR} ${ATTACHMENTDIR}
-	${CHMOD} 750 ${ATTACHMENTDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${ATTACHMENTDIR}
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/cache
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/flyspray.conf.php
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 post-install: install-doc
 	@${CAT} ${PKGMESSAGE}
diff -bNur flyspray.orig/files/README.FreeBSD flyspray/files/README.FreeBSD
--- flyspray.orig/files/README.FreeBSD	Sun Aug 26 08:15:40 2007
+++ flyspray/files/README.FreeBSD	Mon Aug 27 12:44:00 2007
@@ -20,8 +20,13 @@
                 Allow from all
         </Directory>
 
-3) Point your browser to http://yourserver.example.com/flyspray/ and you should
-   see the Flyspray installer.
+3) If this is a new Flyspray installation, install the default configuration
+   file and edit to taste:
+
+# cp %%FLYSPRAYDIR%%/flyspray.conf.php-dist %%FLYSPRAYDIR%%/flyspray.conf.php
+
+   Then point your browser to http://yourserver.example.com/flyspray/ and
+   you should see the Flyspray installer.
 
 4) Once the setup procedure has been completed, you must remove the "setup"
    directory:
diff -bNur flyspray.orig/files/pkg-install.in flyspray/files/pkg-install.in
--- flyspray.orig/files/pkg-install.in	Thu Jan  1 01:00:00 1970
+++ flyspray/files/pkg-install.in	Mon Aug 27 12:35:46 2007
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+case $2 in
+	POST-INSTALL)
+		if [ ! -d %%ATTACHMENTDIR%% ]; then
+			%%MKDIR%% %%ATTACHMENTDIR%%
+		fi
+		%%CHMOD%% 750 %%ATTACHMENTDIR%%
+		%%CHOWN%% %%WWWOWN%%:%%WWWGRP%% %%ATTACHMENTDIR%%
+	;;
+esac
diff -bNur flyspray.orig/pkg-deinstall flyspray/pkg-deinstall
--- flyspray.orig/pkg-deinstall	Sun Aug 26 08:15:40 2007
+++ flyspray/pkg-deinstall	Mon Aug 27 12:58:20 2007
@@ -2,8 +2,6 @@
 
 case $2 in
 DEINSTALL)
-#	/bin/rm -f ${PKG_PREFIX}/share/flyspray/flyspray.conf.php
-#	/bin/rmdir ${PKG_PREFIX}/share/flyspray/
 	echo "--"
 	echo "The Flyspray program has been deleted but the bug tracking database has"
 	echo "not been touched. To delete all the bug tracking information, execute the"
diff -bNur flyspray.orig/pkg-plist flyspray/pkg-plist
--- flyspray.orig/pkg-plist	Sun Aug 26 08:15:40 2007
+++ flyspray/pkg-plist	Mon Aug 27 12:39:00 2007
@@ -6,7 +6,7 @@
 %%DATADIR%%/feed.php
 %%DATADIR%%/header.php
 %%DATADIR%%/htaccess.dist
-%%DATADIR%%/flyspray.conf.php
+%%DATADIR%%/flyspray.conf.php-dist
 %%DATADIR%%/includes/.htaccess
 %%DATADIR%%/includes/class.backend.php
 %%DATADIR%%/includes/class.database.php
>Release-Note:
>Audit-Trail:
>Unformatted: