Bug 127118 - [patch] net/unison: prepare for new port net/unison-nox11
Summary: [patch] net/unison: prepare for new port net/unison-nox11
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-09-05 17:10 UTC by Boris Samorodov
Modified: 2008-09-24 15:10 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov freebsd_committer freebsd_triage 2008-09-05 17:10:01 UTC
	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.

Fix: 

WBR
-- 
bsam--zeciHSCecXN0foD27tcrlF8dMF6z4hj8X3DjnAaCFVqBkSY3
Content-Type: text/plain; name="unison.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="unison.diff"

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.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2008-09-05 17:10:19 UTC
Class Changed
From-To: update->change-request

Fix category (new ports should be change-requests) (via the GNATS Auto 
Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2008-09-05 17:10:25 UTC
Responsible Changed
From-To: freebsd-ports-bugs->bsam

Submitter has GNATS access (via the GNATS Auto Assign Tool)
Comment 3 Boris Samorodov freebsd_committer freebsd_triage 2008-09-05 17:23:50 UTC
State Changed
From-To: open->suspended

Depends upon PR/127117.
Comment 4 Boris Samorodov freebsd_committer freebsd_triage 2008-09-05 17:31:02 UTC
State Changed
From-To: suspended->feedback

Sorry, this should be in a feedback state. 
Dear maintainer, do you approve the patch? Thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2008-09-24 15:01:44 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"
Comment 6 Boris Samorodov freebsd_committer freebsd_triage 2008-09-24 15:08:41 UTC
State Changed
From-To: feedback->closed

Committed, thanks!