From 4a7e2d283f231e1609811f263a5fac5162388d2e Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Sat, 31 Jul 2004 01:42:06 +0000
Subject: I don't know why, but using XFree86 or xorg from pkgsrc, doesn't get
 the correct link flags, anyway adding ExtraLoadFlags seems to fix this.

Bump version to 1.12 (XFree86/xorg fix).
---
 pkgtools/xpkgwedge/Makefile            | 24 +++++++++++++++++++++---
 pkgtools/xpkgwedge/files/xpkgwedge.def |  3 ++-
 2 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 4d5f1cb93ca..84b478e6b33 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2004/06/15 02:27:10 minskim Exp $
+# $NetBSD: Makefile,v 1.52 2004/07/31 01:42:06 xtraeme Exp $
 
-DISTNAME=	xpkgwedge-1.11
+DISTNAME=	xpkgwedge-1.12
 CATEGORIES=	pkgtools devel x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -42,12 +42,30 @@ FILES_SUBST+=		VIEWBASE=${VIEWBASE}
 FILES_SUBST+=		FONT_PROGS=${FONT_PROGS:Q}
 FILES_SUBST+=		MAKE=${MAKE_PROGRAM:Q}
 
+post-extract:
+	@${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC}
+
 do-build:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/pkgxmkmf.in > ${WRKDIR}/pkgxmkmf
 
+.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \
+    defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
+X11TYPEFLAGS?=		-L${X11BASE}/lib \
+	${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+SUBST_CLASSES=		fix
+SUBST_STAGE.fix=	post-patch
+SUBST_FILES.fix=	xpkgwedge.def
+SUBST_SED.fix=		-e "s|@X11TYPEFLAGS@|${X11TYPEFLAGS}|"
+.else # X11_TYPE == XFree86 || X11_TYPE == xorg.
+SUBST_CLASSES=		foo
+SUBST_STAGE.foo=	post-patch
+SUBST_FILES.foo=	xpkgwedge.def
+SUBST_SED.foo=		-e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||"
+.endif # X11_TYPE == native.
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config
-	${INSTALL_DATA} ${FILESDIR}/xpkgwedge.def ${PREFIX}/lib/X11/config
+	${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${PREFIX}/lib/X11/config
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${PREFIX}/bin/pkgxmkmf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def
index 450cef12826..1be76bed769 100644
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def
@@ -1,4 +1,4 @@
-/*	$NetBSD: xpkgwedge.def,v 1.11 2004/04/30 19:44:21 tv Exp $	*/
+/*	$NetBSD: xpkgwedge.def,v 1.12 2004/07/31 01:42:06 xtraeme Exp $	*/
 
 #ifdef BeforeVendorCF
 
@@ -89,6 +89,7 @@ X11_ROOT = ProjectRoot
  * X11 root, and one for the user-set prefix.
  */
 #define X11ProjectRoot $(X11_ROOT)
+#define ExtraLoadFlags @X11TYPEFLAGS@
 
 /* 
  * InstallAppDefaultsLong - general rule to install application default file
-- 
cgit v1.2.3