Tads uses termcap, not curses.diff -r1.15 -r1.16 pkgsrc/games/tads/Makefile
(roy)
@@ -1,27 +1,28 @@ | @@ -1,27 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.15 2013/04/06 15:46:36 rodent Exp $ | 1 | # $NetBSD: Makefile,v 1.16 2013/10/10 18:27:37 roy Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= tads23-unix | 4 | DISTNAME= tads23-unix | |
5 | PKGNAME= tads-3.0.8 | 5 | PKGNAME= tads-3.0.8 | |
6 | PKGREVISION= 1 | 6 | PKGREVISION= 2 | |
7 | CATEGORIES= games | 7 | CATEGORIES= games | |
8 | MASTER_SITES= http://www.tads.org/t3dl/ | 8 | MASTER_SITES= http://www.tads.org/t3dl/ | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://www.tads.org/ | 11 | HOMEPAGE= http://www.tads.org/ | |
12 | COMMENT= TADS compiler and interpreter | 12 | COMMENT= TADS compiler and interpreter | |
13 | 13 | |||
14 | # for other OSs, enable appropriate Makefile sections | 14 | # for other OSs, enable appropriate Makefile sections | |
15 | ONLY_FOR_PLATFORM= NetBSD-*-* | 15 | ONLY_FOR_PLATFORM= NetBSD-*-* | |
16 | 16 | |||
17 | DIST_SUBDIR= ${PKGNAME_NOREV}-1 | 17 | DIST_SUBDIR= ${PKGNAME_NOREV}-1 | |
18 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | 18 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | |
19 | NO_CONFIGURE= yes | 19 | NO_CONFIGURE= yes | |
20 | BUILD_DIRS= tads2 tads3 | 20 | BUILD_DIRS= tads2 tads3 | |
21 | USE_LANGUAGES= c c++ | 21 | USE_LANGUAGES= c c++ | |
22 | 22 | |||
23 | post-extract: | 23 | post-extract: | |
24 | ${RM} ${WRKSRC}/tads3/BSD/wchar.h | 24 | ${RM} ${WRKSRC}/tads3/BSD/wchar.h | |
25 | 25 | |||
26 | .include "../../devel/ncurses/buildlink3.mk" | 26 | #.include "../../mk/curses.buildlink3.mk" | |
27 | .include "../../mk/termcap.buildlink3.mk" | |||
27 | .include "../../mk/bsd.pkg.mk" | 28 | .include "../../mk/bsd.pkg.mk" |
@@ -1,10 +1,10 @@ | @@ -1,10 +1,10 @@ | |||
1 | $NetBSD: distinfo,v 1.11 2013/07/18 12:07:24 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.12 2013/10/10 18:27:37 roy Exp $ | |
2 | 2 | |||
3 | SHA1 (tads-3.0.8-1/tads23-unix.tar.gz) = 2bd4c64fd090d880b98a8a590d48482d4dfcb67b | 3 | SHA1 (tads-3.0.8-1/tads23-unix.tar.gz) = 2bd4c64fd090d880b98a8a590d48482d4dfcb67b | |
4 | RMD160 (tads-3.0.8-1/tads23-unix.tar.gz) = 8f83f60d01fb8549fa38adcc48fa04c92fba5250 | 4 | RMD160 (tads-3.0.8-1/tads23-unix.tar.gz) = 8f83f60d01fb8549fa38adcc48fa04c92fba5250 | |
5 | Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes | 5 | Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes | |
6 | SHA1 (patch-aa) = 8d53351305a435d3c2c5d0c1c7f60ed9cbdd7018 | 6 | SHA1 (patch-aa) = 1466c119b43e1090d4f0946cc2bceb40c8c2dc23 | |
7 | SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062 | 7 | SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062 | |
8 | SHA1 (patch-ac) = 2c05036ff65316699533471d3cbe275e33a100b3 | 8 | SHA1 (patch-ac) = 2e387c9844cdcf47ecd63ee1051876c27b50aa95 | |
9 | SHA1 (patch-tads2_osunixt.c) = 7bf4ca85ae9986eea4caff61c27845b6a309ef9f | 9 | SHA1 (patch-tads2_osunixt.c) = 7bf4ca85ae9986eea4caff61c27845b6a309ef9f | |
10 | SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef | 10 | SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-aa,v 1.5 2010/05/29 14:31:23 dillo Exp $ | 1 | $NetBSD: patch-aa,v 1.6 2013/10/10 18:27:37 roy Exp $ | |
2 | 2 | |||
3 | --- tads2/Makefile.orig 2004-11-05 13:34:49.000000000 +0000 | 3 | --- tads2/Makefile.orig 2004-11-05 13:34:49.000000000 +0000 | |
4 | +++ tads2/Makefile | 4 | +++ tads2/Makefile | |
5 | @@ -56,7 +56,7 @@ | 5 | @@ -56,7 +56,7 @@ | |
6 | # | 6 | # | |
7 | # DATADIR is where the TADS 2 development libraries (adv.t, std.t and | 7 | # DATADIR is where the TADS 2 development libraries (adv.t, std.t and | |
8 | # gameinfo.t) will get installed. | 8 | # gameinfo.t) will get installed. | |
9 | -PREFIX=/usr/local | 9 | -PREFIX=/usr/local | |
10 | +#PREFIX=/usr/local | 10 | +#PREFIX=/usr/local | |
11 | BINDIR=$(PREFIX)/bin | 11 | BINDIR=$(PREFIX)/bin | |
12 | DATADIR=$(PREFIX)/share/tads2 | 12 | DATADIR=$(PREFIX)/share/tads2 | |
13 | 13 | |||
14 | @@ -278,16 +278,18 @@ MATT=Matt Herberg <meherberg@earthlink.n | 14 | @@ -278,16 +278,18 @@ MATT=Matt Herberg <meherberg@earthlink.n | |
@@ -24,27 +24,27 @@ $NetBSD: patch-aa,v 1.5 2010/05/29 14:31 | @@ -24,27 +24,27 @@ $NetBSD: patch-aa,v 1.5 2010/05/29 14:31 | |||
24 | -#OVLFLG= | 24 | -#OVLFLG= | |
25 | -#MACHDEP= | 25 | -#MACHDEP= | |
26 | -#LIBS=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lncurses | 26 | -#LIBS=-L/usr/pkg/lib -Wl,-R/usr/pkg/lib -lncurses | |
27 | -#MAKEXEC=touch | 27 | -#MAKEXEC=touch | |
28 | +.if ${OPSYS} == "NetBSD" | 28 | +.if ${OPSYS} == "NetBSD" | |
29 | +CC=gcc | 29 | +CC=gcc | |
30 | +OPTIMIZE= | 30 | +OPTIMIZE= | |
31 | +UNIXFLAGS=-g -DOSANSI -DUNIX -DHAVE_STRCASECMP | 31 | +UNIXFLAGS=-g -DOSANSI -DUNIX -DHAVE_STRCASECMP | |
32 | +SYSFLAGS=-DOS_SYSTEM_NAME=\""NETBSD"\" -DSYSNAME=\""NetBSD"\" -DSYSPL=\"1\" -DPORTER=\""$(DOUGLAS)"\" -DSYSMAINTAINER=\""NetBSD port maintained by $(DOUGLAS)\n"\" | 32 | +SYSFLAGS=-DOS_SYSTEM_NAME=\""NETBSD"\" -DSYSNAME=\""NetBSD"\" -DSYSPL=\"1\" -DPORTER=\""$(DOUGLAS)"\" -DSYSMAINTAINER=\""NetBSD port maintained by $(DOUGLAS)\n"\" | |
33 | +CFLAGS+=$(UNIXFLAGS) $(SYSFLAGS) -DNETBSD | 33 | +CFLAGS+=$(UNIXFLAGS) $(SYSFLAGS) -DNETBSD | |
34 | +AFLAGS= | 34 | +AFLAGS= | |
35 | +OVLFLG= | 35 | +OVLFLG= | |
36 | +MACHDEP= | 36 | +MACHDEP= | |
37 | +LIBS=$(LDFLAGS) -lncurses | 37 | +LIBS=-ltermcap | |
38 | +MAKEXEC=touch | 38 | +MAKEXEC=touch | |
39 | +.endif | 39 | +.endif | |
40 | 40 | |||
41 | # | 41 | # | |
42 | # i386+ running DOS/Windows, using DJGPP 2.X | 42 | # i386+ running DOS/Windows, using DJGPP 2.X | |
43 | @@ -382,10 +384,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp | 43 | @@ -382,10 +384,14 @@ TDBOBJS= $(DBGOBJS) osgen.o osunixt.o tp | |
44 | all: tadsr tadsc tdb | 44 | all: tadsr tadsc tdb | |
45 | 45 | |||
46 | install: all | 46 | install: all | |
47 | - install -d $(BINDIR) | 47 | - install -d $(BINDIR) | |
48 | - install -d $(DATADIR) | 48 | - install -d $(DATADIR) | |
49 | - install -s -m755 tadsc tadsr tdb $(BINDIR) | 49 | - install -s -m755 tadsc tadsr tdb $(BINDIR) | |
50 | - install -m644 adv.t std.t gameinfo.t $(DATADIR) | 50 | - install -m644 adv.t std.t gameinfo.t $(DATADIR) |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-ac,v 1.4 2010/05/29 14:31:23 dillo Exp $ | 1 | $NetBSD: patch-ac,v 1.5 2013/10/10 18:27:37 roy Exp $ | |
2 | 2 | |||
3 | --- tads3/Makefile.orig 2005-03-05 10:44:48.000000000 +0000 | 3 | --- tads3/Makefile.orig 2005-03-05 10:44:48.000000000 +0000 | |
4 | +++ tads3/Makefile | 4 | +++ tads3/Makefile | |
5 | @@ -14,9 +14,9 @@ | 5 | @@ -14,9 +14,9 @@ | |
6 | # Installation points for TADS3. Tailor these to your liking. If you install | 6 | # Installation points for TADS3. Tailor these to your liking. If you install | |
7 | # manually, DATADIR must match where you actually put the libraries and | 7 | # manually, DATADIR must match where you actually put the libraries and | |
8 | # resources, or the TADS3 compiler will not be able to find them. | 8 | # resources, or the TADS3 compiler will not be able to find them. | |
9 | -PREFIX = /usr/local | 9 | -PREFIX = /usr/local | |
10 | +#PREFIX = /usr/local | 10 | +#PREFIX = /usr/local | |
11 | BINDIR = $(PREFIX)/bin | 11 | BINDIR = $(PREFIX)/bin | |
12 | -DOCDIR = $(PREFIX)/doc/tads3 | 12 | -DOCDIR = $(PREFIX)/doc/tads3 | |
13 | +DOCDIR = $(PREFIX)/share/doc/html/tads3 | 13 | +DOCDIR = $(PREFIX)/share/doc/html/tads3 | |
14 | DATADIR = $(PREFIX)/share/tads3 | 14 | DATADIR = $(PREFIX)/share/tads3 | |
@@ -23,27 +23,27 @@ $NetBSD: patch-ac,v 1.4 2010/05/29 14:31 | @@ -23,27 +23,27 @@ $NetBSD: patch-ac,v 1.4 2010/05/29 14:31 | |||
23 | +# Maintainer: | 23 | +# Maintainer: | |
24 | +# | 24 | +# | |
25 | +# Uncomment -fno-exceptions from CXX_OPTIMIZE if you have a reasonably | 25 | +# Uncomment -fno-exceptions from CXX_OPTIMIZE if you have a reasonably | |
26 | +# current (> 2.7) version of g++. | 26 | +# current (> 2.7) version of g++. | |
27 | +########################################################################### | 27 | +########################################################################### | |
28 | +# | 28 | +# | |
29 | +.if ${OPSYS} == "NetBSD" | 29 | +.if ${OPSYS} == "NetBSD" | |
30 | +CXX = g++ | 30 | +CXX = g++ | |
31 | +CC = gcc | 31 | +CC = gcc | |
32 | +IDENT = -DOS_SYSTEM_NAME=\"NetBSD\" | 32 | +IDENT = -DOS_SYSTEM_NAME=\"NetBSD\" | |
33 | +OPTIMIZE = -O2 | 33 | +OPTIMIZE = -O2 | |
34 | +CXX_OPTIMIZE = -fno-exceptions | 34 | +CXX_OPTIMIZE = -fno-exceptions | |
35 | +OS_FLAGS = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD | 35 | +OS_FLAGS = -DOS_ANSI -DHAVE_STRCASECMP -Dmemicmp=strncasecmp -I./BSD | |
36 | +DISPLAY_LIB = ${LDFLAGS} -lncurses | 36 | +DISPLAY_LIB = -ltermcap | |
37 | +.endif | 37 | +.endif | |
38 | + | 38 | + | |
39 | +########################################################################### | 39 | +########################################################################### | |
40 | # OpenBSD | 40 | # OpenBSD | |
41 | # Compiled and tested on OpenBSD 3.0 | 41 | # Compiled and tested on OpenBSD 3.0 | |
42 | # Maintainer: Mark Wickham (macwickham@attbi.com) | 42 | # Maintainer: Mark Wickham (macwickham@attbi.com) | |
43 | @@ -216,18 +235,46 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu | 43 | @@ -216,18 +235,46 @@ MKCHRTAB_OBJS = mkchrtab.o $(T2_DIR)/osu | |
44 | all: t3make t3run t23run t3pre t3res mkchrtab | 44 | all: t3make t3run t23run t3pre t3res mkchrtab | |
45 | 45 | |||
46 | install: all install-common | 46 | install: all install-common | |
47 | - install -s -m755 t3make t3run t23run t3res mkchrtab $(BINDIR) | 47 | - install -s -m755 t3make t3run t23run t3res mkchrtab $(BINDIR) | |
48 | + ${BSD_INSTALL_PROGRAM} t3make ${DESTDIR}$(BINDIR) | 48 | + ${BSD_INSTALL_PROGRAM} t3make ${DESTDIR}$(BINDIR) | |
49 | + ${BSD_INSTALL_PROGRAM} t3run ${DESTDIR}$(BINDIR) | 49 | + ${BSD_INSTALL_PROGRAM} t3run ${DESTDIR}$(BINDIR) |