From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 11 08:20:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB8D41065677 for ; Mon, 11 May 2009 08:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A5BD18FC26 for ; Mon, 11 May 2009 08:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n4B8K2Fc050384 for ; Mon, 11 May 2009 08:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n4B8K255050382; Mon, 11 May 2009 08:20:02 GMT (envelope-from gnats) Resent-Date: Mon, 11 May 2009 08:20:02 GMT Resent-Message-Id: <200905110820.n4B8K255050382@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Philip M. Gollucci" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8411106566B for ; 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" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: sexbear@tmu.edu.tw Subject: ports/134452: [PATCH] ftp/proma: apache@ cleanups X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2009 08:20:03 -0000 >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@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 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: >Unformatted: