Install catted man page as .0; fix compilation on -current; and

apply patch from pkg/10906.

5 files changed, 49 insertions, 3 deletions

diff --git a/graphics/dx/files/patch-sum b/graphics/dx/files/patch-sum
index 2df3718ca86..d7e2a0ff061 100644
--- a/graphics/dx/files/patch-sum
+++ b/graphics/dx/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/04/28 15:27:01 drochner Exp $
+$NetBSD: patch-sum,v 1.5 2001/02/26 19:00:55 wiz Exp $
 
 MD5 (patch-aa) = 60cbeb7aedff7bfe4b2a6b9931a4c022
 MD5 (patch-ab) = d7b99a9de1e62500b9009f2ba81a259e
@@ -11,3 +11,6 @@ MD5 (patch-ah) = 72332c85c9f8bbb5211e25a6aecd3ef1
 MD5 (patch-ai) = 53af2847fea8ca02a5622a7024222f2f
 MD5 (patch-aj) = bc9f4da6d5b1c9a01706bf6204ddd191
 MD5 (patch-am) = 9974c2c6c7f6cbc90ffb7041c40ba159
+MD5 (patch-an) = 51e4ff7a7521e32b29012243afc807da
+MD5 (patch-ao) = 7dbaafc92c02ebf404565890b9038a15
+MD5 (patch-ap) = 8d7e35e0bb8dbfa4d6793bdd1429138c
diff --git a/graphics/dx/patches/patch-an b/graphics/dx/patches/patch-an
new file mode 100644
index 00000000000..114aff2afef
--- /dev/null
+++ b/graphics/dx/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2001/02/26 19:00:56 wiz Exp $
+
+--- man/catl/Makefile.in.orig	Wed Apr  5 21:02:18 2000
++++ man/catl/Makefile.in
+@@ -132,9 +132,9 @@
+ 	@list='$(cat_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/$$p; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/dx.0; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/$$p"; \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/dx.0"; \
+ 	    $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/$$p; \
+ 	  fi; fi; \
+ 	done
diff --git a/graphics/dx/patches/patch-ao b/graphics/dx/patches/patch-ao
new file mode 100644
index 00000000000..2c0c393ee14
--- /dev/null
+++ b/graphics/dx/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2001/02/26 19:00:56 wiz Exp $
+
+--- src/exec/hwrender/hwInitScreen.c.orig	Mon May 10 17:45:34 1999
++++ src/exec/hwrender/hwInitScreen.c
+@@ -24,7 +24,7 @@
+  */
+ 
+ #include <stdio.h>
+-#ifdef DXD_WIN
++#if defined(DXD_WIN) || defined(__NetBSD__)
+ #include <signal.h>
+ #else
+ #include <sys/signal.h>
diff --git a/graphics/dx/patches/patch-ap b/graphics/dx/patches/patch-ap
new file mode 100644
index 00000000000..4a731e2da7b
--- /dev/null
+++ b/graphics/dx/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2001/02/26 19:00:56 wiz Exp $
+
+--- src/exec/dxexec/Makefile.in.orig	Wed Apr  5 21:01:12 2000
++++ src/exec/dxexec/Makefile.in
+@@ -139,7 +139,8 @@
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++CXXLD = $(CXX)
++LINK = $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+ 
diff --git a/graphics/dx/pkg/PLIST b/graphics/dx/pkg/PLIST
index c82c6ac5d08..544ebe5d274 100644
--- a/graphics/dx/pkg/PLIST
+++ b/graphics/dx/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/04/28 15:27:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/26 19:00:56 wiz Exp $
 bin/dx
 dx/lib_netbsd/arch.mak
 dx/lib_netbsd/libDXlite.a
@@ -2231,7 +2231,7 @@ dx/html/usrguide.htm
 dx/html/index.htm
 dx/html/index.html
 dx/man/manl/dx.l
-dx/man/catl/dx.l
+dx/man/catl/dx.0
 dx/fonts/Readme
 dx/fonts/area.dx
 dx/fonts/cyril_d.dx