From 4ab73fde6eb5fc46fecfc39aec07fdcefbeff324 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 10 Jul 2013 06:49:35 +0000 Subject: [PATCH] Convert from USE_MOTIF to USES=motif --- databases/sqsh/Makefile | 2 +- databases/xmbase-grok/Makefile | 8 ++------ deskutils/mrundlg/Makefile | 5 ++--- deskutils/plan/Makefile | 11 ++++------- deskutils/xmaddressbook/Makefile | 3 +-- deskutils/xmdiary/Makefile | 3 +-- devel/ddd/Makefile | 10 ++-------- editors/asedit/Makefile | 3 +-- editors/emacs-devel/Makefile | 2 +- editors/emacs/Makefile | 5 ++--- editors/emacs23/Makefile | 2 +- editors/nedit/Makefile | 10 +++------- editors/ted/Makefile | 2 +- editors/vim/Makefile | 2 +- editors/xemacs-devel-mule/Makefile | 6 +++--- editors/xemacs-devel/Makefile | 12 ++++-------- editors/xemacs/Makefile | 6 ++++-- editors/xemacs21-mule/Makefile | 6 +++--- editors/xvile/Makefile | 2 +- 19 files changed, 38 insertions(+), 62 deletions(-) diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 74a125c0a483..2f155700f4bc 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= bin/sqsh etc/sqshrc.default .include .if ${PORT_OPTIONS:MX11} -USE_MOTIF= yes +USES= motif CONFIGURE_ARGS+= --with-motif --with-x .else PKGNAMESUFFIX= -nox11 diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile index 54c37b620b61..17b915c564ee 100644 --- a/databases/xmbase-grok/Makefile +++ b/databases/xmbase-grok/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmbase-grok -# Date created: Sat Aug 30 13:29:42 CEST 1997 -# Whom: Andreas Klemm -# +# Created by: Andreas Klemm # $FreeBSD$ -# PORTNAME= xmbase-grok PORTVERSION= 1.5 @@ -19,8 +15,8 @@ COMMENT= Graphical Resource Organizer Kit BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src +USES= motif USE_XORG= x11 xt -USE_MOTIF= yes MAKE_ENV= MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \ GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \ CF="-I${LOCALBASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm" diff --git a/deskutils/mrundlg/Makefile b/deskutils/mrundlg/Makefile index 3e436f9c7173..55f873da6c01 100644 --- a/deskutils/mrundlg/Makefile +++ b/deskutils/mrundlg/Makefile @@ -9,10 +9,9 @@ CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_FREEBSD} MAINTAINER= sixxgate@hotmail.com -COMMENT= An application / program launcher for Motif +COMMENT= Application / program launcher for Motif -USES= imake -USE_MOTIF= yes +USES= imake motif USE_BZIP2= yes USE_XORG= x11 xmu xt MAN1= mrundlg.1 diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile index 25361c012cf4..680e9a427af9 100644 --- a/deskutils/plan/Makefile +++ b/deskutils/plan/Makefile @@ -1,9 +1,6 @@ -# New ports collection makefile for: plan -# Date created: 14 April 1996 -# Whom: Daniel Eischen -# +# Created by: Daniel Eischen # $FreeBSD$ -# + # Also update ports/japanese/plan/ (ja-plan) when this port is updated PORTNAME= plan @@ -13,9 +10,9 @@ MASTER_SITES= ftp://plan.ftp.fu-berlin.de/ MASTER_SITE_SUBDIR= applications MAINTAINER= ports@FreeBSD.org -COMMENT= An X/Motif schedule planner with calendar +COMMENT= X/Motif schedule planner with calendar -USE_MOTIF= yes +USES= motif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src ALL_TARGET= freebsd MAN1= netplan.1 plan.1 diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile index ff2a50f39df4..b7105fdaff1f 100644 --- a/deskutils/xmaddressbook/Makefile +++ b/deskutils/xmaddressbook/Makefile @@ -12,8 +12,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= X11/Motif-based addressbook program -USES= imake -USE_MOTIF= yes +USES= imake motif USE_XORG= ice sm x11 xext xi xp xt oldx WRKSRC= ${WRKDIR}/xmaddressbook MAN1= xmaddressbook.1 diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index b02651bc0f2a..d67bd95d46ae 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -14,8 +14,7 @@ COMMENT= Personal and group calendar utility NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz -USE_MOTIF= yes -USES= imake +USES= imake motif USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 2d00adf98680..d3009bb22a07 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: ddd -# Date created: Tue Jan 28, 1997 -# Whom: David O'Brien (obrien@NUXI.com) -# +# Created by: David O'Brien # $FreeBSD$ -# PORTNAME= ddd PORTVERSION= 3.3.12 @@ -16,9 +11,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sergio@softshark.org COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB -USE_GMAKE= yes +USES= gmake motif USE_XORG= xpm -USE_MOTIF= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-deprecated diff --git a/editors/asedit/Makefile b/editors/asedit/Makefile index 888d9fbd12f4..85b69bf2ce73 100644 --- a/editors/asedit/Makefile +++ b/editors/asedit/Makefile @@ -12,8 +12,7 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Text editor for X/Motif -USES= imake -USE_MOTIF= yes +USES= imake motif USE_XORG= ice sm x11 xext xmu xp xt XMKMF= xmkmf diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index d510acd093a9..bfed3fb7c7fd 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 5df92d86ceb9..6bb568ea41a7 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -22,8 +22,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ EMACS_VER= 24.3 GNU_CONFIGURE= yes -USES= ncurses -USE_GMAKE= yes +USES= ncurses gmake USE_XZ= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -113,7 +112,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 194b068e0708..923f178aa252 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --with-x-toolkit=athena USE_XORG= xaw CONFIGURE_ARGS+= --with-x-toolkit=athena --without-xaw3d .elif ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-x-toolkit=motif .endif diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 346076aee2a6..5eeb2e2e08ac 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: nedit -# Date created: 7 April 1996 -# Whom: Daniel Eischen -# +# Created by: Daniel Eischen # $FreeBSD$ -# PORTNAME= nedit PORTVERSION= 5.5 @@ -23,11 +19,11 @@ DISTFILES= nedit-5.5-src.tar.bz2 nedit.app-defaults EXTRACT_ONLY= nedit-5.5-src.tar.bz2 MAINTAINER= deischen@FreeBSD.org -COMMENT= An X11/Motif GUI text editor for programs and plain text files +COMMENT= X11/Motif GUI text editor for programs and plain text files LICENSE= GPLv1 +USES= motif USE_BZIP2= yes -USE_MOTIF= yes USE_XORG= xpm MAN1= nclient.1 nedit.1 ALL_TARGET= freebsd diff --git a/editors/ted/Makefile b/editors/ted/Makefile index f5add35fa439..67e0f96682d1 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -50,7 +50,7 @@ INDDIR= ${DATADIR}/dfa USE_GNOME= gtk20 CONFIGURE_ARGS+=--with-GTK .else -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+=--with-MOTIF .endif diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 61043b071053..0d631fba5981 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -160,7 +160,7 @@ USE_XORG+= xt glproto . endif . if ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MAKE_ARGS+= MOTIFHOME=${LOCALBASE} . endif diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index 244c49669f1d..62762855bcca 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -120,7 +120,7 @@ PKGDIR= ${.CURDIR}/../../editors/xemacs-devel-mule PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include .if ${OSVERSION} >= 900000 BROKEN= does not build on FreeBSD 9.X @@ -145,7 +145,7 @@ CONFIGURE_ARGS+= --with-x11=no @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif CONFIGURE_ARGS+=--with-jpeg=yes --with-png=yes --with-tiff=yes --with-xface=yes -USE_MOTIF= yes +USES= motif # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) @@ -259,4 +259,4 @@ post-install: .endif .endif -.include +.include diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index ca1a34a4b2be..9093786853a3 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: X-Emacs -# Date created: 25 Oct 2001 -# Whom: Gary Jennejohn (gj@FreeBSD.org) -# +# Created by: Gary Jennejohn # $FreeBSD$ -# PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} @@ -79,10 +75,10 @@ ALL_TARGET= all dist PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include .if exists(${LOCALBASE}/lib/libXm.so) -USE_MOTIF= yes +USES+= motif HAVE_MOTIF= yes .endif @@ -157,4 +153,4 @@ post-install:: # @${ECHO_MSG} "to ${PORTNAME}${PKGNAMESUFFIX}-${XEMACS_VER}." #.endif -.include +.include diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 7d8dbfcaa7df..3ea9d247e7fa 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -60,7 +60,7 @@ ALL_TARGET= all dist PLIST_SUB+= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == amd64 @@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff USE_XORG= xpm x11 xbitmaps xaw CFLAGS+= -I${LOCALBASE}/include/libpng15 .if !defined(WITHOUT_MOTIF) && !defined(MOTIF_STATIC) -USE_MOTIF= yes +USES+= motif WITH_SCROLLBARS= --with-scrollbars=motif WITH_DIALOGS= --with-dialogs=motif WITH_WIDGETS= --with-widgets=motif @@ -113,6 +113,8 @@ CONFIGURE_ARGS+= --with-athena=3d CONFIGURE_ARGS+= --without-x11 .endif +.include + .if !defined(WITHOUT_X11) && ${HAVE_GNOME:Mgnomehier}!="" USE_GNOME+= gnomehier PLIST_SUB+= DESKTOP="" diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index c97100a666cf..660ba9478a44 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -90,7 +90,7 @@ PKGDIR= ${.CURDIR}/../../editors/xemacs21-mule PLIST_SUB= XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} -.include +.include # Undump and malloc do not behave on amd64 at the moment .if ${ARCH} == "amd64" @@ -112,7 +112,7 @@ pre-fetch: @${ECHO_MSG} "In this case, set the environment variable MOTIF_STATIC and recompile, " @${ECHO_MSG} "which will force the use of athena widgets for dialogs." .endif -USE_MOTIF= yes +USES+= motif # hack to avoid shipping binaries linked with Motif .if defined(MOTIF_STATIC) @@ -215,4 +215,4 @@ post-install:: .endif .endif -.include +.include diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 1765780ab1fa..6f5bf03b67b0 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -74,7 +74,7 @@ CONFIGURE_ARGS+= --with-screen=x11 .endif .if ${PORT_OPTIONS:MMOTIF} -USE_MOTIF= yes +USES+= motif CONFIGURE_ARGS+= --with-screen=motif .endif