Subject: RE: Revisiting the tk80 issue
To: Hubert Feyrer <hubert.feyrer@rrzc1.rz.uni-regensburg.de>
From: Tim Rightnour <root@garbled.net>
List: tech-pkg
Date: 07/16/1998 01:10:35
Ok..  seeing as actions speak louder than words, I'd like to submit the
following change to bsd.pkg.mk:

--- bsd.pkg.mk.orig     Thu Jul 16 00:38:12 1998
+++ bsd.pkg.mk  Thu Jul 16 00:40:11 1998
@@ -110,3 +110,3 @@
 
-.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_XBASE)
 PREFIX?=               ${X11BASE}
@@ -231,3 +231,3 @@
 .if !defined(MTREE_FILE)
-.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)
+.if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_XBASE)
 MTREE_FILE=    /etc/mtree/BSD.x11.dist

This provides the following:
rigel# make
===>  tk-8.0p2 uses X11, but /usr/X11R6 not found.

with this patch to tk80's Makefile:

--- Makefile.orig       Thu Jul 16 00:59:07 1998
+++ Makefile    Thu Jul 16 00:59:18 1998
@@ -17,2 +17,3 @@
 CONFIGURE_ENV+=  PORTSDIR=${.CURDIR}/../../../../..
+USE_X11=       yes

Trying this on my machine with X installed it into /usr/pkg, as is correct.

This neccesitates the change to other pkgs,  for example, xneko:

--- Makefile.orig       Thu Jul 16 01:04:20 1998
+++ Makefile    Thu Jul 16 01:04:30 1998
@@ -12,2 +12,3 @@
 USE_X11=       yes
+USE_XBASE=     yes
 IGNOREFILES=   ${DISTFILES}

This change only needs to take place on pkgs which _only_ specify USE_X11, and
really, really want to be installed into the X11 tree.  (a descision I do not
attempt to make here.)

If this is acceptable, I will submit a patch which adds the USE_XBASE= yes to
all pkgs that have a USE_X11=yes, and fix *all* the current broken tk and X11
dependencies.  Additionally, this allows people to build X11 dependent pkgs
(xemacs anyone?) and install them in /usr/pkg.  (however, USE_IMAKE is an
allways lose situation without pkgwedge)

Opinions?

---
Tim Rightnour    -  root@garbled.net
http://www.zynetwc.com/~garbled/garbled.html