update to 1.62

6 files changed, 4 insertions, 82 deletions

diff --git a/palm/makeztxt/Makefile b/palm/makeztxt/Makefile
index 3fdc3d659c0d..00a420e1cbdc 100644
--- a/palm/makeztxt/Makefile
+++ b/palm/makeztxt/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	makeztxt
-PORTVERSION=	1.60
-PORTREVISION=	1
+PORTVERSION=	1.62
 CATEGORIES=	palm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gutenpalm
diff --git a/palm/makeztxt/distinfo b/palm/makeztxt/distinfo
index 41eb1bea3151..b9942f83805e 100644
--- a/palm/makeztxt/distinfo
+++ b/palm/makeztxt/distinfo
@@ -1,3 +1,3 @@
-MD5 (makeztxt-1.60-src.tar.gz) = d2f4166191b8ddd1033252de2d4680b5
-SHA256 (makeztxt-1.60-src.tar.gz) = 016b1542e40819e2854cf617c2ab08c7f9aebc26dd613673e81a95603dde7146
-SIZE (makeztxt-1.60-src.tar.gz) = 39508
+MD5 (makeztxt-1.62-src.tar.gz) = 81b44b72894248b7e579592e650f1da4
+SHA256 (makeztxt-1.62-src.tar.gz) = 72404f0c1ea037038937884a79f75061d2c0347de0d9cd09b91b8f3139cd9567
+SIZE (makeztxt-1.62-src.tar.gz) = 39971
diff --git a/palm/makeztxt/files/patch-libztxt-ztxt_disect.c b/palm/makeztxt/files/patch-libztxt-ztxt_disect.c
deleted file mode 100644
index a17dc8ceb43c..000000000000
--- a/palm/makeztxt/files/patch-libztxt-ztxt_disect.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libztxt/ztxt_disect.c.orig	Sun Jun  3 13:31:46 2007
-+++ libztxt/ztxt_disect.c	Sun Jun  3 13:32:42 2007
-@@ -152,8 +152,8 @@
-   zstream.zalloc = Z_NULL;
-   zstream.zfree = Z_NULL;
-   zstream.opaque = Z_NULL;
--  zstream.next_in = &db->output[ntohl(db->dbRecordEntries[1].localChunkID)];
--  zstream.next_out = db->input;
-+  zstream.next_in = (Bytef *)&db->output[ntohl(db->dbRecordEntries[1].localChunkID)];
-+  zstream.next_out = (Bytef *)db->input;
-   zstream.avail_in = data_size;
-   zstream.avail_out = db->input_size + 1;
- 
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 f4f2caf3fe4a..000000000000
--- a/palm/makeztxt/files/patch-libztxt-ztxt_init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libztxt/ztxt_init.c.orig	Mon May 28 20:23:08 2007
-+++ libztxt/ztxt_init.c	Mon May 28 20:23:16 2007
-@@ -61,7 +61,7 @@
- 
-   /* Initialize the Palm DB header structure */
-   header = ztxtdb->dbHeader;
--  strcpy(header->name, "New zTXT database");
-+  strcpy((char *)header->name, "New zTXT database");
-   header->attributes = htons(dmHdrAttrBackup);
-   header->version = htons(ZTXT_VERSION);
-   header->creationDate = htonl(time(NULL) + PALM_CTIME_OFFSET);
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 2ed1f2d232c7..000000000000
--- a/palm/makeztxt/files/patch-libztxt-ztxt_process.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- libztxt/ztxt_process.c.orig	Tue Aug 12 15:05:21 2003
-+++ libztxt/ztxt_process.c	Sun Jun  3 13:29:24 2007
-@@ -321,8 +321,8 @@
-         /* Method 1 allows for random access in the compressed data */
- 
-         /* Set buffer pointers */
--        zstream.next_in = buf;
--        zstream.next_out = zbuf;
-+        zstream.next_in = (Bytef *)buf;
-+        zstream.next_out = (Bytef *)zbuf;
-         zstream.avail_in = RECORD_SIZE;
-         zstream.avail_out = zbuf_size;
- 
-@@ -354,7 +354,7 @@
-                     memcpy(buf, &(db->tmp[zpos]), RECORD_SIZE);
-                     zpos += RECORD_SIZE;
-                     bytesleft -= RECORD_SIZE;
--                    zstream.next_in = buf;
-+                    zstream.next_in = (Bytef *)buf;
-                     zstream.avail_in = RECORD_SIZE;
-                     db->num_records++;
-                     offsets[db->num_records] = zstream.total_out;
-@@ -365,7 +365,7 @@
-                   {
-                     memcpy(buf, &(db->tmp[zpos]), bytesleft);
-                     zpos += bytesleft;
--                    zstream.next_in = buf;
-+                    zstream.next_in = (Bytef *)buf;
-                     zstream.avail_in = bytesleft;
-                     db->num_records++;
-                     offsets[db->num_records] = zstream.total_out;
-@@ -402,8 +402,8 @@
-         /* Method 2 gives about 10% - 15% more compression */
- 
-         /* Set buffer pointers */
--        zstream.next_in = db->tmp;
--        zstream.next_out = zbuf;
-+        zstream.next_in = (Bytef *)db->tmp;
-+        zstream.next_out = (Bytef *)zbuf;
-         zstream.avail_in = db->tmpsize;
-         zstream.avail_out = zbuf_size;
- 
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 21b5b7259e61..000000000000
--- a/palm/makeztxt/files/patch-libztxt-ztxt_set.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libztxt/ztxt_set.c.orig	Mon May 28 20:12:33 2007
-+++ libztxt/ztxt_set.c	Mon May 28 20:12:44 2007
-@@ -40,7 +40,7 @@
- void
- ztxt_set_title(ztxt *db, char *new_title)
- {
--  strncpy(db->dbHeader->name, new_title, dmDBNameLength);
-+  strncpy((char *)db->dbHeader->name, new_title, dmDBNameLength);
-   db->dbHeader->name[dmDBNameLength - 1] = '\0';
- }
-