summaryrefslogtreecommitdiff
path: root/comms/xtel/patches/patch-ab
blob: fe713f4bbc220f134fadc25b0a74ca6c2bbbc8a3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
$NetBSD: patch-ab,v 1.3 2009/02/07 22:06:06 joerg Exp $

--- Imakefile.orig	2001-02-12 17:33:01.000000000 +0100
+++ Imakefile
@@ -26,7 +26,7 @@ NETWORKCFLAGS = -DNO_NETWORK
 #ifdef NO_TERMIO
 TERMIOCFLAGS = -DNO_TERMIO
 #else
-#if defined(USE_TERMIOS) || defined(__FreeBSD__)
+#if defined(USE_TERMIOS) || defined(__FreeBSD__) || defined (NetBSDArchitecture) || defined(DragonFlyArchitecture)
 TERMIOCFLAGS = -DUSE_TERMIOS
 #endif
 #endif
@@ -71,7 +71,7 @@ SYSLOGCFLAGS= -DUSE_SYSLOG
 #ifdef NO_TVR
   TVRCFLAGS= -DNO_TVR
 #else
-    JPEGLIB= -ljpeg
+    JPEGLIB= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ljpeg
 #endif
 
 #ifdef WINDAUBE
@@ -103,7 +103,7 @@ CONF_DEFINES  = '-DFICHIER_DEFINITION_LI
 
 TELE_DEFINES  = '-DXTERM_PATH="$(BINDIR)/xterm"'
 
-XTELD_DEFINES = '-DFICHIER_LOG="$(LIBDIR)/xtel/xtel.log"' \
+XTELD_DEFINES = '-DFICHIER_LOG="/var/log/xtel.log"' \
 		  '-DXTEL_LIBDIR="$(LIBDIR)/xtel"'
 
 
@@ -241,19 +241,12 @@ clean::
 InstallManPage(xteld,$(MANDIR))
 
 #ifdef INSTALLDEMON
-InstallProgram(xteld, $(BINDIR))
-InstallProgramWithFlags(mdmdetect, $(BINDIR), $(INSTUIDFLAGS))
+InstallProgram(xteld,$(BINDIR))
+InstallProgramWithFlags(mdmdetect,$(BINDIR),$(INSTUIDFLAGS))
 InstallNamedProg(make_xtel_lignes.sh,make_xtel_lignes,$(BINDIR))
-
-install::
-	@if [ -r $(LIBDIR)/xtel/$(XTELLIGNES) ]; then \
-	cp $(LIBDIR)/xtel/$(XTELLIGNES) $(LIBDIR)/xtel/$(XTELLIGNES).old; fi
-	@if [ -r $(LIBDIR)/xtel/$(XTELSERVICES) ]; then \
-	cp $(LIBDIR)/xtel/$(XTELSERVICES) $(LIBDIR)/xtel/$(XTELSERVICES).old; fi
-
-InstallNonExecFile($(XTELLIGNES), $(LIBDIR)/xtel)
-InstallNonExecFile($(XTELSERVICES), $(LIBDIR)/xtel)
-InstallNonExecFile(modem.list, $(LIBDIR)/xtel)
+InstallNonExecFile($(XTELLIGNES),$(LIBDIR)/xtel)
+InstallNonExecFile($(XTELSERVICES),$(LIBDIR)/xtel)
+InstallNonExecFile(modem.list,$(LIBDIR)/xtel)
 #endif
 
 SpecialObjectRule(teleinfo.o, teleinfo.c, $(TELE_DEFINES))