2 files changed, 21 insertions, 27 deletions

diff --git a/net/cvsup-without-gui/Makefile b/net/cvsup-without-gui/Makefile
index 9a8eff1d352e..417fc528a5ab 100644
--- a/net/cvsup-without-gui/Makefile
+++ b/net/cvsup-without-gui/Makefile
@@ -7,6 +7,6 @@
 
 MASTERDIR=	${.CURDIR}/../cvsup
 WITHOUT_X11=	yes
-CONFLICTS=	cvsup-[0-9]*
+SLAVE_WITHOUT_GUI=	yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index cea855464a55..e4d3ede2b212 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -6,21 +6,32 @@
 #
 
 PORTNAME=	cvsup
-PORTVERSION?=	16.1h
-PORTREVISION?=	3
+PORTVERSION=	16.1h
+PORTREVISION=	3
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/snapshots
 DISTNAME=	cvsup-snap-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT?=	General network file distribution system optimized for CVS (GUI version)
+COMMENT=	File distribution system optimized for CVS
 
-CONFLICTS?=	cvsup-without-gui-[0-9]*
 ONLY_FOR_ARCHS=	alpha amd64 i386 sparc64
 
+.if !defined(SLAVE_WITHOUT_GUI)
+OPTIONS+=	X11 "Build with X11 support" on
+.endif
+
 .include <bsd.port.pre.mk>
 
+.if defined(STATIC)
+WITH_STATIC=	yes
+.endif
+
+.if defined(WITH_STATIC) && !defined(WITHOUT_STATIC)
+M3FLAGS+=	-DSTATIC
+.endif
+
 .if ${ARCH} == "alpha"
 TARGET=		FBSD_ALPHA
 .elif ${ARCH} == "amd64"
@@ -37,46 +48,29 @@ TARGET=		FBSD_SPARC64
 M3FLAGS+=	-DNOGUI
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
 PKGNAMESUFFIX=	-without-gui
-COMMENT=	General network file distribution system optimized for CVS (non-GUI version)
+COMMENT+=	(non-GUI version)
 DESCR=		${PKGDIR}/pkg-descr.nogui
+CONFLICTS=	cvsup-[0-9]*
 .if !defined(WITHOUT_X11) && ${ARCH} == "amd64"
 NO_LATEST_LINK=	yes
 .endif
 .else
 USE_XLIB=	yes
+COMMENT+=	(GUI version)
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/formsvbt/${TARGET}/libm3formsvbt.a:${PORTSDIR}/lang/ezm3
+CONFLICTS=	cvsup-without-gui-[0-9]*
 .endif
 
 MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
 MAN1=		cvpasswd.1 cvsup.1
 MAN8=		cvsupd.8
 
-pre-everything::
-.ifdef STATIC
-	@${ECHO_MSG} "*****************************************************"
-	@${ECHO_MSG} "* In future, please define WITH_STATIC instead of   *"
-	@${ECHO_MSG} "* STATIC.                                           *"
-	@${ECHO_MSG} "*****************************************************"
-	@${ECHO_MSG} ""
-.endif
-
-.ifdef STATIC || WITH_STATIC
-M3FLAGS+=	-DSTATIC
-.endif
-
 pre-fetch:
-.ifndef WITHOUT_X11
-.if ${ARCH} == "amd64"
+.if !defined(WITHOUT_X11) && ${ARCH} == "amd64"
 	@${ECHO_MSG} "*****************************************************"
 	@${ECHO_MSG} "* CVSup with X11 is not yet supported on amd64.     *"
 	@${ECHO_MSG} "* I will build cvsup without X11 support now.       *"
 	@${ECHO_MSG} "*****************************************************"
-.else
-	@${ECHO_MSG} "*****************************************************"
-	@${ECHO_MSG} "* To build CVSup without X11 (and without the GUI)  *"
-	@${ECHO_MSG} "* use the \"net/cvsup-without-gui\" port.             *"
-	@${ECHO_MSG} "*****************************************************"
-.endif
 .endif
 
 pre-patch: