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

5 files changed, 14 insertions, 14 deletions

diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile
index 8d437d10ed2..38c3e3fa42d 100644
--- a/time/emiclock/Makefile
+++ b/time/emiclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/10/08 13:04:17 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/01/15 16:21:35 morr Exp $
 #
 
 DISTNAME=	emiclock-2.0.2
@@ -34,5 +34,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/R6/EUC/EmiClock.ad \
 		${DESTDIR}${PREFIX}/lib/X11/ja_JP.eucJP/app-defaults/EmiClock
 
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo
index f13bffd6791..6a8996be248 100644
--- a/time/emiclock/distinfo
+++ b/time/emiclock/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/03/23 14:09:31 obache Exp $
+$NetBSD: distinfo,v 1.10 2013/01/15 16:21:35 morr Exp $
 
 SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1
 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179
@@ -6,7 +6,7 @@ Size (emiclock-2.0.2.tar.gz) = 308682 bytes
 SHA1 (patch-aa) = a5eea083c1a05bacd2605ac8e0ecbef9310a8cfd
 SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b
 SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690
-SHA1 (patch-ad) = e3f57f3b7d68efa401ae471e786476e68b2bd282
+SHA1 (patch-ad) = 3cde51980c8802a225a6a91291297176fc9dba69
 SHA1 (patch-ae) = ecbc4f169c0fd249ba1cc0c3031922c02f7a6bb2
 SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503
 SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d
diff --git a/time/emiclock/patches/patch-ad b/time/emiclock/patches/patch-ad
index 38385e3d7b1..71496257e21 100644
--- a/time/emiclock/patches/patch-ad
+++ b/time/emiclock/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $
+$NetBSD: patch-ad,v 1.7 2013/01/15 16:21:35 morr Exp $
 
 --- Imakefile.orig	1999-09-02 14:33:47.000000000 +0000
 +++ Imakefile
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.6 2011/03/23 14:09:31 obache Exp $
  # ifdef	USE_XAW3D
        DEPXAWLIB = $(USRLIBDIR)/libXaw3d.a
 -         XAWLIB = -lXaw3d
-+         XAWLIB = ${LIBXAW}
++         XAWLIB = -lXaw
  # endif	/* USE_XAW3D */
  
    SYS_LIBRARIES = SoundLibrary -lm
diff --git a/time/xalarm/distinfo b/time/xalarm/distinfo
index f637372e2c6..437f8b776ed 100644
--- a/time/xalarm/distinfo
+++ b/time/xalarm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/04/16 01:00:06 perry Exp $
+$NetBSD: distinfo,v 1.6 2013/01/15 16:21:35 morr Exp $
 
 SHA1 (xalarm-3.06.tar.gz) = a4365224c14491d1f089f4a30722d8e33ccccad5
 RMD160 (xalarm-3.06.tar.gz) = 9a9a6fd67669e6464729bdba2210ef38265dd5ea
 Size (xalarm-3.06.tar.gz) = 55351 bytes
-SHA1 (patch-aa) = 9d6837ff4ba95d82b37df9144178581e39a48283
+SHA1 (patch-aa) = 0da8a64ac4cb0399f38ddfd8901b1455c351eeb2
 SHA1 (patch-ab) = f9890acefcef2111da7284f2c96f21875bf27d29
 SHA1 (patch-ac) = c053df3ac2503a03233e076b590e6387b04f6faa
diff --git a/time/xalarm/patches/patch-aa b/time/xalarm/patches/patch-aa
index 2ba2d94df43..aff896e9fe1 100644
--- a/time/xalarm/patches/patch-aa
+++ b/time/xalarm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $
+$NetBSD: patch-aa,v 1.4 2013/01/15 16:21:35 morr Exp $
 
---- Imakefile.orig	1995-07-21 10:32:07.000000000 -0400
-+++ Imakefile	2006-04-15 20:52:05.000000000 -0400
+--- Imakefile.orig	1995-07-21 14:32:07.000000000 +0000
++++ Imakefile
 @@ -1,27 +1,27 @@
 -/**/# Based on an Imakefile from:
 -/**/# Andreas Stolcke
@@ -54,15 +54,14 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $
  
  DEFINES = $(SIGNAL_DEFINES) -DUSERENAME -DUSEGETHOSTNAME -DUSEGETPWUID
  
-@@ -29,29 +29,16 @@
+@@ -29,29 +29,14 @@ DEFINES = $(SIGNAL_DEFINES) -DUSERENAME 
  OBJS = alarm.o when.o warnings.o times.o dates.o file.o fns.o xalarm.o
  SRCS = alarm.c when.c warnings.c times.c dates.c file.c fns.c xalarm.c
  
 -# How we find commands.  Use WHICH, LOCATE or FIND.
 -WHICH= WHICH
 -MADE = test -f
-+XAWLIB = ${LIBXAW}
- 
+-
  LOCAL_LIBRARIES = XawClientLibs
  
 -AllTarget (.config)
@@ -86,7 +85,7 @@ $NetBSD: patch-aa,v 1.3 2006/04/16 01:00:06 perry Exp $
  
  xfortune::
  
-@@ -60,14 +47,6 @@
+@@ -60,14 +45,6 @@ xyow::
  clean::
  	$(RM) xfortune xyow xmemo.man xyow.man xfortune.man fns.h .config