Fix the following problems with version 1.31 of the xbanner port.

    - installing in libexec directory isn't useful
    - app-defaults file could only be found when XAPPLRESDIR
      enviroment variable is set -> patch in sourcefile is needed
    - some compiler warnings and gets usage is fixed
    - wrong usage of isnumber macro fixed

PR:		11768
Submitted by:	Lars Koeller <lkoeller@cc.fh-lippe.de>

6 files changed, 265 insertions, 15 deletions

diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 8c8568994045..dbadb493b5e7 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -3,13 +3,14 @@
 # Date created:		13 Jan 1999
 # Whom:			giffunip@asme.org
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/20 08:18:56 flathill Exp $
+# $Id: Makefile,v 1.2 1999/02/02 03:27:50 asami Exp $
 #
 
 DISTNAME=	XBanner1.31
 PKGNAME=	xbanner-1.31
 CATEGORIES=	x11
 MASTER_SITES=	ftp://physics.fullerton.edu/pub/Linux/XBanner/	\
+		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=X11/xutils
 
@@ -19,6 +20,10 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
 #USE_IMAKE=	yes
+post-patch:
+	${MV} ${WRKSRC}/xres.c ${WRKSRC}/xres.c.input
+	${SED} "s:%%X11BASE%%:${X11BASE}:" ${WRKSRC}/xres.c.input > ${WRKSRC}/xres.c
+	${RM} -f ${WRKSRC}/xres.c.input
 
 post-install:
 	${INSTALL_DATA}	${WRKSRC}/samples/XBanner.ad \
diff --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-aa
index fa54317e5496..bd05fd450945 100644
--- a/x11/xbanner/files/patch-aa
+++ b/x11/xbanner/files/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.orig	Mon May 12 10:55:59 1997
---- Makefile	Tue Jan 19 22:27:09 1999
+*** Makefile.orig	Mon May 12 17:55:59 1997
+--- Makefile	Tue May 18 21:22:21 1999
 ***************
 *** 6,30 ****
   
@@ -40,7 +40,7 @@
   GZIP	=gzip
   
   # Binary directory for make install
-! BINDIR	=$(PREFIX)/libexec
+! BINDIR	=$(PREFIX)/bin
   
   # Library directories for Linux
 ! XLIBDIR	=$(X11BASE)/lib
@@ -85,26 +85,29 @@
   # Just change it to wherever your libX11.a resides.
 ! LDFLAGS+=-L$(XLIBDIR)
   
-  all: xbanner freetemp random_effect xb_check 
+  all: xbanner freetemp random_effect xb_check
   
 ***************
-*** 71,79 ****
+*** 70,79 ****
+  xb_check: xb_check.o 
   	$(CC) $(CFLAGS) -o xb_check xb_check.o 
   
-  install: freetemp xbanner xb_check 
+! install: freetemp xbanner xb_check 
 ! 	$(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp
 ! 	$(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner
 ! 	$(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check
   
   strip: exe
   	strip xbanner freetemp xb_check random_effect
---- 71,79 ----
-  	$(CC) $(CFLAGS) -o xb_check xb_check.o 
+--- 70,80 ----
+  xb_check: xb_check.o
+  	$(CC) $(CFLAGS) -o xb_check xb_check.o
   
-  install: freetemp xbanner xb_check 
+! install: freetemp xbanner xb_check random_effect
 ! 	$(INSTALL) -cs -g bin -m "0755" -o root freetemp $(BINDIR)/freetemp
 ! 	$(INSTALL) -cs -g bin -m "0755" -o root xbanner $(BINDIR)/xbanner
 ! 	$(INSTALL) -cs -g bin -m "0755" -o root xb_check $(BINDIR)/xb_check
+! 	$(INSTALL) -cs -g bin -m "0755" -o root random_effect $(BINDIR)/random_effect
   
   strip: exe
   	strip xbanner freetemp xb_check random_effect
diff --git a/x11/xbanner/files/patch-ab b/x11/xbanner/files/patch-ab
index ea2ecff0a56e..48705ce3cfff 100644
--- a/x11/xbanner/files/patch-ab
+++ b/x11/xbanner/files/patch-ab
@@ -1,5 +1,5 @@
-*** xb_check.c.orig	Mon Jan 18 23:27:31 1999
---- xb_check.c	Mon Jan 18 23:31:08 1999
+*** xb_check.c.orig	Mon May 12 17:55:59 1997
+--- xb_check.c	Tue May 18 20:51:35 1999
 ***************
 *** 145,151 ****
   }
@@ -17,3 +17,54 @@
   {
     if(atoi(s)==0 && *s!='0')
       return 0;
+***************
+*** 303,309 ****
+      }
+    }
+  
+!   while(gets(line)!=NULL)
+    {
+      if(line[0]=='!')
+        continue;
+--- 303,309 ----
+      }
+    }
+  
+!   while(fgets(line, LNLEN, stdin)!=NULL)
+    {
+      if(line[0]=='!')
+        continue;
+***************
+*** 363,369 ****
+              printf("Valid resource name with unknown program name:\n%s\n",line);
+            if(val[0]=='\0')
+              printf("No value in line containing valid resource name:\n%s\n",line);
+! 	  if(!isnumber(val))
+  	    printf("Value in line requiring a numerical value is not numerical:\n%s\n",line);
+          }
+          else
+--- 363,369 ----
+              printf("Valid resource name with unknown program name:\n%s\n",line);
+            if(val[0]=='\0')
+              printf("No value in line containing valid resource name:\n%s\n",line);
+! 	  if(!isnumb(val))
+  	    printf("Value in line requiring a numerical value is not numerical:\n%s\n",line);
+          }
+          else
+***************
+*** 373,379 ****
+              printf("Valid resource class name with unknown program name:\n%s\n",line);
+            if(val[0]=='\0')
+              printf("No value in line containing valid resource class name:\n%s\n",line);
+! 	  if(!isnumber(val))
+  	    printf("Value in line requiring a numerical value is not numerical:\n%s\n",line);
+          }
+          break;
+--- 373,379 ----
+              printf("Valid resource class name with unknown program name:\n%s\n",line);
+            if(val[0]=='\0')
+              printf("No value in line containing valid resource class name:\n%s\n",line);
+! 	  if(!isnumb(val))
+  	    printf("Value in line requiring a numerical value is not numerical:\n%s\n",line);
+          }
+          break;
diff --git a/x11/xbanner/files/patch-ac b/x11/xbanner/files/patch-ac
new file mode 100644
index 000000000000..511a61378370
--- /dev/null
+++ b/x11/xbanner/files/patch-ac
@@ -0,0 +1,33 @@
+*** xres.c.org	Tue May 18 20:07:11 1999
+--- xres.c	Tue May 18 20:30:50 1999
+***************
+*** 8,13 ****
+--- 8,14 ----
+  #include <string.h>
+  #include <stdlib.h>
+  #include <ctype.h>
++ #include <sys/param.h>
+  
+  #include <X11/Xlib.h>
+  #include <X11/Xutil.h>
+***************
+*** 1196,1202 ****
+    /* get the app-defaults */
+  
+  #ifndef vms
+!   strcpy(line,"/usr/lib/X11/app-defaults/");
+    strcat(line,PRGCLASS);
+    appdefDB = XrmGetFileDatabase(line);
+    if(appdefDB==NULL && getenv("XAPPLRESDIR")!=NULL)
+--- 1197,1207 ----
+    /* get the app-defaults */
+  
+  #ifndef vms
+! #  if (defined(BSD) && (BSD >= 199306))
+!      strcpy(line,"%%X11BASE%%/lib/X11/app-defaults/");
+! #  else
+!      strcpy(line,"/usr/lib/X11/app-defaults/");
+! #  endif
+    strcat(line,PRGCLASS);
+    appdefDB = XrmGetFileDatabase(line);
+    if(appdefDB==NULL && getenv("XAPPLRESDIR")!=NULL)
diff --git a/x11/xbanner/files/patch-ad b/x11/xbanner/files/patch-ad
new file mode 100644
index 000000000000..65867854f820
--- /dev/null
+++ b/x11/xbanner/files/patch-ad
@@ -0,0 +1,154 @@
+*** backg.c.org	Tue May 18 20:52:54 1999
+--- backg.c	Tue May 18 20:54:22 1999
+***************
+*** 5,11 ****
+  #include <stdlib.h>
+  #include <string.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  #include <math.h>
+  
+--- 5,14 ----
+  #include <stdlib.h>
+  #include <string.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  #include <math.h>
+  
+*** colors.c.org	Tue May 18 20:54:37 1999
+--- colors.c	Tue May 18 20:55:39 1999
+***************
+*** 7,13 ****
+  #include <stdio.h>
+  #include <ctype.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  
+  /* X11 include(s) */
+--- 7,16 ----
+  #include <stdio.h>
+  #include <ctype.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  
+  /* X11 include(s) */
+*** effect.c.org	Tue May 18 20:55:49 1999
+--- effect.c	Tue May 18 20:56:39 1999
+***************
+*** 7,13 ****
+  #include <stdio.h>
+  #include <ctype.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  
+  /* X11 include(s) */
+--- 7,16 ----
+  #include <stdio.h>
+  #include <ctype.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  
+  /* X11 include(s) */
+*** plasma.c.org	Tue May 18 20:55:56 1999
+--- plasma.c	Tue May 18 20:56:58 1999
+***************
+*** 2,8 ****
+  #include <math.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  
+  #include <X11/Xlib.h>
+--- 2,11 ----
+  #include <math.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  
+  #include <X11/Xlib.h>
+*** random_effect.c.org	Tue May 18 20:56:06 1999
+--- random_effect.c	Tue May 18 20:57:12 1999
+***************
+*** 1,7 ****
+  #include <stdio.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  #include <time.h>
+  #include <string.h>
+--- 1,10 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  #include <time.h>
+  #include <string.h>
+*** ripples.c.org	Tue May 18 20:56:11 1999
+--- ripples.c	Tue May 18 20:57:22 1999
+***************
+*** 2,8 ****
+  #include <math.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  
+  /* use this to change if you want ripples with more than 256 colors */
+--- 2,11 ----
+  #include <math.h>
+  #include <stdlib.h>
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  
+  /* use this to change if you want ripples with more than 256 colors */
+*** util.c.org	Tue May 18 20:56:18 1999
+--- util.c	Tue May 18 20:57:34 1999
+***************
+*** 7,13 ****
+  #include <stdlib.h>
+  
+  #ifndef vms
+! #include <malloc.h>
+  #endif
+  
+  #include <X11/Xlib.h>
+--- 7,16 ----
+  #include <stdlib.h>
+  
+  #ifndef vms
+! #include <sys/param.h>
+! #  if !(defined(BSD) && (BSD >= 199306))
+! #    include <malloc.h>
+! #  endif
+  #endif
+  
+  #include <X11/Xlib.h>
diff --git a/x11/xbanner/pkg-plist b/x11/xbanner/pkg-plist
index db009efd85fe..afbeb03d0083 100644
--- a/x11/xbanner/pkg-plist
+++ b/x11/xbanner/pkg-plist
@@ -1,6 +1,8 @@
-libexec/freetemp
-libexec/xbanner
-libexec/xb_check
+bin/freetemp
+bin/xbanner
+bin/xb_check
+bin/random_effect
+lib/X11/app-defaults/XBanner
 share/doc/XBanner/COPYING-2.0
 share/doc/XBanner/Changes.txt
 share/doc/XBanner/Credits.txt
@@ -23,3 +25,5 @@ share/examples/XBanner/FatText_Sky
 share/examples/XBanner/FgGrad_Idea_2
 share/examples/XBanner/Just_an_Idea
 share/examples/XBanner/My_Home_Setup.tar
+@dirrm share/doc/XBanner
+@dirrm share/examples/XBanner