[pkgsrc/trunk]: pkgsrc Update pkgtools/xpkgwedge to 1.9. Changes from versio...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/896b9414a1e9
branches:  trunk
changeset: 465639:896b9414a1e9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jan 03 23:34:19 2004 +0000

description:
Update pkgtools/xpkgwedge to 1.9.  Changes from version 1.8 are making
this package work in a pkgviews world by looking for imake config files
in ${PREFIX}/lib/X11/config, then ${VIEWBASE}/lib/X11/config, then
${X11BASE}/lib/X11/config.  The second directory is where some packages
may share a commonly-editted host.def file.

diffstat:

 doc/CHANGES                            |   3 ++-
 pkgtools/xpkgwedge/Makefile            |   7 +++++--
 pkgtools/xpkgwedge/files/pkgxmkmf.in   |   6 +++++-
 pkgtools/xpkgwedge/files/xpkgwedge.def |  12 ++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diffs (98 lines):

diff -r f6d872f3ee9f -r 896b9414a1e9 doc/CHANGES
--- a/doc/CHANGES       Sat Jan 03 23:24:17 2004 +0000
+++ b/doc/CHANGES       Sat Jan 03 23:34:19 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4336 2004/01/03 23:23:03 tron Exp $
+$NetBSD: CHANGES,v 1.4337 2004/01/03 23:34:19 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -36,3 +36,4 @@
        Updated silc-server to 0.9.16 [salo 2004-01-03]
        Updated tiff to 3.6.1 [reed 2004-01-3]
        Added oidentd-2.0.7 [tron 2004-01-03]
+       Updated xpkgwedge to 1.9 [jlam 2004-01-03]
diff -r f6d872f3ee9f -r 896b9414a1e9 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sat Jan 03 23:24:17 2004 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sat Jan 03 23:34:19 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2003/11/23 08:35:05 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/03 23:34:21 jlam Exp $
 
-DISTNAME=      xpkgwedge-1.8
+DISTNAME=      xpkgwedge-1.9
 WRKSRC=                ${WRKDIR}
 CATEGORIES=    pkgtools devel x11
 MASTER_SITES=  # empty
@@ -10,6 +10,8 @@
 HOMEPAGE=      ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/Packages.txt
 COMMENT=       Allows X11 pkgs to be built and used outside of $${X11BASE}
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 EXTRACT_ONLY=  # empty
 NO_CONFIGURE=  # defined
 NO_BUILDLINK=  # defined
@@ -26,6 +28,7 @@
 #
 FONT_PROGS=            bdftopcf fstobdf mkfontdir
 
+FILES_SUBST+=          VIEWBASE=${VIEWBASE}
 FILES_SUBST+=          FONT_PROGS=${FONT_PROGS:Q}
 FILES_SUBST+=          MAKE=${MAKE_PROGRAM:Q}
 
diff -r f6d872f3ee9f -r 896b9414a1e9 pkgtools/xpkgwedge/files/pkgxmkmf.in
--- a/pkgtools/xpkgwedge/files/pkgxmkmf.in      Sat Jan 03 23:24:17 2004 +0000
+++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in      Sat Jan 03 23:34:19 2004 +0000
@@ -3,7 +3,7 @@
 # XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp
 # XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
 #
-# $NetBSD: pkgxmkmf.in,v 1.3 2003/06/12 15:34:39 jschauma Exp $
+# $NetBSD: pkgxmkmf.in,v 1.4 2004/01/03 23:34:21 jlam Exp $
 #
 # make a Makefile from an Imakefile from inside or outside the sources
 # with support for config files in ${PREFIX}/lib/X11/config
@@ -12,10 +12,14 @@
 
 xcfgdir=@X11BASE@/lib/X11/config
 lcfgdir=@PREFIX@/lib/X11/config
+vcfgdir=@VIEWBASE@/lib/X11/config
 configdirspec=''
 if [ "${xcfgdir}" != "${lcfgdir}" -a -d ${lcfgdir} ]; then
        configdirspec="${configdirspec} -I${lcfgdir}"
 fi
+if [ "${lcfgdir}" != "${vcfgdir}" -a -d ${vcfgdir} ]; then
+       configdirspec="${configdirspec} -I${vcfgdir}"
+fi
 configdirspec="${configdirspec} -I${xcfgdir}"
 
 topdir=
diff -r f6d872f3ee9f -r 896b9414a1e9 pkgtools/xpkgwedge/files/xpkgwedge.def
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def    Sat Jan 03 23:24:17 2004 +0000
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def    Sat Jan 03 23:34:19 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xpkgwedge.def,v 1.9 2003/09/10 17:31:44 gavan Exp $    */
+/*     $NetBSD: xpkgwedge.def,v 1.10 2004/01/03 23:34:21 jlam Exp $    */
 
 #ifdef AfterVendorCF
 
@@ -50,13 +50,13 @@
 
 #ifdef UseInstalled
 /*
- * We need to redefine ImakeCmd so that imake will look in
- * $(PREFIX)/lib/X11/config *before* looking in the standard X
- * config directory to override any configuration files installed
- * there.
+ * We need to redefine ImakeCmd so that imake will look in both
+ * $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before*
+ * looking in the standard X11 config directory to override any
+ * configuration files installed there.
  */
 #undef ImakeCmd
-#define ImakeCmd imake -I$(PREFIX)/lib/X11/config
+#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
 #endif
 
 #endif /* AfterVendorCF */