diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-07 05:51:44 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-09-07 05:51:44 +0000 |
| commit | baf42148d188279a4049a87f9113ca9411bcd877 (patch) | |
| tree | 07394646d63ffb0f82a19a2f54b3d2ef32434151 /net/cvsup/Makefile | |
| parent | comms/ncid: Upgrade version 0.89 => 1.0 (diff) | |
Revert part of r367443
After this change, 2 ports with different origin had the same pkgname
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=367486
Diffstat (limited to 'net/cvsup/Makefile')
| -rw-r--r-- | net/cvsup/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index ff0e9479b24d..7efe710279d7 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -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 |