From 0bfedb8f673ef4a6cda2d76716b6dd53296a8ecc Mon Sep 17 00:00:00 2001
From: morr <morr>
Date: Tue, 15 Jan 2013 16:21:34 +0000
Subject: Clean up libXaw handling. [1/2]

- remove LIBXAW variable. It is handled by buildlink3.mk now
- simplify patches and Makefile in packages using libXaw
- in some cases force use of Xaw3d (won't build with Xaw)
- replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk

In next part:
- replace more includes with mk/xaw.buildlink3.mk
---
 cad/felt/distinfo         | 4 ++--
 cad/felt/patches/patch-ab | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'cad/felt')

diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index ea2e34d3ee2..c6560adb554 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/12/17 20:31:37 abs Exp $
+$NetBSD: distinfo,v 1.16 2013/01/15 16:21:34 morr Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 RMD160 (felt-3.05.src.tar.gz) = 0d2a363a6ef09f3b3a0e2be186c4c051ac1ea19a
@@ -7,7 +7,7 @@ SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 RMD160 (felt-3.05.ps.gz) = b8bd2a4a83a951455403c2f2f17db6db697035a1
 Size (felt-3.05.ps.gz) = 626985 bytes
 SHA1 (patch-aa) = 040259f3b9835409f2d98f0cde12667142da2160
-SHA1 (patch-ab) = 0db67c162ea81b7b7650ae1d62f0e89235067b53
+SHA1 (patch-ab) = 0822f1bea2822ad692153311d159a257c0420484
 SHA1 (patch-ac) = 04b93dbb663ca5f04cb78956c3dbb77bc68a7b8f
 SHA1 (patch-ad) = c41c74393782fd65f871097e9fc51aae1dacf643
 SHA1 (patch-ae) = 482fbf439ebc23b41294b7c903f921e6e285cd55
diff --git a/cad/felt/patches/patch-ab b/cad/felt/patches/patch-ab
index b8ae319b215..c401c47e9b0 100644
--- a/cad/felt/patches/patch-ab
+++ b/cad/felt/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $
+$NetBSD: patch-ab,v 1.5 2013/01/15 16:21:34 morr Exp $
 
 --- src/Velvet/Makefile.orig	2000-02-21 22:44:51.000000000 +0000
 +++ src/Velvet/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2009/12/17 20:31:37 abs Exp $
  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\
 -	  -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-+	  ${LIBXAW} -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
++	  -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
  #	  /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
  #	  /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
  #	  /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \
-- 
cgit v1.2.3