From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 27 15:00:03 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A471616A46B for ; Sat, 27 Oct 2007 15:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7B3FD13C4B2 for ; Sat, 27 Oct 2007 15:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9RF02a6009208 for ; Sat, 27 Oct 2007 15:00:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9RF025g009207; Sat, 27 Oct 2007 15:00:02 GMT (envelope-from gnats) Resent-Date: Sat, 27 Oct 2007 15:00:02 GMT Resent-Message-Id: <200710271500.l9RF025g009207@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Pelleg Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFBE316A46C for ; Sat, 27 Oct 2007 14:55:04 +0000 (UTC) (envelope-from dpelleg@cs.cmu.edu) Received: from lawrence.libagent.org (lawrence.libagent.org [69.60.120.231]) by mx1.freebsd.org (Postfix) with ESMTP id 983A413C4B7 for ; Sat, 27 Oct 2007 14:55:04 +0000 (UTC) (envelope-from dpelleg@cs.cmu.edu) Received: from localhost (unknown [127.0.0.1]) by lawrence.libagent.org (Postfix) with ESMTP id B1BC4B2466 for ; Sat, 27 Oct 2007 16:35:05 +0200 (IST) Received: from lawrence.libagent.org ([127.0.0.1]) by localhost (lawrence.libagent.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Ww-F6hGhK4DA for ; Sat, 27 Oct 2007 16:35:01 +0200 (IST) Received: from muky.here (bzq-84-109-51-246.red.bezeqint.net [84.109.51.246]) by lawrence.libagent.org (Postfix) with ESMTP id 569CBB2463 for ; Sat, 27 Oct 2007 16:35:01 +0200 (IST) Received: by muky.here (Postfix, from userid 7675) id EFF2FC19F; Sat, 27 Oct 2007 16:34:58 +0200 (IST) Message-Id: <20071027143458.EFF2FC19F@muky.here> Date: Sat, 27 Oct 2007 16:34:58 +0200 (IST) From: Dan Pelleg To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117563: Maintainer update: net/unison minor fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Pelleg List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2007 15:00:03 -0000 >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 # -# $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 @@ -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: