| @@ -1,39 +1,39 @@ | | | @@ -1,39 +1,39 @@ |
1 | $NetBSD: patch-ae,v 1.11 2012/08/27 00:35:08 dholland Exp $ | | 1 | $NetBSD: patch-ae,v 1.12 2014/02/04 00:18:40 joerg Exp $ |
2 | | | 2 | |
3 | - configure for pkgsrc | | 3 | - configure for pkgsrc |
4 | - use tcl/tk 8.5 instead of 8.4 | | 4 | - use tcl/tk 8.6 instead of 8.4 |
5 | | | 5 | |
6 | --- Makefile.bsd.orig 2005-03-29 16:49:22.000000000 +0000 | | 6 | --- Makefile.bsd.orig 2005-03-29 16:49:22.000000000 +0000 |
7 | +++ Makefile.bsd | | 7 | +++ Makefile.bsd |
8 | @@ -32,7 +32,7 @@ | | 8 | @@ -32,7 +32,7 @@ |
9 | X11BASE ?= /usr/X11R6 | | 9 | X11BASE ?= /usr/X11R6 |
10 | LOCALBASE ?= /usr/local | | 10 | LOCALBASE ?= /usr/local |
11 | PREFIX ?= $(X11BASE) | | 11 | PREFIX ?= $(X11BASE) |
12 | - | | 12 | - |
13 | +BUILD_DIR = build-netbsd | | 13 | +BUILD_DIR = build-netbsd |
14 | prefix = $(PREFIX) | | 14 | prefix = $(PREFIX) |
15 | TK_LIBRARY_BASE = $(LOCALBASE)/lib | | 15 | TK_LIBRARY_BASE = $(LOCALBASE)/lib |
16 | ifeq ($(OS), FreeBSD) | | 16 | ifeq ($(OS), FreeBSD) |
17 | @@ -46,10 +46,10 @@ WANT_USER_DBDIR = 1 | | 17 | @@ -46,10 +46,10 @@ WANT_USER_DBDIR = 1 |
18 | # other settings | | 18 | # other settings |
19 | # On FreeBSD there is only a modified tclsh with a message to launch | | 19 | # On FreeBSD there is only a modified tclsh with a message to launch |
20 | # tclsh8.3 or tclsh8.4 , so this is hardcoded here | | 20 | # tclsh8.3 or tclsh8.4 , so this is hardcoded here |
21 | -TCL_VER = 8.4 | | 21 | -TCL_VER = 8.4 |
22 | +TCL_VER = 8.5 | | 22 | +TCL_VER = 8.6 |
23 | LDLIBS = -L$(LOCALBASE)/lib\ | | 23 | LDLIBS = -L$(LOCALBASE)/lib\ |
24 | -L$(X11BASE)/lib\ | | 24 | -L$(X11BASE)/lib\ |
25 | - -ltk84 -ltcl84 -lX11 -lXmu -lm | | 25 | - -ltk84 -ltcl84 -lX11 -lXmu -lm |
26 | + -ltk85 -ltcl85 -lX11 -lXmu -lm | | 26 | + -ltk86 -ltcl86 -lX11 -lXmu -lm |
27 | | | 27 | |
28 | INCS += -I$(LOCALBASE)/include/tcl$(TCL_VER)\ | | 28 | INCS += -I$(LOCALBASE)/include/tcl$(TCL_VER)\ |
29 | -I$(LOCALBASE)/include/tk$(TCL_VER) | | 29 | -I$(LOCALBASE)/include/tk$(TCL_VER) |
30 | @@ -64,7 +64,7 @@ endif | | 30 | @@ -64,7 +64,7 @@ endif |
31 | ### Common part for all UN*X variants ### | | 31 | ### Common part for all UN*X variants ### |
32 | | | 32 | |
33 | # Tools | | 33 | # Tools |
34 | -PERL ?= /usr/bin/perl | | 34 | -PERL ?= /usr/bin/perl |
35 | +PERL ?= ${LOCALBASE}/bin/perl | | 35 | +PERL ?= ${LOCALBASE}/bin/perl |
36 | CC ?= gcc | | 36 | CC ?= gcc |
37 | ECHO ?= @echo | | 37 | ECHO ?= @echo |
38 | | | 38 | |
39 | @@ -125,7 +125,7 @@ WARN = -Wall -Wnested-externs -Wstric | | 39 | @@ -125,7 +125,7 @@ WARN = -Wall -Wnested-externs -Wstric |