Update cxunzip to 0.98 - closed PR pkg/23404 from Tero Koskinen

Changes since version 0.96:
 * Tyler R. Retzlaff's gcc 3.x patches included.
 * Modified version of Jeremy C. Reed's "view file with spaces in
   the filename" patch included.
 * Fix for "segmentation fault at exit" bug.
 * Memory usage of uncompression routines is now constant and
   doesn't depend on the size of the file.
 * tempname and mktemp functions replaced with mkdtemp.

5 files changed, 13 insertions, 77 deletions

diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index ea139980294..a6f10233f45 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:21:08 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/26 10:40:01 abs Exp $
 
-DISTNAME=	cxunzip-0.96
-PKGREVISION=	3
+DISTNAME=	cxunzip-0.98
 CATEGORIES=	archivers
 MASTER_SITES=	http://gurb.ton.tut.fi/gnome/download/
 
diff --git a/archivers/cxunzip/distinfo b/archivers/cxunzip/distinfo
index 2bd7c68f81c..e04364961e4 100644
--- a/archivers/cxunzip/distinfo
+++ b/archivers/cxunzip/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/10/06 12:33:03 rtr Exp $
+$NetBSD: distinfo,v 1.3 2003/11/26 10:40:01 abs Exp $
 
-SHA1 (cxunzip-0.96.tar.gz) = 5c639c344a8a3a05ab33419d1b1f66b99ac460a4
-Size (cxunzip-0.96.tar.gz) = 185785 bytes
-SHA1 (patch-aa) = 1738c34f3a0ca48f8651228b72e044b32872d6a1
-SHA1 (patch-ab) = 4850d910d93a17f7be0987a76eb209f777955f9d
-SHA1 (patch-ac) = 7b97e5faf824c5347ace88ff8bbddf6404390238
+SHA1 (cxunzip-0.98.tar.gz) = 515721b5e016d0384deadbc61ba0cfe0d042d16f
+Size (cxunzip-0.98.tar.gz) = 188499 bytes
+SHA1 (patch-aa) = fa6c6d1817f43c2f373209cbae5a300189595857
diff --git a/archivers/cxunzip/patches/patch-aa b/archivers/cxunzip/patches/patch-aa
index 6ea1a82ec3e..f0af48e11b4 100644
--- a/archivers/cxunzip/patches/patch-aa
+++ b/archivers/cxunzip/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/25 02:42:32 fredb Exp $
+$NetBSD: patch-aa,v 1.2 2003/11/26 10:40:01 abs Exp $
 
---- src/callbacks.cc.orig	Fri May 24 12:49:34 2002
-+++ src/callbacks.cc	Fri May 24 12:51:17 2002
-@@ -203,7 +203,7 @@
- 			msg=g_strdup_printf(_("Unable view file %s"),filename);
+--- src/callbacks.cc.orig	2003-10-12 17:36:01.000000000 +0100
++++ src/callbacks.cc
+@@ -246,7 +246,7 @@ void view_dialog_clicked_callback(gchar 
  			show_error(msg);
  		} else {
+                         std::string fname = escapeChars(filename);
 -			msg=g_strdup_printf("%s %s/%s &",
-+			msg=g_strdup_printf("%s \"%s/%s\" &",
- 					    string,dirname,filename);
++ 			msg=g_strdup_printf("%s \"%s/%s\" &",
+ 					    cmdstring,dirname,fname.c_str());
  			system(msg);
  		}
diff --git a/archivers/cxunzip/patches/patch-ab b/archivers/cxunzip/patches/patch-ab
deleted file mode 100644
index 7d79a8f48b8..00000000000
--- a/archivers/cxunzip/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/10/18 11:59:30 cjep Exp $
---- src/app.cc.orig	2003-10-06 21:17:24.000000000 +1000
-+++ src/app.cc	2003-10-06 21:17:32.000000000 +1000
-@@ -215,7 +215,7 @@
- 
- 	dialog=gnome_request_dialog(FALSE,_("View file with program"),
- 				    program,1024,
--				    view_dialog_clicked_callback,app,
-+				    (void (*)(gchar*, gpointer))view_dialog_clicked_callback,app,
- 				    NULL);
- 	g_free(program);
- 	gtk_widget_show(dialog);
diff --git a/archivers/cxunzip/patches/patch-ac b/archivers/cxunzip/patches/patch-ac
deleted file mode 100644
index aa6b6a50c3e..00000000000
--- a/archivers/cxunzip/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/10/18 11:59:30 cjep Exp $
---- src/menu.hh.orig	2003-10-06 21:18:37.000000000 +1000
-+++ src/menu.hh	2003-10-06 21:18:43.000000000 +1000
-@@ -38,34 +38,34 @@
- 	GNOMEUIINFO_END
- };
- 
--GnomeUIInfo actionsmenu[] = {
--	(GnomeUIInfo){GNOME_APP_UI_ITEM,
-+static GnomeUIInfo actionsmenu[] = {
-+	{GNOME_APP_UI_ITEM,
- 		      N_("_Uncompress..."),N_("Uncompress archive"),
--		      uncompress_file_callback,NULL,NULL,
-+		      (gpointer)uncompress_file_callback,NULL,NULL,
- 		      GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_CONVERT,
- 		      'U',GDK_CONTROL_MASK,NULL},
--	(GnomeUIInfo){GNOME_APP_UI_ITEM,
-+	{GNOME_APP_UI_ITEM,
- 		      N_("_View..."),N_("View selected file from archive"),
--		      view_callback,NULL,NULL,
-+		      (gpointer)view_callback,NULL,NULL,
- 		      GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_INDEX,
- 		      'V',GDK_CONTROL_MASK,NULL},
--	(GnomeUIInfo){GNOME_APP_UI_ITEM,
-+	{GNOME_APP_UI_ITEM,
- 		      N_("_Test..."),N_("Test archive"),
--		      test_archive_callback,NULL,NULL,
-+		      (gpointer)test_archive_callback,NULL,NULL,
- 		      GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_SEARCH,
- 		      'T',GDK_CONTROL_MASK,NULL},
- 	GNOMEUIINFO_END
- };
- 
--GnomeUIInfo helpmenu[] = {
--	(GnomeUIInfo){GNOME_APP_UI_ITEM,
-+static GnomeUIInfo helpmenu[] = {
-+	{GNOME_APP_UI_ITEM,
- 		      _("_About..."),NULL,
--		      about_callback,NULL,NULL,
-+		      (gpointer)about_callback,NULL,NULL,
- 		      GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_ABOUT,
- 		      0,(GdkModifierType)0,NULL},
- 	/*  GNOMEUIINFO_SEPARATOR,
- 	    GNOMEUIINFO_HELP("cxunzip"), */
--	GNOMEUIINFO_END,
-+	GNOMEUIINFO_END
- };
- 
- GnomeUIInfo mainmenu[] = {