From d2c12aa0df5c61e68381b63cb3d6b7a27cb74a4a Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Thu, 11 Aug 2005 13:20:12 +0000
Subject: - Unbreak xview-clients on FreeBSD 5.X and newer

Reported by:	krismail
Approved by:	portmgr (kris)
---
 x11-toolkits/xview/files/patch-Imakefile           | 30 +++++++++++++++++-----
 .../xview/files/patch-clients+olwm+gettext.c       | 15 ++++++-----
 2 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'x11-toolkits/xview')

diff --git a/x11-toolkits/xview/files/patch-Imakefile b/x11-toolkits/xview/files/patch-Imakefile
index ff53199f4a60..49ba5f52e7da 100644
--- a/x11-toolkits/xview/files/patch-Imakefile
+++ b/x11-toolkits/xview/files/patch-Imakefile
@@ -1,5 +1,5 @@
 --- Imakefile.orig	Sun Jun 26 03:47:22 1994
-+++ Imakefile	Sat Aug  6 23:14:35 2005
++++ Imakefile	Thu Aug 11 14:26:34 2005
 @@ -4,8 +4,8 @@
  /**/# Top level Imakefile for ProductNameAndRelease
  /**/# @(#)Imakefile	1.7 1/7/92 SMI
@@ -11,7 +11,7 @@
  
  #define IHaveSubdirs
  #define PassCDebugFlags
-@@ -13,7 +13,7 @@
+@@ -13,14 +13,21 @@
             WORLDOPTS = 
  /**/# If you want to make only the library, then start the build in the lib
  /**/# subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
@@ -20,17 +20,22 @@
  #if InstallOpenLookFonts 
              FONTSDIR = fonts
  #else
-@@ -21,6 +21,9 @@
+             FONTSDIR = 
  #endif
            CLIENTSDIR = clients
-              SUBDIRS = $(COREDIRS) $(FONTSDIR) 
+-             SUBDIRS = $(COREDIRS) $(FONTSDIR) 
++.ifdef DOCLIENTS
++             SUBDIRS = $(CLIENTSDIR)
++.else
++             SUBDIRS = $(COREDIRS) $(FONTSDIR)
++.endif
 +.ifdef WITHDOCSUBDIR
-+SUBDIRS+= doc
++SUBDIRS+=doc
 +.endif
  /**/# even if these subdirs are not included in the general rules, be sure to
  /**/# do a make clean in them.
         CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util
-@@ -59,11 +62,11 @@
+@@ -59,11 +66,11 @@
  	@echo ""
  	@date
  	@echo ""
@@ -47,3 +52,16 @@
  	@echo ""
  	@date
  	@echo ""
+@@ -96,9 +103,9 @@
+ 	@echo ""
+ 	@date
+ 	@echo ""
+-	$(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' Makefiles
+-	$(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' depend
+-	$(MAKE) $(MFLAGS) 'SUBDIRS=$(CLIENTSDIR)' 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS)
++	$(MAKE) $(MFLAGS) -DDOCLIENTS Makefiles
++	$(MAKE) $(MFLAGS) -DDOCLIENTS depend
++	$(MAKE) $(MFLAGS) -DDOCLIENTS 'CDEBUGFLAGS=$(CDEBUGFLAGS)' $(WORLDOPTS)
+ 	@echo ""
+ 	@date
+ 	@echo ""
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
index 7858cf27d5f0..08c598dd4153 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
@@ -1,13 +1,16 @@
---- clients/olwm/gettext.c.orig	Fri Oct 17 11:24:49 2003
-+++ clients/olwm/gettext.c	Fri Oct 17 11:30:14 2003
-@@ -20,7 +20,10 @@
+--- clients/olwm/gettext.c.orig	Thu Aug 11 13:59:59 2005
++++ clients/olwm/gettext.c	Thu Aug 11 14:05:12 2005
+@@ -16,11 +16,13 @@
+ #endif
+ 
+ char *malloc(), *strdup();
+-char * dgettext();
++char * dgettext(char *domain_name, char *msg_id);
  char *_gettext();
  char *in_path();
  char *fgets(), *getenv();
--caddr_t mmap(), calloc();
-+caddr_t calloc();
 +#ifndef __FreeBSD__
-+caddr_t mmap();
+ caddr_t mmap(), calloc();
 +#endif
  
  static struct domain_binding *firstbind=0, *lastbind=0;
-- 
cgit v1.2.3