ports/134452: [PATCH] ftp/proma: apache@ cleanups

[Philip M. Gollucci]

>Number:         134452
>Category:       ports
>Synopsis:       [PATCH] ftp/proma: apache@ cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 11 08:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
Riderway Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #36: Mon Dec 29 15:15:30 UTC 2008
>Description:
- convert to USE_APACHE/USE_MYSQL/USE_PHP
- install -> mkdir
- move perms to post-install
- Cleanup config.php.inc and -example handling

Port maintainer (sexbear at tmu.edu.tw) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- proma-0.8.3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/proma/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- Makefile	20 Feb 2008 09:57:47 -0000	1.5
+++ Makefile	11 May 2009 08:11:13 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	proma
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	SF
 
@@ -32,37 +33,36 @@
 RUN_DEPENDS+=	proftpd:${PORTSDIR}/ftp/proftpd-mysql
 .endif
 .if defined(WITH_APACHE)
-RUN_DEPENDS+=	apachectl:${PORTSDIR}/www/apache22
+USE_APACHE=	2.2
 .endif
 .if defined(WITH_MYSQL)
-RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql50-server
+USE_MYSQL=	yes
 .endif
 .if defined(WITH_PHP)
-RUN_DEPENDS+=	php:${PORTSDIR}/lang/php5
+USE_PHP=	mysql pcre
 .endif
 
 do-install:
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/
 	@cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
-	@${INSTALL} -d ${WWWDIR}
+	@${MKDIR} ${WWWDIR}/
 	@${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/,} ${WWWDIR}/
 	@${INSTALL} -d ${WWWDIR}/libs
 	@${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/libs/,} ${WWWDIR}/libs/
 	@${INSTALL} -d ${WWWDIR}/pages
 	@${INSTALL_DATA} ${PAGES:S,^,${WRKSRC}/pages/,} ${WWWDIR}/pages/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
-	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR}' >> ${TMPPLIST}
 
 post-install:
 	@if [ ! -f ${WWWDIR}/config.inc.php ]; then \
-	${CP} -p ${WWWDIR}/config.inc.php-example ${WWWDIR}/config.inc.php ; \
-	${CHMOD} 640 ${WWWDIR}/config.inc.php ; \
+		${CP} -p ${WRKSRC}/config.inc.php-example ${WWWDIR}/config.inc.php ; \
+		${CP} -p ${WRKSRC}/config.inc.php-example ${WWWDIR}/config.inc.php-example ; \
+		${CHMOD} 640 ${WWWDIR}/config.inc.php* ; \
 	fi
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/proma/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- pkg-plist	20 Feb 2008 09:57:47 -0000	1.4
+++ pkg-plist	11 May 2009 08:11:13 -0000
@@ -1,6 +1,6 @@
- at unexec if cmp -s %D/%%WWWDIR%%/config.inc.php-example %D/%%WWWDIR%%/config.inc.php; then rm -f %D/%%WWWDIR%%/config.inc.php; fi
+ at unexec if cmp %B/%%WWWDIR%%/config.inc.php-example %B/%%WWWDIR%%/config.inc.php; then rm -f %B/%%WWWDIR%%/config.inc.php; fi
+ at exec if [ ! -f %B/%%WWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%WWWDIR%%/config.inc.php-example
- at exec if [ ! -f %D/%%WWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%WWWDIR%%/index.php
 %%WWWDIR%%/style.css
 %%WWWDIR%%/libs/admin.lib.php
--- proma-0.8.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: