| @@ -1,99 +1,99 @@ | | | @@ -1,99 +1,99 @@ |
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 |
15 | LIBDIR = $(DATADIR)/libraries | | 15 | LIBDIR = $(DATADIR)/libraries |
16 | INCDIR = $(DATADIR)/includes | | 16 | INCDIR = $(DATADIR)/includes |
17 | @@ -117,6 +117,25 @@ RESDIR = $(DATADIR)/resources | | 17 | @@ -117,6 +117,25 @@ RESDIR = $(DATADIR)/resources |
18 | #DISPLAY_LIB = -ltermcap | | 18 | #DISPLAY_LIB = -ltermcap |
19 | | | 19 | |
20 | ########################################################################### | | 20 | ########################################################################### |
21 | +# NetBSD | | 21 | +# NetBSD |
22 | +# Compiled and tested on NetBSD 1.6 | | 22 | +# Compiled and tested on NetBSD 1.6 |
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) |
50 | + ${BSD_INSTALL_PROGRAM} t23run ${DESTDIR}$(BINDIR) | | 50 | + ${BSD_INSTALL_PROGRAM} t23run ${DESTDIR}$(BINDIR) |
51 | + ${BSD_INSTALL_PROGRAM} t3res ${DESTDIR}$(BINDIR) | | 51 | + ${BSD_INSTALL_PROGRAM} t3res ${DESTDIR}$(BINDIR) |
52 | + ${BSD_INSTALL_PROGRAM} mkchrtab ${DESTDIR}$(BINDIR) | | 52 | + ${BSD_INSTALL_PROGRAM} mkchrtab ${DESTDIR}$(BINDIR) |
53 | | | 53 | |
54 | install-common: all | | 54 | install-common: all |
55 | - install -d $(BINDIR) | | 55 | - install -d $(BINDIR) |
56 | - install -d $(DOCDIR) | | 56 | - install -d $(DOCDIR) |
57 | - install -d $(DATADIR) | | 57 | - install -d $(DATADIR) |
58 | - rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) | | 58 | - rm -rf $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) |
59 | - cp -rp t3include $(INCDIR) | | 59 | - cp -rp t3include $(INCDIR) |
60 | - cp -rp t3library $(LIBDIR) | | 60 | - cp -rp t3library $(LIBDIR) |
61 | - cp -rp t3resource $(RESDIR) | | 61 | - cp -rp t3resource $(RESDIR) |
62 | - cp -rp doc $(DOCDIR) | | 62 | - cp -rp doc $(DOCDIR) |
63 | - -chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) | | 63 | - -chown -fR root.root $(INCDIR) $(LIBDIR) $(RESDIR) $(DOCDIR) |
64 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DOCDIR) | | 64 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DOCDIR) |
65 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DATADIR) | | 65 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DATADIR) |
66 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${INCDIR} | | 66 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${INCDIR} |
67 | + for f in t3include/*; \ | | 67 | + for f in t3include/*; \ |
68 | + do \ | | 68 | + do \ |
69 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${INCDIR}; \ | | 69 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${INCDIR}; \ |
70 | + done | | 70 | + done |
71 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR} | | 71 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR} |
72 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3 | | 72 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3 |
73 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3/en_us | | 73 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${LIBDIR}/adv3/en_us |
74 | + for f in t3library/*.*; \ | | 74 | + for f in t3library/*.*; \ |
75 | + do \ | | 75 | + do \ |
76 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}; \ | | 76 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}; \ |
77 | + done | | 77 | + done |
78 | + for f in t3library/adv3/*.*; \ | | 78 | + for f in t3library/adv3/*.*; \ |
79 | + do \ | | 79 | + do \ |
80 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3; \ | | 80 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3; \ |
81 | + done | | 81 | + done |
82 | + for f in t3library/adv3/en_us/*.*; \ | | 82 | + for f in t3library/adv3/en_us/*.*; \ |
83 | + do \ | | 83 | + do \ |
84 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3/en_us; \ | | 84 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${LIBDIR}/adv3/en_us; \ |
85 | + done | | 85 | + done |
86 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR} | | 86 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR} |
87 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR}/charmap | | 87 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${RESDIR}/charmap |
88 | + for f in t3resource/charmap/*; \ | | 88 | + for f in t3resource/charmap/*; \ |
89 | + do \ | | 89 | + do \ |
90 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${RESDIR}/charmap; \ | | 90 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${RESDIR}/charmap; \ |
91 | + done | | 91 | + done |
92 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} | | 92 | + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} |
93 | + for f in doc/*; \ | | 93 | + for f in doc/*; \ |
94 | + do \ | | 94 | + do \ |
95 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \ | | 95 | + ${BSD_INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}; \ |
96 | + done | | 96 | + done |
97 | | | 97 | |
98 | clean: | | 98 | clean: |
99 | rm -f *.o t3make t3run t23run t3pre t3res mkchrtab test_utf8 test_chr test_pool test_err test_obj test_write test_exec test_gets test_tok test_prs test_sym test_prs_top test_comp_obj test_link test_regex test_sort iter.t3s test.t3v | | 99 | rm -f *.o t3make t3run t23run t3pre t3res mkchrtab test_utf8 test_chr test_pool test_err test_obj test_write test_exec test_gets test_tok test_prs test_sym test_prs_top test_comp_obj test_link test_regex test_sort iter.t3s test.t3v |