diff options
| author | agc <agc> | 2000-11-30 17:48:05 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-11-30 17:48:05 +0000 |
| commit | 69266ec40ff75ce5b771293e98ca194015be4fa3 (patch) | |
| tree | cc2fce8dffb21ab58ce79664c84c76336484e775 /games | |
| parent | 1fdbe58eda6615133bbb1aee8669c0c3aea0d329 (diff) | |
| download | pkgsrc-69266ec40ff75ce5b771293e98ca194015be4fa3.tar.gz | |
Make this package work in the presence of xpkgwedge by passing XMKMF
through the environment, and using it.
Diffstat (limited to 'games')
| -rw-r--r-- | games/xpat2/Makefile | 4 | ||||
| -rw-r--r-- | games/xpat2/files/patch-sum | 3 | ||||
| -rw-r--r-- | games/xpat2/patches/patch-ab | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile index 787b28962e6..c4c0202c7c0 100644 --- a/games/xpat2/Makefile +++ b/games/xpat2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/09/03 10:09:04 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2000/11/30 17:48:05 agc Exp $ # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp DISTNAME= xpat2-1.06 @@ -11,7 +11,7 @@ USE_X11BASE= YES USE_XPM= YES EVAL_PREFIX= XPMDIR=xpm -MAKE_ENV+= XPMDIR="${XPMDIR}" +MAKE_ENV+= XPMDIR="${XPMDIR}" XMKMF="${XMKMF}" post-install: ${CHOWN} root.games ${PREFIX}/bin/xpat2 diff --git a/games/xpat2/files/patch-sum b/games/xpat2/files/patch-sum index 4eeede82117..aee2c6ff93d 100644 --- a/games/xpat2/files/patch-sum +++ b/games/xpat2/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/11/30 17:48:06 agc Exp $ MD5 (patch-aa) = 554037777765f040acbd6519e027c086 +MD5 (patch-ab) = ee7a545464be55744baf13db945b54a3 diff --git a/games/xpat2/patches/patch-ab b/games/xpat2/patches/patch-ab new file mode 100644 index 00000000000..879013491d5 --- /dev/null +++ b/games/xpat2/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2000/11/30 17:48:06 agc Exp $ + +Use the correct xmkmf, in case xpkgwedge is installed + +--- Makefile 2000/11/30 17:28:17 1.1 ++++ Makefile 2000/11/30 17:29:36 +@@ -12,7 +12,7 @@ + # no longer valid. + + all: +- (cd src && xmkmf && $(MAKE) && strip xpat2) ++ (cd src && ${XMKMF} && $(MAKE) && strip xpat2) + + manual: + (cd doc && $(MAKE) xpat2.ps) |