Replace local prototypes in gettext.c with correct header files,

at least mmap was conflicting anyway on DragonFly. Use InstallGenMan
for section 5 man page. Explicitly add rpath entry for PREFIX/lib.

4 files changed, 74 insertions, 14 deletions

diff --git a/wm/olvwm/distinfo b/wm/olvwm/distinfo
index 5d524f723ce..df0bae30ad5 100644
--- a/wm/olvwm/distinfo
+++ b/wm/olvwm/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/01/19 23:15:59 joerg Exp $
 
 SHA1 (olvwm4.src4.tar.gz) = d8900f1aeccfc75924e922d9e86008462de12e62
 RMD160 (olvwm4.src4.tar.gz) = 6523adb9a2f08829dbe6099e88ac031b1dd232a4
 Size (olvwm4.src4.tar.gz) = 386560 bytes
-SHA1 (patch-aa) = 53094a965123b1f078c51c58a64490e6ce71aeb1
+SHA1 (patch-aa) = e0a4eaab392555e9e5adb3b7376a21e70f8fadb1
 SHA1 (patch-ab) = c9e045f8dbc966feac732adb2ab53c531bdfa8cf
 SHA1 (patch-ac) = 157710147ecef7ff4ce3b167c7c6cdaa2449cf33
 SHA1 (patch-ad) = d33f6afd90cfd21e038dfea456eb2d9e34ac8fc6
 SHA1 (patch-ae) = 537fa9aed7555eede44b3b13cf2ef2ee5378dd3a
 SHA1 (patch-af) = 2a6d5ba368b91ac829b03f9c3b2d92073a0aaf26
 SHA1 (patch-ag) = 9651a2a6acd3bc7acf04517f4eaf32b795c519f4
-SHA1 (patch-ah) = 945c215e736d0487cc75c495695557534ed0cd1e
+SHA1 (patch-ah) = c3ed0d792a9cdaba4ae69fcd4482e0d612bc1cc7
 SHA1 (patch-ai) = 186f9283f7eb31bf2c3ac296b505bdb487398107
 SHA1 (patch-aj) = ca38388a38ae00f3085dccf7933517cb07a070bf
 SHA1 (patch-ak) = 2b5caceb2022dd769cf3ad1eefbb25a924ade012
 SHA1 (patch-al) = 76e0eccf43e6a103ffdafad2692b5817ec138d14
+SHA1 (patch-am) = 801152c57c9e5b50a48f9091464d8cff3b4db0f5
diff --git a/wm/olvwm/patches/patch-aa b/wm/olvwm/patches/patch-aa
index 8d81b34d89f..eb79db82bd8 100644
--- a/wm/olvwm/patches/patch-aa
+++ b/wm/olvwm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/19 23:15:59 joerg Exp $
 
---- Imakefile.orig	Tue Jan 13 16:23:54 1998
+--- Imakefile.orig	1998-01-13 21:23:54.000000000 +0000
 +++ Imakefile
 @@ -48,7 +48,11 @@
  /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  
  /**/#
  /**/# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
-@@ -57,8 +61,10 @@
+@@ -57,8 +61,10 @@ MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 
  /**/#MORELDFLAGS=-L${OPENWINHOME}/lib
  /**/#
  /**/# For Solaris 2.x, I'd suggest
@@ -27,7 +27,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  
  /**/# No more changes needed
  
-@@ -93,7 +99,7 @@
+@@ -73,6 +79,7 @@ SYS_LIBRARIES = -ll -lm
+ INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR) 
+ DEPLIBS = 
+ LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
++EXTRA_LDOPTIONS = ${LINKER_RPATH_FLAG}${PREFIX}/lib
+ 
+ HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h \
+           events.h gettext.h globals.h group.h helpcmd.h i18n.h iconimage.h \
+@@ -93,7 +100,7 @@ MISC 	= openwin-menu
  SRCS	= atom.c client.c cmdstream.c cursors.c debug.c defaults.c dsdm.c \
         environ.c error.c evbind.c events.c fontset.c gettext.c gif.c group.c \
         helpsend.c i18n.c images.c info.c kbdfuncs.c list.c mem.c menu.c \
@@ -36,7 +44,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz 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 @@
+@@ -136,13 +143,6 @@ version.c: ${SRCS} ${HEADERS}
  clean::
  	/bin/rm -f parse.c olvwmrc.c version.c
  
@@ -48,6 +56,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
 -	echo "installing $$i"; \
 -	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
 -	done
-+InstallManPage(olvwmrc,$(FILEMANDIR))
++InstallGenManPage(olvwmrc,$(FILEMANDIR),${FILEMANSUFFIX})
  
  #include <XView.prog>
diff --git a/wm/olvwm/patches/patch-ah b/wm/olvwm/patches/patch-ah
index e7efe598e1d..91922810314 100644
--- a/wm/olvwm/patches/patch-ah
+++ b/wm/olvwm/patches/patch-ah
@@ -1,8 +1,16 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2006/01/19 23:15:59 joerg Exp $
 
---- virtual.c.orig	Sat Jan  8 00:36:29 2000
-+++ virtual.c	Sat Jan  8 00:37:54 2000
-@@ -69,6 +69,9 @@
+--- virtual.c.orig	2000-03-02 21:41:11.000000000 +0000
++++ virtual.c
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <sys/types.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <dirent.h>
+@@ -69,6 +70,9 @@ extern Button	*MakeUpLeftButton(),*MakeL
  
  extern char	*ExpandPath();
  
@@ -12,7 +20,21 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  /*
   * Semantic action associated with each of the buttons above.  These must
   * be in the same order as the button array; it would be better if the Button
-@@ -2108,7 +2111,9 @@
+@@ -1982,8 +1986,13 @@ struct _menu	*menu;
+ DIR	*dir;
+ struct dirent	*ent;
+ Button	*b;
++#if defined(NAME_MAX)
++char	s[NAME_MAX], dirname[MAXPATHLEN - NAME_MAX], *newname, *ExpandPath();
++char	pattern[NAME_MAX];
++#else
+ char	s[MAXNAMLEN], dirname[MAXPATHLEN - MAXNAMLEN], *newname, *ExpandPath();
+ char	pattern[MAXNAMLEN];
++#endif
+ extern int AppMenuFunc();
+ MenuCache	*menuCache;
+ int		slot;
+@@ -2108,7 +2117,9 @@ int val;
      }
  }
  
diff --git a/wm/olvwm/patches/patch-am b/wm/olvwm/patches/patch-am
new file mode 100644
index 00000000000..c80af3a9a50
--- /dev/null
+++ b/wm/olvwm/patches/patch-am
@@ -0,0 +1,29 @@
+$NetBSD: patch-am,v 1.1 2006/01/19 23:15:59 joerg Exp $
+
+--- gettext.c.orig	1998-01-13 21:01:04.000000000 +0000
++++ gettext.c
+@@ -11,18 +11,21 @@
+  *      LEGAL_NOTICE file for terms of the license.
+  */
+ 
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
+ #include "gettext.h"
+ 
+ #ifdef SYSV
+ #define bzero(a,b) memset(a,0,b)
+ #endif
+ 
+-char *malloc(), *strdup();
+ char * dgettext();
+ char *_gettext();
+ char *in_path();
+-char *fgets(), *getenv();
+-caddr_t mmap(), calloc();
+ 
+ #ifdef NOT
+ static struct domain_binding *firstbind=0, *lastbind=0;