Update xview-config to 3.2.1nb2. Changes from version 3.2.1nb1:

    * Remove xvmkmf; we use pkgxmkmf now.
    * Move config files to ${PREFIX}/lib/X11/config where pkgxmkmf can
      find them.

7 files changed, 21 insertions, 117 deletions

diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 8c578828f94..a4404eaf9b3 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2000/09/14 14:07:50 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2000/10/23 18:02:54 jlam Exp $
 # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
 #
 
 DISTNAME=		xview3.2p1-X11R6
-PKGNAME=		xview-config-3.2.1nb1
+PKGNAME=		xview-config-3.2.1nb2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -15,17 +15,7 @@ EXTRACT_ELEMENTS=	${DISTNAME}/config
 WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_IMAKE=		# defined
 
-XVCONFIGDIR=		${PREFIX}/lib/X11/xview
-
 post-extract:
 	@${CHMOD} -R go+rX ${WRKDIR}
 
-do-build:
-	${SED}	-e "s,@X11BASE@,${X11BASE},g" \
-		-e "s,@XVCONFIGDIR@,${XVCONFIGDIR},g" \
-		< ${FILESDIR}/xvmkmf.in > ${WRKDIR}/xvmkmf
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/xvmkmf ${PREFIX}/bin
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-config/files/patch-sum b/x11/xview-config/files/patch-sum
index d81735811ea..f9ef1f73fd1 100644
--- a/x11/xview-config/files/patch-sum
+++ b/x11/xview-config/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.5 2000/09/13 20:21:53 jlam Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/23 18:02:55 jlam Exp $
 
-MD5 (patch-aa) = 9426cb2bce4bce1907e81daff809409f
-MD5 (patch-ab) = 3e37659398503fb8fb47a7073d26a748
+MD5 (patch-aa) = 0d582c8e51e15913c3d267a9dc79fbc9
+MD5 (patch-ab) = 5a23e1449b5811da6c90767d73c28ccc
 MD5 (patch-ac) = 94eeec3a337036aeef91ef913925dd96
 MD5 (patch-ad) = eb18151caf86ca6fa9bb120d77f334de
-MD5 (patch-ae) = ee452a334bb230d729f075665a877097
+MD5 (patch-ae) = d5cd5434956952d43683ffef40d37614
diff --git a/x11/xview-config/files/xvmkmf.in b/x11/xview-config/files/xvmkmf.in
deleted file mode 100644
index 5723a882694..00000000000
--- a/x11/xview-config/files/xvmkmf.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
-#
-# $NetBSD: xvmkmf.in,v 1.1 2000/09/13 20:21:53 jlam Exp $
-#
-# make a Makefile from an Imakefile from inside or outside the sources
-# with support for XView
-
-usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
-
-X11BASE=@X11BASE@
-XVCONFIGDIR=@XVCONFIGDIR@
-configdirspec="-I${X11BASE}/lib/X11/config -I${XVCONFIGDIR}"
-topdir=
-curdir=.
-do_all=
-
-case "$1" in
--a)
-    do_all="yes"
-    shift
-    ;;
-esac
-
-case $# in 
-    0) ;;
-    1) topdir=$1 ;;
-    2) topdir=$1  curdir=$2 ;;
-    *) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-case "$topdir" in
-    -*) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-if [ -f Makefile ]; then 
-    echo mv -f Makefile Makefile.bak
-    mv -f Makefile Makefile.bak
-fi
-
-if [ "$topdir" = "" ]; then
-    args="-DUseInstalled "$configdirspec
-else
-    args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
-fi
-
-echo imake $args
-case "$do_all" in
-yes)
-    imake $args && 
-    echo "make Makefiles" &&
-    make Makefiles &&
-    echo "make includes" &&
-    make includes &&
-    echo "make depend" &&
-    make depend
-    ;;
-*)
-    imake $args
-    ;;
-esac
diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa
index 332f8683265..f587f3bc226 100644
--- a/x11/xview-config/patches/patch-aa
+++ b/x11/xview-config/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2000/09/13 20:21:54 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/10/23 18:02:56 jlam Exp $
 
 --- Imakefile.orig	Tue Jun 29 01:13:19 1993
 +++ Imakefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2000/09/13 20:21:54 jlam Exp $
  CFFILES = $(XVFILES) $(HEADERS)
  
 -InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
-+InstallMultipleDestFlags(install,$(CFFILES),$(XVCONFIGDIR),$(INSTDATFLAGS))
++InstallMultipleDestFlags(install,$(CFFILES),$(PREFIX)/lib/X11/config,$(INSTDATFLAGS))
  
  depend::
  
diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab
index 468002d36fa..ddd54ad658f 100644
--- a/x11/xview-config/patches/patch-ab
+++ b/x11/xview-config/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2000/09/13 20:21:54 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2000/10/23 18:02:56 jlam Exp $
 
 --- XView.cf.orig	Sun Jun 26 22:09:19 1994
 +++ XView.cf
@@ -29,15 +29,6 @@ $NetBSD: patch-ab,v 1.5 2000/09/13 20:21:54 jlam Exp $
  #endif
  /*
   *	The implementation of internationalization support in XView depends
-@@ -315,7 +315,7 @@
-  *	features disabled.
-  */
- #ifndef OsHasLocale
--#define OsHasLocale YES
-+#define OsHasLocale NO
- #endif
- /*
-  *	There are number of memory allocation macros in lib/libxview/base.h 
 @@ -360,7 +360,7 @@
   *    	be defined as -PIC
   */
diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae
index 622307ebd51..ff54f3ac180 100644
--- a/x11/xview-config/patches/patch-ae
+++ b/x11/xview-config/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
+$NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
 
 --- XView.tmpl.orig	Sun Jun 26 22:10:00 1994
 +++ XView.tmpl
@@ -11,20 +11,7 @@ $NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
  #endif
  
  #if OsHasLocale
-@@ -158,6 +158,12 @@
- # endif
-               CONFIGDIR = XVConfigdir
- #endif
-+/*
-+ *	Set the config directory for XView and add this directory to
-+ *	the places imake searches for config files.
-+ */
-+            XVCONFIGDIR = $(XVDESTDIR)/lib/X11/xview
-+         IMAKE_DEFINES += -I$(XVCONFIGDIR)
- 
-                XVLIBSRC = $(TOP)/lib
-               HELP_DEST = XVHelpDest
-@@ -192,14 +198,6 @@
+@@ -192,14 +192,6 @@
                       AS = as
   */
  /*
@@ -39,7 +26,7 @@ $NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
   *	Temporary directory used during build process before the include
   *	files are installed.  This is just a place where symbolic links are
   *	placed to point back to the actual files in the build hierarchy to
-@@ -224,7 +222,7 @@
+@@ -224,7 +216,7 @@
   *	afterwards.
   */
  #ifndef XVIncludeDirName
@@ -48,7 +35,7 @@ $NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
  #endif
                   INCDIR = XVIncludeDirName
  /*
-@@ -356,10 +354,10 @@
+@@ -356,10 +348,10 @@
  
  #if SystemV4
               SYSV_CLIENT_LIB = -lintl -ldl
@@ -61,7 +48,7 @@ $NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
  #endif
  
  /*
-@@ -371,16 +369,16 @@
+@@ -371,16 +363,16 @@
   */
  
  #if XvI18nLevel == 4
diff --git a/x11/xview-config/pkg/PLIST b/x11/xview-config/pkg/PLIST
index c01906f7bf3..005e4f7f4a5 100644
--- a/x11/xview-config/pkg/PLIST
+++ b/x11/xview-config/pkg/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2000/09/13 22:00:37 jlam Exp $
-bin/xvmkmf
-lib/X11/xview/XView.cf
-lib/X11/xview/XView.lib
-lib/X11/xview/XView.obj
-lib/X11/xview/XView.prog
-lib/X11/xview/XView.rules
-lib/X11/xview/XView.tmpl
-@dirrm lib/X11/xview
+@comment $NetBSD: PLIST,v 1.5 2000/10/23 18:02:56 jlam Exp $
+lib/X11/config/XView.cf
+lib/X11/config/XView.lib
+lib/X11/config/XView.obj
+lib/X11/config/XView.prog
+lib/X11/config/XView.rules
+lib/X11/config/XView.tmpl