summaryrefslogtreecommitdiffstats
path: root/misc/videotext/files/patch-ba
blob: 4f95ae68f243d7969f49aa01224db7416b427d18 (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
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
--- Makefile.orig	Fri Oct 29 07:06:32 1999
+++ Makefile	Wed Feb 16 03:23:53 2000
@@ -22,14 +22,21 @@
 
 # Set the installation-directories & permissions here
 
-LIBDIR = /usr/local/lib/vtx
-SPOOLDIR = /var/spool/vtx
+#LIBDIR = /usr/local/lib/vtx
+#SPOOLDIR = /var/spool/vtx
+#BINDIR = /usr/local/bin
+#XBINDIR = /usr/local/bin/X11
+#FONTDIR = /usr/lib/X11/fonts/local
+#MANDIR = /usr/local/man
+#XMANDIR = /usr/local/man
 
-BINDIR = /usr/local/bin
-XBINDIR = /usr/local/bin/X11
-FONTDIR = /usr/lib/X11/fonts/local
-MANDIR = /usr/local/man
-XMANDIR = /usr/local/man
+SPOOLDIR = /var/spool/vtx
+LIBDIR = ${PREFIX}/lib/X11/vtx
+BINDIR = ${PREFIX}/bin
+XBINDIR = ${PREFIX}/bin
+FONTDIR = ${PREFIX}/lib/X11/fonts/local
+MANDIR = ${PREFIX}/man
+XMANDIR = ${PREFIX}/man
 
 DIRPERM = 755
 SPOOLDIRPERM = 777
@@ -58,11 +65,11 @@
 
 # Compiler options
 
-INCLUDEDIRS = -I/usr/openwin/include -I/usr/X11R6/include
-LIBDIRS = -L/usr/openwin/lib -L/usr/X11R6/lib
+INCLUDEDIRS = -I${X11BASE}/include
+LIBDIRS = -L${X11BASE}/lib
 
-CC = gcc
-CCFLAGS = -O2 -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes
+CC ?= gcc
+CCFLAGS = -fomit-frame-pointer -pipe -Wall #-Wstrict-prototypes
 
 LDFLAGS =
 CLIBS =
@@ -79,10 +86,10 @@
 # Uncomment the next lines if you want PNG support and have libpng and libz
 # installed.
 
-#PNG_SUPPORT = -DPNG_SUPPORT
-#PNG_LIBS = -lpng -lz -lm
-#PNG_INCLUDEDIRS = -I/usr/local/include
-#PNG_LIBDIRS = -L/usr/local/lib
+PNG_SUPPORT = -DPNG_SUPPORT
+PNG_LIBS = -lpng -lz -lm
+PNG_INCLUDEDIRS = -I${LOCALBASE}/include
+PNG_LIBDIRS = -L${LOCALBASE}/lib
 
 
 # Uncomment the following line if you want to get coredumps when an
@@ -131,7 +138,7 @@
 #####################################################################
 
 DEFINES += -DVTX_LIBDIR=\"$(LIBDIR)\" -DVTX_SPOOLDIR=\"$(SPOOLDIR)\"
-CFLAGS = $(DEFINES) $(GIF_SUPPORT) $(PNG_SUPPORT) $(CCFLAGS) $(INCLUDEDIRS) $(PNG_INCLUDEDIRS) \
+CFLAGS += $(DEFINES) $(GIF_SUPPORT) $(PNG_SUPPORT) $(CCFLAGS) $(INCLUDEDIRS) $(PNG_INCLUDEDIRS) \
          -I. -Ibitmaps $(XCFLAGS)
 LDFLAGS += $(XLDFLAGS)
 
@@ -246,37 +253,33 @@
 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(XMANDIR) \
 	  $(DESTDIR)$(XMANDIR)/man1
 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
-	install $(STRIP) $(_BINGRP) -m $(BINPERM) videotext $(DESTDIR)$(XBINDIR)
-	install $(_MANGRP) -m $(MANPERM) videotext.1 $(DESTDIR)$(XMANDIR)/man1
-	install $(_LIBGRP) -m $(LIBPERM) $(HELP) $(DESTDIR)$(LIBDIR)/videotext.info
+	${BSD_INSTALL_PROGRAM} videotext $(DESTDIR)$(XBINDIR)
+	${BSD_INSTALL_MAN} videotext.1 $(DESTDIR)$(XMANDIR)/man1
+	${BSD_INSTALL_DATA} $(HELP) $(DESTDIR)$(LIBDIR)/videotext.info
 
 install.vtxget: vtxget vtxget.1
 	-install -d $(_BINDIRGRP) -m $(BINDIRPERM) $(DESTDIR)$(BINDIR)
 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(MANDIR) \
 	  $(DESTDIR)$(MANDIR)/man1
-	install $(STRIP) $(_BINGRP) -m $(BINPERM) vtxget $(DESTDIR)$(BINDIR)
-	install $(_MANGRP) -m $(MANPERM) vtxget.1 $(DESTDIR)$(MANDIR)/man1
+	${BSD_INSTALL_PROGRAM} vtxget $(DESTDIR)$(BINDIR)
+	${BSD_INSTALL_MAN} vtxget.1 $(DESTDIR)$(MANDIR)/man1
 
 install.tunerctl: tunerctl tunerctl.1
 	-install -d $(_BINDIRGRP) -m $(BINDIRPERM) $(DESTDIR)$(BINDIR)
 	-install -d $(_MANDIRGRP) -m $(MANDIRPERM) $(DESTDIR)$(MANDIR) \
 	  $(DESTDIR)$(MANDIR)/man1
-	install $(STRIP) $(_BINGRP) -m $(BINPERM) tunerctl $(DESTDIR)$(BINDIR)
-	install $(_MANGRP) -m $(MANPERM) tunerctl.1 $(DESTDIR)$(MANDIR)/man1
+	${BSD_INSTALL_PROGRAM} tunerctl $(DESTDIR)$(BINDIR)
+	${BSD_INSTALL_MAN} tunerctl.1 $(DESTDIR)$(MANDIR)/man1
 
 install.xfonts: $(PCFFONTS)
 	-install -d $(_FONTDIRGRP) -m $(FONTDIRPERM) $(DESTDIR)$(FONTDIR)
-	install $(_FONTGRP) -m $(FONTPERM) $(PCFFONTS) $(DESTDIR)$(FONTDIR)
+	${BSD_INSTALL_DATA} $(PCFFONTS) $(DESTDIR)$(FONTDIR)
 	mkfontdir $(DESTDIR)$(FONTDIR)
-	chmod $(FONTPERM) $(DESTDIR)$(FONTDIR)/fonts.dir
-ifneq ($(FONTGRP),)
-	chgrp $(FONTGRP) $(DESTDIR)$(FONTDIR)/fonts.dir
-endif
 	-xset fp rehash
 
 install.fonts: $(VTXFONTS)
 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
-	install $(_LIBGRP) -m $(LIBPERM) $(VTXFONTS) $(DESTDIR)$(LIBDIR)
+	${BSD_INSTALL_DATA} $(VTXFONTS) $(DESTDIR)$(LIBDIR)
 
 install.config:
 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
@@ -286,7 +289,7 @@
 	@echo Do a \'make install.forceconfig\' to overwrite old version.
 	@echo
 else
-	install $(_LIBGRP) -m $(LIBPERM) data/vtxrc $(DESTDIR)$(LIBDIR)
+	${BSD_INSTALL_DATA} data/vtxrc $(DESTDIR)$(LIBDIR)
 endif
 ifeq ($(DESTDIR)$(LIBDIR)/vtx-hotlist,$(wildcard $(DESTDIR)$(LIBDIR)/vtx-hotlist))
 	@echo
@@ -295,16 +298,16 @@
 	@echo Or do a \'make install.forceconfig\' to overwrite old version.
 	@echo
 else
-	install $(_LIBGRP) -m $(LIBPERM) data/vtx-hotlist $(DESTDIR)$(LIBDIR)
+	${BSD_INSTALL_DATA} data/vtx-hotlist $(DESTDIR)$(LIBDIR)
 endif
 
 install.forceconfig:
 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
-	install $(_LIBGRP) -m $(LIBPERM) data/vtxrc data/vtx-hotlist $(DESTDIR)$(LIBDIR)
+	${BSD_INSTALL_DATA} data/vtxrc data/vtx-hotlist $(DESTDIR)$(LIBDIR)
 
 install.lib:
 	-install -d $(_LIBDIRGRP) -m $(LIBDIRPERM) $(DESTDIR)$(LIBDIR)
-	install $(_LIBGRP) -m $(LIBPERM) data/tv-channels $(DESTDIR)$(LIBDIR)
+	${BSD_INSTALL_DATA} data/tv-channels $(DESTDIR)$(LIBDIR)
 
 install.spooldirs:
 	-install -d -m $(BASESPOOLDIRPERM) $(DESTDIR)$(SPOOLDIR)
OpenPOWER on IntegriCloud