Switch from old x11/Xaw3d to new x11/libXaw3d.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Oct 14 22:18:29 2015 +0200
Changeset:	d7b44e5a0fcd4608cab2e4c5b0af0b9ee687dd43

Modified Files:
	emacs-current/options.mk
	emacs-snapshot/options.mk
	felt/Makefile

Log Message:
Switch from old x11/Xaw3d to new x11/libXaw3d.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d7b44e5a0fcd4608cab2e4c5b0af0b9ee687dd43

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 emacs-current/options.mk  | 2 +-
 emacs-snapshot/options.mk | 2 +-
 felt/Makefile             | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diffs:
diff --git a/emacs-current/options.mk b/emacs-current/options.mk
index 975a96b..69dc28d 100644
--- a/emacs-current/options.mk
+++ b/emacs-current/options.mk
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--without-gconf
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
 .  if !empty(PKG_OPTIONS:Mxaw3d)
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-xaw3d
 .  endif
diff --git a/emacs-snapshot/options.mk b/emacs-snapshot/options.mk
index a4d2bcd..7fe76ec 100644
--- a/emacs-snapshot/options.mk
+++ b/emacs-snapshot/options.mk
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--without-gconf
 ### Support Xaw3d (This is only valid with Lucid Toolkit)
 ###
 .  if !empty(PKG_OPTIONS:Mxaw3d)
-.include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXaw3d/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--without-xaw3d
 .  endif
diff --git a/felt/Makefile b/felt/Makefile
index b0b44e6..472dcbc 100644
--- a/felt/Makefile
+++ b/felt/Makefile
@@ -17,6 +17,13 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_X11BASE=		yes
 USE_TOOLS+=		gzcat
 XAW_TYPE?=		3d
+# 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
 
 MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
 MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}