Pullup ticket #3825 - requested by dholland

x11/xvidtune: build fix

Revisions pulled up:
- x11/xvidtune/hacks.mk                                         1.1-1.2

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sat Jun  2 21:03:03 UTC 2012

   Added Files:
   	pkgsrc/x11/xvidtune: hacks.mk

   Log Message:
   Work around x11-links lossage with native X on NetBSD 5.

   x11-links rejects xf86vidmodeproto because it's too old according
   to the pkgsrc X xf86vidmodeproto bl3 file (which is at best dubious
   logic) and doesn't link it. Then the .pc file isn't available, so
   this package's configure script silently fails running pkg-config
   and sets XVIDTUNE_LIBS to empty. The build then fails at link time
   because no X libs at all have been requested. Fix it by feeding in
   the result of running the same pkg-config invocation outside
   pkgsrc. The fact that the native xf86vidmode is "too old" does not
   itself break the package.

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Jun  3 18:06:11 UTC 2012

   Modified Files:
   	pkgsrc/x11/xvidtune: hacks.mk

   Log Message:
   This should also have bsd.prefs.mk before checking MACHINE_PLATFORM.

1 files changed, 21 insertions, 0 deletions

diff --git a/x11/xvidtune/hacks.mk b/x11/xvidtune/hacks.mk
new file mode 100644
index 00000000000..e12a482a3b4
--- /dev/null
+++ b/x11/xvidtune/hacks.mk
@@ -0,0 +1,21 @@
+# $NetBSD: hacks.mk,v 1.2.2.2 2012/06/06 20:47:03 tron Exp $
+
+#
+# Work around x11-links lossage with native X on NetBSD 5.
+#
+# x11-links rejects xf86vidmodeproto because it's too old according
+# to the pkgsrc X xf86vidmodeproto bl3 file (which is at best dubious
+# logic) and doesn't link it. Then the .pc file isn't available, so
+# this package's configure script silently fails running pkg-config
+# and sets XVIDTUNE_LIBS to empty. The build then fails at link time
+# because no X libs at all have been requested. Fix it by feeding in
+# the result of running the same pkg-config invocation outside
+# pkgsrc. The fact that the native xf86vidmode is "too old" does not
+# itself break the package.
+#
+.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_PLATFORM:MNetBSD-5*} && ${X11_TYPE} == "native"
+NEEDED_LIBS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+NEEDED_LIBS+=		-lXxf86vm -lXaw7 -lXmu -lXt -lSM -lICE -lX11
+CONFIGURE_ENV+=		XVIDTUNE_LIBS=${NEEDED_LIBS:Q}
+.endif