Change motif to a normal dependency. REQUIRES_MOTIF is now called

USE_MOTIF and generates a LIB_DEPENDS to x11-toolkits/open-motif. As before, it implies USE_XPM (and therefore USE_XLIB). Motif-dummy is removed from PKG_IGNORE_DEPENDS, whose sole resident is now XFree86-3. Most of the simple ".if defined(HAVE_MOTIF)"s are removed to always have USE_MOTIF. ftp/moxftp will define USE_MOTIF unless WANT_ATHENA_VERSION (new variable) is defined. I merged the X cases in cad/mars, so USE_MOTIF is used iff WITHOUT_X11 is not defined. I will remove x11-toolkits/Motif-dummy (which has been repo copied to open-motif) in a few days.
author: Satoshi Asami <asami@FreeBSD.org> 2000-11-07 23:28:20 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 2000-11-07 23:28:20 +0000
commit: 7112ba2b404b9dd889c9f4a5a3d433b26f9035bc (patch)
tree: a9ee08af9bd503352ea6981ff0980381216b49bc
parent: Hylafax DISTFILE moved. (diff)
61 files changed, 69 insertions, 121 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5f8da3786b90..85b5ea08d055 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -169,6 +169,7 @@ FreeBSD_MAINTAINER=	asami@FreeBSD.org
 #				  Implies USE_NEWGCC.
 # USE_QT2		- Says that the port uses version 2 of the qt toolkit.
 #				  Implies USE_NEWGCC.
+# USE_MOTIF		- Says that the port uses the Motif toolkit.  Implies USE_XPM.
 #
 # Dependency checking.  Use these if your port requires another port
 # not in the list above.
@@ -245,20 +246,6 @@ FreeBSD_MAINTAINER=	asami@FreeBSD.org
 # PKGDIR 		- A direction containing any package creation files.
 #				  (default: ${MASTERDIR}/pkg)
 #
-# Motif support:
-#
-# REQUIRES_MOTIF - Set this in your port if it requires Motif.  It will  be
-#				  built only if HAVE_MOTIF is set.
-# HAVE_MOTIF	- If set, means system has Motif.  Typically set in
-#				  /etc/make.conf.
-# MOTIF_STATIC	- If set, link libXm statically; otherwise, link it
-#				  dynamically.  Typically set in /etc/make.conf.
-# MOTIFLIB		- Set automatically to appropriate value depending on
-#				  ${MOTIF_STATIC}.  Substitute references to -lXm with 
-#				  patches to make your port conform to our standards.
-# MOTIF_ONLY	- If set, build Motif ports only.  (Not much use except for
-#				  building packages.)
-#
 # Variables that serve as convenient "aliases" for your *-install targets.
 # Use these like: "${INSTALL_PROGRAM} ${WRKSRC}/prog ${PREFIX}/bin".
 #
@@ -815,15 +802,9 @@ MAKE_ENV+=		CC=${CC} CXX=${CXX}
 RUN_DEPENDS+=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base
 .endif
 
-.if defined(REQUIRES_MOTIF)
+.if defined(USE_MOTIF)
 USE_XPM=			yes
-.if defined(MOTIF_OPEN)
 LIB_DEPENDS+=		Xm.2:${PORTSDIR}/x11-toolkits/open-motif
-.else
-.if defined(PARALLEL_PACKAGE_BUILD)
-BUILD_DEPENDS+=		${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy
-.endif
-.endif
 .endif
 
 .if defined(USE_FREETYPE)
@@ -841,7 +822,7 @@ LIB_DEPENDS+=			dps.0:${PORTSDIR}/x11/dgs
 LIB_DEPENDS+=			GL.14:${PORTSDIR}/graphics/Mesa3
 .endif
 XAWVER=					6
-PKG_IGNORE_DEPENDS?=	'(XFree86-3\.3\.6_4|Motif-2\.1\.10)'
+PKG_IGNORE_DEPENDS?=	'(XFree86-3\.3\.6_4)'
 .else
 .if defined(USE_IMAKE)
 BUILD_DEPENDS+=			imake:${PORTSDIR}/devel/imake-4
@@ -853,7 +834,7 @@ USE_XLIB=				yes
 LIB_DEPENDS+=			GLU.1:${PORTSDIR}/graphics/Mesa3
 .endif
 XAWVER=					7
-PKG_IGNORE_DEPENDS?=	'Motif-2\.1\.10'
+PKG_IGNORE_DEPENDS?=	'()'
 .endif
 PLIST_SUB+=				XAWVER=${XAWVER}
 
@@ -1088,14 +1069,7 @@ PKG_SUFX?=		.tgz
 # where pkg_add records its dirty deeds.
 PKG_DBDIR?=		/var/db/pkg
 
-# shared/dynamic motif libs
-.if defined(HAVE_MOTIF)
-.if defined(MOTIF_STATIC) && !defined(MOTIF_OPEN)
-MOTIFLIB?=	${X11BASE}/lib/libXm.a -L${X11BASE}/lib -lXp
-.else
 MOTIFLIB?=	-L${X11BASE}/lib -lXm -lXp
-.endif
-.endif
 
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
@@ -1385,9 +1359,6 @@ LDCONFIG_RUNLIST!=	${ECHO} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!"
 # overnight, then come back in the morning and do _only_ the
 # interactive ones that required your intervention.
 #
-# Don't attempt to build ports that require Motif if you don't
-# have Motif.
-#
 # Ignore ports that can't be resold if building for a CDROM.
 #
 # Don't build a port if it's restricted and we don't want to get
@@ -1455,10 +1426,6 @@ IGNORE+=	"and you are running ${ARCH}"
 IGNORE=	"is an interactive port"
 .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE))
 IGNORE=	"is not an interactive port"
-.elif (defined(REQUIRES_MOTIF) && !defined(HAVE_MOTIF))
-IGNORE=	"requires Motif.  LessTif is an LGPL implementation of the Motif API.  A port is available in ports/x11-toolkits/lesstif.  Please see /etc/make.conf"
-.elif (defined(MOTIF_ONLY) && !defined(REQUIRES_MOTIF))
-IGNORE=	"does not require Motif"
 .elif (defined(NO_CDROM) && defined(FOR_CDROM))
 IGNORE=	"may not be placed on a CDROM: ${NO_CDROM}"
 .elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 622d49c7cff8..602df5ab29f5 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_XPM=	yes
 USE_IMAKE=	yes
 MAN1=		xephem.1
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 0a871b0e2979..748d5d1873a4 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -47,7 +47,7 @@ USE_GTK=	yes
 CONFIGURE_ENV=	SHLD="gcc -shared"
 .elif ${INTERFACE} == "motif"
 LINK=		xmmidi
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
 .elif ${INTERFACE} == "slang"
 .if defined(JAPANESE)
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 1fc845c73055..f5ca7103700d 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://metalab.unc.edu/tkan/download/xmcd/src/
 
 MAINTAINER=	eischen@vigrid.com
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 PLIST_SUB+=	RELEASE=${OSREL:R} ARCH=${ARCH}
 
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index bb536b0f23bf..3a1388a6555b 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		xmmix.1
 
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 47935b13d4b1..6e90e59e847e 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	runge@rostock.zgdv.de
 
 USE_IMAKE=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 #post-install:
 #              strip ${PREFIX}/bin/xmradio
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index ce4b58c86b5a..fe3332cf2704 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	ncbi
 
 MAINTAINER=	tony.maher@ebioinformatics.com
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 #
 # In the files directory we have:
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 246b5d59ffff..490ea60c2ee3 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	lioux@FreeBSD.org
 
 USE_XLIB=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 EXTRA_PATCHES=	${WRKDIR}/patch-prefix
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 276cea59f2f6..6bc6359a1341 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -19,13 +19,11 @@ MAINTAINER=	obrien@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-.if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING)
-MAKEFILE=       Makefile.XMotif
-.elif defined(WITHOUT_X11)
+.if defined(WITHOUT_X11)
 MAKEFILE=	Makefile.NoX
 .else
-USE_XLIB=	yes
-MAKEFILE=	Makefile.SimpleX
+USE_MOTIF=	yes
+MAKEFILE=       Makefile.XMotif
 .endif
 ALL_TARGET=	depend mars
 MAN1=		mars.1
diff --git a/chinese/stardict/Makefile b/chinese/stardict/Makefile
index 635f5bd70c75..437a3e730aa0 100644
--- a/chinese/stardict/Makefile
+++ b/chinese/stardict/Makefile
@@ -15,13 +15,11 @@ DISTNAME=	${PKGNAME}
 
 MAINTAINER=	phj@cn.FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 GNU_CONFIGURE=	yes
-USE_GMAKE    =  yes
-USE_XLIB=	yes
-
-PREFIX=		${X11BASE}
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 
 port-install:
 	strip	$(PREFIX)/bin/${PORTNAME}
diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index f921dd743280..35c51d9c6915 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 GLOK_DATADIR=	${PREFIX}/lib/X11/xmbase-grok
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index e493c5fc1cce..e4bc0d7ba7dc 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	deischen@iworks.InterWorks.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/plan-1.8.2/src
 ALL_TARGET=	freebsd
 MAN1=		netplan.1 plan.1
diff --git a/deskutils/xinvest/Makefile b/deskutils/xinvest/Makefile
index 41b78f34d0d2..3c804ec3350a 100644
--- a/deskutils/xinvest/Makefile
+++ b/deskutils/xinvest/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/deskutils/xmaddressbook/Makefile b/deskutils/xmaddressbook/Makefile
index f40a5d47f95d..37e5ce9ee79f 100644
--- a/deskutils/xmaddressbook/Makefile
+++ b/deskutils/xmaddressbook/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xmaddressbook
 MAN1=		xmaddressbook.1
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 43e9b00d747d..db3e0f69e101 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	mi@aldan.algebra.com
 
 NO_CDROM=	"Don't sell for profit"
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \
 		xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \
diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile
index 327cb128c039..b652b6392645 100644
--- a/deskutils/xopps/Makefile
+++ b/deskutils/xopps/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=
 USE_X_PREFIX=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 MAKE_ENV=	'MACH=${OPSYS}'
 
 MAN1=	xopps.1
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index dd8c8487cf3e..6dfdc7e74f99 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--with-motif-libraries="${LIBXMDIR}" \
 		--with-readline-libraries=/usr/lib
 USE_GMAKE=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		ddd.1
 
diff --git a/devel/yacl/Makefile b/devel/yacl/Makefile
index 545cfd6ec517..500ba401ad76 100644
--- a/devel/yacl/Makefile
+++ b/devel/yacl/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV=		YACLPATH=${WRKDIR}
 MAKEFILE=		gnuc.mak
 ALL_TARGET=		yacl
 
-REQUIRES_MOTIF=		true
+USE_MOTIF=		true
 
 post-build:
 	@(cd ${WRKSRC}/apps/bmpview; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
diff --git a/editors/asedit/Makefile b/editors/asedit/Makefile
index b5634b43e302..8f0bdb3ffee7 100644
--- a/editors/asedit/Makefile
+++ b/editors/asedit/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 XMKMF=		xmkmf
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 96ea6a3a636c..3dd80d4e94c9 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	nedit-5.1.1-src.tar.gz nedit-5.1.app-defaults
 
 MAINTAINER=	deischen@freebsd.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 EXTRACT_ONLY=	nedit-5.1.1-src.tar.gz
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 516619961dc6..a5e23704340c 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -20,9 +20,8 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	chuckr@FreeBSD.org
 
 THOT_SUBDIR=	Target
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 WRKSRC=		$(WRKDIR)/Thot/$(THOT_SUBDIR)
-REQUIRES_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-thot --enable-plugin --without-insure --without-amaya --disable-java --disable-intr --disable-jit --disable-math --disable-ilu
 USE_GMAKE=	yes
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index a991ae69807a..65b2c5afb8ca 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -57,7 +57,7 @@ MAKE_ARGS+=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
 USE_GTK=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
 .elif defined(HAVE_MOTIF)
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE}
 .else
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 989f9d920562..bdfb3d442da9 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -56,7 +56,7 @@ MAKE_ARGS+=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
 USE_GTK=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
 .elif defined(HAVE_MOTIF)
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE}
 .else
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index a991ae69807a..65b2c5afb8ca 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -57,7 +57,7 @@ MAKE_ARGS+=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
 USE_GTK=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
 .elif defined(HAVE_MOTIF)
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE}
 .else
 MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 41b78f34d0d2..3c804ec3350a 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 30bea132fef5..6b5095f46abe 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR= applications
 
 MAINTAINER=	mph@freebsd.org
 
-REQUIRES_MOTIF=		yes
-
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index 062706042bfb..d9533823c66e 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	dima@FreeBSD.org
 MAN1=	xdir.1
 
 WRKSRC=		${WRKDIR}/llnlxdir2_1_2/sources
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index e18409ec73d9..5565b07ec2fe 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	dima@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/llnlxftp2.1/sources
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 5dd48cdcafa5..da22eadb1b0b 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -15,20 +15,14 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 MAN1=		${PROGRAM_NAME}.1
 PLIST_SUB=	PROGRAM_NAME=${PROGRAM_NAME} RESOURCE_NAME=${RESOURCE_NAME}
 STRIP=
 
-# CONFIGURE_ARGS set to :
-#	motif - for motif version, (not tested!!!)
-#	athena - for athena version,
-#	athena3d - for athena 3 d version, (you should have installed Xaw3d!!!)
-#	openlook - for open look version - (not tested!!!)
-# If you use athena3d uncomment LIB_DEPENDS !!!
-.if defined(HAVE_MOTIF)
+.if !defined(WANT_ATHENA_VERSION)
+USE_MOTIF=	yes
 CONFIGURE_ARGS=	motif
 PROGRAM_NAME=mftp
 RESOURCE_NAME=Mftp
diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index 48e2bfbe5f7a..6a35fa97d1fd 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -15,7 +15,7 @@ DISTNAME=		CS
 MAINTAINER=		ports@FreeBSD.org
 
 MAKEFILE=		Xmakefile
-REQUIRES_MOTIF=		yes
+USE_MOTIF=		yes
 USE_X_PREFIX=		yes
 CFLAGS=			-pedantic
 
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 481776d0ae79..146f85a857de 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/xabacus
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 74583771f9b6..f1e106aa1b6f 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xblackjack.1
 
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 143d992bd196..114970bdff5e 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	tg@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/xminehunter
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 ALL_TARGET=	xminehunter
 
 .include <bsd.port.mk>
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 03e59ac2de91..1f0a17200dcf 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://koala.inria.fr/pub/games/znibbles/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif \
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index e992f90294d6..57d4379cc956 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/Geomview
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 
diff --git a/graphics/mpeg2play/Makefile b/graphics/mpeg2play/Makefile
index ce6a5737aa87..35df41285f6c 100644
--- a/graphics/mpeg2play/Makefile
+++ b/graphics/mpeg2play/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 MAINTAINER=	charnier@lirmm.fr
 
 USE_IMAKE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 ALL_TARGET=	mpeg2play
 
 do-install:
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 3fc7596ddc2e..df2dc249b261 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf
 
 USE_XLIB=	yes
 USE_MESA=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -Dfreebsd -I${PREFIX}/include" \
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index a6be5be72b55..c99905c50759 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -20,11 +20,8 @@ USE_NEWGCC=	yes
 CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi
 MAN1=		ode.1 plot.1 spline.1 tek2plot.1
 
-.ifdef HAVE_MOTIF
+USE_MOTIF=	yes
 CONFIGURE_ARGS+=	--with-motif
 CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
-# to ensure dependency info is generated properly
-REQUIRES_MOTIF=	yes
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile
index bb24e2ae96ee..fbc832f2a50f 100644
--- a/graphics/xmfract/Makefile
+++ b/graphics/xmfract/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 9cc93b8aa30d..405b90b169f1 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=		albast@xs4all.nl
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=		yes
-REQUIRES_MOTIF=		yes
+USE_MOTIF=		yes
 NO_INSTALL_MANPAGES=	yes
 
 pre-configure:
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 32ad1d4bc35f..255bf2769222 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -36,7 +36,7 @@ MAN1=		grace.1 xmgrace.1 gracebat.1 grconvert.1
 USE_X_PREFIX=	YES
 USE_XPM=	yes
 USE_GMAKE=	YES
-REQUIRES_MOTIF=	YES
+USE_MOTIF=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	-prefix=${X11BASE} \
 	--enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include:${LOCALBASE}/include/gd \
diff --git a/math/ngraph/Makefile b/math/ngraph/Makefile
index ea767da57f36..b5428c8eb4c8 100644
--- a/math/ngraph/Makefile
+++ b/math/ngraph/Makefile
@@ -14,7 +14,7 @@ DISTNAME=       Ngraph-${PORTVERSION}-src
 
 MAINTAINER=     sanpei@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index a1edf62a7ca4..8fafb5e6845b 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp \
 LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae
 
 USE_X_PREFIX=	YES
-REQUIRES_MOTIF=	YES
+USE_MOTIF=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS=	-prefix=${X11BASE} \
 	--enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include \
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 2eedcb775305..968bad43ed6f 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	asami/kp
 
 MAINTAINER=	asami@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		kp.1
 
diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile
index 30bea132fef5..6b5095f46abe 100644
--- a/misc/xquote/Makefile
+++ b/misc/xquote/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR= applications
 
 MAINTAINER=	mph@freebsd.org
 
-REQUIRES_MOTIF=		yes
-
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index d99a5a6a9ed6..56253a743ecb 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xtar.1
 
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index ce6a5737aa87..35df41285f6c 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
 MAINTAINER=	charnier@lirmm.fr
 
 USE_IMAKE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 ALL_TARGET=	mpeg2play
 
 do-install:
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index c79706ffe21e..81945a430905 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=	tcpillust.1
 
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 4b41a18faa4b..c1c34030ddae 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	handy@physics.montana.edu
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--enable-optimize \
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index e48910205b50..7aa368be157c 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	apps/tex
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
index 22e195c346ae..3dbfc8d69c2c 100644
--- a/textproc/mgdiff/Makefile
+++ b/textproc/mgdiff/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	andreas@marvin.robin.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=      yes
 MAN1=		mgdiff.1
 
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 4708e557839d..995d0b9646c2 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
 ALL_TARGET=	bsdi
 USE_X_PREFIX=	yes
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 74ee17dd2f09..a41ab281a13e 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	croyle@gelemna.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 DIST_SUBDIR=	amaya
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index fc448e2d6753..932777a25987 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 MAN1=		xhtml.1
 MANCOMPRESSED=	yes
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 8c87768f715c..f20e6ee2b537 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		xmbdfed.1
 
diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index ba41061ff44c..46ac448263b0 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	jseger@FreeBSD.org
 BROKEN=		../../lib/libfwf.a: cannot read symbols
 .endif
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/FWF
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index f7b3eed6b380..f522091e9a07 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	Xbae-${PORTVERSION}
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
-REQUIRES_MOTIF= yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index 1a098ae6e865..7b0f27f92345 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/Xg-1.0
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index d7f8d84b3276..f0fb5afce108 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	thepish@freebsd.org
 LIB_DEPENDS=    png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 XMKMF=		PORTOBJFORMAT=${PORTOBJFORMAT} xmkmf -a
 
diff --git a/x11/libhelp/Makefile b/x11/libhelp/Makefile
index 59dbca262944..77684d596cfd 100644
--- a/x11/libhelp/Makefile
+++ b/x11/libhelp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/libhelp/
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
-REQUIRES_MOTIF= YES
+USE_MOTIF= 	YES
 USE_IMAKE=	YES
 NO_INSTALL_MANPAGES= YES
 
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 4feafb4627c8..1742b5ea1a22 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -14,10 +14,7 @@ MAINTAINER=	runge@rostock.zgdv.de
 
 USE_IMAKE=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	no
-
-# you can build it with a motif interface as well!
-# REQUIRES_MOTIF=	no
+USE_MOTIF=	yes
 
 #post-install:
 #		strip ${PREFIX}/bin/xlupe
author	Satoshi Asami <asami@FreeBSD.org>	2000-11-07 23:28:20 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	2000-11-07 23:28:20 +0000
commit	7112ba2b404b9dd889c9f4a5a3d433b26f9035bc (patch)
tree	a9ee08af9bd503352ea6981ff0980381216b49bc
parent	Hylafax DISTFILE moved. (diff)