From nobody@FreeBSD.org  Wed Feb  6 01:12:40 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2F5B16A417
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Feb 2008 01:12:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id AF18413C442
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  6 Feb 2008 01:12:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m161Adu0055570
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 6 Feb 2008 01:10:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m161AdhO055569;
	Wed, 6 Feb 2008 01:10:39 GMT
	(envelope-from nobody)
Message-Id: <200802060110.m161AdhO055569@www.freebsd.org>
Date: Wed, 6 Feb 2008 01:10:39 GMT
From: Felippe de Meirelles Motta <lippemail@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] ftp/proma
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: sexbear@tmu.edu.tw

>Number:         120306
>Category:       ports
>Synopsis:       [UPDATE] ftp/proma
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 06 01:20:03 UTC 2008
>Closed-Date:    Wed Feb 20 09:58:42 UTC 2008
>Last-Modified:  Wed Feb 20 10:00:02 UTC 2008
>Originator:     Felippe de Meirelles Motta
>Release:        FreeBSD 7.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD 7.0-PRERELEASE #0: Thu Jan 10 01:55:37 BRST 2008
    lippe@shire.freebsd.org:/usr/obj/usr/src/sys/GENERIC

>Description:
- Updated to 0.8.3;
- Use SF macro;
- Now using BZIP2 package;
- Respecting WWWDIR, and installing all docs in DOCSDIR;
- OPTIONS to install MySQL, Apache, PHP and ProFTPd-MySQL;
- Update/replace pkg-message;
- Update and sort pkg-plist.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/proma/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	1 Mar 2006 21:42:34 -0000	1.4
+++ Makefile	6 Feb 2008 01:08:38 -0000
@@ -6,26 +6,52 @@
 #
 
 PORTNAME=	proma
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 CATEGORIES=	ftp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	sexbear@tmu.edu.tw
 COMMENT=	Administrating a ProFTPd server storing users in a MySQL database
 
+USE_BZIP2=	yes
 NO_BUILD=	yes
 
-MYADMDIR?=	www/data/proma
-
-PLIST_SUB+=	MYADMDIR=${MYADMDIR}
+DOCS=		COPYING ChangeLog INSTALL README TODO UPGRADE
+FILES=		index.php style.css config.inc.php-example
+LIBS=		admin.lib.php auth.lib.php common.lib.php
+PAGES=		admin.inc.php change.inc.php main.inc.php register.inc.php
+
+OPTIONS=	PROFTPD "Install ProFTPd with MySQL support" off \
+		APACHE "Install Apache Web Server 2.2.x" off \
+		MYSQL "Install MySQL Server 4.x" off \
+		PHP "Install PHP4 with MySQL support" off
+
+SUB_FILES=	pkg-message
+
+.if defined(WITH_PROFTPD)
+RUN_DEPENDS+=	proftpd:${PORTSDIR}/ftp/proftpd-mysql
+.endif
+.if defined(WITH_APACHE)
+RUN_DEPENDS+=	apachectl:${PORTSDIR}/www/apache22
+.endif
+.if defined(WITH_MYSQL)
+RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql${MYSQL_WANT_VER}-server
+.endif
+.if defined(WITH_PHP)
+RUN_DEPENDS+=	php:${PORTSDIR}/lang/php4
+.endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/${MYADMDIR}
-	${FIND} ${WRKSRC} ! -path '*/CVS*' | \
-		${XARGS} -n1 ${SH} -c 'if ${TEST} -d $$0; \
-			then ${MKDIR} ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; \
-			else ${INSTALL_DATA} $$0 ${PREFIX}/${MYADMDIR}$${0#${WRKSRC}}; fi'
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/docs/,} ${DOCSDIR}/
+.endif
+	@${MKDIR} ${WWWDIR}
+	@${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/,} ${WWWDIR}/
+	@${MKDIR} ${WWWDIR}/libs
+	@${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/libs/,} ${WWWDIR}/libs/
+	@${MKDIR} ${WWWDIR}/pages
+	@${INSTALL_DATA} ${PAGES:S,^,${WRKSRC}/pages/,} ${WWWDIR}/pages/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/proma/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	1 Mar 2006 21:42:34 -0000	1.5
+++ distinfo	6 Feb 2008 01:08:38 -0000
@@ -1,3 +1,3 @@
-MD5 (proma-0.8.2.tar.gz) = cdf5da188782b7673c14d576a0081de8
-SHA256 (proma-0.8.2.tar.gz) = 37569d8e7bdcc6b1ff11e0bcf197592f92253b44d513cb04c2623f8d6d2e9ad2
-SIZE (proma-0.8.2.tar.gz) = 18523
+MD5 (proma-0.8.3.tar.bz2) = 8fc20ddabae94f6c31ac2b314abca061
+SHA256 (proma-0.8.3.tar.bz2) = 1ce462f7a7b854683d3776b6b6db1821075483a08a0c00248e320eee5bd92295
+SIZE (proma-0.8.3.tar.bz2) = 17099
Index: pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- pkg-message	3 Jan 2004 07:39:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
----------------------------------------------------------------
-There are two things that you sdould take care:
-1.configure proftpd with 'WITH_MYSQL'.
-2.read 'INSTALL' for installation instructions.
----------------------------------------------------------------
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/proma/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	1 Mar 2006 21:42:34 -0000	1.3
+++ pkg-plist	6 Feb 2008 01:08:38 -0000
@@ -1,21 +1,20 @@
-%%MYADMDIR%%/docs/COPYING
-%%MYADMDIR%%/docs/ChangeLog
-%%MYADMDIR%%/docs/INSTALL
-%%MYADMDIR%%/docs/README
-%%MYADMDIR%%/docs/TODO
-%%MYADMDIR%%/docs/UPGRADE
-%%MYADMDIR%%/config.inc.php-example
-%%MYADMDIR%%/index.php
-%%MYADMDIR%%/style.css
-%%MYADMDIR%%/libs/admin.lib.php
-%%MYADMDIR%%/libs/auth.lib.php
-%%MYADMDIR%%/libs/common.lib.php
-%%MYADMDIR%%/pages/change.inc.php
-%%MYADMDIR%%/pages/register.inc.php
-%%MYADMDIR%%/pages/admin.inc.php
-%%MYADMDIR%%/pages/main.inc.php
-@dirrm %%MYADMDIR%%/docs
-@dirrm %%MYADMDIR%%/pages
-@dirrm %%MYADMDIR%%/libs
-@dirrm %%MYADMDIR%%
-@dirrmtry www/data
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%WWWDIR%%/config.inc.php-example
+%%WWWDIR%%/index.php
+%%WWWDIR%%/style.css
+%%WWWDIR%%/libs/admin.lib.php
+%%WWWDIR%%/libs/auth.lib.php
+%%WWWDIR%%/libs/common.lib.php
+%%WWWDIR%%/pages/admin.inc.php
+%%WWWDIR%%/pages/change.inc.php
+%%WWWDIR%%/pages/main.inc.php
+%%WWWDIR%%/pages/register.inc.php
+@dirrm %%WWWDIR%%/pages
+@dirrm %%WWWDIR%%/libs
+@dirrm %%WWWDIR%%
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in	6 Feb 2008 01:08:38 -0000
@@ -0,0 +1,9 @@
+---------------------------------------------------------------
+ProMA is now installed!
+
+Please, read the following reference for install instructions:
+
+%%DOCSDIR%%/INSTALL
+
+Rename %%WWWDIR%%/config.inc.php-example and setup it.
+---------------------------------------------------------------


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 6 01:20:10 UTC 2008 
Responsible-Changed-Why:  
beech@ wants this category PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120306 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Feb 6 01:20:13 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120306 
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Wed Feb 20 09:58:12 UTC 2008 
State-Changed-Why:  
Committed (maintainer timeout), Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/120306: commit references a PR
Date: Wed, 20 Feb 2008 09:57:52 +0000 (UTC)

 beech       2008-02-20 09:57:48 UTC
 
   FreeBSD ports repository
 
   Modified files:
     ftp/proma            Makefile distinfo pkg-plist 
   Added files:
     ftp/proma/files      pkg-message.in 
   Removed files:
     ftp/proma            pkg-message 
   Log:
   - Update to 0.8.3;
   - Use SF macro;
   - Use BZIP2 package;
   - Respect WWWDIR, and install all docs in DOCSDIR;
   - OPTIONS to install MySQL, Apache, PHP and ProFTPd-MySQL;
   - Update/replace pkg-message;
   - Update and sort pkg-plist.
   
   PR:             ports/120306
   Submitted by:   Felippe de Meirelles Motta <lippemail@gmail.com>
   Approved by:    maintainer timeout (two weeks)
   
   Revision  Changes    Path
   1.5       +49 -12    ports/ftp/proma/Makefile
   1.6       +3 -3      ports/ftp/proma/distinfo
   1.1       +9 -0      ports/ftp/proma/files/pkg-message.in (new)
   1.2       +0 -5      ports/ftp/proma/pkg-message (dead)
   1.4       +15 -21    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:
