diff options
| author | eadler <eadler@FreeBSD.org> | 2013-06-06 04:53:32 +0800 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2013-06-06 04:53:32 +0800 |
| commit | 4a47cecaa6c8323445bd2e70550c78654cd578de (patch) | |
| tree | dd242be33886d79a67f07c03261874860ef46253 /net | |
| parent | 675e004c8d31b118abfe287eaa3c8328e2a2cf87 (diff) | |
| download | freebsd-ports-gnome-4a47cecaa6c8323445bd2e70550c78654cd578de.tar.gz freebsd-ports-gnome-4a47cecaa6c8323445bd2e70550c78654cd578de.tar.zst freebsd-ports-gnome-4a47cecaa6c8323445bd2e70550c78654cd578de.zip | |
Convert cvsup and cvsup-without-gui to OptionsNG.
There is a little more cleanup work to be done with these ports.
Reviewed by: kwm, ak
Diffstat (limited to 'net')
| -rw-r--r-- | net/cvsup-without-gui/Makefile | 10 | ||||
| -rw-r--r-- | net/cvsup/Makefile | 22 |
2 files changed, 10 insertions, 22 deletions
diff --git a/net/cvsup-without-gui/Makefile b/net/cvsup-without-gui/Makefile index 417fc528a5ab..0157464cddd5 100644 --- a/net/cvsup-without-gui/Makefile +++ b/net/cvsup-without-gui/Makefile @@ -1,12 +1,6 @@ -# New ports collection makefile for: cvsup-without-gui -# Date created: 12 January 2002 -# Whom: jdp -# +# Created by: jdp # $FreeBSD$ -# MASTERDIR= ${.CURDIR}/../cvsup -WITHOUT_X11= yes -SLAVE_WITHOUT_GUI= yes - +OPTIONS_EXCLUDE= X11 .include "${MASTERDIR}/Makefile" diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index d0d4ce54724d..d134180b1042 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: cvsup -# Date created: 7 August 1996 -# Whom: asami -# +# Created by: asami # $FreeBSD$ -# PORTNAME= cvsup PORTVERSION= 16.1h @@ -18,20 +14,18 @@ COMMENT= File distribution system optimized for CVS ONLY_FOR_ARCHS= amd64 i386 sparc64 -.if !defined(SLAVE_WITHOUT_GUI) -OPTIONS+= X11 "Build with X11 support" on -.endif +OPTIONS_DEFINE= X11 STATIC +OPTIONS_EXCLUDE_amd64= X11 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(STATIC) +.if ${PORT_OPTIONS:MSTATIC} WITH_STATIC= yes -.endif - -.if defined(WITH_STATIC) && !defined(WITHOUT_STATIC) M3FLAGS+= -DSTATIC .endif +.include <bsd.port.pre.mk> + .if ${ARCH} == "amd64" TARGET= FBSD_AMD64 AMD64_PATCHES= p-amd64-aa p-amd64-zlib @@ -41,7 +35,7 @@ TARGET= FreeBSD4 TARGET= FBSD_SPARC64 .endif -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} M3FLAGS+= -DNOGUI BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3 PKGNAMESUFFIX= -without-gui |