Apply patches from Georg Schwarz in order to compile helpdeco on IRIX 5.3.

5 files changed, 52 insertions, 18 deletions

diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index e6e9f75194c..7a66ff97612 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/17 04:49:07 ben Exp $
+# $NetBSD: Makefile,v 1.12 2004/09/22 17:00:33 ben Exp $
 #
 
 DISTNAME=		helpdc21
@@ -41,6 +41,11 @@ MASTER_SITE_SIMTEL+=	ftp://ftp.cdrom.com/pub/simtelnet/ \
 CFLAGS+=		-Dstrlcpy=strncpy
 .endif
 
+.if !empty(LOWER_OPSYS:Mirix5*)
+DEPENDS+=		../../pkgtools/libnbcompat
+LDFLAGS+=		-lgen -L${LOCALBASE}/lib -lnbcompat
+.endif
+
 MAKE_ENV+=		CFLAGS="${CFLAGS}"
 
 post-extract:
diff --git a/textproc/helpdeco/distinfo b/textproc/helpdeco/distinfo
index 86f73a5426d..bb003f71589 100644
--- a/textproc/helpdeco/distinfo
+++ b/textproc/helpdeco/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/05/23 15:47:43 agc Exp $
+$NetBSD: distinfo,v 1.2 2004/09/22 17:00:33 ben Exp $
 
 SHA1 (helpdc21.zip) = 1a6ca50acb3783674a225764066cd90307806552
 Size (helpdc21.zip) = 222217 bytes
-SHA1 (patch-aa) = 8890da60f28a678714d7d4c8d8140940b122557e
-SHA1 (patch-ab) = 43cb2836955c1541d7d3f57ec9b21ce285ab1c72
+SHA1 (patch-aa) = 3af5ad63eb624420bcde21fd0bfabf5ff5c911b3
+SHA1 (patch-ab) = 6d1c9da92c9eb46007280544da8a75eb695c4137
 SHA1 (patch-ac) = a40ce0a49631ea0d03f4f51f5c12d253d19cd282
 SHA1 (patch-ad) = 7416d09c01df45b8b5fa903d69e77e1b3f204e95
 SHA1 (patch-ae) = 2dd709c96ae22671cfc38892c093f544544ce810
+SHA1 (patch-af) = 4fee85e274fdba16a760782b828a0cd7478a1243
diff --git a/textproc/helpdeco/patches/patch-aa b/textproc/helpdeco/patches/patch-aa
index 1424204f43b..3c0cb21f906 100644
--- a/textproc/helpdeco/patches/patch-aa
+++ b/textproc/helpdeco/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/22 17:00:33 ben Exp $
 
 --- splitmrb.c.orig	Fri Sep 13 00:11:54 1996
-+++ splitmrb.c	Sat May 12 23:25:04 2001
-@@ -216,14 +216,10 @@
++++ splitmrb.c
+@@ -12,6 +12,7 @@ n is a digit from 0 to 9). Discarded hot
+ This program is freeware. Use at your own risk. No part of it may be used
+ commercially. No fees may be charged on distributing.
+ */
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -216,14 +217,10 @@ void PrintHotspotInfo(FILE *f)
      int i,l,n;
      typedef struct
      {
@@ -21,7 +29,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
      HOTSPOT *hotspot;
      char name[80];
      char buffer[128];
-@@ -308,7 +304,7 @@
+@@ -308,7 +305,7 @@ int main(int argc,char *argv[])
  	while(l>0&&filename[l-1]!='\\'&&filename[l-1]!='/'&&filename[l-1]!=':') l--;
  	m=l;
  	while(filename[l]!='\0'&&filename[l]!='.') l++;
@@ -30,7 +38,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
  	f=fopen(filename,"rb");
  	if(!f)
  	{
-@@ -331,7 +327,7 @@
+@@ -331,7 +328,7 @@ int main(int argc,char *argv[])
  		    fseek(f,offset,SEEK_SET);
  		    byType=getc(f); // type of picture: 5=DDB, 6=DIB, 8=METAFILE
  		    byPacked=getc(f); // packing method: 0=unpacked, 1=RunLen, 2=LZ77
@@ -39,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
  		    {
  			memset(&bmfh,0,sizeof(bmfh));
  			memset(&bmih,0,sizeof(bmih));
-@@ -378,17 +374,17 @@
+@@ -378,17 +375,17 @@ int main(int argc,char *argv[])
  			    sprintf(filename+l,".%03d",j);
  			    if(w==96&&h==48&&!res[0])
  			    {
@@ -60,7 +68,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
  				res[2]=TRUE;
  			    }
  			    else if(w==120&&h==120&&!res[3])
-@@ -398,12 +394,12 @@
+@@ -398,12 +395,12 @@ int main(int argc,char *argv[])
  			    }
  			    else if(w==72&&h==72&&!res[4])
  			    {
@@ -75,7 +83,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
  				res[6]=TRUE;
  			    }
  			    fTarget=fopen(filename+m,"wb");
-@@ -472,7 +468,6 @@
+@@ -472,7 +469,6 @@ int main(int argc,char *argv[])
  		    }
  		    else if(byType==8) // Windows MetaFile
  		    {
@@ -83,7 +91,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
  			unsigned short *wp;
  
  			memset(&afh,0,sizeof(afh));
-@@ -512,7 +507,7 @@
+@@ -512,7 +508,7 @@ int main(int argc,char *argv[])
  			    for(k=0;k<10;k++) afh.wChecksum^=*wp++;
  			    if(!res[5])
  			    {
diff --git a/textproc/helpdeco/patches/patch-ab b/textproc/helpdeco/patches/patch-ab
index ca050b62abb..2bc747c736c 100644
--- a/textproc/helpdeco/patches/patch-ab
+++ b/textproc/helpdeco/patches/patch-ab
@@ -1,19 +1,20 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/22 17:00:33 ben Exp $
 
 --- zapres.c.orig	Fri Sep 13 20:52:50 1996
-+++ zapres.c	Sat May 12 23:26:01 2001
-@@ -17,8 +17,9 @@
++++ zapres.c
+@@ -17,8 +17,10 @@ commercially. No fees may be charged on 
  
  #include <stdio.h>
  #include <stdlib.h>
 -#include <dir.h>
++#include <sys/types.h>
 +#include <sys/dir.h>
  #include <string.h>
 +#include "compat.h"
  
  int backup(FILE *f,char *oldname)
  {
-@@ -31,7 +32,7 @@
+@@ -31,7 +33,7 @@ int backup(FILE *f,char *oldname)
      int result=0;
  
      _splitpath(oldname,drive,dir,fname,ext);
@@ -22,7 +23,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/23 15:47:45 agc Exp $
      bak=fopen(path,"wb");
      if(bak)
      {
-@@ -102,7 +103,7 @@
+@@ -102,7 +104,7 @@ int main(int argc,char *argv[])
      else for(i=1;i<b;i++)
      {
  	_splitpath(argv[i],drive,dir,fname,ext);
diff --git a/textproc/helpdeco/patches/patch-af b/textproc/helpdeco/patches/patch-af
new file mode 100644
index 00000000000..3e30fd1a0f6
--- /dev/null
+++ b/textproc/helpdeco/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1 2004/09/22 17:00:33 ben Exp $
+
+--- Makefile.orig	Wed Sep 22 09:42:27 2004
++++ Makefile
+@@ -3,11 +3,11 @@ all: splitmrb zapres helpdeco
+ CFLAGS+=-g
+ 
+ splitmrb: splitmrb.c
+-	${CC} ${CFLAGS} -o splitmrb splitmrb.c
++	${CC} ${CFLAGS} -o splitmrb splitmrb.c ${LDFLAGS}
+ zapres: zapres.c compat.o
+-	${CC} ${CFLAGS} -o zapres zapres.c compat.o
++	${CC} ${CFLAGS} -o zapres zapres.c compat.o ${LDFLAGS}
+ helpdeco: helpdeco.c helpdec1.c compat.o
+-	${CC} ${CFLAGS} -o helpdeco helpdeco.c helpdec1.c compat.o
++	${CC} ${CFLAGS} -o helpdeco helpdeco.c helpdec1.c compat.o ${LDFLAGS}
+ compat.o: compat.c
+ 
+ clean: