From bsam@bb.ipt.ru  Fri Sep  5 16:08:05 2008
Return-Path: <bsam@bb.ipt.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF71D1065688
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Sep 2008 16:08:05 +0000 (UTC)
	(envelope-from bsam@bb.ipt.ru)
Received: from bb.ipt.ru (bb.ipt.ru [194.62.233.89])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F6E98FC40
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  5 Sep 2008 16:08:04 +0000 (UTC)
	(envelope-from bsam@bb.ipt.ru)
Received: from bb.ipt.ru (localhost [127.0.0.1])
	by bb.ipt.ru (8.14.2/8.14.2) with ESMTP id m85G81Nu077311
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 5 Sep 2008 20:08:01 +0400 (MSD)
	(envelope-from bsam@bb.ipt.ru)
Received: (from bsam@localhost)
	by bb.ipt.ru (8.14.2/8.14.2/Submit) id m85G81XP077310;
	Fri, 5 Sep 2008 20:08:01 +0400 (MSD)
	(envelope-from bsam)
Message-Id: <200809051608.m85G81XP077310@bb.ipt.ru>
Date: Fri, 5 Sep 2008 20:08:01 +0400 (MSD)
From: Boris Samorodov <bsam@freebsd.org>
Reply-To: Boris Samorodov <bsam@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel+unison@pelleg.org
Subject: [patch] net/unison: prepare for new port net/unison-nox11
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         127118
>Category:       ports
>Synopsis:       [patch] net/unison: prepare for new port net/unison-nox11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 05 16:10:01 UTC 2008
>Closed-Date:    Wed Sep 24 14:08:51 UTC 2008
>Last-Modified:  Wed Sep 24 14:10:01 UTC 2008
>Originator:     Boris Samorodov
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
InPharmtech, Co.
>Environment:
System: FreeBSD bb.ipt.ru 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Thu Aug 28 12:59:02 MSD 2008 root@bb.ipt.ru:/usr/obj/usr/src/sys/BB i386

>Description:
	A new port (net/unison-nox11) is a slave for net/unison:
	http://www.freebsd.org/cgi/query-pr.cgi?pr=127117 .
	The main idea about the new port is to have it's package
	which has 5 dependencies instead of 198...

	So, I propose those changes:
	. add CONFLICTS;
	. add pkg-message.nox11 file;
	. show apropriate message file;
	. switch from = to ?= for PORTREVISION (seems that slave port should
	  be rarely bumpted having only 5 dependencies);
	. bump PORTREVISION.

>How-To-Repeat:
>Fix:

--- unison.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/unison/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	6 Jun 2008 13:50:29 -0000	1.22
+++ Makefile	5 Sep 2008 15:21:47 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	unison
 PORTVERSION=	2.27.57
-PORTREVISION=	1
+PORTREVISION?=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -20,7 +20,7 @@
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USE_GMAKE=	yes
 MAKE_ARGS=	CFLAGS=""
-CONFLICTS=	unison-devel-[0-9]*
+CONFLICTS=	unison-devel-[0-9]* unison-nox11-[0-9]*
 
 .include <bsd.port.pre.mk>
 
@@ -60,14 +60,16 @@
 	${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin
 
 post-install:
-.if defined(WITH_GTK2)
-	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
+.if defined(WITH_GTK2)
+	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
 	@${CAT} ${PKGMESSAGE}
+.else
+	@${CAT} ${PKGMESSAGE}.nox11
+.endif
 
 .include <bsd.port.post.mk>
Index: pkg-message.nox11
===================================================================
RCS file: pkg-message.nox11
diff -N pkg-message.nox11
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-message.nox11	5 Sep 2008 15:21:47 -0000
@@ -0,0 +1,3 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+A text-only unison binary is installed.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- unison.diff ends here ---

WBR
-- 
bsam
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Fri Sep 5 16:10:19 UTC 2008 
Class-Changed-Why:  
Fix category (new ports should be change-requests) (via the GNATS Auto 
Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127118 
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 5 16:10:25 UTC 2008 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127118 
State-Changed-From-To: open->suspended 
State-Changed-By: bsam 
State-Changed-When: Fri Sep 5 16:23:50 UTC 2008 
State-Changed-Why:  
Depends upon PR/127117. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127118 
State-Changed-From-To: suspended->feedback 
State-Changed-By: bsam 
State-Changed-When: Fri Sep 5 16:31:02 UTC 2008 
State-Changed-Why:  
Sorry, this should be in a feedback state. 
Dear maintainer, do you approve the patch? Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127118 
State-Changed-From-To: feedback->closed 
State-Changed-By: bsam 
State-Changed-When: Wed Sep 24 14:08:41 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/127118: commit references a PR
Date: Wed, 24 Sep 2008 14:01:44 +0000 (UTC)

 bsam        2008-09-24 14:01:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/unison           Makefile 
   Added files:
     net/unison           pkg-message.nox11 
   Log:
   Those changes should deal with an upcomming new slave port net/unison-nox11
   (PR/127117):
   . add CONFLICTS;
   . add pkg-message.nox11 file;
   . show apropriate message file;
   . switch from '=' to '?=' for PORTREVISION (seems that slave port should
     be rarely bumpted having only 5 dependencies);
   . bump PORTREVISION.
   
   PR:             127118
   Submitted by:   bsam (me)
   Approved by:    maintainer (timeout for 19 days)
   
   Revision  Changes    Path
   1.23      +7 -5      ports/net/unison/Makefile
   1.1       +3 -0      ports/net/unison/pkg-message.nox11 (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:
