Alistair G. Crooks <agc@netbsd.org> wrote:

>Module Name:	pkgsrc
>Committed By:	agc
>Date:		Fri Jun 30 10:23:32 UTC 2000

>Modified Files:
>	pkgsrc: Packages.txt

>Log Message:
>Update Packages.txt to reflect reality - there has been a way of
>installing X11 packages in ${LOCALBASE} for a while now.
>Document the new X11PREFIX definition, which points to X11BASE by
>default, or LOCALBASE if xpkgwedge is installed.

>To generate a diff of this commit:
>cvs rdiff -r1.90 -r1.91 pkgsrc/Packages.txt

Well, now that we've got X11PREFIX, we should probably pass it in (like
the other variables) as part of MAKE_ENV and SCRIPTS_ENV so that we can
use it...

Index: /source/NetBSD-current/pkgsrc/mk/bsd.pkg.mk
===================================================================
RCS file: /source/cvs/netbsd/current/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.493
diff -u -r1.493
--- bsd.pkg.mk	2000/06/30 15:34:45	1.493
+++ bsd.pkg.mk	2000/06/30 19:39:38	
@@ -240,7 +240,7 @@
 
 MAKE_FLAGS?=
 MAKEFILE?=		Makefile
-MAKE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} CFLAGS="${CFLAGS}"
+MAKE_ENV+=		PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} X11PREFIX=${X11PREFIX} CFLAGS="${CFLAGS}"
 
 .if defined(USE_MOTIF)
 MAKE_ENV+=		MOTIFLIB="${MOTIFLIB}"
@@ -871,7 +871,8 @@
 	WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
 	SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
 	PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \
-	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+	X11PREFIX=${X11PREFIX}
 
 .if defined(BATCH)
 SCRIPTS_ENV+=	BATCH=yes


jdarrow

-- 
John Darrow - Senior Technical Specialist               Office: 630/752-5201
Computing Services, Wheaton College, Wheaton, IL 60187  Fax:    630/752-5968
Alphapage: 6303160707@alphapage.airtouch.com            Pager:  630/316-0707
Email:     John.P.Darrow@wheaton.edu