Update to 1.40b: Support for on-demand decompression.

Update provided by Dieter Baron in private mail.

6 files changed, 68 insertions, 13 deletions

diff --git a/textproc/makeztxt/Makefile b/textproc/makeztxt/Makefile
index d7b8a40b295..a29620a45ec 100644
--- a/textproc/makeztxt/Makefile
+++ b/textproc/makeztxt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/19 15:14:58 wiz Exp $
+#
 
 DISTNAME=	${PKGNAME}-src
-PKGNAME=	${PRG}-1.10
+PKGNAME=	makeztxt-1.40b
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	textproc converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gutenpalm/}
@@ -10,17 +11,11 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://gutenpalm.sourceforge.net/makeztxt.php
 COMMENT=	ASCII text to Palm zTXT database converter
 
-PRG=		makeztxt
-
-do-build:
-	cd ${WRKSRC} &&							\
-	${CC} ${CFLAGS} -I. -o ${PRG} ${PRG}.c ${LDFLAGS} -lz
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PRG} ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PRG}
+	${INSTALL_PROGRAM} ${WRKSRC}/makeztxt ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/makeztxt
 .for doc in COPYING ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/${PRG}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/makeztxt
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/makeztxt/files/md5 b/textproc/makeztxt/files/md5
index e908d1a5e80..44f97dd062e 100644
--- a/textproc/makeztxt/files/md5
+++ b/textproc/makeztxt/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/01/21 22:44:16 rh Exp $
+$NetBSD: md5,v 1.2 2001/02/19 15:14:58 wiz Exp $
 
-MD5 (makeztxt-1.10-src.tar.gz) = 6309743860f5f2f6abd867497dfaeb7e
+MD5 (makeztxt-1.40b-src.tar.gz) = a44b8ea356c01fb17f598f0ea98a195d
diff --git a/textproc/makeztxt/files/patch-sum b/textproc/makeztxt/files/patch-sum
new file mode 100644
index 00000000000..9867c1d3ed7
--- /dev/null
+++ b/textproc/makeztxt/files/patch-sum
@@ -0,0 +1,5 @@
+$NetBSD: patch-sum,v 1.1 2001/02/19 15:14:58 wiz Exp $
+
+MD5 (patch-aa) = 900ebce055bb838275711640789f96f0
+MD5 (patch-ab) = 99ccfc89ad9c0ffdce817c204eb956b7
+MD5 (patch-ac) = b6a00729a5964ae4dcb8fd2f25bf7dc2
diff --git a/textproc/makeztxt/patches/patch-aa b/textproc/makeztxt/patches/patch-aa
new file mode 100644
index 00000000000..3bf15965598
--- /dev/null
+++ b/textproc/makeztxt/patches/patch-aa
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1 2001/02/19 15:14:59 wiz Exp $
+
+--- Makefile.orig	Fri Feb 16 20:23:19 2001
++++ Makefile	Fri Feb 16 20:23:21 2001
+@@ -7,8 +7,9 @@
+ LIBS	= -lz -lztxt
+ INCLUDE	= -I../common -I.
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2 -pipe $(INCLUDE)
++#CC	= gcc
++#CFLAGS	= -Wall -O2 -pipe $(INCLUDE)
++CFLAGS	+= $(INCLUDE)
+ 
+ # If you're compiling on a Sun (with gcc), you'll need this
+ #CFLAGS	+= -fpack-struct
+@@ -32,11 +33,11 @@
+ 	$(CC) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
+ 
+ libztxt::
+-	+make -C libztxt all
++	cd libztxt && ${MAKE} all
+ 
+ # Cleaning and Makefile maintainence
+ clean:
+-	make -C libztxt clean
++	cd libztxt && ${MAKE} clean
+ 	-rm -f *.o *~
+ 
+ distclean: clean
diff --git a/textproc/makeztxt/patches/patch-ab b/textproc/makeztxt/patches/patch-ab
new file mode 100644
index 00000000000..8c46e37efed
--- /dev/null
+++ b/textproc/makeztxt/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2001/02/19 15:14:59 wiz Exp $
+
+--- libztxt/Makefile.orig	Fri Feb 16 20:21:12 2001
++++ libztxt/Makefile	Fri Feb 16 20:21:43 2001
+@@ -8,7 +8,7 @@
+ 
+ INCLUDE	= -I../../common -I..
+ 
+-CC	= gcc
++#CC	= gcc
+ CFLAGS	+= $(INCLUDE)
+ 
+ SRC	= ztxt_add_regex.c ztxt_generate_db.c ztxt_list_bookmarks.c \
diff --git a/textproc/makeztxt/patches/patch-ac b/textproc/makeztxt/patches/patch-ac
new file mode 100644
index 00000000000..8f92352c7c6
--- /dev/null
+++ b/textproc/makeztxt/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2001/02/19 15:14:59 wiz Exp $
+
+--- libztxt/ztxt_set.c.orig	Fri Feb 16 20:21:59 2001
++++ libztxt/ztxt_set.c	Fri Feb 16 20:22:13 2001
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <string.h>
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include "ztxt.h"
+