DESTDIR supportdiff -r1.12 -r1.13 pkgsrc/games/spellcast/Makefile
(joerg)
@@ -1,19 +1,21 @@ | @@ -1,19 +1,21 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2008/01/19 09:16:22 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2010/02/14 21:03:19 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= spellcast | 4 | DISTNAME= spellcast | |
5 | PKGNAME= spellcast-1.2 | 5 | PKGNAME= spellcast-1.2 | |
6 | PKGREVISION= 1 | 6 | PKGREVISION= 1 | |
7 | CATEGORIES= games x11 | 7 | CATEGORIES= games x11 | |
8 | MASTER_SITES= http://www.eblong.com/zarf/ftp/ | 8 | MASTER_SITES= http://www.eblong.com/zarf/ftp/ | |
9 | EXTRACT_SUFX= .tar.Z | 9 | EXTRACT_SUFX= .tar.Z | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://www.eblong.com/zarf/spellcast.html | 12 | HOMEPAGE= http://www.eblong.com/zarf/spellcast.html | |
13 | COMMENT= Game of dueling wizards for two players | 13 | COMMENT= Game of dueling wizards for two players | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | |||
16 | ||||
15 | USE_X11BASE= yes | 17 | USE_X11BASE= yes | |
16 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 | 18 | INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 | |
17 | 19 | |||
18 | .include "../../x11/libX11/buildlink3.mk" | 20 | .include "../../x11/libX11/buildlink3.mk" | |
19 | .include "../../mk/bsd.pkg.mk" | 21 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2005/02/23 23:12:03 agc Exp $ | 1 | $NetBSD: distinfo,v 1.4 2010/02/14 21:03:19 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (spellcast.tar.Z) = 3c51aa1746d4b8385a87ab5af5ed78b48cc4ac19 | 3 | SHA1 (spellcast.tar.Z) = 3c51aa1746d4b8385a87ab5af5ed78b48cc4ac19 | |
4 | RMD160 (spellcast.tar.Z) = ed4751d902a58abdc2a79333541fc866170a642d | 4 | RMD160 (spellcast.tar.Z) = ed4751d902a58abdc2a79333541fc866170a642d | |
5 | Size (spellcast.tar.Z) = 129173 bytes | 5 | Size (spellcast.tar.Z) = 129173 bytes | |
6 | SHA1 (patch-aa) = 8c81fd0791496d118b27a930ec0edc67284f1184 | 6 | SHA1 (patch-aa) = 0b407bfe80ca4170d54da83deebf5ea57952cf90 |
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | $NetBSD: patch-aa,v 1.1 1998/08/07 11:54:29 frueauf Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2010/02/14 21:03:19 joerg Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig Fri Aug 7 04:21:15 1998 | 3 | --- Makefile.orig Fri Aug 7 04:21:15 1998 | |
4 | +++ Makefile Fri Aug 7 04:24:19 1998 | 4 | +++ Makefile Fri Aug 7 04:24:19 1998 | |
5 | @@ -15,6 +15,6 @@ | 5 | @@ -15,6 +15,5 @@ | |
6 | # spell list postscript file are installed. Change them to whatever is appropriate. | 6 | # spell list postscript file are installed. Change them to whatever is appropriate. | |
7 | -DESTDIR=/afs/andrew.cmu.edu/usr0/games | 7 | -DESTDIR=/afs/andrew.cmu.edu/usr0/games | |
8 | -DESTBIN=$(DESTDIR)/bin/.unpriv/@sys | 8 | -DESTBIN=$(DESTDIR)/bin/.unpriv/@sys | |
9 | +DESTDIR=$(PREFIX) | 9 | -DESTMAN=$(DESTDIR)/man/man6 | |
10 | +DESTBIN=$(DESTDIR)/bin | |||
11 | DESTMAN=$(DESTDIR)/man/man6 | |||
12 | -DESTLIB=$(DESTDIR)/lib/spellcast | 10 | -DESTLIB=$(DESTDIR)/lib/spellcast | |
13 | +DESTLIB=$(DESTDIR)/share/doc/spellcast | 11 | +DESTBIN=$(DESTDIR)${PREFIX}/bin | |
12 | +DESTMAN=$(DESTDIR)${PREFIX}/${PKGMANDIR}/man6 | |||
13 | +DESTLIB=$(DESTDIR)${PREFIX}/share/doc/spellcast | |||
14 | 14 | |||
15 | @@ -24,7 +24,7 @@ | 15 | @@ -24,7 +24,7 @@ | |
16 | 16 | |||
17 | -CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \ | 17 | -CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \ | |
18 | +CFLAGS = -O -I$(X11BASE)/include -I./bitmaps -DBODYFONT=$(FONT1) \ | 18 | +CFLAGS = -O -I$(X11BASE)/include -I./bitmaps -DBODYFONT=$(FONT1) \ | |
19 | -DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR) | 19 | -DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR) | |
20 | -LFLAGS = -g | 20 | -LFLAGS = -g | |
21 | +LFLAGS = -Wl,-R$(X11BASE)/lib | 21 | +LFLAGS = -Wl,-R$(X11BASE)/lib | |
22 | 22 | |||
23 | -XLIB = -L/usr/local/lib -lX11 | 23 | -XLIB = -L/usr/local/lib -lX11 | |
24 | +XLIB = -L$(X11BASE)/lib -lX11 | 24 | +XLIB = -L$(X11BASE)/lib -lX11 | |
25 | 25 | |||
26 | @@ -51,3 +51,3 @@ | 26 | @@ -51,3 +51,3 @@ |