[pkgsrc/trunk]: pkgsrc I don't know why, but using XFree86 or xorg from pkgsr...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/92bec0bf5e42
branches:  trunk
changeset: 478838:92bec0bf5e42
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jul 31 01:42:06 2004 +0000

description:
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).

diffstat:

 doc/CHANGES                            |   3 ++-
 pkgtools/xpkgwedge/Makefile            |  24 +++++++++++++++++++++---
 pkgtools/xpkgwedge/files/xpkgwedge.def |   3 ++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diffs (75 lines):

diff -r 4ab489064f0f -r 92bec0bf5e42 doc/CHANGES
--- a/doc/CHANGES       Sat Jul 31 01:37:23 2004 +0000
+++ b/doc/CHANGES       Sat Jul 31 01:42:06 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6739 2004/07/30 22:15:59 jmmv Exp $
+$NetBSD: CHANGES,v 1.6740 2004/07/31 01:42:06 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3658,3 +3658,4 @@
        Updated vice to 1.14nb3 [kristerw 2004-07-30]
        Updated dvdrip to 0.50.18 [recht 2004-07-30]
        Updated glib2 to 2.4.5 [jmmv 2004-07-30]
+       Updated xpkgwedge to 1.12 [xtraeme 2004-07-31]
diff -r 4ab489064f0f -r 92bec0bf5e42 pkgtools/xpkgwedge/Makefile
--- a/pkgtools/xpkgwedge/Makefile       Sat Jul 31 01:37:23 2004 +0000
+++ b/pkgtools/xpkgwedge/Makefile       Sat Jul 31 01:42:06 2004 +0000
@@ -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+=          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 -r 4ab489064f0f -r 92bec0bf5e42 pkgtools/xpkgwedge/files/xpkgwedge.def
--- a/pkgtools/xpkgwedge/files/xpkgwedge.def    Sat Jul 31 01:37:23 2004 +0000
+++ b/pkgtools/xpkgwedge/files/xpkgwedge.def    Sat Jul 31 01:42:06 2004 +0000
@@ -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, and one for the user-set prefix.
  */
 #define X11ProjectRoot $(X11_ROOT)
+#define ExtraLoadFlags @X11TYPEFLAGS@
 
 /* 
  * InstallAppDefaultsLong - general rule to install application default file