Switch from x11/Xaw3d to newer x11/libXaw3d.

Adapt some packages so they build with that.
Bump their PKGREVISIONs.

10 files changed, 69 insertions, 18 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 79830834029..a6c3750f587 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2015/08/07 11:20:34 jaapb Exp $
+# $NetBSD: Makefile,v 1.152 2015/10/14 20:17:26 wiz Exp $
 
 DISTNAME=	graphviz-2.38.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
diff --git a/graphics/libotf/Makefile b/graphics/libotf/Makefile
index 060da9f1b94..4e1eae566b5 100644
--- a/graphics/libotf/Makefile
+++ b/graphics/libotf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2015/03/15 17:56:15 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.15 2015/10/14 20:17:26 wiz Exp $
 #
 
 DISTNAME=	libotf-0.9.13
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.savannah.gnu.org/releases/m17n/
 
diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile
index a9bff7da773..3fe83e5c3bc 100644
--- a/graphics/ncview/Makefile
+++ b/graphics/ncview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2015/07/04 16:18:36 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2015/10/14 20:17:26 wiz Exp $
 
 DISTNAME=		ncview-1.92d
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://cirrus.ucsd.edu/pub/ncview/
 
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 349e9cadedf..d333e082a5c 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2015/07/04 16:18:36 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2015/10/14 20:17:26 wiz Exp $
 
 DISTNAME=	xfig.3.2.5b.full
 PKGNAME=	xfig-3.2.5b
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}
 
@@ -40,6 +40,12 @@ SUBST_FILES.xaw=	Imakefile
 .if defined(XAW_TYPE) && ${XAW_TYPE} == "3d"
 # define XAW3D and XAW3D1_5E
 SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D\)/\1/'
+# does not directly support Xaw3d
+.PHONY: buildlink-Xaw3d-inc-hack
+pre-configure: buildlink-Xaw3d-inc-hack
+
+buildlink-Xaw3d-inc-hack: buildlink-directories
+	cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw
 .elif defined(XAW_TYPE) && ${XAW_TYPE} == "xpm"
 #  define XAW3D, undef XAW3D1_5E
 SUBST_SED.xaw+=		-e 's/.*\(\#define.XAW3D1_5E\)/XCOMM \1/'
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index f30fb11688b..9b48dc08112 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2012/12/24 21:12:36 joerg Exp $
+$NetBSD: distinfo,v 1.27 2015/10/14 20:17:26 wiz Exp $
 
 SHA1 (xfig.3.2.5b.full.tar.gz) = 0730d7e6bc217c0de02682efb0078821512bb542
 RMD160 (xfig.3.2.5b.full.tar.gz) = aad4cfd808c116d34218e9890a898652e4f52ab6
 Size (xfig.3.2.5b.full.tar.gz) = 5821049 bytes
 SHA1 (patch-aa) = c931f4735f7502cc9d7c116378dcd3b420a40c6f
-SHA1 (patch-ab) = e3c240cc325804ec466e7ef77754791b18fd4338
+SHA1 (patch-ab) = 549f3795923e984988684f2ba29cafb437d9f83d
 SHA1 (patch-ac) = b43b811dce9aa3cdb5d18dc7c403a4a2e503fd44
 SHA1 (patch-ad) = fc686b6509ff45f6aa8ba235b95eb85e1dbead88
 SHA1 (patch-ae) = 8bb5d1c01faae34a6ad2cd1eaddf794cbf39a02e
@@ -19,6 +19,7 @@ SHA1 (patch-ap) = 84a453de2badd82eb31d950981f086e48310d66f
 SHA1 (patch-aq) = 83c15caff521ab857b0a2744590cbd17f678c107
 SHA1 (patch-d__text.c) = f57cb3c7d0b68a9d27e87538db17ae106acb0ba5
 SHA1 (patch-d__text.h) = 3816e30a21c5c4dfd41a8e43d785babc2c8c7789
+SHA1 (patch-e__edit.c) = 9c3630139f3002a3ea65528e44a3af81af35093f
 SHA1 (patch-w__export.c) = 2787cb59a692d5e435249fea21d6978877db7ea7
 SHA1 (patch-w__print.c) = 1856279ad76a2e71ea896a66d874a0b72330acd0
 SHA1 (patch-w__util.c) = 35f2cfe73697c0b6005e3a8c3e46b44b2ed8f721
diff --git a/graphics/xfig/patches/patch-ab b/graphics/xfig/patches/patch-ab
index 551f161db75..ebcdddf8cad 100644
--- a/graphics/xfig/patches/patch-ab
+++ b/graphics/xfig/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $
+$NetBSD: patch-ab,v 1.15 2015/10/14 20:17:26 wiz Exp $
 
---- Imakefile.orig	2009-03-30 17:53:05.000000000 +0200
+--- Imakefile.orig	2009-03-30 15:53:05.000000000 +0000
 +++ Imakefile
-@@ -65,18 +65,21 @@ XCOMM #define XAW3D1_5E
+@@ -60,23 +60,26 @@ XCOMM Uncomment the following if you hav
+ XCOMM some new features, including "Tips", which replace xfig's "help balloons"
+ XCOMM NOTE: This is the default for many X systems now.
+ 
+-XCOMM #define XAW3D1_5E
++#define XAW3D1_5E
+ 
  #ifdef XAW3D1_5E
      DUSEXAW3D = -DXAW3D -DXAW3D1_5E
  #else
@@ -56,6 +62,15 @@ $NetBSD: patch-ab,v 1.14 2011/02/17 08:46:50 markd Exp $
  #endif
  
  XCOMM Uncomment the following definiton if you want to use the small icons
+@@ -150,7 +153,7 @@ XCOMM Comment out the next line if you h
+ XCOMM If your setlocale() doesn't support the locale, you should
+ XCOMM add -DSETLOCALE to I18N_DEFS.
+ 
+-XCOMM #define I18N
++#define I18N
+ 
+ XCOMM If using an input tablet uncomment the following
+ 
 @@ -161,7 +164,7 @@ XCOMM uncomment the following line if yo
  XCOMM inline functions. With the "INLINE" keyword, you should notice that
  XCOMM the display will be a bit faster in complex figures
diff --git a/graphics/xfig/patches/patch-e__edit.c b/graphics/xfig/patches/patch-e__edit.c
new file mode 100644
index 00000000000..9d89403fe26
--- /dev/null
+++ b/graphics/xfig/patches/patch-e__edit.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-e__edit.c,v 1.1 2015/10/14 20:17:26 wiz Exp $
+
+--- e_edit.c.orig	2007-04-04 16:18:32.000000000 +0000
++++ e_edit.c
+@@ -4247,10 +4247,6 @@ str_panel(char *string, char *name, Widg
+     NextArg(XtNbottom, XtChainBottom);
+     NextArg(XtNleft, XtChainLeft);
+     NextArg(XtNright, XtChainRight);
+-#ifdef I18N
+-    if (!appres.international || !international)
+-      NextArg(XtNinternational, False);
+-#endif /* I18N */
+     *pi_x = XtCreateManagedWidget(textname, asciiTextWidgetClass, form, Args, ArgCount);
+ 
+     /* make CR do nothing for now */
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e24fdfe0aea..da2a232b9bb 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2013/08/14 23:51:08 gsutre Exp $
+# $NetBSD: Makefile,v 1.76 2015/10/14 20:17:27 wiz Exp $
 
 DISTNAME=	xpaint-2.7.8.1
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sf-xpaint/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ SUBST_STAGE.foo=	pre-configure
 SUBST_FILES.foo=	Local.config configure
 SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g"
 SUBST_SED.foo+=		-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.foo+=		-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g"
+SUBST_SED.foo+=		-e "s|@XAWDIR@|${BUILDLINK_PREFIX.libXaw3d}|g"
 SUBST_SED.foo+=		-e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
 
 INSTALLATION_DIRS+=	bin lib/X11/app-defaults ${PKGMANDIR}/cat1
@@ -43,5 +43,5 @@ pre-configure:
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/distinfo b/graphics/xpaint/distinfo
index 105d677e81e..c425d22e09d 100644
--- a/graphics/xpaint/distinfo
+++ b/graphics/xpaint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2013/08/15 00:05:44 gsutre Exp $
+$NetBSD: distinfo,v 1.25 2015/10/14 20:17:27 wiz Exp $
 
 SHA1 (xpaint-2.7.8.1.tar.bz2) = d225254cc15cbc166c392b112b57104657a33aaa
 RMD160 (xpaint-2.7.8.1.tar.bz2) = 8efca6ff71df8635b8ed50e0c6db2b81f2e068cf
@@ -13,4 +13,5 @@ SHA1 (patch-ag) = a8eba89d7389a3e0b0973bf3a3c25a76ae7e0d84
 SHA1 (patch-ai) = 38f3532befe2c58cc11d0e055765b6098bbdd9f5
 SHA1 (patch-bitmaps_Imakefile) = c9d566999b13b10e3f7d7d7a60c34ef520597117
 SHA1 (patch-image_h) = 5e8afa76bdd58cd747c13662e0a37fcf5a62256e
+SHA1 (patch-misc.c) = b4ff0e25621312e7ed4dede9df5f99cca3359e2e
 SHA1 (patch-rw_readWritePS.c) = f56b512e888821134d2f7548741a33f0f8b886fd
diff --git a/graphics/xpaint/patches/patch-misc.c b/graphics/xpaint/patches/patch-misc.c
new file mode 100644
index 00000000000..f4826feb70e
--- /dev/null
+++ b/graphics/xpaint/patches/patch-misc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-misc.c,v 1.1 2015/10/14 20:17:27 wiz Exp $
+
+--- misc.c.orig	2005-04-24 11:57:52.000000000 +0000
++++ misc.c
+@@ -671,7 +671,7 @@ mousewheelScroll(Widget w, void * l, XEv
+ 	}
+         else return;
+         if (sb == None) return;
+-#ifdef XAW3DG
++#if defined(XAW3DG) && defined(XAW_ARROW_SCROLLBARS)
+         if (((ScrollbarWidget)sb)->scrollbar.scroll_mode == 2 /* if scroll continuous */
+             || LookAhead (sb, event))
+             return;