5 files changed, 39 insertions, 59 deletions
diff --git a/graphics/dx/patches/patch-aa b/graphics/dx/patches/patch-aa
index 794bc6a1fd3..3eccdea9d52 100644
--- a/graphics/dx/patches/patch-aa
+++ b/graphics/dx/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2006/04/28 20:33:30 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2006/10/13 16:39:13 drochner Exp $
 
---- src/exec/dpexec/ccm.c.orig	2006-04-22 18:17:03.000000000 +0000
+--- src/exec/dpexec/ccm.c.orig	2006-01-03 00:49:26.000000000 +0100
 +++ src/exec/dpexec/ccm.c
-@@ -19,6 +19,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <string.h>
- #include <ctype.h>
- 
- #if defined(HAVE_SYS_TYPES_H)
-@@ -82,7 +83,6 @@ _dxfSetupServer(int pport, int *psock,
+@@ -90,7 +90,6 @@ _dxfSetupServer(int pport, int *psock,
      u_short port;
      int sts;
      int oldPort;
@@ -18,9 +10,9 @@ $NetBSD: patch-aa,v 1.4 2006/04/28 20:33:30 joerg Exp $
      int tries;
  
      port = pport;
-@@ -224,7 +224,6 @@ _dxfCompleteServer(int sock, 
-     int length;
-     int fd;
+@@ -232,7 +231,6 @@ _dxfCompleteServer(int sock, 
+     socklen_t length;
+     int fd=-1;
      int sts;
 -    extern int errno; /* from <errno.h> */
      fd_set fds;
diff --git a/graphics/dx/patches/patch-ae b/graphics/dx/patches/patch-ae
index 8a1042ae754..120f5ef683c 100644
--- a/graphics/dx/patches/patch-ae
+++ b/graphics/dx/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-ae,v 1.4 2006/10/13 16:39:13 drochner Exp $
 
---- src/exec/dpexec/loader.c.orig	2003-10-29 17:34:13.000000000 +0000
-+++ src/exec/dpexec/loader.c	2004-04-20 19:23:40.000000000 +0000
-@@ -38,21 +38,19 @@
+--- src/exec/dpexec/loader.c.orig	2005-12-26 22:52:26.000000000 +0100
++++ src/exec/dpexec/loader.c
+@@ -38,12 +38,10 @@
  #include <stdio.h>
  #include <stdlib.h>
  
@@ -16,16 +16,4 @@ $NetBSD: patch-ae,v 1.3 2004/04/20 22:11:48 drochner Exp $
 +#include <sys/errno.h>
  #endif
  
-+#if !defined(HAVE_SYS_ERRLIST)
- #if defined(HAVE__SYS_ERRLIST) 
- #define sys_errlist _sys_errlist
--#endif
--
--#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST))
-+#else
- extern char *sys_errlist[];
- #endif
-+#endif
- 
- 
  #include <sys/stat.h> 
diff --git a/graphics/dx/patches/patch-am b/graphics/dx/patches/patch-am
index 24e503d217e..ec582612f9b 100644
--- a/graphics/dx/patches/patch-am
+++ b/graphics/dx/patches/patch-am
@@ -1,14 +1,14 @@
-$NetBSD: patch-am,v 1.6 2006/04/28 20:33:30 joerg Exp $
+$NetBSD: patch-am,v 1.7 2006/10/13 16:39:13 drochner Exp $
 
---- src/uipp/dxuilib/PacketIF.C.orig	2003-09-26 17:38:11.000000000 +0000
-+++ src/uipp/dxuilib/PacketIF.C	2004-04-20 19:26:00.000000000 +0000
-@@ -1418,9 +1418,6 @@ void PacketIF::connectAsServer(int pport
-     int fd;
-     int sts;
-     int oldPort;
+--- src/uipp/dxuilib/PacketIF.C.orig	2006-06-29 20:58:46.000000000 +0200
++++ src/uipp/dxuilib/PacketIF.C
+@@ -1586,9 +1586,6 @@ void PacketIF::connectAsServer(int pport
+ 	int fd;
+ 	int sts;
+ 	int oldPort;
 -#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(solaris)
--    extern int errno;
+-	extern int errno;
 -#endif
-     int tries;
-     fd_set fds;
-     int  width = getdtablesize();
+ 	int tries;
+ 	fd_set fds;
+ 	int  width = getdtablesize();
diff --git a/graphics/dx/patches/patch-an b/graphics/dx/patches/patch-an
index a508cef7b16..862fd5b7fa3 100644
--- a/graphics/dx/patches/patch-an
+++ b/graphics/dx/patches/patch-an
@@ -1,15 +1,15 @@
-$NetBSD: patch-an,v 1.2 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-an,v 1.3 2006/10/13 16:39:13 drochner Exp $
 
---- man/catl/Makefile.in.orig	2003-09-26 22:19:38.000000000 +0000
-+++ man/catl/Makefile.in	2004-04-20 19:29:31.000000000 +0000
-@@ -213,8 +213,8 @@
+--- man/catl/Makefile.in.orig	2006-08-21 23:58:52.000000000 +0200
++++ man/catl/Makefile.in
+@@ -254,8 +254,8 @@ install-catDATA: $(cat_DATA)
  	@list='$(cat_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/$$f"; \
--	  $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/$$f; \
-+	  echo " $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/dx.0"; \
-+	  $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/dx.0; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(catDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(catdir)/$$f'"; \
+-	  $(catDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(catdir)/$$f"; \
++	  echo " $(catDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(catdir)/dx.0'"; \
++	  $(catDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(catdir)/dx.0"; \
  	done
  
  uninstall-catDATA:
diff --git a/graphics/dx/patches/patch-ap b/graphics/dx/patches/patch-ap
index 353737ce670..ff9780836a8 100644
--- a/graphics/dx/patches/patch-ap
+++ b/graphics/dx/patches/patch-ap
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.2 2004/04/20 22:11:48 drochner Exp $
+$NetBSD: patch-ap,v 1.3 2006/10/13 16:39:13 drochner Exp $
 
---- src/exec/dxexec/Makefile.in.orig	2003-09-26 22:22:50.000000000 +0000
-+++ src/exec/dxexec/Makefile.in	2004-04-20 19:31:41.000000000 +0000
-@@ -219,7 +219,8 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/exec/dxexec/Makefile.in.orig	2006-08-21 23:58:53.000000000 +0200
++++ src/exec/dxexec/Makefile.in
+@@ -70,7 +70,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +CXXLD = $(CXX)
-+LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libDXEXEC_la_SOURCES) $(dxexec_SOURCES)
  DIST_SOURCES = $(libDXEXEC_la_SOURCES) $(dxexec_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in