When passing files to gunzip make sure they don't get mistaken as options.

Problem noted by Greg Woods in personal email.  Bump PKGREVISION.

4 files changed, 63 insertions, 7 deletions

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index c6068b1ed50..ae1b7772ba1 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2006/06/02 12:13:03 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2006/11/16 02:28:58 markd Exp $
 
 DISTNAME=	xfig.3.2.5-alpha5.full
 PKGNAME=	xfig-3.2.5alpha5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://epb.lbl.gov/xfig/alpha/
 
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index d8caf87cb17..c50b8d0fa9c 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.16 2006/06/30 18:59:34 tron Exp $
+$NetBSD: distinfo,v 1.17 2006/11/16 02:28:58 markd Exp $
 
 SHA1 (xfig.3.2.5-alpha5.full.tar.gz) = ed99caf4505bc401ac34ecbe3d4c0aa783c4cc62
 RMD160 (xfig.3.2.5-alpha5.full.tar.gz) = 47fd9d74b117518d1870297228e31591f312df2d
 Size (xfig.3.2.5-alpha5.full.tar.gz) = 5836544 bytes
 SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
 SHA1 (patch-ab) = 7fb6cdf47d980db3d95cba0797408247087148e0
-SHA1 (patch-ac) = 63ac4774439cab4bda5c75a3912103080bc1c6fd
+SHA1 (patch-ac) = 8ebf2bb18d05a2d383c4ac00a1c0e09e8190594f
 SHA1 (patch-ad) = 80ae2ce2eea6a747862d1b223ffff56feaa73f1a
 SHA1 (patch-ae) = 91aaa109fb38429043be89c9224ad3ca8f7bc02f
 SHA1 (patch-af) = 26277c44716de75eef8cd6e1db5ab4c6c728d9a0
+SHA1 (patch-ag) = 021f15be1fd36adc80c638bbb485e2f3753ac11b
diff --git a/graphics/xfig/patches/patch-ac b/graphics/xfig/patches/patch-ac
index 3ed871c99e1..b4e4a18d589 100644
--- a/graphics/xfig/patches/patch-ac
+++ b/graphics/xfig/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2005/11/12 16:08:21 itohy Exp $
+$NetBSD: patch-ac,v 1.6 2006/11/16 02:28:58 markd Exp $
 
---- f_util.c.orig	Wed Jan  7 04:46:08 2004
-+++ f_util.c	Sat Nov 12 14:16:03 2005
+--- f_util.c.orig	2004-01-07 08:46:08.000000000 +1300
++++ f_util.c
 @@ -111,15 +111,15 @@ change_directory(path)
  get_directory(direct)
      char	   *direct;
@@ -30,3 +30,21 @@ $NetBSD: patch-ac,v 1.5 2005/11/12 16:08:21 itohy Exp $
  	*direct = '\0';
  	return 0;
      }
+@@ -782,7 +782,7 @@ uncompress_file(name)
+     else strcpy(dirname, ".");
+ 
+     if (access(dirname, W_OK) == 0) {  /* OK - the directory is writable */
+-      sprintf(unc, "gunzip -q %s", name);
++      sprintf(unc, "gunzip -q -- %s", name);
+       if (system(unc) != 0)
+ 	file_msg("Couldn't uncompress the file: \"%s\"", unc);
+       strcpy(name, plainname);
+@@ -793,7 +793,7 @@ uncompress_file(name)
+ 	  sprintf(tmpfile, "%s%s", TMPDIR, c);
+       else
+ 	  sprintf(tmpfile, "%s/%s", TMPDIR, plainname);
+-      sprintf(unc, "gunzip -q -c %s > %s", name, tmpfile);
++      sprintf(unc, "gunzip -q -c -- %s > %s", name, tmpfile);
+       if (system(unc) != 0)
+ 	  file_msg("Couldn't uncompress the file: \"%s\"", unc);
+       file_msg ("Uncompressing file %s in %s because it is in a read-only directory",
diff --git a/graphics/xfig/patches/patch-ag b/graphics/xfig/patches/patch-ag
new file mode 100644
index 00000000000..bc9f91136d1
--- /dev/null
+++ b/graphics/xfig/patches/patch-ag
@@ -0,0 +1,37 @@
+$NetBSD: patch-ag,v 1.1 2006/11/16 02:28:58 markd Exp $
+
+--- f_picobj.c.orig	2006-11-15 20:57:47.000000000 +1300
++++ f_picobj.c
+@@ -266,28 +266,28 @@ open_picfile(name, type, pipeok, retname
+     if ((strlen(name) > 3 && !strcmp(".gz", name + (strlen(name)-3))) ||
+ 	       (strlen(name) > 2 && !strcmp(".Z", name + (strlen(name)-3))) ||
+ 	       (strlen(name) > 2 && !strcmp(".z", name + (strlen(name)-2)))) {
+-	sprintf(unc,"gunzip -q %s %s",gzoption,name);
++	sprintf(unc,"gunzip -q %s -- %s",gzoption,name);
+ 	*type = 1;
+     /* none of the above, see if the file with .Z or .gz or .z appended exists */
+     } else {
+ 	strcpy(retname, name);
+ 	strcat(retname, ".Z");
+ 	if (!stat(retname, &status)) {
+-	    sprintf(unc, "gunzip %s %s",gzoption,retname);
++	    sprintf(unc, "gunzip %s -- %s",gzoption,retname);
+ 	    *type = 1;
+ 	    name = retname;
+ 	} else {
+ 	    strcpy(retname, name);
+ 	    strcat(retname, ".z");
+ 	    if (!stat(retname, &status)) {
+-		sprintf(unc, "gunzip %s %s",gzoption,retname);
++		sprintf(unc, "gunzip %s -- %s",gzoption,retname);
+ 		*type = 1;
+ 		name = retname;
+ 	    } else {
+ 		strcpy(retname, name);
+ 		strcat(retname, ".gz");
+ 		if (!stat(retname, &status)) {
+-		    sprintf(unc, "gunzip %s %s",gzoption,retname);
++		    sprintf(unc, "gunzip %s -- %s",gzoption,retname);
+ 		    *type = 1;
+ 		    name = retname;
+ 		}