diff options
| author | jlam <jlam> | 2001-01-18 17:05:50 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-01-18 17:05:50 +0000 |
| commit | 03ec993846c91fb2a0950609f8b1e97f785bb84d (patch) | |
| tree | ec0e24ff6625d136f7b05ca5b35f5384a7a7a4ae /pkgtools/xpkgwedge | |
| parent | a8c50c890fc2a6192732ebe7ec4dd7adca9680e8 (diff) | |
| download | pkgsrc-03ec993846c91fb2a0950609f8b1e97f785bb84d.tar.gz | |
Pull in a minor change to xmkmf from XFree86-4.0.2: xmkmf now supports
adding preprocessor definitions on the command line with -DVAR=var.
Update package version to 1.1.
Diffstat (limited to 'pkgtools/xpkgwedge')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/pkgxmkmf.in | 32 |
2 files changed, 24 insertions, 12 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index c989e0037bd..a13164e7d06 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2001/01/13 16:23:04 tron Exp $ +# $NetBSD: Makefile,v 1.18 2001/01/18 17:05:50 jlam Exp $ # -DISTNAME= xpkgwedge-1.0 +DISTNAME= xpkgwedge-1.1 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/xpkgwedge/files/pkgxmkmf.in b/pkgtools/xpkgwedge/files/pkgxmkmf.in index 82b6759d15b..02e603ee785 100644 --- a/pkgtools/xpkgwedge/files/pkgxmkmf.in +++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in @@ -1,8 +1,9 @@ #!/bin/sh # +# XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp # XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws # -# $NetBSD: pkgxmkmf.in,v 1.1 2000/10/23 17:32:08 jlam Exp $ +# $NetBSD: pkgxmkmf.in,v 1.2 2001/01/18 17:05:50 jlam Exp $ # # make a Makefile from an Imakefile from inside or outside the sources # with support for config files in ${PREFIX}/lib/X11/config @@ -20,13 +21,24 @@ configdirspec="${configdirspec} -I${xcfgdir}" topdir= curdir=. do_all= +imake_defines= -case "$1" in --a) - do_all="yes" - shift - ;; -esac +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) ;; @@ -50,10 +62,10 @@ else args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" fi -echo imake $args +echo imake $imake_defines $args case "$do_all" in yes) - imake $args && + imake $imake_defines $args && echo "make Makefiles" && make Makefiles && echo "make includes" && @@ -62,6 +74,6 @@ yes) make depend ;; *) - imake $args + imake $imake_defines $args ;; esac |