- fine grained X11 dependencies for packages which have either USE_IMAKE

  or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or
  via buildlink3.mks
- introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm
  in the !modular case
- fix some cases where the check for libX11 couldn't work at all by using
  C++ for compilation without including the proper headers

Verified using a full X11_TYPE=xorg bulk build without additional
breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.

3 files changed, 8 insertions, 22 deletions

diff --git a/geography/xrmap-base/Makefile b/geography/xrmap-base/Makefile
index e04960030bf..52b4f153fe8 100644
--- a/geography/xrmap-base/Makefile
+++ b/geography/xrmap-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/09/06 09:59:24 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:37 joerg Exp $
 #
 
 DISTNAME=		xrmap-2.29
@@ -19,4 +19,8 @@ MAKE_FLAGS+=		MANPATH=${PREFIX}/${PKGMANDIR}
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/rmap/factbook
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/xrmap-base/distinfo b/geography/xrmap-base/distinfo
index 0b5e395399a..5aa72f2e7f9 100644
--- a/geography/xrmap-base/distinfo
+++ b/geography/xrmap-base/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/22 21:08:32 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/12/27 13:37:37 joerg Exp $
 
 SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973
 RMD160 (xrmap-2.29.tar.bz2) = f8cacc343643a66c8236743c76c80d3c33c44c5c
 Size (xrmap-2.29.tar.bz2) = 1072241 bytes
-SHA1 (patch-aa) = 8ffc67bb8b73819b143e65a29eea4e8e2674b1a1
+SHA1 (patch-aa) = 31ae754c428cd96e5c4313b53c26cadefff3e47f
 SHA1 (patch-ab) = fa0619337c40cef0d3bd63fcadc9f7bcefb473a6
diff --git a/geography/xrmap-base/patches/patch-aa b/geography/xrmap-base/patches/patch-aa
index 3ef7f4ab28c..956b6153f76 100644
--- a/geography/xrmap-base/patches/patch-aa
+++ b/geography/xrmap-base/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2006/12/27 13:37:37 joerg Exp $
 
 --- Imakefile.orig	2003-05-18 20:53:02.000000000 +0200
 +++ Imakefile
@@ -18,21 +18,3 @@ $NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $
  
  XCOMM Default external utilities :
  XCOMM PostScript viewer, image viewer, HTML viewer, Print command
-@@ -68,7 +60,7 @@ install.man::
- 
- all::
- 	strip xrmap ; ls -al xrmap
--	cd editkit ; xmkmf ; make
-+	cd editkit ; pkgxmkmf ; make
- 
- install:: install.man
- 	$(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
-@@ -88,7 +80,7 @@ install:: install.man
- 	      EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
- 	cd rc ; rm -f *~
- 	cp -fR rc $(DESTDIR)$(SHAREDIR)
--	cd editkit ; xmkmf ; make install
-+	cd editkit ; pkgxmkmf ; make install
- 	cat WARNING
- 
- clean::