Date: Mon, 27 Jul 1998 16:16:27 -0700 (PDT) From: asami@cs.berkeley.edu (Satoshi Asami) To: ports@FreeBSD.ORG Cc: jkh@FreeBSD.ORG Subject: comments on X dependency patch? Message-ID: <199807272316.QAA14892@silvia.HIP.Berkeley.EDU>
next in thread | raw e-mail | index | archive | help
Date: Fri, 26 Jun 1998 22:06:34 -0700 (PDT)
To: ac199@hwcn.org
CC: sue@welearn.com.au, jkh@freebsd.org, ac199@hwcn.org,
seggers@semyam.dinoco.de, freebsd-ports@freebsd.org
Subject: Re: Concurrent package making allowed?
From: asami@freebsd.org (Satoshi Asami)
* Another INDEX field is probably not the solution. This is just a
* dependency problem, and there are hundreds of dependencies... :)
That's because the X dependency is implicit, the fact caused by X
traditionally being installed from the XF86 distributions instead of
the x11/XFree86 port. So ports that require X libraries (etc.) do not
have anything in their Makefiles (except for USE_X11 or USE_IMAKE,
which are really only for changing PREFIX and calling xmkmf).
Maybe we should add dependencies to X too. A simple LIB_DEPENDS on
X11 or something just work if installations of the XF86lib (or
whatever the right name is) tarball can be coerced to leave a entry
like "/var/db/pkg/XFree86-3.3.2". Jordan, how hard would that be?
Here's a sample patch (warning, untested!). Basically it renames
USE_X11 (which always didn't really mean what it says) to USE_X_PREFIX
and adds a renewed USE_X11 meaning "requires X libraries". While I
was there, I got rid of NO_CONFIGURE and NO_PATCH, which never meant
anything.
===
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.227.2.38
diff -u -r1.227.2.38 bsd.port.mk
--- bsd.port.mk 1998/05/30 22:40:59 1.227.2.38
+++ bsd.port.mk 1998/06/27 05:04:04
@@ -108,7 +108,6 @@
# otherwise.)
#
# NO_BUILD - Use a dummy (do-nothing) build target.
-# NO_CONFIGURE - Use a dummy (do-nothing) configure target.
# NO_CDROM - Port may not go on CDROM. Set this string to reason.
# NO_DESCRIBE - Use a dummy (do-nothing) describe target.
# NO_EXTRACT - Use a dummy (do-nothing) extract target.
@@ -127,8 +126,9 @@
# USE_GMAKE - Says that the port uses gmake.
# USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE.
# USE_PERL5 - Says that the port uses perl5 for building and running.
-# USE_IMAKE - Says that the port uses imake. Implies USE_X11.
-# USE_X11 - Says that the port uses X11 (i.e., installs in ${X11BASE}).
+# USE_IMAKE - Says that the port uses imake. Implies USE_X_PREFIX.
+# USE_X_PREFIX - Says that the port installs in ${X11BASE}. Implies USE_X11.
+# USE_X11 - Says that the port uses X libraries.
# NO_INSTALL_MANPAGES - For imake ports that don't like the install.man
# target.
# HAS_CONFIGURE - Says that the port has its own configure script.
@@ -348,10 +348,14 @@
.endif
.if defined(USE_IMAKE)
+USE_X_PREFIX= yes
+.endif
+
+.if defined(USE_X_PREFIX)
USE_X11= yes
.endif
-.if defined(USE_X11)
+.if defined(USE_X_PREFIX)
PREFIX?= ${X11BASE}
.else
PREFIX?= ${LOCALBASE}
@@ -372,6 +376,9 @@
BUILD_DEPENDS+= perl5.00404:${PORTSDIR}/lang/perl5
RUN_DEPENDS+= perl5.00404:${PORTSDIR}/lang/perl5
.endif
+.if defined(USE_X11)
+LIB_DEPENDS+= X11\\.6:${PORTSDIR}/x11/XFree86
+.endif
.if exists(${PORTSDIR}/../Makefile.inc)
.include "${PORTSDIR}/../Makefile.inc"
@@ -455,7 +462,7 @@
# Figure out where the local mtree file is
.if !defined(MTREE_FILE)
-.if defined(USE_X11)
+.if defined(USE_X_PREFIX)
MTREE_FILE= /etc/mtree/BSD.x11.dist
.else
MTREE_FILE= /etc/mtree/BSD.local.dist
@@ -792,8 +800,10 @@
IGNORE= "may not be placed on a CDROM: ${NO_CDROM}"
.elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
IGNORE= "is restricted: ${RESTRICTED}"
-.elif (defined(USE_X11) && !exists(${X11BASE}))
-IGNORE= "uses X11, but ${X11BASE} not found"
+.elif defined(NO_CONFIGURE)
+IGNORE= "defines NO_CONFIGURE, which is obsoleted"
+.elif defined(NO_PATCH)
+IGNORE= "defines NO_PATCH, which is obsoleted"
.elif defined(BROKEN)
IGNORE= "is marked as broken: ${BROKEN}"
.endif
@@ -879,18 +889,6 @@
@${DO_NADA}
makesum:
@${DO_NADA}
-.endif
-
-# Disable patch
-.if defined(NO_PATCH) && !target(patch)
-patch: extract
- @${TOUCH} ${TOUCH_FLAGS} ${PATCH_COOKIE}
-.endif
-
-# Disable configure
-.if defined(NO_CONFIGURE) && !target(configure)
-configure: patch
- @${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
.endif
# Disable build
===
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?199807272316.QAA14892>