From pgollucci@FreeBSD.org  Mon May 11 08:13:04 2009
Return-Path: <pgollucci@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B8411106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 11 May 2009 08:13:04 +0000 (UTC)
	(envelope-from pgollucci@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id A6C1D8FC0C;
	Mon, 11 May 2009 08:13:04 +0000 (UTC)
	(envelope-from pgollucci@FreeBSD.org)
Received: from freefall.freebsd.org (pgollucci@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4B8D4tU048323;
	Mon, 11 May 2009 08:13:04 GMT
	(envelope-from pgollucci@freefall.freebsd.org)
Received: (from pgollucci@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4B8D3Pr048322;
	Mon, 11 May 2009 08:13:03 GMT
	(envelope-from pgollucci)
Message-Id: <200905110813.n4B8D3Pr048322@freefall.freebsd.org>
Date: Mon, 11 May 2009 08:13:03 GMT
From: "Philip M. Gollucci" <pgollucci@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: sexbear@tmu.edu.tw
Subject: [PATCH] ftp/proma: apache@ cleanups
X-Send-Pr-Version: 3.113
X-GNATS-Notify: sexbear@tmu.edu.tw

>Number:         134452
>Category:       ports
>Synopsis:       [PATCH] ftp/proma: apache@ cleanups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 11 08:20:02 UTC 2009
>Closed-Date:    Mon May 25 22:48:00 UTC 2009
>Last-Modified:  Mon May 25 22:50:05 UTC 2009
>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@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 @@
-@unexec if cmp -s %D/%%WWWDIR%%/config.inc.php-example %D/%%WWWDIR%%/config.inc.php; then rm -f %D/%%WWWDIR%%/config.inc.php; fi
+@unexec if cmp %B/%%WWWDIR%%/config.inc.php-example %B/%%WWWDIR%%/config.inc.php; then rm -f %B/%%WWWDIR%%/config.inc.php; fi
+@exec if [ ! -f %B/%%WWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi
 %%WWWDIR%%/config.inc.php-example
-@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:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 11 08:20:29 UTC 2009 
Responsible-Changed-Why:  
beech@ wants this category PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134452 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon May 11 08:20:35 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134452 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: sexbear@tmu.edu.tw
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/134452: [PATCH] ftp/proma: apache@ cleanups
Date: Mon, 11 May 2009 08:20:32 UT

 Maintainer of ftp/proma,
 
 Please note that PR ports/134452 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/134452
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: pgollucci 
State-Changed-When: Mon May 25 22:47:58 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=134452 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/134452: commit references a PR
Date: Mon, 25 May 2009 22:47:58 +0000 (UTC)

 pgollucci    2009-05-25 22:47:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/proma            Makefile pkg-plist 
   Log:
   - convert to USE_APACHE/USE_MYSQL/USE_PHP
   - install -> mkdir
   - move perms to post-install
   - Cleanup config.php.inc and -example handling
   
   PR:             ports/134452
   Approved by:    maintainer timeout (2 weeks)
   Submitted by:   me
   
   Revision  Changes    Path
   1.6       +11 -12    ports/ftp/proma/Makefile
   1.5       +2 -2      ports/ftp/proma/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
