Date: Wed, 5 Jun 2013 20:53:32 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320020 - in head/net: cvsup cvsup-without-gui Message-ID: <201306052053.r55KrWNi039707@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Wed Jun 5 20:53:32 2013 New Revision: 320020 URL: http://svnweb.freebsd.org/changeset/ports/320020 Log: 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 Modified: head/net/cvsup-without-gui/Makefile head/net/cvsup/Makefile Modified: head/net/cvsup-without-gui/Makefile ============================================================================== --- head/net/cvsup-without-gui/Makefile Wed Jun 5 20:40:58 2013 (r320019) +++ head/net/cvsup-without-gui/Makefile Wed Jun 5 20:53:32 2013 (r320020) @@ -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" Modified: head/net/cvsup/Makefile ============================================================================== --- head/net/cvsup/Makefile Wed Jun 5 20:40:58 2013 (r320019) +++ head/net/cvsup/Makefile Wed Jun 5 20:53:32 2013 (r320020) @@ -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 optimi 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306052053.r55KrWNi039707>