From ketas@si.pri.ee  Sat Sep 30 20:47:07 2006
Return-Path: <ketas@si.pri.ee>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1F19016A494
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Sep 2006 20:47:07 +0000 (UTC)
	(envelope-from ketas@si.pri.ee)
Received: from mail.neti.ee (smtp-out-1.neti.ee [194.126.101.98])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B460643D68
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Sep 2006 20:47:04 +0000 (GMT)
	(envelope-from ketas@si.pri.ee)
Received: from dome.gotdns.org (213-35-250-149-dsl.kvm.estpak.ee [213.35.250.149])
	by Relayhost1.neti.ee (Postfix) with ESMTP id 47DD834B73
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Sep 2006 23:47:03 +0300 (EEST)
Received: by dome.gotdns.org (Postfix, from userid 1007)
	id 65D98BF; Sat, 30 Sep 2006 23:47:02 +0300 (EEST)
Message-Id: <20060930204702.65D98BF@dome.gotdns.org>
Date: Sat, 30 Sep 2006 23:47:02 +0300 (EEST)
From: Sulev-Madis Silber <madis555@hot.ee>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] sysutils/pkgfe: update to 20060929
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103858
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/pkgfe: update to 20060929
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 30 20:50:11 GMT 2006
>Closed-Date:    Sun Oct 01 11:07:22 GMT 2006
>Last-Modified:  Sun Oct  1 11:10:18 GMT 2006
>Originator:     Sulev-Madis Silber
>Release:        FreeBSD 4.7-RELEASE-p26 i386
>Organization:
>Environment:
System: FreeBSD dome.gotdns.org 4.7-RELEASE-p26 FreeBSD 4.7-RELEASE-p26 #0: Thu Mar 25 20:28:02 EET 2004
>Description:
- Fix the portsnap dependency for systems where it is already in base
- Make sure we don't overwrite user's configuration file in case of upgrade

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

--- pkgfe-20060929.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/pkgfe/Makefile /usr/home/ketas/myports/pkgfe/Makefile
--- /usr/ports/sysutils/pkgfe/Makefile	Sat Sep 30 14:07:42 2006
+++ /usr/home/ketas/myports/pkgfe/Makefile	Sat Sep 30 23:26:31 2006
@@ -2,7 +2,7 @@
 # Date created:		2006-01-14
 # Whom:			Sulev-Madis Silber <madis555@hot.ee>
 #
-# $FreeBSD: ports/sysutils/pkgfe/Makefile,v 1.5 2006/09/30 11:07:42 miwi Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	pkgfe
@@ -16,16 +16,21 @@
 COMMENT=	Ncurses front-end to manage the ports collection
 
 RUN_DEPENDS=	portupgrade:${PORTSDIR}/sysutils/portupgrade \
-		portaudit:${PORTSDIR}/security/portaudit \
-		portsnap:${PORTSDIR}/sysutils/portsnap
+		portaudit:${PORTSDIR}/security/portaudit
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 600033 && ( ${OSVERSION} < 504103 || ${OSVERSION} > 600000 )
+RUN_DEPENDS+=	portsnap:${PORTSDIR}/sysutils/portsnap
+.endif
 
 NO_BUILD=	yes
 
-PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf
+PLIST_FILES=	sbin/pkgfe etc/pkgfe.conf.sample
 
 do-install:
 	${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/pkgfe
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgfe ${PREFIX}/sbin/pkgfe
-	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf
+	${INSTALL_DATA} ${WRKSRC}/pkgfe.conf ${PREFIX}/etc/pkgfe.conf.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- pkgfe-20060929.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: bsam 
State-Changed-When: Sun Oct 1 00:05:38 UTC 2006 
State-Changed-Why:  
Awaiting for a feedback. 

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

From: Boris Samorodov <bsam@FreeBSD.org>
To: bug-followup@FreeBSD.org, madis555@hot.ee
Cc:  
Subject: Re: ports/103858: [MAINTAINER] sysutils/pkgfe: update to 20060929
Date: Sun, 01 Oct 2006 04:04:06 +0400

 Uh! Does this PR absoletes PR/103854? Please, provide a feedback for
 the latter.
 
 WBR
 -- 
 bsam
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: bsam 
Responsible-Changed-When: Sun Oct 1 10:37:42 UTC 2006 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103858 
State-Changed-From-To: feedback->closed 
State-Changed-By: bsam 
State-Changed-When: Sun Oct 1 11:06:12 UTC 2006 
State-Changed-Why:  
Committed, thanks! 
PORTREVISION was bumpted. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103858: commit references a PR
Date: Sun,  1 Oct 2006 11:05:39 +0000 (UTC)

 bsam        2006-10-01 11:05:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/pkgfe       Makefile 
   Log:
   - fix the portsnap dependency for systems where it is already in base;  [1]
   - make sure we don't overwrite user's configuration file in case of     [1]
     upgrade;
   - bump PORTREVISION.
   
   PR:             103858  [1]
   Submitted by:   Sulev-Madis Silber <madis555 at hot.ee> (maintainer)    [1]
   
   Revision  Changes    Path
   1.6       +11 -5     ports/sysutils/pkgfe/Makefile
 _______________________________________________
 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:
