Adapt to xpkgwedge and install olvwmrc.0 manpage in correct location.

6 files changed, 37 insertions, 23 deletions

diff --git a/x11/olvwm/Makefile b/x11/olvwm/Makefile
index be90222d9c5..91447c93430 100644
--- a/x11/olvwm/Makefile
+++ b/x11/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:35 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/09/13 22:50:35 jlam Exp $
 #
 
 DISTNAME=	olvwm4.src4
@@ -9,15 +9,14 @@ MASTER_SITES=	http://www.akula.com/~jadler/sdo/olvwm/
 MAINTAINER=	w.wnuk@zodiac.mimuw.edu.pl
 HOMEPAGE=	http://www.akula.com/~jadler/sdo/olvwm/index.html
 
-DEPENDS+=	xview-lib-3.2.*:../xview-lib
-DEPENDS+=	xview-clients-3.2.*:../xview-clients
+DEPENDS+=	xview-lib>=3.2.1:../xview-lib
+DEPENDS+=	xview-clients>=3.2.1:../xview-clients
 
-USE_X11BASE=	YES
-USE_XPM=	YES
-USE_IMAKE=	YES
-NO_WRKSUBDIR=	YES
+USE_X11BASE=	# defined
+USE_XPM=	# defined
+USE_IMAKE=	# defined
+XMKMF=		${X11PREFIX}/bin/xvmkmf -a
 
-post-install:
-	${MV} ${PREFIX}/man/cat1/olvwmrc.1 ${PREFIX}/man/man1/olvwmrc.1
+NO_WRKSUBDIR=	# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/olvwm/files/patch-sum b/x11/olvwm/files/patch-sum
index cacb7744953..a7ab91c4b93 100644
--- a/x11/olvwm/files/patch-sum
+++ b/x11/olvwm/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/06/16 14:18:52 pooka Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/13 22:50:36 jlam Exp $
 
-MD5 (patch-aa) = 02eda95293ef05027184bc8e4d77b964
-MD5 (patch-ab) = d6cc6ac0082090dad1cb1b6ce01822d2
+MD5 (patch-aa) = d9360f9a984c17bdf04c872eb6befc1b
+MD5 (patch-ab) = 62aa3edc690b24cf6351a09e3249a137
 MD5 (patch-ac) = 24c588b113c9ef4426853493f05acc5b
 MD5 (patch-ad) = 9bf85e99c01a8c4d4b08312eb05f4df5
 MD5 (patch-ae) = 708843f2743d34dac6ce5e00584b5e85
@@ -10,5 +10,5 @@ MD5 (patch-ag) = 4113faf5439ac6202c1c82b4acc0db7b
 MD5 (patch-ah) = f103769d75102ae35765346d86f96588
 MD5 (patch-ai) = eaecbbf3b85bc781f794cba0c0c90f0d
 MD5 (patch-aj) = 62e1eb37af59d0ad1d83ab274350389e
-MD5 (patch-ak) = b6fcd8816b38748e11ae44b3f9d674b4
+MD5 (patch-ak) = 96c1896453ccc2b3ee5cb10c364c302e
 MD5 (patch-al) = 2917ff9f602404b4310a433d19d9f16b
diff --git a/x11/olvwm/patches/patch-aa b/x11/olvwm/patches/patch-aa
index 446489e6eb6..281d19488d5 100644
--- a/x11/olvwm/patches/patch-aa
+++ b/x11/olvwm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/06/16 14:18:54 pooka Exp $
+$NetBSD: patch-aa,v 1.2 2000/09/13 22:50:36 jlam Exp $
 
---- Imakefile.orig	Tue Jan 13 22:23:54 1998
-+++ Imakefile	Tue Jun  6 19:27:42 2000
+--- Imakefile.orig	Tue Jan 13 16:23:54 1998
++++ Imakefile
 @@ -48,7 +48,11 @@
  /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/06/16 14:18:54 pooka Exp $
 +
 +/**/# For NetBSD the following is fine
 +MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DREGEXP -DXPM -DIDENT -DMAXPID=30000 \
-+	-DX11BASE=\"${X11BASE}\"
++	-DPREFIX=\"${PREFIX}\"
  
  /**/#
  /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
@@ -36,3 +36,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/06/16 14:18:54 pooka Exp $
         olwm.c pixmap.c properties.c reduce.c resources.c screen.c \
         selection.c services.c slave.c slots.c st.c states.c usermenu.c \
         usleep.c virtual.c win.c winbusy.c winbutton.c wincolor.c winframe.c \
+@@ -136,13 +142,6 @@
+ clean::
+ 	/bin/rm -f parse.c olvwmrc.c version.c
+ 
+-install.man:: $(MANPAGES)
+-	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
+-	else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
+-	@for i in $(MANPAGES) ;\
+-	do \
+-	echo "installing $$i"; \
+-	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
+-	done
++InstallManPage(olvwmrc,$(FILEMANDIR))
+ 
+ #include <XView.prog>
diff --git a/x11/olvwm/patches/patch-ab b/x11/olvwm/patches/patch-ab
index d90568548b4..0ab070795f0 100644
--- a/x11/olvwm/patches/patch-ab
+++ b/x11/olvwm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/06/16 14:18:54 pooka Exp $
+$NetBSD: patch-ab,v 1.2 2000/09/13 22:50:36 jlam Exp $
 
 --- defaults.c.orig	Thu Mar  2 22:44:29 2000
 +++ defaults.c	Tue Jun  6 19:33:36 2000
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/06/16 14:18:54 pooka Exp $
      }
  
 -    appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm");
-+    appDB = XrmGetFileDatabase(X11BASE "/lib/X11/app-defaults/Olwm");
++    appDB = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Olwm");
      return appDB;
  }
  
diff --git a/x11/olvwm/patches/patch-ak b/x11/olvwm/patches/patch-ak
index e4a382f02a1..b8cf5e4d720 100644
--- a/x11/olvwm/patches/patch-ak
+++ b/x11/olvwm/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/06/16 14:18:57 pooka Exp $
+$NetBSD: patch-ak,v 1.2 2000/09/13 22:50:36 jlam Exp $
 
 --- usermenu.c.orig	Thu Mar  2 22:41:31 2000
 +++ usermenu.c	Tue Jun  6 19:24:12 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/06/16 14:18:57 pooka Exp $
   
  	if ((owHome = getenv("OPENWINHOME")) == NULL)
 -		owHome = "/usr/openwin";
-+		owHome = X11BASE;
++		owHome = PREFIX;
   
  	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
   
diff --git a/x11/olvwm/pkg/PLIST b/x11/olvwm/pkg/PLIST
index 5bda0da3903..898c56006d8 100644
--- a/x11/olvwm/pkg/PLIST
+++ b/x11/olvwm/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2000/06/17 09:41:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/09/13 22:50:36 jlam Exp $
 bin/olvwm
 lib/help/olvwm.info
 man/cat1/olvwm.0
-man/man1/olvwmrc.1
+man/cat5/olvwmrc.0