From root@kobe.netlab.nec.de  Mon Jul 18 14:50:25 2005
Return-Path: <root@kobe.netlab.nec.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 893DD16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jul 2005 14:50:25 +0000 (GMT)
	(envelope-from root@kobe.netlab.nec.de)
Received: from kobe.netlab.nec.de (kobe.netlab.nec.de [195.37.70.60])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D5D3043D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jul 2005 14:50:24 +0000 (GMT)
	(envelope-from root@kobe.netlab.nec.de)
Received: from kobe.netlab.nec.de (localhost [127.0.0.1])
	by kobe.netlab.nec.de (8.13.3/8.13.3) with ESMTP id j6IEqK9d009924
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jul 2005 16:52:20 +0200 (CEST)
	(envelope-from root@kobe.netlab.nec.de)
Received: (from root@localhost)
	by kobe.netlab.nec.de (8.13.3/8.13.3/Submit) id j6IEqKwb009923;
	Mon, 18 Jul 2005 16:52:20 +0200 (CEST)
	(envelope-from root)
Message-Id: <200507181452.j6IEqKwb009923@kobe.netlab.nec.de>
Date: Mon, 18 Jul 2005 16:52:20 +0200 (CEST)
From: Lars Eggert <lars.eggert@gmx.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] www/podcastamatic: better conf file handling
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         83674
>Category:       ports
>Synopsis:       [MAINTAINER] www/podcastamatic: better conf file handling
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 18 15:00:33 GMT 2005
>Closed-Date:    Mon Jul 18 21:02:01 GMT 2005
>Last-Modified:  Mon Jul 18 21:02:01 GMT 2005
>Originator:     Lars Eggert
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD kobe.netlab.nec.de 5.4-STABLE FreeBSD 5.4-STABLE #23: Fri Jun 17 10:28:19 CEST 2005
>Description:
No longer overwrite conf file on reinstall.
Use sane FreeBSD defaults.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- podcastamatic-1.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/podcastamatic--/Makefile /usr/ports/www/podcastamatic/Makefile
--- /usr/ports/www/podcastamatic--/Makefile	Mon Jul 18 16:14:44 2005
+++ /usr/ports/www/podcastamatic/Makefile	Mon Jul 18 16:38:33 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	podcastamatic
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://bradley.chicago.il.us/projects/podcastamatic/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
@@ -25,10 +26,20 @@
 do-patch:
 	@${REINPLACE_CMD} -e "s|${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|"\
 		 ${WRKSRC}/${PORTNAME}.pl
+	@${REINPLACE_CMD} -e "s|podcastamatic.log|/var/log/${PORTNAME}.log|"\
+		${WRKSRC}/${PORTNAME}.conf
+	@${REINPLACE_CMD} -e "s|/projects/podcastamatic|/podcast|"\
+		${WRKSRC}/${PORTNAME}.conf
+	@${REINPLACE_CMD} -e "s|style.css|${PREFIX}/share/${PORTNAME}/style.css|"\
+		${WRKSRC}/${PORTNAME}.conf
+	@${REINPLACE_CMD} -e "s|/testpodcast||" ${WRKSRC}/${PORTNAME}.conf
+	@${REINPLACE_CMD} -e "s|/audio||" ${WRKSRC}/${PORTNAME}.conf
+	@${REINPLACE_CMD} -e "s|[wW]:|${PREFIX}/www|" ${WRKSRC}/${PORTNAME}.conf
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample
+	test \! -f ${PREFIX}/etc/${PORTNAME}.conf && ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf || true
 	@${MKDIR} ${PREFIX}/share/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/style.css ${PREFIX}/share/${PORTNAME}/
 .if !defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/www/podcastamatic--/pkg-plist /usr/ports/www/podcastamatic/pkg-plist
--- /usr/ports/www/podcastamatic--/pkg-plist	Mon Jul 18 16:14:44 2005
+++ /usr/ports/www/podcastamatic/pkg-plist	Mon Jul 18 16:24:11 2005
@@ -1,5 +1,6 @@
+@unexec cmp %D/etc/podcastamatic.conf.sample %D/etc/podcastamatic.conf && rm %D/etc/podcastamatic.conf || true
 bin/podcastamatic
-etc/podcastamatic.conf
+etc/podcastamatic.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%DATADIR%%/style.css
 @dirrm %%DATADIR%%
--- podcastamatic-1.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jul 18 21:01:54 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=83674 
>Unformatted:
