Linux build fixes:

- Use GZIP_CMD instead of GZIP so that GZIP is exported to the env of ar
  sub-make and then to gzip itself.
- Define EOF if needed.

3 files changed, 63 insertions, 1 deletions

diff --git a/devel/ddd/distinfo b/devel/ddd/distinfo
index fa13cd0e974..4f1ac10a81a 100644
--- a/devel/ddd/distinfo
+++ b/devel/ddd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.16 2010/06/02 13:34:34 hauke Exp $
+$NetBSD: distinfo,v 1.17 2012/10/20 02:25:16 sbd Exp $
 
 SHA1 (ddd-3.3.12.tar.gz) = b91d2dfb1145af409138bd34517a898341724e56
 RMD160 (ddd-3.3.12.tar.gz) = fcc71b2b57f4d7a2c17ac817739674c89e1dd7a0
 Size (ddd-3.3.12.tar.gz) = 5687115 bytes
+SHA1 (patch-Makefile.in) = de1fb079a0870c73aac604ab48996f7a4f2c5258
 SHA1 (patch-ai) = 513621cb015cde43736ad9c28e1535358c398992
+SHA1 (patch-ddd_strclass.C) = ad2453f8322d70846c9a816f28bef86e9b0410a3
diff --git a/devel/ddd/patches/patch-Makefile.in b/devel/ddd/patches/patch-Makefile.in
new file mode 100644
index 00000000000..2163714a42a
--- /dev/null
+++ b/devel/ddd/patches/patch-Makefile.in
@@ -0,0 +1,43 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/10/20 02:25:17 sbd Exp $
+
+Use GZIP_CMD instead of GZIP so that GZIP is exported to the env of a
+sub-make and then to gzip itself.
+
+--- Makefile.in.orig	2012-10-19 09:33:04.860211550 +0000
++++ Makefile.in
+@@ -318,7 +318,7 @@ dddroot_DATA = NEWS COPYING
+ # Subdirectories.
+ # -----------------------------------------------------------------------------
+ SUBDIRS = themes vsllib ddd
+-GZIP = gzip
++GZIP_CMD = gzip
+ 
+ # -----------------------------------------------------------------------------
+ # Distribution (via etc/make-final).
+@@ -872,7 +872,7 @@ snapshot:
+ 		> proto-toplev/FILES; \
+ 	    ( cd proto-toplev; $(TAR) --create --dereference \
+ 		--verbose --files-from FILES \
+-		--file - ) | $(GZIP) -v -9 > $$ddd-$$VER.tar.gz; \
++		--file - ) | $(GZIP_CMD) -v -9 > $$ddd-$$VER.tar.gz; \
+ 	)
+ 	rm -fr proto-toplev
+ 
+@@ -900,7 +900,7 @@ htmldist:
+ 		> proto-toplev/FILES; \
+ 	    ( cd proto-toplev; $(TAR) --create --dereference \
+ 		--verbose --files-from FILES \
+-		--file - ) | $(GZIP) -v -9 > $$ddd-$$VER-html-manual.tar.gz; \
++		--file - ) | $(GZIP_CMD) -v -9 > $$ddd-$$VER-html-manual.tar.gz; \
+ 	)
+ 	rm -fr proto-toplev
+ 
+@@ -928,7 +928,7 @@ picsdist:
+ 		> proto-toplev/FILES; \
+ 	    ( cd proto-toplev; $(TAR) --create --dereference \
+ 		--verbose --files-from FILES \
+-		--file - ) | $(GZIP) -v -9 > $$ddd-$$VER-pics.tar.gz; \
++		--file - ) | $(GZIP_CMD) -v -9 > $$ddd-$$VER-pics.tar.gz; \
+ 	)
+ 	rm -fr proto-toplev
+ $(srcdir)/ChangeLog: $(srcdir)/Makefile.am
diff --git a/devel/ddd/patches/patch-ddd_strclass.C b/devel/ddd/patches/patch-ddd_strclass.C
new file mode 100644
index 00000000000..d24f7ac950a
--- /dev/null
+++ b/devel/ddd/patches/patch-ddd_strclass.C
@@ -0,0 +1,17 @@
+$NetBSD: patch-ddd_strclass.C,v 1.1 2012/10/20 02:25:17 sbd Exp $
+
+Define EOF if needed.
+
+--- ddd/strclass.C.orig	2009-02-11 17:25:06.000000000 +0000
++++ ddd/strclass.C
+@@ -40,6 +40,10 @@ extern "C" int malloc_verify();
+ #include <new>
+ #include <stdlib.h>
+ 
++#ifndef EOF
++# define EOF (-1)
++#endif
++
+ void string::error(const char* msg) const
+ {
+     std::cerr << "string: " << msg << "\n";