Date: 13 Aug 2000 12:21:59 -0700 From: asami@freebsd.org (Satoshi - Ports Wraith - Asami) To: Steve Price <sprice@hiwaay.net> Cc: alex@freebsd.org, ports@freebsd.org Subject: Re: cvs commit: ports/games/xsok Makefile Message-ID: <vqcya213r1k.fsf@silvia.hip.berkeley.edu> In-Reply-To: Steve Price's message of "Sun, 13 Aug 2000 12:28:02 -0500" References: <200008131635.JAA13051@freefall.freebsd.org> <20000813183919.B20187@cichlids.cichlids.com> <20000813114249.S90230@bonsai.hiwaay.net> <20000813185728.A23014@cichlids.cichlids.com> <20000813121453.U90230@bonsai.hiwaay.net> <20000813122802.W90230@bonsai.hiwaay.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Good good. I was starting to wonder if I'm the only one that was
trying out XFree86-5.... ;)
* From: Steve Price <sprice@hiwaay.net>
* Since USE_IMAKE implies USE_X_PREFIX implies USE_XLIB you can't always
* assume that USE_XLIB only ever means you want just the X libraries.
* Applying the following patch should fix all the problems that the
* package building cluster is seeing. Note this is only a quick fix.
You are correct. I caught that in my previous run and have a fix ready.
* -LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries
* +LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4
You can't use XFree86-4 in any case, it is supposed to be replaced by
the divided XFree86-4-* ports. :)
This is the bsd.port.mk that is currently used on the ports cluster.
I believe it fixes all the problems mentioned here.
===
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.345
diff -u -r1.345 bsd.port.mk
--- bsd.port.mk 2000/08/03 09:28:57 1.345
+++ bsd.port.mk 2000/08/09 07:50:20
@@ -748,11 +748,15 @@
.endif
.if defined(REQUIRES_MOTIF)
-LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
+USE_XPM= yes
.if defined(PARALLEL_PACKAGE_BUILD)
+.if defined(MOTIF_OPEN)
+LIB_DEPENDS+= Xm.2:${PORTSDIR}/x11-toolkits/open-motif
+.else
BUILD_DEPENDS+= ${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy
.endif
.endif
+.endif
# defaults to 3.3.6; will be changed to 4.0 when it is ready
XFREE86_VERSION?= 3
@@ -770,10 +774,16 @@
.if defined(USE_FREETYPE)
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype
.endif
-XAWVER= 7
+XAWVER= 6
PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6|Motif-2\.1\.10)'
.else
-XAWVER= 6
+.if defined(USE_IMAKE)
+BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4
+.endif
+.if defined(USE_XPM) || defined(USE_DGS) || defined(USE_MESA) || defined(USE_FREETYPE)
+USE_XLIB= yes
+.endif
+XAWVER= 7
PKG_IGNORE_DEPENDS?= 'Motif-2\.1\.10'
.endif
PLIST_SUB+= XAWVER=${XAWVER}
@@ -804,7 +814,7 @@
.if exists(/usr/bin/perl5) && ${OSVERSION} >= 300000
# 3.0-current after perl5 import
.if !exists(/usr/bin/perl${PERL_VERSION}) && defined(USE_PERL5)
-.BEGIN:
+pre-everything::
@${ECHO} "Error: you don't have the right version of perl in /usr/bin."
@${FALSE}
.endif
@@ -1008,7 +1018,7 @@
# shared/dynamic motif libs
.if defined(HAVE_MOTIF)
-.if defined(MOTIF_STATIC)
+.if defined(MOTIF_STATIC) && !defined(MOTIF_OPEN)
MOTIFLIB?= ${X11BASE}/lib/libXm.a -L${X11BASE}/lib -lXp
.else
MOTIFLIB?= -L${X11BASE}/lib -lXm -lXp
@@ -1170,7 +1180,7 @@
editors elisp emulators ftp games german gnome graphics \
hebrew ipv6 irc japanese java kde korean lang linux \
mail math mbone misc net news \
- offix palm perl5 plan9 print python russian \
+ offix palm perl5 plan9 print python ruby russian \
security shells sysutils \
tcl76 tcl80 tcl81 tcl82 tcl83 textproc \
tk42 tk80 tk82 tk83 tkstep80 \
@@ -1948,8 +1958,13 @@
# call the necessary targets/scripts.
################################################################
+.if !target(pre-everything)
+pre-everything:
+ @${DO_NADA}
+.endif
+
.if !target(fetch)
-fetch:
+fetch: pre-everything
@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} real-fetch
.endif
===
There are some changes to Motif too. If you define MOTIF_OPEN, it
will use open-motif instead of assuming Motif is installed. (This is
just for testing -- after we verify that open-motif works, I will
switch over completely.)
The pre-everything hack is for building the 5-current index on a
4-stable machine. Using .BEGIN will make the describe target blow up.
As for XFree86, there are changes to xpm/Motif interaction, USE_XPM
etc. implying USE_XLIB now (some ports had LIB_DEPENDS to xpm but no
USE_XLIB, since xpm pulled in X anyway), and USE_IMAKE implying a
dependency to devel/imake-4 when XFREE86_VERSION=4.
Actually, I'm not sure I like that last part very much. As you can
see in the following commit, USE_IMAKE is a bit awkward since it runs
xmkmf rather than just depending on imake.
===
From: Satoshi Asami <asami@FreeBSD.org>
Date: Thu, 10 Aug 2000 23:34:48 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: ports/x11-toolkits/iv Makefile ports/games/lincity
Makefile ports/cad/pisces Makefile ports/math/simpack Makefile
ports/www/vrweb Makefile
asami 2000/08/10 23:34:48 PDT
Modified files:
x11-toolkits/iv Makefile
games/lincity Makefile
cad/pisces Makefile
math/simpack Makefile
www/vrweb Makefile
Log:
Add imake:${PORTSDIR}/devel/imake-4 to BUILD_DEPENDS -- these ports
use imake themselves.
Submitted by: bento (sort of)
Revision Changes Path
1.27 +3 -1 ports/x11-toolkits/iv/Makefile
1.9 +3 -1 ports/games/lincity/Makefile
1.2 +3 -2 ports/cad/pisces/Makefile
1.15 +3 -1 ports/math/simpack/Makefile
1.19 +3 -1 ports/www/vrweb/Makefile
===
IMO, the USE_IMAKE directive should imply that the port requires
imake, not that it runs xmkmf. The latter should have been called
USE_XMKMF or something, so they will work like this.
USE_IMAKE: dependency on devel/imake-4 and X libraries
USE_XMKMF: implies USE_IMAKE, runs xmkmf
But this might be another change that is too drastic. ;)
Another way around the problem would be to add an easy way to disable
running xmkmf when USE_IMAKE is defined. (Did I hear someone say
"XMKMF=/usr/bin/true" ? ;)
Satoshi
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?vqcya213r1k.fsf>