Date: Sun, 7 Sep 2014 05:51:44 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367486 - head/net/cvsup Message-ID: <201409070551.s875piTU069374@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409070551.s875piTU069374>