added support for IRIX 5

4 files changed, 48 insertions, 11 deletions

diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common
index 17142379f91..6506f5c0d84 100644
--- a/textproc/catdoc/Makefile.common
+++ b/textproc/catdoc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/03/04 21:30:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/10/01 08:58:24 schwarz Exp $
 #
 
 DISTNAME=	catdoc-0.91.4
@@ -18,3 +18,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
 
 CPPFLAGS+=		-Dunix -D__unix
+
+.include "../../mk/bsd.prefs.mk"
+.if !empty(LOWER_OPSYS:Mirix5*)
+# needs glob.h
+. include "../../pkgtools/libnbcompat/buildlink3.mk"
+SUBST_CLASSES+=		glob_h
+SUBST_STAGE.glob_h=	post-patch
+SUBST_FILES.glob_h=	src/fileutil.c
+SUBST_SED.glob_h=	-e "s,<glob\.h>,<nbcompat/glob.h>,"
+.endif
diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo
index 2fffe7e6654..1a50c589f9a 100644
--- a/textproc/catdoc/distinfo
+++ b/textproc/catdoc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/12/27 18:38:00 reed Exp $
+$NetBSD: distinfo,v 1.7 2006/10/01 08:58:24 schwarz Exp $
 
 SHA1 (catdoc-0.91.4.tar.gz) = f486345447993bc818093f84b505c2ebbb046954
 RMD160 (catdoc-0.91.4.tar.gz) = 6519112a49c495c2b2fcee442c841d1ee23e9970
 Size (catdoc-0.91.4.tar.gz) = 128428 bytes
 SHA1 (patch-aa) = c9b4834bdd9ce734320dc6cc1077037de007308b
 SHA1 (patch-ab) = 328c6d3f1613dff35760836bf051c48fba343576
-SHA1 (patch-ac) = 4b008af59792a155421bc99d6daf31db0da50c63
+SHA1 (patch-ac) = 30d9873a3360b4153ab2c5ff4dc867fc076870fd
 SHA1 (patch-ad) = 8c31913ccee50b7f1b26b7a2f0ab48ae9368cadd
 SHA1 (patch-ae) = e088cd6ca202a6d201ff6f7d93a98dc1c712f3c0
 SHA1 (patch-af) = d813dbbadd7749b80aa7bab47d8b963ad41cc1fc
diff --git a/textproc/catdoc/patches/patch-ac b/textproc/catdoc/patches/patch-ac
index 2a21e5f110b..5e2b1674198 100644
--- a/textproc/catdoc/patches/patch-ac
+++ b/textproc/catdoc/patches/patch-ac
@@ -1,15 +1,37 @@
-$NetBSD: patch-ac,v 1.4 2000/04/17 10:55:03 jdolecek Exp $
+$NetBSD: patch-ac,v 1.5 2006/10/01 08:58:24 schwarz Exp $
 
-Add CPPFLAGS to CFLAGS, passed down through the environment.
-
---- src/Makefile.in.orig	Mon Apr 17 12:52:30 2000
-+++ src/Makefile.in	Mon Apr 17 12:52:01 2000
-@@ -61,7 +61,7 @@
+--- src/Makefile.in.orig	1999-12-30 15:24:10.000000000 +0100
++++ src/Makefile.in	2006-09-21 00:20:08.000000000 +0200
+@@ -18,7 +18,7 @@
+ install_targets = @installtargets@
+ # Flags to pass to your C compilier
+ # remove -O2 on HP/UX 9. It is known to cause problems
+-FLAGS=-Wall -O2 -g 
++#FLAGS=-Wall -O2 -g 
+ 
+ #Compile-time configuration of catdoc itself. Edit according to taste
+ 
+@@ -61,19 +61,19 @@
   -DREPL_EXT=\"$(REPL_EXT)\" -DUNKNOWN_CHAR=\'$(UNKNOWN_CHAR)\'\
   -DSOURCE_CHARSET=\"$(SOURCE_CHARSET)\" -DTARGET_CHARSET=\"$(TARGET_CHARSET)\"
  
 -CFLAGS=$(FLAGS) $(DEFINES) @DEFS@
-+CFLAGS=$(FLAGS) $(DEFINES) @DEFS@ $(CPPFLAGS)
++FLAGS=$(CFLAGS) $(DEFINES) @DEFS@ $(CPPFLAGS)
  OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o\
  	confutil.o analyze.o rtfreader.o
  
+ OBJXLS=xls2csv.o charsets.o substmap.o fileutil.o confutil.o
+ 
+ #.c.o:
+-#	$(CC) -c $(CFLAGS) $*
++#	$(CC) -c $(FLAGS) $*
+ all: @buildtargets@
+ catdoc: $(OBJ)
+-	$(CC)  -o catdoc  $(OBJ)
++	$(CC)  -o catdoc  $(OBJ) @LIBS@
+ xls2csv: $(OBJXLS)
+-	$(CC) -o xls2csv $(OBJXLS) -lm
++	$(CC) -o xls2csv $(OBJXLS) -lm @LIBS@
+ install: @installtargets@
+ install-catdoc:catdoc xls2csv
+ 	../mkinstalldirs $(installroot)$(bindir)
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index ef9d1ec0670..28f296bcca8 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/07/08 12:50:18 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2006/10/01 08:56:28 schwarz Exp $
 
 DISTNAME=	libxslt-1.1.17
 CATEGORIES=	textproc
@@ -23,6 +23,11 @@ CONFIGURE_ARGS+=	--without-python
 
 TEST_TARGET=		check
 
+.include "../../mk/bsd.prefs.mk"
+.if !empty(LOWER_OPSYS:Mirix5*)
+CPPFLAGS+=	-Dsocklen_t=int
+.endif
+
 BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.25
 
 .include "../../textproc/libxml2/buildlink3.mk"