From owner-svn-ports-all@FreeBSD.ORG  Sun Sep  7 05:51:44 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A8D6595D;
 Sun,  7 Sep 2014 05:51:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 950D713E1;
 Sun,  7 Sep 2014 05:51:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s875pigC069375;
 Sun, 7 Sep 2014 05:51:44 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s875piTU069374;
 Sun, 7 Sep 2014 05:51:44 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409070551.s875piTU069374@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 7 Sep 2014 05:51:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367486 - head/net/cvsup
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Sep 2014 05:51:44 -0000

Author: antoine
Date: Sun Sep  7 05:51:44 2014
New Revision: 367486
URL: http://svnweb.freebsd.org/changeset/ports/367486
QAT: https://qat.redports.org/buildarchive/r367486/

Log:
  Revert part of r367443
  After this change, 2 ports with different origin had the same pkgname
  
  With hat:	portmgr

Modified:
  head/net/cvsup/Makefile

Modified: head/net/cvsup/Makefile
==============================================================================
--- head/net/cvsup/Makefile	Sun Sep  7 05:49:54 2014	(r367485)
+++ head/net/cvsup/Makefile	Sun Sep  7 05:51:44 2014	(r367486)
@@ -16,7 +16,6 @@ ONLY_FOR_ARCHS=	amd64 i386 sparc64
 
 OPTIONS_DEFINE=	X11 STATIC
 OPTIONS_DEFAULT=X11
-OPTIONS_EXCLUDE_amd64=	X11
 
 .include <bsd.port.pre.mk>
 
@@ -42,11 +41,15 @@ COMMENT+=	(non-GUI version)
 DESCR=		${PKGDIR}/pkg-descr.nogui
 CONFLICTS=	cvsup-[0-9]*
 .else
+.if ${ARCH} == amd64
+IGNORE=		does not support GUI on amd64, please disable X11 option or use net/cvsup-without-gui instead
+.else
 USE_XORG+=	oldx dmx pixman xaw 
 COMMENT+=	(GUI version)
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3
 CONFLICTS=	cvsup-without-gui-[0-9]*
 .endif
+.endif
 
 MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
 INSTALL_TARGET=	install BINDIR=${STAGEDIR}${PREFIX}/bin MANDIR=${STAGEDIR}${MANPREFIX}/man