Update buildlink-x11 to 0.5. Changes from previous version are the

addition of the xmkmf script from the XFree86-4.0.x distribution, which
understands passing -D options through to imake.  Update the dependency
on buildlink-x11 in bsd.pkg.mk for packages using USE_BUILDLINK_ONLY to
>=0.5.  Also, if USE_BUILDLINK_X11 is set, then refer to ${BUILDLINK_DIR}
for location of X headers and libraries.

1 files changed, 71 insertions, 0 deletions

diff --git a/pkgtools/buildlink-x11/files/buildlink-xmkmf.in b/pkgtools/buildlink-x11/files/buildlink-xmkmf.in
new file mode 100644
index 00000000000..f5316cb9fc3
--- /dev/null
+++ b/pkgtools/buildlink-x11/files/buildlink-xmkmf.in
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# XConsortium: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
+#
+# $NetBSD: buildlink-xmkmf.in,v 1.1 2001/07/05 04:47:28 jlam Exp $
+#
+# make a Makefile from an Imakefile from inside or outside the sources
+# with support for passing -D options through to imake
+
+usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
+
+configdirspec="-I@X11BASE@/lib/X11/config"
+topdir=
+curdir=.
+do_all=
+imake_defines=
+
+while [ $# -gt 0 ]
+do
+    case "$1" in
+    -D*)
+       	imake_defines="$imake_defines $1"
+	shift
+	;;
+    -a)
+	do_all="yes"
+	shift
+	;;
+    *)
+    	break
+	;;
+    esac
+done
+
+case $# in 
+    0) ;;
+    1) topdir=$1 ;;
+    2) topdir=$1  curdir=$2 ;;
+    *) echo "$usage" 1>&2; exit 1 ;;
+esac
+
+case "$topdir" in
+    -*) echo "$usage" 1>&2; exit 1 ;;
+esac
+
+if [ -f Makefile ]; then 
+    echo mv -f Makefile Makefile.bak
+    mv -f Makefile Makefile.bak
+fi
+
+if [ "$topdir" = "" ]; then
+    args="-DUseInstalled "$configdirspec
+else
+    args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
+fi
+
+echo imake $imake_defines $args
+case "$do_all" in
+yes)
+    imake $imake_defines $args && 
+    echo "make Makefiles" &&
+    make Makefiles &&
+    echo "make includes" &&
+    make includes &&
+    echo "make depend" &&
+    make depend
+    ;;
+*)
+    imake $imake_defines $args
+    ;;
+esac