Date: 26 Oct 2000 02:38:32 -0700 From: asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami) To: ports@FreeBSD.ORG Subject: Re: open-motif default? Message-ID: <vqcy9zckkmf.fsf@silvia.hip.berkeley.edu> In-Reply-To: asami@FreeBSD.ORG's message of "Thu, 26 Oct 2000 02:33:31 -0700 (PDT)" References: <200010241003.e9OA3Dx04425@silvia.hip.berkeley.edu> <kqwveyh4fs.fsf@cip12.melaten.rwth-aachen.de> <200010260933.e9Q9XVc22042@silvia.hip.berkeley.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
* ===
* 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
Sigh. Please replace the bsd.port.mk part with this one. (I hate
PKG_IGNORE_DEPENDS....)
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:35:21
@@ -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,15 +771,9 @@
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)
@@ -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,7 @@
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}
@@ -1057,14 +1038,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 +1358,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 +1425,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))
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?vqcy9zckkmf.fsf>