Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Oct 2000 02:33:31 -0700 (PDT)
From:      asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami)
To:        ports@FreeBSD.ORG
Subject:   Re: open-motif default?
Message-ID:  <200010260933.e9Q9XVc22042@silvia.hip.berkeley.edu>
In-Reply-To: <kqwveyh4fs.fsf@cip12.melaten.rwth-aachen.de> (message from Thomas Gellekum on 24 Oct 2000 13:19:35 %2B0200)
References:  <200010241003.e9OA3Dx04425@silvia.hip.berkeley.edu> <kqwveyh4fs.fsf@cip12.melaten.rwth-aachen.de>

next in thread | previous in thread | raw e-mail | index | archive | help
Well, seems like nobody is against the idea, so here's a patch for
review.  Basically it gets rid of all the Motif stuff except for
USE_MOTIF (renamed from REQUIRES_MOTIF) and MOTIFLIB.

As for the Makefile diffs, only editors/vim[56], graphics/plotutils
and x11/xlupe were non-trivial.

vim and plotutils are .ifdef'ing off HAVE_MOTIF.  I'm pretty sure you
can just take off the .ifdef in plotutils, since that's the only
condition it has.  vim is more problematic, since there are many cases
in that Makefile.  Someone (David?  Ade?) needs to figure out what to
do with it, since you can't expect users to set HAVE_MOTIF anymore.

I can't for my life of myself figure out what xlupe was trying to do.
REQUIRES_MOTIF is an on/off variable so setting it to "no" clearly
didn't have the desired effect.  (On top of that, it had a commented
out redefinition to "no"!)  Anyway, since open-motif is available,
just changing it to USE_MOTIF should be fine.

By the way, chinese/stardict was setting PREFIX=${X11BASE} and
USE_XLIB.  It should have been USE_X_PREFIX, otherwise the wrong mtree
file will be used.

What should we do with x11-toolkits/lesstif?  I don't mind having it
around if people want it, but we should have it emit some highlighted
notes about the availability of open-motif.

Satoshi
===
Index: Mk/bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.356
diff -u -r1.356 bsd.port.mk
--- Mk/bsd.port.mk	2000/10/17 10:11:16	1.356
+++ Mk/bsd.port.mk	2000/10/26 09:25:55
@@ -169,6 +169,7 @@
 #				  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 @@
 # 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".
 #
@@ -784,16 +771,10 @@
 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)
 LIB_DEPENDS+=			ttf.4:${PORTSDIR}/print/freetype
@@ -810,7 +791,7 @@
 LIB_DEPENDS+=			GL.14:${PORTSDIR}/graphics/Mesa3
 .endif
 XAWVER=					6
-PKG_IGNORE_DEPENDS?=	'(XFree86-3\.3\.6_2|Motif-2\.1\.10)'
+PKG_IGNORE_DEPENDS?=	'(XFree86-3\.3\.6_3)'
 .else
 .if defined(USE_IMAKE)
 BUILD_DEPENDS+=			imake:${PORTSDIR}/devel/imake-4
@@ -822,7 +803,6 @@
 LIB_DEPENDS+=			GLU.1:${PORTSDIR}/graphics/Mesa3
 .endif
 XAWVER=					7
-PKG_IGNORE_DEPENDS?=	'Motif-2\.1\.10'
 .endif
 PLIST_SUB+=				XAWVER=${XAWVER}
 
@@ -1032,7 +1012,11 @@
 PKG_DELETE?=	/usr/sbin/pkg_delete
 PKG_INFO?=		/usr/sbin/pkg_info
 .if !defined(PKG_ARGS)
+.if defined(PKG_IGNORE_DEPENDS)
 PKG_ARGS=		-v -c ${COMMENT} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | sort -u`" ${EXTRA_PKG_ARGS}
+.else
+PKG_ARGS=		-v -c ${COMMENT} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`${MAKE} package-depends | sort -u`" ${EXTRA_PKG_ARGS}
+.endif
 .if exists(${PKGINSTALL})
 PKG_ARGS+=		-i ${PKGINSTALL}
 .endif
@@ -1057,14 +1041,7 @@
 # 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
 
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
@@ -1384,9 +1361,6 @@
 # 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
@@ -1454,10 +1428,6 @@
 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))
Index: ./astro/xephem/Makefile
===================================================================
RCS file: /usr/cvs/ports/astro/xephem/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./astro/xephem/Makefile	2000/08/03 09:22:21	1.20
+++ ./astro/xephem/Makefile	2000/10/26 09:18:11
@@ -15,7 +15,7 @@
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MANCOMPRESSED=	no
 WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
Index: ./audio/timidity++-emacs/Makefile
===================================================================
RCS file: /usr/cvs/ports/audio/timidity++-emacs/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./audio/timidity++-emacs/Makefile	2000/10/19 14:46:52	1.13
+++ ./audio/timidity++-emacs/Makefile	2000/10/26 09:14:43
@@ -47,7 +47,7 @@
 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)
Index: ./audio/xmcd/Makefile
===================================================================
RCS file: /usr/cvs/ports/audio/xmcd/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- ./audio/xmcd/Makefile	2000/04/08 21:24:53	1.26
+++ ./audio/xmcd/Makefile	2000/10/26 09:14:32
@@ -12,7 +12,7 @@
 
 MAINTAINER=	eischen@vigrid.com
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 PLIST_SUB+=	RELEASE=${OSREL:R} ARCH=${ARCH}
 
Index: ./audio/xmmix/Makefile
===================================================================
RCS file: /usr/cvs/ports/audio/xmmix/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./audio/xmmix/Makefile	2000/04/23 22:59:15	1.10
+++ ./audio/xmmix/Makefile	2000/10/26 09:14:36
@@ -14,7 +14,7 @@
 MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		xmmix.1
 
Index: ./audio/xmradio/Makefile
===================================================================
RCS file: /usr/cvs/ports/audio/xmradio/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./audio/xmradio/Makefile	2000/08/03 09:22:34	1.8
+++ ./audio/xmradio/Makefile	2000/10/26 09:14:38
@@ -18,7 +18,7 @@
 
 USE_IMAKE=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 #post-install:
 #              strip ${PREFIX}/bin/xmradio
Index: ./cad/electric/Makefile
===================================================================
RCS file: /usr/cvs/ports/cad/electric/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ./cad/electric/Makefile	2000/10/07 21:32:51	1.3
+++ ./cad/electric/Makefile	2000/10/26 09:14:45
@@ -14,7 +14,7 @@
 MAINTAINER=	lioux@FreeBSD.org
 
 USE_XLIB=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 EXTRA_PATCHES=	${WRKDIR}/patch-prefix
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
Index: ./chinese/stardict/Makefile
===================================================================
RCS file: /usr/cvs/ports/chinese/stardict/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./chinese/stardict/Makefile	2000/09/19 14:55:34	1.6
+++ ./chinese/stardict/Makefile	2000/10/26 09:17:32
@@ -15,13 +15,11 @@
 
 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}
Index: ./databases/xmbase-grok/Makefile
===================================================================
RCS file: /usr/cvs/ports/databases/xmbase-grok/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ./databases/xmbase-grok/Makefile	2000/04/29 21:14:35	1.12
+++ ./databases/xmbase-grok/Makefile	2000/10/26 09:14:47
@@ -14,7 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 GLOK_DATADIR=	${PREFIX}/lib/X11/xmbase-grok
Index: ./deskutils/plan/Makefile
===================================================================
RCS file: /usr/cvs/ports/deskutils/plan/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./deskutils/plan/Makefile	2000/04/14 17:10:34	1.20
+++ ./deskutils/plan/Makefile	2000/10/26 09:18:20
@@ -15,7 +15,7 @@
 
 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
Index: ./deskutils/xinvest/Makefile
===================================================================
RCS file: /usr/cvs/ports/deskutils/xinvest/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./deskutils/xinvest/Makefile	2000/08/03 09:22:53	1.7
+++ ./deskutils/xinvest/Makefile	2000/10/26 09:18:24
@@ -14,7 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
Index: ./deskutils/xmaddressbook/Makefile
===================================================================
RCS file: /usr/cvs/ports/deskutils/xmaddressbook/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./deskutils/xmaddressbook/Makefile	2000/04/08 22:04:00	1.7
+++ ./deskutils/xmaddressbook/Makefile	2000/10/26 09:18:26
@@ -14,7 +14,7 @@
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xmaddressbook
 MAN1=		xmaddressbook.1
Index: ./deskutils/xmdiary/Makefile
===================================================================
RCS file: /usr/cvs/ports/deskutils/xmdiary/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./deskutils/xmdiary/Makefile	2000/04/08 22:04:03	1.8
+++ ./deskutils/xmdiary/Makefile	2000/10/26 09:18:28
@@ -16,7 +16,7 @@
 
 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 \
Index: ./deskutils/xopps/Makefile
===================================================================
RCS file: /usr/cvs/ports/deskutils/xopps/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./deskutils/xopps/Makefile	2000/04/08 22:04:05	1.11
+++ ./deskutils/xopps/Makefile	2000/10/26 09:18:30
@@ -16,7 +16,7 @@
 
 ALL_TARGET=
 USE_X_PREFIX=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 MAKE_ENV=	'MACH=${OPSYS}'
 
 MAN1=	xopps.1
Index: ./devel/ddd/Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/ddd/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- ./devel/ddd/Makefile	2000/09/25 19:48:22	1.33
+++ ./devel/ddd/Makefile	2000/10/26 09:14:48
@@ -21,7 +21,7 @@
 		--with-readline-libraries=/usr/lib
 USE_GMAKE=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		ddd.1
 
Index: ./devel/yacl/Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/yacl/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./devel/yacl/Makefile	2000/04/14 18:40:15	1.8
+++ ./devel/yacl/Makefile	2000/10/26 09:14:50
@@ -20,7 +20,7 @@
 MAKEFILE=		gnuc.mak
 ALL_TARGET=		yacl
 
-REQUIRES_MOTIF=		true
+USE_MOTIF=		true
 
 post-build:
 	@(cd ${WRKSRC}/apps/bmpview; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
Index: ./editors/asedit/Makefile
===================================================================
RCS file: /usr/cvs/ports/editors/asedit/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./editors/asedit/Makefile	2000/04/14 00:25:17	1.8
+++ ./editors/asedit/Makefile	2000/10/26 09:14:52
@@ -15,7 +15,7 @@
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 XMKMF=		xmkmf
 
Index: ./editors/nedit/Makefile
===================================================================
RCS file: /usr/cvs/ports/editors/nedit/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- ./editors/nedit/Makefile	2000/08/03 09:22:59	1.21
+++ ./editors/nedit/Makefile	2000/10/26 09:14:54
@@ -14,7 +14,7 @@
 
 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
Index: ./editors/thoteditor/Makefile
===================================================================
RCS file: /usr/cvs/ports/editors/thoteditor/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./editors/thoteditor/Makefile	2000/04/14 00:25:44	1.18
+++ ./editors/thoteditor/Makefile	2000/10/26 09:15:03
@@ -20,9 +20,8 @@
 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
Index: ./editors/vim5/Makefile
===================================================================
RCS file: /usr/cvs/ports/editors/vim5/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- ./editors/vim5/Makefile	2000/10/24 10:07:21	1.85
+++ ./editors/vim5/Makefile	2000/10/26 09:15:05
@@ -56,7 +56,7 @@
 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"
Index: ./editors/vim6/Makefile
===================================================================
RCS file: /usr/cvs/ports/editors/vim6/Makefile,v
retrieving revision 1.90
diff -u -r1.90 Makefile
--- ./editors/vim6/Makefile	2000/10/24 08:58:31	1.90
+++ ./editors/vim6/Makefile	2000/10/26 09:15:30
@@ -57,7 +57,7 @@
 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"
Index: ./ftp/llnlxdir/Makefile
===================================================================
RCS file: /usr/cvs/ports/ftp/llnlxdir/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./ftp/llnlxdir/Makefile	2000/06/07 18:00:05	1.10
+++ ./ftp/llnlxdir/Makefile	2000/10/26 09:18:43
@@ -17,7 +17,7 @@
 MAN1=	xdir.1
 
 WRKSRC=		${WRKDIR}/llnlxdir2_1_2/sources
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
Index: ./ftp/llnlxftp/Makefile
===================================================================
RCS file: /usr/cvs/ports/ftp/llnlxftp/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./ftp/llnlxftp/Makefile	2000/06/07 18:02:02	1.8
+++ ./ftp/llnlxftp/Makefile	2000/10/26 09:18:45
@@ -15,7 +15,7 @@
 MAINTAINER=	dima@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/llnlxftp2.1/sources
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
Index: ./ftp/moxftp/Makefile
===================================================================
RCS file: /usr/cvs/ports/ftp/moxftp/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./ftp/moxftp/Makefile	2000/04/12 05:31:16	1.27
+++ ./ftp/moxftp/Makefile	2000/10/26 09:18:48
@@ -15,7 +15,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 MAN1=		${PROGRAM_NAME}.1
Index: ./games/CaribbeanStud/Makefile
===================================================================
RCS file: /usr/cvs/ports/games/CaribbeanStud/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./games/CaribbeanStud/Makefile	2000/07/14 09:51:12	1.6
+++ ./games/CaribbeanStud/Makefile	2000/10/26 09:17:58
@@ -15,7 +15,7 @@
 MAINTAINER=		ports@FreeBSD.org
 
 MAKEFILE=		Xmakefile
-REQUIRES_MOTIF=		yes
+USE_MOTIF=		yes
 USE_X_PREFIX=		yes
 CFLAGS=			-pedantic
 
Index: ./games/xabacus/Makefile
===================================================================
RCS file: /usr/cvs/ports/games/xabacus/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./games/xabacus/Makefile	2000/04/14 12:26:53	1.7
+++ ./games/xabacus/Makefile	2000/10/26 09:17:55
@@ -15,7 +15,7 @@
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/xabacus
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
Index: ./games/xblackjack/Makefile
===================================================================
RCS file: /usr/cvs/ports/games/xblackjack/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- ./games/xblackjack/Makefile	2000/04/23 22:59:23	1.11
+++ ./games/xblackjack/Makefile	2000/10/26 09:17:40
@@ -14,7 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xblackjack.1
 
Index: ./games/xminehunter/Makefile
===================================================================
RCS file: /usr/cvs/ports/games/xminehunter/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./games/xminehunter/Makefile	2000/08/03 09:24:09	1.13
+++ ./games/xminehunter/Makefile	2000/10/26 09:17:44
@@ -16,7 +16,7 @@
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/xminehunter
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 ALL_TARGET=	xminehunter
 
 .include <bsd.port.mk>
Index: ./games/znibbles/Makefile
===================================================================
RCS file: /usr/cvs/ports/games/znibbles/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./games/znibbles/Makefile	2000/10/05 06:36:16	1.6
+++ ./games/znibbles/Makefile	2000/10/26 09:18:00
@@ -12,7 +12,7 @@
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-motif \
Index: ./graphics/geomview/Makefile
===================================================================
RCS file: /usr/cvs/ports/graphics/geomview/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- ./graphics/geomview/Makefile	2000/08/15 20:57:43	1.24
+++ ./graphics/geomview/Makefile	2000/10/26 09:15:55
@@ -18,7 +18,7 @@
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/Geomview
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 
Index: ./graphics/mpeg2play/Makefile
===================================================================
RCS file: /usr/cvs/ports/graphics/mpeg2play/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./graphics/mpeg2play/Makefile	2000/04/14 10:46:42	1.7
+++ ./graphics/mpeg2play/Makefile	2000/10/26 09:15:58
@@ -13,7 +13,7 @@
 MAINTAINER=	charnier@lirmm.fr
 
 USE_IMAKE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 ALL_TARGET=	mpeg2play
 
 do-install:
Index: ./graphics/opendx/Makefile
===================================================================
RCS file: /usr/cvs/ports/graphics/opendx/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./graphics/opendx/Makefile	2000/08/03 09:24:49	1.8
+++ ./graphics/opendx/Makefile	2000/10/26 09:16:29
@@ -17,7 +17,7 @@
 
 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" \
Index: ./graphics/plotutils/Makefile
===================================================================
RCS file: /usr/cvs/ports/graphics/plotutils/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./graphics/plotutils/Makefile	2000/08/21 10:07:32	1.16
+++ ./graphics/plotutils/Makefile	2000/10/26 09:16:22
@@ -24,7 +24,7 @@
 CONFIGURE_ARGS+=	--with-motif
 CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
 # to ensure dependency info is generated properly
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 .endif
 
 .include <bsd.port.mk>
Index: ./graphics/xmfract/Makefile
===================================================================
RCS file: /usr/cvs/ports/graphics/xmfract/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./graphics/xmfract/Makefile	2000/04/23 22:59:38	1.8
+++ ./graphics/xmfract/Makefile	2000/10/26 09:16:00
@@ -14,7 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
Index: ./mail/ml/Makefile
===================================================================
RCS file: /usr/cvs/ports/mail/ml/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./mail/ml/Makefile	2000/04/13 20:00:09	1.5
+++ ./mail/ml/Makefile	2000/10/26 09:16:31
@@ -14,7 +14,7 @@
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=		yes
-REQUIRES_MOTIF=		yes
+USE_MOTIF=		yes
 NO_INSTALL_MANPAGES=	yes
 
 pre-configure:
Index: ./math/grace/Makefile
===================================================================
RCS file: /usr/cvs/ports/math/grace/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./math/grace/Makefile	2000/08/03 09:25:37	1.13
+++ ./math/grace/Makefile	2000/10/26 09:16:36
@@ -36,7 +36,7 @@
 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 \
Index: ./math/ngraph/Makefile
===================================================================
RCS file: /usr/cvs/ports/math/ngraph/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ./math/ngraph/Makefile	2000/10/25 04:16:41	1.7
+++ ./math/ngraph/Makefile	2000/10/26 09:16:38
@@ -14,7 +14,7 @@
 
 MAINTAINER=     sanpei@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
Index: ./math/xmgr/Makefile
===================================================================
RCS file: /usr/cvs/ports/math/xmgr/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- ./math/xmgr/Makefile	2000/04/14 07:20:55	1.20
+++ ./math/xmgr/Makefile	2000/10/26 09:16:33
@@ -20,7 +20,7 @@
 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 \
Index: ./misc/kp/Makefile
===================================================================
RCS file: /usr/cvs/ports/misc/kp/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- ./misc/kp/Makefile	2000/06/29 07:02:31	1.16
+++ ./misc/kp/Makefile	2000/10/26 09:14:17
@@ -13,7 +13,7 @@
 
 MAINTAINER=	asami@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		kp.1
 
Index: ./misc/xquote/Makefile
===================================================================
RCS file: /usr/cvs/ports/misc/xquote/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./misc/xquote/Makefile	2000/08/03 09:25:51	1.6
+++ ./misc/xquote/Makefile	2000/10/26 09:14:30
@@ -13,7 +13,7 @@
 
 MAINTAINER=	mph@freebsd.org
 
-REQUIRES_MOTIF=		yes
+USE_MOTIF=	yes
 
 USE_IMAKE=	yes
 USE_XPM=	yes
Index: ./misc/xtar/Makefile
===================================================================
RCS file: /usr/cvs/ports/misc/xtar/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ./misc/xtar/Makefile	2000/04/14 08:47:19	1.6
+++ ./misc/xtar/Makefile	2000/10/26 09:14:24
@@ -13,7 +13,7 @@
 
 MAINTAINER=	shanee@augusta.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xtar.1
 
Index: ./net/tcpillust/Makefile
===================================================================
RCS file: /usr/cvs/ports/net/tcpillust/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- ./net/tcpillust/Makefile	2000/07/29 06:26:00	1.1.1.1
+++ ./net/tcpillust/Makefile	2000/10/26 09:16:41
@@ -18,7 +18,7 @@
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=	tcpillust.1
 
Index: ./print/mgv/Makefile
===================================================================
RCS file: /usr/cvs/ports/print/mgv/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- ./print/mgv/Makefile	2000/10/08 10:22:44	1.18
+++ ./print/mgv/Makefile	2000/10/26 09:17:36
@@ -14,7 +14,7 @@
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--enable-optimize \
Index: ./print/xmbibtex/Makefile
===================================================================
RCS file: /usr/cvs/ports/print/xmbibtex/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./print/xmbibtex/Makefile	2000/04/09 17:50:51	1.10
+++ ./print/xmbibtex/Makefile	2000/10/26 09:17:34
@@ -13,7 +13,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
Index: ./textproc/mgdiff/Makefile
===================================================================
RCS file: /usr/cvs/ports/textproc/mgdiff/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- ./textproc/mgdiff/Makefile	2000/10/08 10:23:03	1.8
+++ ./textproc/mgdiff/Makefile	2000/10/26 09:18:16
@@ -14,7 +14,7 @@
 
 MAINTAINER=	andreas@marvin.robin.de
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=      yes
 MAN1=		mgdiff.1
 
Index: ./tmp/kp/Makefile
===================================================================
RCS file: /usr/cvs/ports/misc/kp/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- ./tmp/kp/Makefile	2000/04/14 08:46:06	1.14
+++ ./tmp/kp/Makefile	2000/10/26 09:18:18
@@ -1,18 +1,20 @@
 # New ports collection makefile for:    kp
-# Date created:         8 May 1995
+# Version required:	foo
+# Date created:		foo
 # Whom:                 asami
 #
 # $FreeBSD: ports/misc/kp/Makefile,v 1.14 2000/04/14 08:46:06 asami Exp $
 #
 
-PORTNAME=       kp
-PORTVERSION=	1.00
+DISTNAME=       kp-1.00
 CATEGORIES=	misc
 MASTER_SITES=   ftp://stampede.cs.berkeley.edu/pub/kp/
 
 MAINTAINER=	asami@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		kp.1
 
Index: ./www/Mosaic/Makefile
===================================================================
RCS file: /usr/cvs/ports/www/Mosaic/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- ./www/Mosaic/Makefile	2000/08/03 09:26:44	1.27
+++ ./www/Mosaic/Makefile	2000/10/26 09:18:03
@@ -16,7 +16,7 @@
 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
Index: ./www/amaya/Makefile
===================================================================
RCS file: /usr/cvs/ports/www/amaya/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ./www/amaya/Makefile	2000/07/13 22:49:00	1.13
+++ ./www/amaya/Makefile	2000/10/26 09:18:07
@@ -15,7 +15,7 @@
 
 MAINTAINER=	croyle@gelemna.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 DIST_SUBDIR=	amaya
Index: ./www/ashe/Makefile
===================================================================
RCS file: /usr/cvs/ports/www/ashe/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- ./www/ashe/Makefile	2000/04/10 00:04:28	1.10
+++ ./www/ashe/Makefile	2000/10/26 09:18:04
@@ -18,7 +18,7 @@
 MAN1=		xhtml.1
 MANCOMPRESSED=	yes
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
Index: ./x11-fonts/xmbdfed/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-fonts/xmbdfed/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- ./x11-fonts/xmbdfed/Makefile	2000/08/03 09:27:27	1.19
+++ ./x11-fonts/xmbdfed/Makefile	2000/10/26 09:18:13
@@ -14,7 +14,7 @@
 
 USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 
 MAN1=		xmbdfed.1
 
Index: ./x11-toolkits/FWF/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-toolkits/FWF/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- ./x11-toolkits/FWF/Makefile	2000/08/13 13:10:36	1.23
+++ ./x11-toolkits/FWF/Makefile	2000/10/26 09:18:32
@@ -17,7 +17,7 @@
 BROKEN=		../../lib/libfwf.a: cannot read symbols
 .endif
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 WRKSRC=		${WRKDIR}/FWF
Index: ./x11-toolkits/xbae/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-toolkits/xbae/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- ./x11-toolkits/xbae/Makefile	2000/06/16 21:52:28	1.15
+++ ./x11-toolkits/xbae/Makefile	2000/10/26 09:18:37
@@ -17,7 +17,7 @@
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
-REQUIRES_MOTIF= yes
+USE_MOTIF=	yes
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
 
Index: ./x11-toolkits/xg/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-toolkits/xg/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./x11-toolkits/xg/Makefile	2000/04/10 01:11:20	1.4
+++ ./x11-toolkits/xg/Makefile	2000/10/26 09:18:39
@@ -14,7 +14,7 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+USE_MOTIF=	yes
 USE_X_PREFIX=	yes
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/Xg-1.0
Index: ./x11-toolkits/xmhtml/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11-toolkits/xmhtml/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ./x11-toolkits/xmhtml/Makefile	2000/07/04 07:13:33	1.9
+++ ./x11-toolkits/xmhtml/Makefile	2000/10/26 09:18:41
@@ -20,7 +20,7 @@
 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
 
Index: ./x11/libhelp/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11/libhelp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ./x11/libhelp/Makefile	2000/04/13 19:09:49	1.5
+++ ./x11/libhelp/Makefile	2000/10/26 09:15:53
@@ -12,7 +12,7 @@
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
-REQUIRES_MOTIF= YES
+USE_MOTIF= 	YES
 USE_IMAKE=	YES
 NO_INSTALL_MANPAGES= YES
 
Index: ./x11/xlupe/Makefile
===================================================================
RCS file: /usr/cvs/ports/x11/xlupe/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ./x11/xlupe/Makefile	2000/08/03 09:28:52	1.4
+++ ./x11/xlupe/Makefile	2000/10/26 09:15:47
@@ -14,10 +14,7 @@
 
 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
===


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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