From nobody@FreeBSD.org  Wed Oct 14 11:08:16 2009
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 8F7631065670
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <gerrit.beine@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix remove of typo3 configuration 
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         139596
>Category:       ports
>Synopsis:       Fix remove of typo3 configuration
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 14 11:10:03 UTC 2009
>Closed-Date:    Wed Oct 14 13:13:06 UTC 2009
>Last-Modified:  Wed Oct 14 13:20:01 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Oct 14 11:16:27 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=139596 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Wed Oct 14 11:53:24 UTC 2009 
State-Changed-Why:  
that's wrong, it need a check if the file is present or not, also should 
you tell a user where he can find the conf file to copy that to the 
right dir. 

- Martin 


http://www.freebsd.org/cgi/query-pr.cgi?pr=139596 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Oct 14 13:13:05 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/139596: commit references a PR
Date: Wed, 14 Oct 2009 13:12:56 +0000 (UTC)

 miwi        2009-10-14 13:12:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/typo3            Makefile 
   Added files:
     www/typo3            pkg-plist 
   Log:
   - Fix remove of typo3 configuration
   
   PR:             139596
   Submitted by:   Gerrit Beine <gerrit.beine@gmx.de> (maintainer)
   
   Revision  Changes    Path
   1.28      +3 -0      ports/www/typo3/Makefile
   1.1       +3 -0      ports/www/typo3/pkg-plist (new)
 _______________________________________________
 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:
