9 files changed, 21 insertions, 90 deletions

diff --git a/palm/makeztxt/Makefile b/palm/makeztxt/Makefile
index 20702939226d..838004148ecd 100644
--- a/palm/makeztxt/Makefile
+++ b/palm/makeztxt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	makeztxt
-PORTVERSION=	1.43
-PORTREVISION=	1
+PORTVERSION=	1.60
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gutenpalm
@@ -20,7 +19,18 @@ PLIST_FILES=	bin/makeztxt
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 
+MAKE_ENV+=	USEPOSIX=1
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500000
+MAKE_ENV+=	LONG_OPTS=1
+.endif
+
+post-patch:
+	${REINPLACE_CMD} 's/-O2//' ${WRKSRC}/libztxt/Makefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/makeztxt ${LOCALBASE}/bin/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/palm/makeztxt/distinfo b/palm/makeztxt/distinfo
index 201d06c87a96..41eb1bea3151 100644
--- a/palm/makeztxt/distinfo
+++ b/palm/makeztxt/distinfo
@@ -1,3 +1,3 @@
-MD5 (makeztxt-1.43-src.tar.gz) = 9af951a5b6d7e5633c02cd4b13bb606a
-SHA256 (makeztxt-1.43-src.tar.gz) = e249daa83133594fd9161fcf787730b5454404c8d9171da5928826cf36dd5434
-SIZE (makeztxt-1.43-src.tar.gz) = 28161
+MD5 (makeztxt-1.60-src.tar.gz) = d2f4166191b8ddd1033252de2d4680b5
+SHA256 (makeztxt-1.60-src.tar.gz) = 016b1542e40819e2854cf617c2ab08c7f9aebc26dd613673e81a95603dde7146
+SIZE (makeztxt-1.60-src.tar.gz) = 39508
diff --git a/palm/makeztxt/files/patch-Makefile b/palm/makeztxt/files/patch-Makefile
index f3282e6da984..0785f9eff2d3 100644
--- a/palm/makeztxt/files/patch-Makefile
+++ b/palm/makeztxt/files/patch-Makefile
@@ -1,26 +1,16 @@
---- Makefile.orig	Sat Oct 19 15:38:34 2002
-+++ Makefile	Sat Oct 19 15:40:04 2002
-@@ -9,8 +9,8 @@
+--- ./Makefile.orig	Mon May  1 14:39:51 2006
++++ ./Makefile	Mon May  1 14:40:05 2006
+@@ -9,8 +9,7 @@
  LIBS	= -lztxt
  INCLUDE	= -I../common -I.
  
 -CC	= gcc
 -CFLAGS	= -Wall -O2 -pipe $(INCLUDE)
-+CC	?= cc
-+CFLAGS	+= -Wall $(INCLUDE)
++CFLAGS	= -Wall $(INCLUDE)
  # GNU make is mandatory
  #MAKE	= make
  
-@@ -29,7 +29,7 @@
- # more featureful and faster (on large strings) than POSIX regex.
- # But... maybe you don't have GNU regex.
- # In particular, if compiling with Cygwin, you need this.
--#USEPOSIX = 1
-+USEPOSIX = 1
- 
- # DOS, in all its infinite wisdom, decided long ago to differentiate between
- # text files and binary files.  Text files get their \n converted to \r\n and
-@@ -44,7 +44,7 @@
+@@ -44,7 +43,7 @@
  
  # If you're on a system that does not have getopt.h or does not have the
  # getopt_long() function, comment this out.  Regular getopt() will be used.
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt.h b/palm/makeztxt/files/patch-libztxt::ztxt.h
deleted file mode 100644
index ece5f2bf4a7f..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libztxt/ztxt.h.old	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt.h	Sun Sep 29 15:46:52 2002
-@@ -31,6 +31,7 @@
- #define _ZTXT_H_ 1
- 
- 
-+#include <sys/types.h>
- #include <regex.h>
- #include "databaseHdrs.h"
- #include <weasel_common.h>
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt_generate_db.c b/palm/makeztxt/files/patch-libztxt::ztxt_generate_db.c
deleted file mode 100644
index bb3f3843ffe7..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt_generate_db.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libztxt/ztxt_generate_db.c.old	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt_generate_db.c	Sun Sep 29 15:51:55 2002
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <regex.h>
- #include "ztxt.h"
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt_init.c b/palm/makeztxt/files/patch-libztxt::ztxt_init.c
deleted file mode 100644
index 25463ba72d1f..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt_init.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libztxt/ztxt_init.c.old	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt_init.c	Sun Sep 29 15:52:33 2002
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <time.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include "ztxt.h"
-
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt_list_bookmarks.c b/palm/makeztxt/files/patch-libztxt::ztxt_list_bookmarks.c
deleted file mode 100644
index 01a83d076112..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt_list_bookmarks.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libztxt/ztxt_list_bookmarks.c.old	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt_list_bookmarks.c	Sun Sep 29 15:52:10 2002
-@@ -29,6 +29,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- 
- #include "ztxt.h"
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt_process.c b/palm/makeztxt/files/patch-libztxt::ztxt_process.c
deleted file mode 100644
index 6a316a66e6b0..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt_process.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- libztxt/ztxt_process.c.orig	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt_process.c	Sat Aug 14 13:35:00 2004
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <regex.h>
- #include <zlib.h>
- #include "ztxt.h"
-@@ -140,7 +141,7 @@
-             break;
- 
-           case 2:
--          default:
-+          default:;
-             /* Just leave the next alone.  No linefeed stripping. */
-         }
- 
diff --git a/palm/makeztxt/files/patch-libztxt::ztxt_set.c b/palm/makeztxt/files/patch-libztxt::ztxt_set.c
deleted file mode 100644
index 3985cc0fb2c6..000000000000
--- a/palm/makeztxt/files/patch-libztxt::ztxt_set.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libztxt/ztxt_set.c.old	Sat Mar  2 07:03:18 2002
-+++ libztxt/ztxt_set.c	Sun Sep 29 15:52:21 2002
-@@ -28,6 +28,7 @@
-  */
- 
- #include <string.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include "ztxt.h"
-