Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jul 2013 07:00:44 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322622 - in head: java/openjdk6 lang/elk lang/xds-c mail/ml math/grace math/ngraph math/oleo misc/floatator misc/xtar multimedia/mpeg2play multimedia/xawtv net/tcpillust net/tcpview pr...
Message-ID:  <201307100700.r6A70iEd027958@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Jul 10 07:00:44 2013
New Revision: 322622
URL: http://svnweb.freebsd.org/changeset/ports/322622

Log:
  Convert from USE_MOTIF to USES=motif
  While here:
  - Trim headers
  - Convert USE_GMAKE to USES=gmake
  - Remove indefinite article from comment

Modified:
  head/java/openjdk6/Makefile
  head/lang/elk/Makefile
  head/lang/xds-c/Makefile
  head/mail/ml/Makefile
  head/math/grace/Makefile
  head/math/ngraph/Makefile
  head/math/oleo/Makefile
  head/misc/floatator/Makefile
  head/misc/xtar/Makefile
  head/multimedia/mpeg2play/Makefile
  head/multimedia/xawtv/Makefile
  head/net/tcpillust/Makefile
  head/net/tcpview/Makefile
  head/print/tex-xdvik/Makefile
  head/print/xmbibtex/Makefile
  head/russian/xruskb/Makefile
  head/science/afni/Makefile
  head/science/felt/Makefile
  head/science/xmakemol/Makefile
  head/sysutils/graphicboot/Makefile
  head/sysutils/mmore/Makefile
  head/textproc/mgdiff/Makefile
  head/x11-fm/xplore/Makefile
  head/x11-toolkits/SoXt/Makefile
  head/x11-toolkits/movingmotif/Makefile
  head/x11-toolkits/open-motif/Makefile
  head/x11-toolkits/viewklass/Makefile
  head/x11-toolkits/xbae/Makefile
  head/x11-toolkits/xmhtml/Makefile
  head/x11/xforward/Makefile
  head/x11/xmotd/Makefile

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/java/openjdk6/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -131,13 +131,13 @@ FASTDEBUG_DESC=	Include fastdebug build
 TEST_DESC=	Add support for running regression test
 .endif
 
+USES=		gmake motif
+
 .include <bsd.port.options.mk>
 
 # java extracts directly to the cwd
 WRKSRC=		${WRKDIR}
 
-USE_GMAKE=	yes
-USE_MOTIF=	yes
 USE_XORG=	x11 xext xi xt xtst
 
 JAXP_BUILD=	144_05

Modified: head/lang/elk/Makefile
==============================================================================
--- head/lang/elk/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/lang/elk/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	elk
-# Date created:		08 March 1995
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	elk
 PORTVERSION=	3.99.8
@@ -11,13 +7,13 @@ CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An embeddable Scheme interpreter
+COMMENT=	Embeddable Scheme interpreter
 
 LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
 		elf.0:${PORTSDIR}/devel/libelf
 
+USES=		motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes

Modified: head/lang/xds-c/Makefile
==============================================================================
--- head/lang/xds-c/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/lang/xds-c/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xds-c
-# Date created:		29 January 2007
-# Whom:			coumarin@gmail.com
-#
+# Created by: coumarin@gmail.com
 # $FreeBSD$
-#
 
 PORTNAME=	xds-c
 PORTVERSION=	2.51
@@ -20,9 +16,8 @@ RESTRICTED=	Excelsior forbids any redist
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	uses assembly code
+USES=		gmake motif
 USE_LINUX=	yes
-USE_GMAKE=	yes
-USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/lib/C
 

Modified: head/mail/ml/Makefile
==============================================================================
--- head/mail/ml/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/mail/ml/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -11,9 +11,8 @@ MAINTAINER=	mjl@luckie.org.nz
 COMMENT=	X11 IMAP client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USES=		imake
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt
-USE_MOTIF=	yes
 
 pre-configure:
 	@${ECHO_MSG} "===>  Building c-client"

Modified: head/math/grace/Makefile
==============================================================================
--- head/math/grace/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/math/grace/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -26,9 +26,8 @@ OPTIONS_DEFAULT=FFTW NETCDF PDF XMHTML
 PDF_DESC=	PDF output
 XMHTML_DESC=	Use XmHTML widget for on-line help
 
-USE_MOTIF=	yes
 USE_GCC=	any
-USE_GMAKE=	yes
+USES=		gmake motif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-grace-home=${DATADIR} \
 		--with-extra-incpath=${LOCALBASE}/include \

Modified: head/math/ngraph/Makefile
==============================================================================
--- head/math/ngraph/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/math/ngraph/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ngraph
-# Date created:         18 Aug 1999
-# Whom:                 nobu@rd.isac.co.jp
-#
+# Created by: nobu@rd.isac.co.jp
 # $FreeBSD$
-#
 
 PORTNAME=	ngraph
 PORTVERSION=	6.3.51
@@ -16,7 +12,6 @@ DISTNAME=	Ngraph-${PORTVERSION}-src
 MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	XY plotting tool for students, scientists, and engineers
 
-USE_MOTIF=	yes
-USE_GMAKE=	yes
+USES=		make motif
 
 .include <bsd.port.mk>

Modified: head/math/oleo/Makefile
==============================================================================
--- head/math/oleo/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/math/oleo/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	MOTIF NLS
 LIB_DEPENDS+=	plot:${PORTSDIR}/graphics/plotutils \
 		Xbae:${PORTSDIR}/x11-toolkits/xbae \
 		XmHTML:${PORTSDIR}/x11-toolkits/xmhtml
-USE_MOTIF=	yes
+USES+=		motif
 CONFIGURE_ARGS+=	--with-motif
 .else
 USE_XORG=	xt ice sm

Modified: head/misc/floatator/Makefile
==============================================================================
--- head/misc/floatator/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/misc/floatator/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -13,7 +13,7 @@ COMMENT=	Interactive fluid dynamics simu
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTCOUT=	skipv:0.9.1
-USE_MOTIF=	yes
+USES=		motif
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DNDEBUG" \
 		X11INCLUDE="-I${LOCALBASE}/include" X11LIB="-L${LOCALBASE}/lib"
 PLIST_FILES=	bin/floatator bin/floatator_X_interface

Modified: head/misc/xtar/Makefile
==============================================================================
--- head/misc/xtar/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/misc/xtar/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -11,8 +11,7 @@ MASTER_SITE_SUBDIR=	utilities
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View and manipulate contents of a tar file
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xp xt
 MAKE_ARGS=	XMLIB="${MOTIFLIB}"
 MAN1=		xtar.1

Modified: head/multimedia/mpeg2play/Makefile
==============================================================================
--- head/multimedia/mpeg2play/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/multimedia/mpeg2play/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -10,9 +10,8 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/gra
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to play mpeg-2 movies on X displays
 
-USES=		imake
+USES=		imake motif
 USE_XORG=	x11 xext xp xt
-USE_MOTIF=	yes
 ALL_TARGET=	mpeg2play
 
 .include <bsd.port.options.mk>

Modified: head/multimedia/xawtv/Makefile
==============================================================================
--- head/multimedia/xawtv/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/multimedia/xawtv/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -21,10 +21,9 @@ OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
+USES=		gmake motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_XORG=	x11 xaw
 CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"

Modified: head/net/tcpillust/Makefile
==============================================================================
--- head/net/tcpillust/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/net/tcpillust/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -9,12 +9,12 @@ CATEGORIES=	net tcl tk
 MASTER_SITES=	http://www.jp.nishida.org/tcpillust/
 
 MAINTAINER=	nishida@sfc.wide.ad.jp
-COMMENT=	A graphical TCP connection analysis tool
+COMMENT=	Graphical TCP connection analysis tool
 
+USES=		motif
 USE_TCL=	yes
 USE_TK=		yes
 USE_XORG=	xt
-USE_MOTIF=	yes
 
 MAN1=		tcpillust.1
 PORTDOCS=	tcpclient.log tcpserver.log

Modified: head/net/tcpview/Makefile
==============================================================================
--- head/net/tcpview/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/net/tcpview/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -9,10 +9,9 @@ MASTER_SITES=	ftp://ftp.cac.washington.e
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	cy@FreeBSD.org
-COMMENT=	A Motif-based TCP/IP protocol analyzer
+COMMENT=	Motif-based TCP/IP protocol analyzer
 
-USES=		bison
-USE_MOTIF=	yes
+USES=		bison motif
 
 MAN1=		tcpview.1
 

Modified: head/print/tex-xdvik/Makefile
==============================================================================
--- head/print/tex-xdvik/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/print/tex-xdvik/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -14,12 +14,10 @@ COMMENT=	DVI Previewer(kpathsearch) for 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		paper:${PORTSDIR}/print/libpaper
 
+USES=		iconv gmake motif
 USE_TEX=	texlive web2c kpathsea texmf texhash
 TEXHASHDIRS=	${TEXMFDIR}
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 USE_XORG=	ice sm x11 xmu xpm xt
-USES=		iconv
 WRKSRC=		${WRKDIR}/${DISTNAME}/texk/xdvik
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \

Modified: head/print/xmbibtex/Makefile
==============================================================================
--- head/print/xmbibtex/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/print/xmbibtex/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -13,8 +13,7 @@ COMMENT=	Reference manager based on the 
 
 WRKSRC_SUBDIR=	src
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt xpm
 NO_INSTALL_MANPAGES=	yes
 

Modified: head/russian/xruskb/Makefile
==============================================================================
--- head/russian/xruskb/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/russian/xruskb/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xruskb
-# Date created:		14 Jan 1998
-# Whom:			Igor Vinokurov <igor@zynaps.ru>
-#
+# Created by: Igor Vinokurov <igor@zynaps.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	xruskb
 PORTVERSION=	1.15.4
@@ -12,7 +8,7 @@ CATEGORIES=	russian x11
 MASTER_SITES=	ftp://ftp.yars.free.net/pub/source/xruskb/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A keyboard layout switcher and indicator
+COMMENT=	Keyboard layout switcher and indicator
 
 USE_XORG=	x11 ice xt xmu
 USE_BZIP2=	YES
@@ -25,14 +21,11 @@ DOCS=		FAQ NEWS README* TODO xrus.doc-*
 OPTIONS_DEFINE=	MOTIF DOCS
 MOTIF_DESC=	Support for pixmaps in indicator icon
 
-.include <bsd.port.options.mk>
+MOTIF_USES=	motif
+MOTIF_CONFIGURE_ON=	--with-toolkit=motif
+MOTIF_CONFIGURE_OFF=	--with-toolkit=none
 
-.if ${PORT_OPTIONS:MMOTIF}
-USE_MOTIF=	yes
-CONFIGURE_ARGS+=	--with-toolkit=motif
-.else
-CONFIGURE_ARGS+=	--with-toolkit=none
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Xrus.ad ${PREFIX}/lib/X11/app-defaults/Xrus

Modified: head/science/afni/Makefile
==============================================================================
--- head/science/afni/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/science/afni/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -23,8 +23,7 @@ EXTRACT_ONLY=	afni_src.tgz CA_EZ_v1.5-Ju
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Advanced Functional Neuro Imaging
 
-LIB_DEPENDS=	Xm:${PORTSDIR}/x11-toolkits/open-motif \
-		R:${PORTSDIR}/math/R \
+LIB_DEPENDS=	R:${PORTSDIR}/math/R \
 		gsl:${PORTSDIR}/math/gsl
 RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/jpeg \
 		mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
@@ -32,6 +31,8 @@ RUN_DEPENDS=	cjpeg:${PORTSDIR}/graphics/
 		ppmtogif:${PORTSDIR}/graphics/netpbm \
 		endian:${PORTSDIR}/sysutils/endian
 
+USES=		gettext iconv gmake motif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -40,9 +41,6 @@ BROKEN=	Does not compile on sparc64: "un
 
 USE_GL=		glw glu
 USE_XORG=	xi
-USE_GMAKE=	yes
-USES=		gettext iconv
-USE_MOTIF=	yes
 MAKE_ENV=	CC="${CC}"
 MAKE_JOBS_UNSAFE=yes
 

Modified: head/science/felt/Makefile
==============================================================================
--- head/science/felt/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/science/felt/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		motif
 USE_BZIP2=	yes
-USE_MOTIF=	yes
 USE_GL=		glu glw
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \

Modified: head/science/xmakemol/Makefile
==============================================================================
--- head/science/xmakemol/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/science/xmakemol/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,8 +1,5 @@
-# New ports collection makefile for: xmakemol
-# Date created:	8 June, 2001
-# Whom:		Chi
+# Created by: Chi
 # $FreeBSD$
-#
 
 PORTNAME=	xmakemol
 PORTVERSION=	5.16
@@ -13,10 +10,9 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecule Viewer Program Based on Motif Widget
 
+USES=		gmake motif
 USE_XORG=	xpm
 USE_GL=		glut glw
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		xmakemol.1

Modified: head/sysutils/graphicboot/Makefile
==============================================================================
--- head/sysutils/graphicboot/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/sysutils/graphicboot/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	graphicboot
-# Date created:		8 July 2005
-# Whom:			Matthew Holder <sixxgate@hotmail.com>
-#
+# Created by: Matthew Holder <sixxgate@hotmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	graphicboot
 PORTVERSION=	1.1
@@ -19,10 +15,9 @@ BUILD_DEPENDS=	xloadimage:${PORTSDIR}/x1
 		xsetroot:${PORTSDIR}/x11/xsetroot
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_MOTIF=	yes
+USES=		motif gmake
 USE_BZIP2=	yes
 USE_XORG=	x11
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN8=		graphicboot.8 sendgbmsg.8

Modified: head/sysutils/mmore/Makefile
==============================================================================
--- head/sysutils/mmore/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/sysutils/mmore/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -10,8 +10,7 @@ MASTER_SITES=	http://matt.sixxgate.com/f
 MAINTAINER=	sixxgate@hotmail.com
 COMMENT=	Motif/X file/stream viewer
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_BZIP2=	yes
 USE_XORG=	x11 xmu xt
 MAN1=		mmore.1

Modified: head/textproc/mgdiff/Makefile
==============================================================================
--- head/textproc/mgdiff/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/textproc/mgdiff/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -12,8 +12,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical front end to the Unix diff command
 
-USES=		imake
-USE_MOTIF=	yes
+USES=		imake motif
 USE_XORG=	ice sm x11 xext xmu xp xt
 MAN1=		mgdiff.1
 

Modified: head/x11-fm/xplore/Makefile
==============================================================================
--- head/x11-fm/xplore/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-fm/xplore/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -12,9 +12,8 @@ COMMENT=	Yet another Motif file manager
 
 LICENSE=	GPLv2
 
-USES=		imake
+USES=		imake motif
 USE_GCC=	any
-USE_MOTIF=	yes
 USE_XORG=	xpm
 MAKE_JOBS_UNSAFE=yes
 CFLAGS+=	-Wno-return-type

Modified: head/x11-toolkits/SoXt/Makefile
==============================================================================
--- head/x11-toolkits/SoXt/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/SoXt/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SoXt
-# Date created:				24 April 2003
-# Whom:					roland.jesse@gmx.net
-#
+# Created by: roland.jesse@gmx.net
 # $FreeBSD$
-#
 
 PORTNAME=	SoXt
 PORTVERSION=	1.3.0
@@ -16,14 +12,13 @@ COMMENT=	GUI binding for using Open Inve
 
 LIB_DEPENDS=	Coin.61:${PORTSDIR}/graphics/Coin
 
+USES=		motif pathfix
 USE_GL=		yes
-USE_MOTIF=	yes
 USE_PERL5_BUILD=	yes
 USE_XORG=	xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${LOCALBASE}
-USES=	pathfix
 # avoid renaming of soxt-config and soxt-config.1
 USE_LDCONFIG=	yes
 MAN1=		soxt-config.1

Modified: head/x11-toolkits/movingmotif/Makefile
==============================================================================
--- head/x11-toolkits/movingmotif/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/movingmotif/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,8 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for:	movingmotif
-# Date created:			Sep 13, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	movingmotif
@@ -14,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Display scientific data as dynamic plot
 
-USE_MOTIF=	yes
+USES=		motif
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 

Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/open-motif/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -23,9 +23,8 @@ CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}
 
-USES=		iconv
+USES=		iconv gmake
 USE_AUTOTOOLS=	libtool autoconf:env automake:env
-USE_GMAKE=	yes
 USE_XORG=	xaw xbitmaps xft
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -35,10 +34,6 @@ USE_CSTD=	gnu89
 
 DEMOS_SRC=	${WRKSRC}/demos/programs
 
-.ifdef USE_MOTIF
-.error You have `USE_MOTIF' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
 .if defined(WITH_JDK_PATCH)
 
 PKGNAMESUFFIX=	-jdk

Modified: head/x11-toolkits/viewklass/Makefile
==============================================================================
--- head/x11-toolkits/viewklass/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/viewklass/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	viewklass
-# Date created:			Jun 4, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	viewklass
 PORTVERSION=	0.7.2
@@ -18,7 +13,7 @@ COMMENT=	C++ Framework for Motif
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-USE_MOTIF=	yes
+USES=		motif
 GNU_CONFIGURE=	yes
 
 post-patch:

Modified: head/x11-toolkits/xbae/Makefile
==============================================================================
--- head/x11-toolkits/xbae/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/xbae/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,11 +1,5 @@
-# New ports collection makefile for:	Xbae
-# Date created:		11 December 96
-# Whom:			Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
-# With some
-# modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
-#
+# Created by: Lars Koeller <Lars.Koeller@Uni-Bielefeld.de>
 # $FreeBSD$
-#
 
 PORTNAME=	Xbae
 PORTVERSION=	4.60.4
@@ -15,11 +9,11 @@ MASTER_SITES=	SF
 DISTNAME=	xbae-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Motif-based widget which displays a grid of cells as a spreadsheet
+COMMENT=	Motif-based widget which displays a grid of cells as a spreadsheet
 
+USES=		motif
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_MOTIF=	yes
 CONFIGURE_ARGS=--enable-production --enable-static
 
 MAN3=		XbaeCaption.3 XbaeInput.3 XbaeMatrix.3

Modified: head/x11-toolkits/xmhtml/Makefile
==============================================================================
--- head/x11-toolkits/xmhtml/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11-toolkits/xmhtml/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmhtml
-# Date created:		18 Feb 1999
-# Whom:			Peter Hawkins <thepish@freebsd.org>
-#
+# Created by: Peter Hawkins <thepish@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.7
@@ -12,14 +8,13 @@ CATEGORIES=	x11-toolkits www
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Motif widget set for displaying HTML 3.2 documents
+COMMENT=	Motif widget set for displaying HTML 3.2 documents
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
+USES=		gmake motif
 USE_AUTOTOOLS=	libtool:env
-USE_MOTIF=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xmu
 CFLAGS+=	-I${LOCALBASE}/include/libpng15

Modified: head/x11/xforward/Makefile
==============================================================================
--- head/x11/xforward/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11/xforward/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xforward
-# Date created:			27 April 2012
-# Whom:				Cy Schubert <cy@FreeBSD.org>
-#
+# Created by: Cy Schubert <cy@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xforward
 PORTVERSION=	1.0
@@ -21,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/NOTICE
 
 MAKE_ARGS+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 USE_XORG=	x11 xt xaw
-USE_MOTIF=	yes
+USES=		motif
 MAN1=		xforward.1
 PLIST_FILES=	bin/xforward
 

Modified: head/x11/xmotd/Makefile
==============================================================================
--- head/x11/xmotd/Makefile	Wed Jul 10 06:55:28 2013	(r322621)
+++ head/x11/xmotd/Makefile	Wed Jul 10 07:00:44 2013	(r322622)
@@ -21,7 +21,6 @@ PLIST_FILES=	bin/xmotd
 OPTIONS_DEFINE=	HTML MOTIF XPM
 HTML_DESC=	Use HTML widget instead of ASCII text
 
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTML}
@@ -31,7 +30,7 @@ BROKEN=		Does not compile when WITH_HTML
 
 .if ${PORT_OPTIONS:MMOTIF}
 MAKE_ARGS+=	-DMOTIF
-USE_MOTIF=	yes
+USES+=		motif
 .endif
 
 .if ${PORT_OPTIONS:MXPM}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307100700.r6A70iEd027958>