Date: Sat, 27 Oct 2007 16:34:58 +0200 (IST) From: Dan Pelleg <daniel+unison@pelleg.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117563: Maintainer update: net/unison minor fixes Message-ID: <20071027143458.EFF2FC19F@muky.here> Resent-Message-ID: <200710271500.l9RF025g009207@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117563 >Category: ports >Synopsis: Maintainer update: net/unison minor fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 27 15:00:02 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Dan Pelleg >Release: 6.2-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD m 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #4: Sat Mar 24 08:55:20 IST 2007 d@m i386 >Description: Record unison-devel as a conflict. Backport other minor changes from the unison-devel port. >How-To-Repeat: >Fix: diff -ruN /usr/ports/net/unison/Makefile unison-2.13.16_2/Makefile --- /usr/ports/net/unison/Makefile Fri Apr 21 10:29:14 2006 +++ unison-2.13.16_2/Makefile Sat Oct 27 15:48:02 2007 @@ -2,14 +2,14 @@ # Date created: 4 October 2000 # Whom: Dan Pelleg <dpelleg+unison@cs.cmu.edu> # -# $FreeBSD: ports/net/unison/Makefile,v 1.19 2006/04/21 07:29:14 vs Exp $ +# $FreeBSD: ports/net/unison-devel/Makefile,v 1.18 2007/10/19 03:05:02 alepulver Exp $ # PORTNAME= unison PORTVERSION= 2.13.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/ +MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz @@ -17,12 +17,10 @@ MAINTAINER= daniel+unison@pelleg.org COMMENT= A user-level file synchronization tool -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml-nox11 -PATCH_DEPENDS= ${BUILD_DEPENDS} - PLIST_SUB= PORTVERSION=${PORTVERSION} USE_GMAKE= yes MAKE_ARGS= CFLAGS="" +CONFLICTS= unison-devel-[0-9]* .include <bsd.port.pre.mk> @@ -32,18 +30,23 @@ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps .endif -.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) && exists(${LOCALBASE}/bin/lablgtk2) +.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) WITH_GTK2= yes .endif .if defined(WITH_GTK2) MAKE_ARGS+= UISTYLE=gtk2 -RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 PLIST_SUB+= TEXT="" +BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ + lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +PATCH_DEPENDS+= ${BUILD_DEPENDS} +CONFLICTS+= ocaml-nox11* .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " +BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 +PATCH_DEPENDS+= ${BUILD_DEPENDS} .endif .if defined(WITH_GTK2) diff -ruN /usr/ports/net/unison/pkg-message unison-2.13.16_2/pkg-message --- /usr/ports/net/unison/pkg-message Wed Aug 31 14:37:57 2005 +++ unison-2.13.16_2/pkg-message Sat Oct 27 15:38:52 2007 @@ -1,11 +1,4 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - ATTENTION: - -1) Unison archive format has changed since 2.10.2. The old archive -won't be deleted automatically in case you want to downgrade it. - -2) Merge functionality has seriously changed. Check the manual. - -3) Together with gtk-enabled version, a text-only unison-text binary +Together with a gtk-enabled version, a text-only unison-text binary is installed as it depends on a smaller number of libraries. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071027143458.EFF2FC19F>