Date: Fri, 5 Sep 2008 20:08:01 +0400 (MSD) From: Boris Samorodov <bsam@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/127118: [patch] net/unison: prepare for new port net/unison-nox11 Message-ID: <200809051608.m85G81XP077310@bb.ipt.ru> Resent-Message-ID: <200809051610.m85GA1hG091914@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127118 >Category: ports >Synopsis: [patch] net/unison: prepare for new port net/unison-nox11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Sep 05 16:10:01 UTC 2008 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809051608.m85G81XP077310>