diff options
author | jlam <jlam@pkgsrc.org> | 2001-07-05 04:47:27 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-07-05 04:47:27 +0000 |
commit | 00655f3659407ee1f62b097462e0cc5d1562bea4 (patch) | |
tree | 4ec819e016d6855cb099b340b79581b510ea26c4 | |
parent | 6e8de5be69662ddccd50e2c94bfc0eb29f0bd063 (diff) | |
download | pkgsrc-00655f3659407ee1f62b097462e0cc5d1562bea4.tar.gz |
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.
-rw-r--r-- | mk/bsd.pkg.mk | 17 | ||||
-rw-r--r-- | pkgtools/buildlink-x11/Makefile | 11 | ||||
-rw-r--r-- | pkgtools/buildlink-x11/files/buildlink-xmkmf.in | 71 |
3 files changed, 91 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 35e8ea10992..fea7f20e9f3 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.778 2001/07/04 23:44:27 perry Exp $ +# $NetBSD: bsd.pkg.mk,v 1.779 2001/07/05 04:47:27 jlam Exp $ # # This file is in the public domain. # @@ -94,15 +94,19 @@ SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} # The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def # is to catch users of xpkgwedge<1.0. # +XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} +XMKMF_FLAGS?= -a .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) X11PREFIX= ${LOCALBASE} XMKMF_CMD?= ${X11PREFIX}/bin/pkgxmkmf -XMKMF_FLAGS?= -a .else X11PREFIX= ${X11BASE} +.if exists(${X11PREFIX}/lib/X11/config/buildlinkX11.def) +XMKMF_CMD?= ${X11PREFIX}/bin/buildlink-xmkmf +.else XMKMF_CMD?= ${X11PREFIX}/bin/xmkmf -XMKMF_FLAGS?= -a +.endif .endif .if defined(USE_BUILDLINK_ONLY) XMKMF_FLAGS+= -DBuildLink @@ -110,7 +114,6 @@ XMKMF_FLAGS+= -DBuildLink XMKMF_FLAGS+= -DBuildLinkX11 .endif .endif -XMKMF?= ${XMKMF_CMD} ${XMKMF_FLAGS} .if defined(USE_MOTIF12) USE_MOTIF= # defined @@ -138,7 +141,7 @@ MOTIFBASE?= ${X11PREFIX} BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge .endif .if defined(USE_BUILDLINK_ONLY) -BUILD_DEPENDS+= buildlink-x11>=0.4:../../pkgtools/buildlink-x11 +BUILD_DEPENDS+= buildlink-x11>=0.5:../../pkgtools/buildlink-x11 BUILDLINK_DIR?= ${WRKDIR}/.buildlink MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" MAKE_ENV+= PKGSRC_CPPFLAGS="${CPPFLAGS}" @@ -956,9 +959,13 @@ CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX} HAS_CONFIGURE= yes .if ${X11PREFIX} == ${LOCALBASE} +.if defined(USE_BUILDLINK_X11) +CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_DIR}/lib --x-includes=${BUILDLINK_DIR}/include +.else CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include .endif .endif +.endif # Passed to most of script invocations SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile index 859059103a3..050ac00f710 100644 --- a/pkgtools/buildlink-x11/Makefile +++ b/pkgtools/buildlink-x11/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/07/02 21:00:44 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/07/05 04:47:28 jlam Exp $ -DISTNAME= buildlink-x11-0.4 +DISTNAME= buildlink-x11-0.5 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty @@ -13,7 +13,6 @@ EXTRACT_ONLY= # empty NO_CHECKSUM= # defined NO_WRKSUBDIR= # defined NO_CONFIGURE= # defined -NO_BUILD= # defined NO_MTREE= # defined USE_X11BASE= # defined @@ -43,10 +42,16 @@ pre-install: ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} +do-build: + ${SED} ${FILES_SUBST_SED} \ + ${FILESDIR}/buildlink-xmkmf.in > ${WRKSRC}/buildlink-xmkmf + do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/config ${INSTALL_DATA} ${FILESDIR}/buildlinkX11.def ${PREFIX}/lib/X11/config ${INSTALL_DATA} ${FILESDIR}/buildlinkX11.rules ${PREFIX}/lib/X11/config + ${INSTALL_SCRIPT} ${WRKSRC}/buildlink-xmkmf \ + ${PREFIX}/bin/buildlink-xmkmf post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL 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 |