Date: Fri, 14 Jul 2000 00:20:26 -0700 (PDT) From: asami@freebsd.org (Satoshi Asami) To: ports@freebsd.org Subject: XFree86-3/4 Message-ID: <200007140720.AAA85016@silvia.hip.berkeley.edu>
next in thread | raw e-mail | index | archive | help
Howdy,
What do people think about this patch to switch between XFree86-3.x
and 4.x? Basically XFREE86_VERSION, which defaults to 3 now, can be
switched to 4 when people want to switch over. The default in
bsd.port.mk will change when we deem XFree86-4 ready for prime time
(at least the non-server parts -- those with cards that are only
supported with XFree86-3 always have the xtt-* servers to fall back
to).
We obviously need to change all the LIB_DEPENDS to xpm, etc., to the
USE_* format as can be seen below. Oh, and I need to make a new mtree
file.
If this is ok, I'll commit this (by default, it should be a no-op for
now) and accompanying USE_* and mtree file changes.
Satoshi
-------
Index: bsd.port.mk
===================================================================
RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.340
diff -u -r1.340 bsd.port.mk
--- bsd.port.mk 2000/06/16 21:52:40 1.340
+++ bsd.port.mk 2000/07/03 20:11:23
@@ -749,14 +758,36 @@
MAKE_ENV+= CC=${CC} CXX=${CXX}
.endif
.if defined(REQUIRES_MOTIF)
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
.if defined(PARALLEL_PACKAGE_BUILD)
BUILD_DEPENDS+= ${X11BASE}/lib/libXm.a:${PORTSDIR}/x11-toolkits/Motif-dummy
.endif
.endif
+
+# defaults to 3.3.6; will be changed to 4.0 when it is ready
+XFREE86_VERSION?= 3
-PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6|Motif-2\.1\.10)'
+.if ${XFREE86_VERSION} == 3
+.if defined(USE_XPM)
+LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm
+.endif
+.if defined(USE_DGS)
+LIB_DEPENDS+= dps.0:${PORTSDIR}/x11/dgs
+.endif
+.if defined(USE_MESA)
+LIB_DEPENDS+= GL.14:${PORTSDIR}/graphics/Mesa3
+.endif
+.if defined(USE_FREETYPE)
+LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype
+.endif
+XAWVER= 7
+PKG_IGNORE_DEPENDS?= '(XFree86-3\.3\.6|Motif-2\.1\.10)'
+.else
+XAWVER= 6
+PKG_IGNORE_DEPENDS?= 'Motif-2\.1\.10'
+.endif
+PLIST_SUB+= XAWVER=${XAWVER}
.if defined(USE_BISON)
.if ${OSVERSION} >= 400014
@@ -793,11 +828,17 @@
.endif
.endif
-# Don't try to build XFree86 even if ALWAYS_BUILD_DEPENDS is defined --
+.if defined(USE_XLIB)
+.if ${XFREE86_VERSION} == 3
+# Don't try to build XFree86-3 even if ALWAYS_BUILD_DEPENDS is defined --
# it's just too big....
-.if defined(USE_XLIB) && !defined(ALWAYS_BUILD_DEPENDS)
+.if !defined(ALWAYS_BUILD_DEPENDS)
LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86
.endif
+.else
+LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+.endif
+.endif
.if exists(${PORTSDIR}/../Makefile.inc)
.include "${PORTSDIR}/../Makefile.inc"
@@ -901,7 +942,10 @@
# Figure out where the local mtree file is
.if !defined(MTREE_FILE) && !defined(NO_MTREE)
.if defined(USE_X_PREFIX)
+.if ${XFREE86_VERSION} == 3
MTREE_FILE= /etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE= /etc/mtree/BSD.x11-4.dist
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
.endif
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?200007140720.AAA85016>