From owner-cvs-all@FreeBSD.ORG  Sat Jun  2 17:40:17 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B1481065672;
	Sat,  2 Jun 2012 17:40:17 +0000 (UTC)
	(envelope-from madpilot@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D128D8FC1B;
	Sat,  2 Jun 2012 17:40:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q52HeGPO035987;
	Sat, 2 Jun 2012 17:40:16 GMT
	(envelope-from madpilot@repoman.freebsd.org)
Received: (from madpilot@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q52HeGcf035986;
	Sat, 2 Jun 2012 17:40:16 GMT (envelope-from madpilot)
Message-Id: <201206021740.q52HeGcf035986@repoman.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Sat, 2 Jun 2012 17:40:16 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/net/unison Makefile ports/net/unison-devel
 Makefile ports/net/unison-nox11 Makefile ports/net/unison232
 Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jun 2012 17:40:17 -0000

madpilot    2012-06-02 17:40:16 UTC

  FreeBSD ports repository

  Modified files:
    net/unison           Makefile 
    net/unison-devel     Makefile 
    net/unison-nox11     Makefile 
    net/unison232        Makefile 
  Log:
  - Revert back to using the X11 knob in options [1]
  - Add missing ?= to unison master port
  - Fix conflicts in net/unison-nox11 [2]
  - Bump PORTREVISION [3]
  
  Reported by:    David Cecchin <dcecchin@gmail.com> [1], Sulev-Madis "ketas" Silber <madis555@hot.ee> [2] (both by email)
  Approved by:    Boris Samorodov <bsam@FreeBSD.org> (maintainer of net/unison-nox11)
  Approved by:    Matthias Andree <mandree@FreeBSD.org> (implicit, maintainer of net/unison232)
  Approved by:    crees, tabthorpe (mentors, implicit)
  
  Revision  Changes    Path
  1.34      +7 -7      ports/net/unison-devel/Makefile
  1.3       +3 -3      ports/net/unison-nox11/Makefile
  1.36      +8 -8      ports/net/unison/Makefile
  1.37      +6 -6      ports/net/unison232/Makefile