Remove Xaw3d, replaced by libXaw3d.

11 files changed, 1 insertions, 280 deletions

diff --git a/x11/Makefile b/x11/Makefile
index a3631562507..ce4830f33e8 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.772 2015/10/10 20:09:17 tnn Exp $
+# $NetBSD: Makefile,v 1.773 2015/10/14 20:19:59 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -6,7 +6,6 @@ COMMENT=	Packages to support the X window system
 SUBDIR+=	9term
 SUBDIR+=	XaoS
 SUBDIR+=	Xaw-Xpm
-SUBDIR+=	Xaw3d
 SUBDIR+=	Xbae
 SUBDIR+=	Xfixes
 SUBDIR+=	XmHTML
diff --git a/x11/Xaw3d/DESCR b/x11/Xaw3d/DESCR
deleted file mode 100644
index 8380a13f8c3..00000000000
--- a/x11/Xaw3d/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This is a set of 3-D widgets based on the R6.1 Athena Widget set.
-The Three-D Athena may be used as a general replacement for the
-Athena (Xaw) Widget set.
-
-In general, you may relink almost any Athena Widget based application
-with the Three-D Athena Widget set and obtain a three dimensional
-appearance on some of the widgets. On systems with shared libraries,
-you can usually replace your shared libXaw with libXaw3d and obtain
-the three dimensional appearance without even relinking.
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
deleted file mode 100644
index dcf7a6a26e8..00000000000
--- a/x11/Xaw3d/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.60 2014/10/09 14:07:13 wiz Exp $
-
-DISTNAME=	Xaw3d-1.5E
-PKGREVISION=	4
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://freshmeat.net/projects/xaw3d/
-COMMENT=	3-D widgets based on the Athena Widget set
-
-CONFLICTS=	Xaw-Xpm-[0-9]*
-
-WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
-USE_IMAKE=	YES
-USE_TOOLS+=	lex yacc
-PLIST_SRC=	${WRKDIR}/PLIST-src
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(X11BASE:M*openwin)
-post-extract:
-	@(cd ${WRKSRC}; ${LN} -s .. X11)
-.else
-IMAKE_FLAGS+=	-DXISOPENWIN
-.endif
-
-XMKMF_FLAGS+=	${IMAKE_FLAGS}
-
-PLIST_SUBST+=	INCDIR=include/X11
-
-post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/Xaw3d
-	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${DESTDIR}${PREFIX}/share/doc/Xaw3d
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${CHMOD} +w ${PLIST_SRC}
-.if ${OPSYS} == "IRIX"
-	${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${DESTDIR}${PREFIX}/lib/
-	${RM} -f /usr/lib${ABI}/libXaw3d*
-.endif
-	cd ${DESTDIR}${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw3d/PLIST b/x11/Xaw3d/PLIST
deleted file mode 100644
index 6bb3218dc08..00000000000
--- a/x11/Xaw3d/PLIST
+++ /dev/null
@@ -1,80 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:24:43 joerg Exp $
-${INCDIR}/Xaw3d/AllWidgets.h
-${INCDIR}/Xaw3d/AsciiSink.h
-${INCDIR}/Xaw3d/AsciiSinkP.h
-${INCDIR}/Xaw3d/AsciiSrc.h
-${INCDIR}/Xaw3d/AsciiSrcP.h
-${INCDIR}/Xaw3d/AsciiText.h
-${INCDIR}/Xaw3d/AsciiTextP.h
-${INCDIR}/Xaw3d/Box.h
-${INCDIR}/Xaw3d/BoxP.h
-${INCDIR}/Xaw3d/Cardinals.h
-${INCDIR}/Xaw3d/Command.h
-${INCDIR}/Xaw3d/CommandP.h
-${INCDIR}/Xaw3d/Dialog.h
-${INCDIR}/Xaw3d/DialogP.h
-${INCDIR}/Xaw3d/Form.h
-${INCDIR}/Xaw3d/FormP.h
-${INCDIR}/Xaw3d/Grip.h
-${INCDIR}/Xaw3d/GripP.h
-${INCDIR}/Xaw3d/Label.h
-${INCDIR}/Xaw3d/LabelP.h
-${INCDIR}/Xaw3d/Layout.h
-${INCDIR}/Xaw3d/LayoutP.h
-${INCDIR}/Xaw3d/List.h
-${INCDIR}/Xaw3d/ListP.h
-${INCDIR}/Xaw3d/MenuButtoP.h
-${INCDIR}/Xaw3d/MenuButton.h
-${INCDIR}/Xaw3d/MultiSink.h
-${INCDIR}/Xaw3d/MultiSinkP.h
-${INCDIR}/Xaw3d/MultiSrc.h
-${INCDIR}/Xaw3d/MultiSrcP.h
-${INCDIR}/Xaw3d/Paned.h
-${INCDIR}/Xaw3d/PanedP.h
-${INCDIR}/Xaw3d/Panner.h
-${INCDIR}/Xaw3d/PannerP.h
-${INCDIR}/Xaw3d/Porthole.h
-${INCDIR}/Xaw3d/PortholeP.h
-${INCDIR}/Xaw3d/Repeater.h
-${INCDIR}/Xaw3d/RepeaterP.h
-${INCDIR}/Xaw3d/Reports.h
-${INCDIR}/Xaw3d/Scrollbar.h
-${INCDIR}/Xaw3d/ScrollbarP.h
-${INCDIR}/Xaw3d/Simple.h
-${INCDIR}/Xaw3d/SimpleMenP.h
-${INCDIR}/Xaw3d/SimpleMenu.h
-${INCDIR}/Xaw3d/SimpleP.h
-${INCDIR}/Xaw3d/Sme.h
-${INCDIR}/Xaw3d/SmeBSB.h
-${INCDIR}/Xaw3d/SmeBSBP.h
-${INCDIR}/Xaw3d/SmeLine.h
-${INCDIR}/Xaw3d/SmeLineP.h
-${INCDIR}/Xaw3d/SmeP.h
-${INCDIR}/Xaw3d/SmeThreeD.h
-${INCDIR}/Xaw3d/SmeThreeDP.h
-${INCDIR}/Xaw3d/StripCharP.h
-${INCDIR}/Xaw3d/StripChart.h
-${INCDIR}/Xaw3d/Template.c
-${INCDIR}/Xaw3d/Template.h
-${INCDIR}/Xaw3d/TemplateP.h
-${INCDIR}/Xaw3d/Text.h
-${INCDIR}/Xaw3d/TextP.h
-${INCDIR}/Xaw3d/TextSink.h
-${INCDIR}/Xaw3d/TextSinkP.h
-${INCDIR}/Xaw3d/TextSrc.h
-${INCDIR}/Xaw3d/TextSrcP.h
-${INCDIR}/Xaw3d/ThreeD.h
-${INCDIR}/Xaw3d/ThreeDP.h
-${INCDIR}/Xaw3d/Tip.h
-${INCDIR}/Xaw3d/TipP.h
-${INCDIR}/Xaw3d/Toggle.h
-${INCDIR}/Xaw3d/ToggleP.h
-${INCDIR}/Xaw3d/Tree.h
-${INCDIR}/Xaw3d/TreeP.h
-${INCDIR}/Xaw3d/VendorEP.h
-${INCDIR}/Xaw3d/Viewport.h
-${INCDIR}/Xaw3d/ViewportP.h
-${INCDIR}/Xaw3d/Xaw3dP.h
-${INCDIR}/Xaw3d/XawImP.h
-${INCDIR}/Xaw3d/XawInit.h
-share/doc/Xaw3d/README.XAW3D
diff --git a/x11/Xaw3d/buildlink3.mk b/x11/Xaw3d/buildlink3.mk
deleted file mode 100644
index e89455f8ae1..00000000000
--- a/x11/Xaw3d/buildlink3.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2013/01/15 16:21:35 morr Exp $
-
-BUILDLINK_TREE+=	Xaw3d
-
-.if !defined(XAW3D_BUILDLINK3_MK)
-XAW3D_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.Xaw3d+=	Xaw3d>=1.5
-BUILDLINK_ABI_DEPENDS.Xaw3d+=	Xaw3d>=1.5Enb1
-BUILDLINK_PKGSRCDIR.Xaw3d?=	../../x11/Xaw3d
-
-BUILDLINK_TRANSFORM+=		l:Xaw:Xaw3d
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-.PHONY: buildlink-Xaw3d-inc-hack
-buildlink-Xaw3d-cookie: buildlink-Xaw3d-inc-hack
-
-buildlink-Xaw3d-inc-hack: buildlink-directories
-	[ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \
-		${MKDIR} ${BUILDLINK_DIR}/include/X11 && \
-		${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw
-.endif
-
-.include "../../x11/libXmu/buildlink3.mk"
-
-.endif # XAW3D_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-Xaw3d
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
deleted file mode 100644
index edc495e322c..00000000000
--- a/x11/Xaw3d/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.12 2007/12/27 14:14:24 reed Exp $
-
-SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1
-RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118
-Size (Xaw3d-1.5E.tar.gz) = 309264 bytes
-SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3
-SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
-SHA1 (patch-ac) = cce339b75bdfe407608f004eaf1f22fca26ecd5e
-SHA1 (patch-ad) = e9c599fd237feabe9b3311f41da96455263a1a28
-SHA1 (patch-ae) = 6f6ffdd9ed4b60afb5518ed1d0245aa7fb515ac6
diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa
deleted file mode 100644
index 664fe1d559c..00000000000
--- a/x11/Xaw3d/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/04/14 01:41:27 dmcmahill Exp $
-
---- Imakefile.orig	2003-03-08 09:55:18.000000000 -0500
-+++ Imakefile
-@@ -9,7 +9,7 @@ XCOMM For color pixmaps, define MULTIPLA
- XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
- #define GRAY_BLKWHT_STIPPLES
- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
--#undef ARROW_SCROLLBARS
-+#define ARROW_SCROLLBARS
- 
- #define DoNormalLib NormalLibXaw
- #define DoSharedLib SharedLibXaw
-@@ -18,11 +18,23 @@ XCOMM For scrollbars with arrows, define
- #define HasSharedData YES
- #define LibName Xaw3d
- #define SoRev SOXAWREV
-+#ifdef SunArchitecture
-+#  ifdef XISOPENWIN
-+#    define IncSubdir Xaw3d
-+#  else
-+#    define IncSubdir X11/Xaw3d
-+#  endif
-+#else
-+#ifdef SGIArchitecture
-+#define IncSubdir Xaw3d
-+#else
- #define IncSubdir X11
- #define IncSubSubdir Xaw3d
-+#endif
-+#endif
- 
- XCOMM When building outside an X11 source tree:
--XCOMM EXTRA_INCLUDES = -I.
-+EXTRA_INCLUDES = -I.
- 
- #ifdef SharedXawReqs
- REQUIREDLIBS = SharedXawReqs
diff --git a/x11/Xaw3d/patches/patch-ab b/x11/Xaw3d/patches/patch-ab
deleted file mode 100644
index 62260be7a78..00000000000
--- a/x11/Xaw3d/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/02/18 15:54:48 wiz Exp $
-
---- XawI18n.h.orig	1996-10-15 16:41:26.000000000 +0200
-+++ XawI18n.h
-@@ -29,11 +29,13 @@ in this Software without prior written a
- 
- #ifdef HAS_WCTYPE_H
- #include <wctype.h>
-+#ifndef NO_WIDEC_H
- #include <widec.h>
- #define wcslen(c) wslen(c)
- #define wcscpy(d,s) wscpy(d,s)
- #define wcsncpy(d,s,l) wsncpy(d,s,l)
- #endif
-+#endif
- 
- #ifdef HAS_WCHAR_H
- #include <wchar.h>
diff --git a/x11/Xaw3d/patches/patch-ac b/x11/Xaw3d/patches/patch-ac
deleted file mode 100644
index 0525528ea4b..00000000000
--- a/x11/Xaw3d/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/03/13 00:16:23 markd Exp $
-
---- Box.c.orig	1996-10-16 03:41:18.000000000 +1300
-+++ Box.c
-@@ -352,8 +352,12 @@ static XtGeometryResult PreferredSize(wi
- 	}
- 	else {
- 	    width = preferred_width;
-+	    if (0==width) width=1;
- 	    do { /* find some width big enough to stay within this height */
--		width *= 2;
-+		if (width>=32768) /* overflow */
-+		    width=constraint->width;
-+		else
-+		    width *= 2;
- 		if (width > constraint->width) width = constraint->width;
- 		DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE);
- 	    } while (preferred_height > constraint->height &&
diff --git a/x11/Xaw3d/patches/patch-ad b/x11/Xaw3d/patches/patch-ad
deleted file mode 100644
index 73e2ba55568..00000000000
--- a/x11/Xaw3d/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/09/11 23:49:40 smb Exp $
-
---- SmeLine.c.orig	2000-11-27 08:19:28.000000000 -0500
-+++ SmeLine.c	2007-09-11 17:21:39.000000000 -0400
-@@ -217,7 +217,7 @@
-     SmeLineObject entry = (SmeLineObject) w;
-     SimpleMenuWidget smw = (SimpleMenuWidget) XtParent (w);
-     ThreeDWidget tdw = (ThreeDWidget) smw->simple_menu.threeD;
--    Dimension s = tdw->threeD.shadow_width;
-+    Dimension s = tdw ? tdw->threeD.shadow_width : NULL;
-     int y = entry->rectangle.y + 
- 	    (int)(entry->rectangle.height - entry->sme_line.line_width) / 2;
- 
diff --git a/x11/Xaw3d/patches/patch-ae b/x11/Xaw3d/patches/patch-ae
deleted file mode 100644
index ec319984524..00000000000
--- a/x11/Xaw3d/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/12/27 14:14:24 reed Exp $
-
-Already in XFree86 and X.org versions since at least Nov. 2004.
-Also in Fedora version since Aug 09 2002.
-http://rpmfind.net//linux/RPM/fedora/7/x86_64/Xaw3d-1.5E-10.1.i386.html
-
---- MultiSrc.c.orig	Tue Aug  6 22:51:08 2002
-+++ MultiSrc.c	Tue Aug  6 22:51:16 2002
-@@ -735,6 +735,7 @@
-   
-   if ( string_set || (old_src->multi_src.type != src->multi_src.type) ) {
-     RemoveOldStringOrFile(old_src, string_set);
-+    src->multi_src.allocated_string = old_src->multi_src.allocated_string;
-     file = InitStringOrFile(src, string_set);
- 
-     /* Load pieces does this logic for us, but it shouldn't.  Its messy.*/