diff options
| author | dholland <dholland> | 2012-05-23 06:05:39 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-05-23 06:05:39 +0000 |
| commit | 527e508d860920bf4dce0a84f99b1f54c9c7b899 (patch) | |
| tree | afa01a094c56b6903b0877d5e21e20d6d2574a7a /games/moria | |
| parent | 416b13cd62c90262f366b15e5d2702913cb5c74e (diff) | |
| download | pkgsrc-527e508d860920bf4dce0a84f99b1f54c9c7b899.tar.gz | |
Honor PKGMANDIR. While here, also honor VARBASE and LDFLAGS.
PKGREVISION -> 2
Diffstat (limited to 'games/moria')
| -rw-r--r-- | games/moria/Makefile | 6 | ||||
| -rw-r--r-- | games/moria/distinfo | 4 | ||||
| -rw-r--r-- | games/moria/patches/patch-aa | 24 |
3 files changed, 23 insertions, 11 deletions
diff --git a/games/moria/Makefile b/games/moria/Makefile index 2fd55540a53..4641146ad9b 100644 --- a/games/moria/Makefile +++ b/games/moria/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2010/06/25 22:12:31 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2012/05/23 06:05:39 dholland Exp $ DISTNAME= um5.5.2 PKGNAME= moria-5.5.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games # The "offical" master site has lost the pub/Games directory. #MASTER_SITES= ftp://ftp.cis.ksu.edu/pub/Games/Moria/source/ @@ -21,7 +21,7 @@ MAKE_FLAGS+= CURSES=-lncurses INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 SETGIDGAME= yes -CONF_FILES_PERMS+= /dev/null /var/games/moria.scores \ +CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/moria.scores \ ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE} SPECIAL_PERMS= bin/moria ${SETGID_GAMES_PERMS} diff --git a/games/moria/distinfo b/games/moria/distinfo index febb81fcbca..a81e59b6e1c 100644 --- a/games/moria/distinfo +++ b/games/moria/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2010/06/25 22:12:31 joerg Exp $ +$NetBSD: distinfo,v 1.11 2012/05/23 06:05:39 dholland Exp $ SHA1 (um5.5.2.tar.Z) = 69c7a7bf4e2c5be123ee7a82f5ad12ad5d0f5b08 RMD160 (um5.5.2.tar.Z) = 1556c76f151d7ea29da79071a57398f63d0b138b Size (um5.5.2.tar.Z) = 910536 bytes -SHA1 (patch-aa) = e2e07df29ffd72809ee36542f62ef1edf501c3cc +SHA1 (patch-aa) = 45338539960c193e9f7556aa6a588cf40bfbe726 SHA1 (patch-ab) = 21418a69d7a694894dd9408513693f87fff91953 SHA1 (patch-ac) = ea9e23de0a147f317a579a4a04502cb165b4c4bd SHA1 (patch-ad) = f83f4596677b8d37493145f82a4d2d5cb489b53a diff --git a/games/moria/patches/patch-aa b/games/moria/patches/patch-aa index 23437830c81..8d939915850 100644 --- a/games/moria/patches/patch-aa +++ b/games/moria/patches/patch-aa @@ -1,6 +1,9 @@ -$NetBSD: patch-aa,v 1.3 2010/06/25 22:12:31 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2012/05/23 06:05:39 dholland Exp $ ---- unix/Makefile.orig Fri Jul 22 08:37:08 1994 +- configure for pkgsrc +- honor PREFIX, PKGMANDIR, VARBASE, CFLAGS, LDFLAGS + +--- unix/Makefile.orig 1994-07-21 22:37:08.000000000 +0000 +++ unix/Makefile @@ -3,15 +3,18 @@ # LIBDIR must be the same directory defined in config.h @@ -12,8 +15,8 @@ $NetBSD: patch-aa,v 1.3 2010/06/25 22:12:31 joerg Exp $ -GROUP = grad +BINDIR = ${PREFIX}/bin +LIBDIR = ${PREFIX}/share/games/moria -+MANDIR = ${PREFIX}/man/man6 -+SCOREFILE = /var/games/moria.scores ++MANDIR = ${PREFIX}/${PKGMANDIR}/man6 ++SCOREFILE = ${VARBASE}/games/moria.scores + +GROUP = games @@ -26,7 +29,16 @@ $NetBSD: patch-aa,v 1.3 2010/06/25 22:12:31 joerg Exp $ # For BSD Systems CURSES = -lcurses -ltermcap -@@ -45,6 +48,8 @@ +@@ -24,7 +27,7 @@ CURSES = -lcurses -ltermcap + # config.h if you use this. + #LFLAGS = -lbsd + # Normal systems don't require anything here. +-LFLAGS = ++LFLAGS = $(LDFLAGS) + + CC = cc + +@@ -45,6 +48,8 @@ OBJS = main.o misc1.o misc2.o misc3.o mi LIBFILES = hours news origcmds.hlp owizcmds.hlp roglcmds.hlp rwizcmds.hlp \ version.hlp welcome.hlp @@ -35,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/25 22:12:31 joerg Exp $ moria : $(OBJS) $(CC) -o moria $(CFLAGS) $(OBJS) $(CURSES) $(LFLAGS) -@@ -57,22 +62,16 @@ +@@ -57,22 +62,16 @@ lintout2 : $(SRCS) TAGS : $(SRCS) ctags -x $(SRCS) > TAGS |