diff options
| author | tron <tron@pkgsrc.org> | 2001-10-14 16:20:24 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-10-14 16:20:24 +0000 |
| commit | dda81631a4cdb3c1c407c17a6f9f584e3b2fe0a3 (patch) | |
| tree | 5059eec061637e1fbb7af207d03180a1540735be /games | |
| parent | cc29c215ec00c62ac30066391f0da3e03a50d81d (diff) | |
| download | pkgsrc-dda81631a4cdb3c1c407c17a6f9f584e3b2fe0a3.tar.gz | |
Fix installation problem on system where "xpkgwedge" is installed.
Diffstat (limited to 'games')
| -rw-r--r-- | games/xmahjongg/Makefile | 8 | ||||
| -rw-r--r-- | games/xmahjongg/distinfo | 4 | ||||
| -rw-r--r-- | games/xmahjongg/patches/patch-aa | 8 | ||||
| -rw-r--r-- | games/xmahjongg/pkg/PLIST | 6 |
4 files changed, 11 insertions, 15 deletions
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile index a3fe036b177..e9abb10c8fe 100644 --- a/games/xmahjongg/Makefile +++ b/games/xmahjongg/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/02/16 15:11:03 wiz Exp $ -# FreeBSD Id: Makefile,v 1.3 1996/12/08 01:11:27 max Exp -# +# $NetBSD: Makefile,v 1.10 2001/10/14 16:20:24 tron Exp $ DISTNAME= xmahjongg PKGNAME= xmahjongg-1.0 @@ -18,11 +16,9 @@ USE_IMAKE= yes RESTRICTED= "Restrictive copyright" NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} +PLIST_SUBST+= X11BASE="${X11BASE}" post-extract: @${CP} ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man -post-install: - ${X11BASE}/bin/mkfontdir ${X11PREFIX}/lib/X11/fonts/misc - .include "../../mk/bsd.pkg.mk" diff --git a/games/xmahjongg/distinfo b/games/xmahjongg/distinfo index 84b40e9786f..db83e1ac186 100644 --- a/games/xmahjongg/distinfo +++ b/games/xmahjongg/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:40 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/14 16:20:24 tron Exp $ SHA1 (xmahjongg.tar.gz) = 2f2c642a89249cac8642e1ef3be97058f4e39aa8 Size (xmahjongg.tar.gz) = 32850 bytes -SHA1 (patch-aa) = e12e1b85a39e85c92968f601ece87bc3ecae6e81 +SHA1 (patch-aa) = d595dd3c7876f34509ffec64d6d8d3b87e53efe7 SHA1 (patch-ab) = fdf3116384c4fcc84758a021c996cc21e8338859 diff --git a/games/xmahjongg/patches/patch-aa b/games/xmahjongg/patches/patch-aa index 40b605f6f67..522dab1074a 100644 --- a/games/xmahjongg/patches/patch-aa +++ b/games/xmahjongg/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:45 agc Exp $ +$NetBSD: patch-aa,v 1.3 2001/10/14 16:20:24 tron Exp $ --- Imakefile.orig Sat Dec 11 03:35:21 1993 -+++ Imakefile Fri Aug 16 18:41:38 1996 ++++ Imakefile Sun Oct 14 18:17:08 2001 @@ -5,7 +5,26 @@ # copyright laws of the United States. # @@ -29,5 +29,5 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:45 agc Exp $ +MakeDirectories(install,$(LAYOUT)) +InstallMultipleDestFlags(install,$(BOARDS),$(LAYOUT),$(INSTDATFLAGS)) + -+install:: -+ RunProgram(MKFONTDIR,$(FONTDIR)/misc) ++#install:: ++# RunProgram(MKFONTDIR,$(FONTDIR)/misc) diff --git a/games/xmahjongg/pkg/PLIST b/games/xmahjongg/pkg/PLIST index 1a99dc388cc..7b77142f4b3 100644 --- a/games/xmahjongg/pkg/PLIST +++ b/games/xmahjongg/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2001/06/12 05:27:59 kei Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/10/14 16:20:24 tron Exp $ bin/xmahjongg man/cat6/xmahjongg.0 lib/X11/xmahjongg/bridge @@ -6,5 +6,5 @@ lib/X11/xmahjongg/default lib/X11/xmahjongg/wedges @dirrm lib/X11/xmahjongg lib/X11/fonts/misc/xmahjongg.bdf -@exec /usr/X11R6/bin/mkfontdir %B -@unexec /usr/X11R6/bin/mkfontdir %B +@exec ${X11BASE}/bin/mkfontdir %B +@unexec ${X11BASE}/bin/mkfontdir %B |