Make this package build on platforms without native zlib by including

zlib's buildlink3.mk.  Thanks to Joerg Sonnenberger for review.

3 files changed, 22 insertions, 5 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 431fa17a2b8..5ecb1710fd4 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/06/12 00:36:25 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2006/07/23 15:45:36 minskim Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -49,6 +49,13 @@ SUBST_FILES.mkstrs=	config/cf/Library.tmpl
 SUBST_SED.mkstrs=	-e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
 SUBST_MESSAGE.mkstrs=	Fixing path of makestrs.
 
+SUBST_CLASSES+=		zlib
+SUBST_STAGE.zlib=	pre-configure
+SUBST_FILES.zlib=	config/cf/Imake.tmpl
+SUBST_SED.zlib=		-e 's|@ZLIBDIR@|${BUILDLINK_PREFIX.zlib}/lib|g' \
+			-e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_MESSAGE.zlib=	Adding the zlib library path.
+
 post-install:
 	@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if ${OPSYS} == "Linux"
@@ -66,6 +73,7 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
 .endfor
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 73be1b3f9b5..e06462b0254 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2006/07/23 13:34:06 minskim Exp $
+$NetBSD: distinfo,v 1.48 2006/07/23 15:45:36 minskim Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -29,7 +29,7 @@ SHA1 (patch-aq) = fd2bcdb1c37ce0cc748b0f5c2a12d226e4486d0d
 SHA1 (patch-ar) = 1343c744c3fde364b0407f24e09d0b11d5dcb8c4
 SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b
 SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd
-SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151
+SHA1 (patch-au) = 8c4062d46c817b80bb0ca85821f6c69dc9947f84
 SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6
 SHA1 (patch-aw) = f9bc393bb6867cd5e2ed54ce7e84ddfb4837785b
 SHA1 (patch-ax) = 582b2b9d8f0f8316b9e2b5528cd14753df1f4bdf
diff --git a/x11/xorg-libs/patches/patch-au b/x11/xorg-libs/patches/patch-au
index 6718ed7cac9..736ed3f7c7d 100644
--- a/x11/xorg-libs/patches/patch-au
+++ b/x11/xorg-libs/patches/patch-au
@@ -1,7 +1,16 @@
-$NetBSD: patch-au,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-au,v 1.3 2006/07/23 15:45:36 minskim Exp $
 
---- config/cf/Imake.tmpl.orig	2006-01-06 16:13:36.000000000 +0000
+--- config/cf/Imake.tmpl.orig	2005-11-07 22:33:24.000000000 -0800
 +++ config/cf/Imake.tmpl
+@@ -596,7 +596,7 @@ XCOMM deprecated; please strongly consid
+ #undef GzipLibrary	/* GzipLibrary was valid only if HasZlib */
+ #endif
+ #ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
+-#define GzipLibrary -lz
++#define GzipLibrary -L@ZLIBDIR@ @COMPILER_RPATH_FLAG@@ZLIBDIR@ -lz
+ #endif
+ /* If the system has the Freetype2 library - if NO, the copy in extras is built */
+ #ifndef HasFreetype2
 @@ -1965,7 +1965,11 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
       SHLIBLDFLAGS = SharedLibraryLoadFlags $(SHLIBGLOBALSFLAGS)
  #if HasGcc