From owner-svn-ports-head@FreeBSD.ORG  Sat Sep  6 15:15:46 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F1008D92;
 Sat,  6 Sep 2014 15:15:45 +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 C2D311167;
 Sat,  6 Sep 2014 15:15:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s86FFjGt051606;
 Sat, 6 Sep 2014 15:15:45 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s86FFjdM051605;
 Sat, 6 Sep 2014 15:15:45 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201409061515.s86FFjdM051605@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 6 Sep 2014 15:15:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367443 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Sep 2014 15:15:46 -0000

Author: adamw
Date: Sat Sep  6 15:15:45 2014
New Revision: 367443
URL: http://svnweb.freebsd.org/changeset/ports/367443
QAT: https://qat.redports.org/buildarchive/r367443/

Log:
  Use OPTIONS_EXCLUDE_amd64 rather than marking it IGNORE on amd64 with the
  default options.

Modified:
  head/net/cvsup/Makefile

Modified: head/net/cvsup/Makefile
==============================================================================
--- head/net/cvsup/Makefile	Sat Sep  6 15:10:18 2014	(r367442)
+++ head/net/cvsup/Makefile	Sat Sep  6 15:15:45 2014	(r367443)
@@ -15,17 +15,16 @@ COMMENT=	File distribution system optimi
 ONLY_FOR_ARCHS=	amd64 i386 sparc64
 
 OPTIONS_DEFINE=	X11 STATIC
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFAULT=X11
+OPTIONS_EXCLUDE_amd64=	X11
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSTATIC}
 WITH_STATIC=	yes
 M3FLAGS+=	-DSTATIC
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64"
 TARGET=		FBSD_AMD64
 AMD64_PATCHES=	p-amd64-aa p-amd64-zlib
@@ -43,15 +42,11 @@ 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
@@ -59,13 +54,13 @@ INSTALL_TARGET=	install BINDIR=${STAGEDI
 pre-patch:
 .if ${ARCH} == "amd64"
 .for f in ${AMD64_PATCHES}
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f}
+	@(cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/${f})
 .endfor
 .endif
 
 post-install:
-	${MV} ${STAGEDIR}${PREFIX}/bin/cvsupd ${STAGEDIR}${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/cvsupd ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cvsup
-	@${INSTALL_DATA} ${WRKSRC}/License ${STAGEDIR}${PREFIX}/share/cvsup/License
+	${INSTALL_DATA} ${WRKSRC}/License ${STAGEDIR}${PREFIX}/share/cvsup/License
 
 .include <bsd.port.post.mk>