From 290b47c25a999a52f9ed37d876514732ed4b57d7 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 14 Oct 2015 20:17:24 +0000
Subject: Switch from x11/Xaw3d to newer x11/libXaw3d.

Adapt some packages so they build with that.
Bump their PKGREVISIONs.
---
 multimedia/xawtv/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'multimedia/xawtv')

diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index eeaed714be4..48ee73e6367 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2015/08/18 07:31:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.44 2015/10/14 20:17:27 wiz Exp $
 
 DISTNAME=	xawtv-3.95
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.bytesex.org/releases/xawtv/
 
@@ -29,6 +28,14 @@ SUBST_FILES.devoss+=	man/motv.1 man/record.1 man/streamer.1 man/xawtv.1
 SUBST_FILES.devoss+=	man/es/streamer.1 man/es/xawtv.1 man/fr/xawtv.1
 SUBST_SED.devoss=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
 
+# does not directly support Xaw3d
+BUILDLINK_TRANSFORM+=	l:Xaw: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
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
@@ -48,7 +55,7 @@ MAKE_FLAGS+=		SUID_ROOT= FS_LIBS=-lFS
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
-- 
cgit v1.2.3