From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 14 11:10:04 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 5C70B106566B for ; Wed, 14 Oct 2009 11:10:04 +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 209F58FC26 for ; Wed, 14 Oct 2009 11:10:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EBA4aq002307 for ; Wed, 14 Oct 2009 11:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9EBA3UQ002306; Wed, 14 Oct 2009 11:10:04 GMT (envelope-from gnats) Resent-Date: Wed, 14 Oct 2009 11:10:04 GMT Resent-Message-Id: <200910141110.n9EBA3UQ002306@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, Gerrit Beine Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F7631065670 for ; Wed, 14 Oct 2009 11:08:16 +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 7F5778FC20 for ; Wed, 14 Oct 2009 11:08:16 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n9EB8Fog033923 for ; Wed, 14 Oct 2009 11:08:16 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n9EB8FUk033922; Wed, 14 Oct 2009 11:08:15 GMT (envelope-from nobody) Message-Id: <200910141108.n9EB8FUk033922@www.freebsd.org> Date: Wed, 14 Oct 2009 11:08:15 GMT From: Gerrit Beine To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139596: Fix remove of typo3 configuration 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: Wed, 14 Oct 2009 11:10:04 -0000 >Number: 139596 >Category: ports >Synopsis: Fix remove of typo3 configuration >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 14 11:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Gerrit Beine >Release: FreeBSD 7.2 >Organization: SQQD GmbH >Environment: >Description: Fix the problem described in http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/130209 >How-To-Repeat: >Fix: diff -Nur /usr/ports/www/typo3/Makefile www/typo3/Makefile --- /usr/ports/www/typo3/Makefile 2009-08-22 02:38:28.000000000 +0200 +++ www/typo3/Makefile 2009-10-14 04:42:20.000000000 +0200 @@ -45,6 +45,9 @@ LIB_DEPENDS+= MagickWand.2:${PORTSDIR}/graphics/ImageMagick .endif +pre-install: + ${MV} ${SITESRC}/typo3conf/localconf.php ${SITESRC}/typo3conf/localconf.php.dist + do-install: ${CP} -R ${WRKSRC} ${PREFIX}/${TYPO3DIR} ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${TYPO3DIR} diff -Nur /usr/ports/www/typo3/pkg-plist www/typo3/pkg-plist --- /usr/ports/www/typo3/pkg-plist 1970-01-01 01:00:00.000000000 +0100 +++ www/typo3/pkg-plist 2009-10-14 05:31:02.000000000 +0200 @@ -0,0 +1,3 @@ +@exec mkdir -p %D/www/typo3/typo3conf 2> /dev/null +@exec [ -f %D/www/typo3/typo3conf/localconf.php ] || cp %D/www/typo3/typo3conf/localconf.php.dist %D/www/typo3/typo3conf/localconf.php +@unexec if cmp -s %D/www/typo3/typo3conf/localconf.php %D/www/typo3/typo3conf/localconf.php.dist; then rm -f %D/www/typo3/typo3conf/localconf.php; fi >Release-Note: >Audit-Trail: >Unformatted: