summaryrefslogtreecommitdiff
path: root/mail/faces/patches/patch-ab
blob: e21326bcecf702e5855117589109cd003db14343 (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
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
$NetBSD: patch-ab,v 1.11 2002/09/21 12:13:44 jlam Exp $

--- Makefile.dist.orig	Sun Nov 24 18:55:28 1991
+++ Makefile.dist
@@ -22,15 +22,18 @@
 #  uncommented and set accordingly, if needed.
 #
 #========================================================================
+# Installation prefix.
+#PREFIX           ?=/usr/local
+#------------------------------------------------------------------------
 #  If you want audio support, then the following line should be uncommented.
 #
-#AUDIO_SUPPORT     = -DAUDIO_SUPPORT
+AUDIO_SUPPORT     = -DAUDIO_SUPPORT
 #========================================================================
 #  There is a default command (/usr/demo/SOUND/play), which is used to
 #  play audio files. Alternatively you can specify your own custom
 #  command here. Uncomment the following line and set appropriately.
 #
-#AUDIO_CMD         = -DAUDIO_CMD=\"/usr/local/bin/play\"
+AUDIO_CMD         = -DAUDIO_CMD=\"$(LOCALBASE)/bin/rplay\"
 #========================================================================
 #  Faces displays a background pattern in its' window. When the window
 #  is not completely full, this gives the appearance of trying to blend
@@ -38,7 +41,7 @@
 #  can specify the name of a file containing an alternate pattern to use.
 #  Uncomment the next two lines and set appropriately.
 #
-#BACKNAME          = /usr/local/sample-background
+#BACKNAME          = $(PREFIX)/sample-background
 #BACKGROUND        = -DBACKGROUND=\"$(BACKNAME)\"
 #------------------------------------------------------------------------
 #  Uncomment the following two lines to use the Domain Name Service to 
@@ -54,8 +57,8 @@
 #  NOTE that for this to work you must have at least a minimal
 #  /etc/resolv.conf file containing a valid nameserver entry.
 #
-#DNSLOOKUP	= -DDNSLOOKUP
-#DNSLIB		= -lresolv
+DNSLOOKUP	= -DDNSLOOKUP
+DNSLIB		=
 #------------------------------------------------------------------------
 #  If you do not want to show the number of messages on the face icon,
 #  then uncomment the next line.
@@ -72,12 +75,12 @@
 #
 #DONTSHOWUSER     = -DDONTSHOWUSER
 #------------------------------------------------------------------------
-#  By default, faces looks for the face images in /usr/local/faces. If
+#  By default, faces looks for the face images in $(PREFIX)/faces. If
 #  you wish to specify an alternate location, then these two lines should
 #  be uncommented and set appropriately. Note that the value must be
 #  a single directory name, not a colon separated list of paths.
 #               
-FACEDIR           = /usr/local/faces
+FACEDIR           = $(PREFIX)/share/faces
 CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #------------------------------------------------------------------------
 #  It is possible to determine what type of monitoring faces does at
@@ -123,7 +126,7 @@
 #  Note that the domain name will be converted to lower case before
 #  attempting to match in the machines file, or create an icon filename.
 #
-#NISLOOKUP	= -DNISLOOKUP
+NISLOOKUP	= -DNISLOOKUP
 #------------------------------------------------------------------------
 #  If you don't want faces to use full domain names for extracting face
 #  icons, then you should uncomment the NODOMAINS definition below.
@@ -188,7 +191,7 @@
 #  to the select call are different, and this definition should be
 #  uncommented. You need to uncomment this for SunOS v3.x.
 #
-#SELTYPE        = -DNO_43SELECT
+SELTYPE        = -DNO_43SELECT
 #------------------------------------------------------------------------
 #  If you are building faces on a Silicon Graphics machine, then you will
 #  need to uncomment the following two definitions.
@@ -199,7 +202,7 @@
 #  If the pending mail for users is in a different directory than
 #  /usr/spool/mail, uncomment the following and set appropriately.
 #
-#SPOOLDIR	= -DSPOOLDIR=\"/usr/mail\"
+SPOOLDIR	= -DSPOOLDIR=\"/var/mail\"
 #------------------------------------------------------------------------
 #  If faces is setup to monitor mail, then the name of the default
 #  spoolfile is /usr/spool/mail/username. An alternative spoolfile name
@@ -258,8 +261,8 @@
 #  library files are not in a standard place, then the following
 #  two lines should be uncommented, and set appropriately.
 #
-#X11INCDIR         = -I$(OPENWINHOME)/include
-#X11LIBDIR         = -L$(OPENWINHOME)/lib
+X11INCDIR         = -I${X11BASE}/include
+X11LIBDIR         = -L${X11BASE}/lib
 #------------------------------------------------------------------------
 #  If you are compiling the XView version, then the following two lines
 #  should be uncommented, and set appropriately.
@@ -272,17 +275,19 @@
 #  Default locations where faces files will be installed.
 #  You might wish to alter these values.
 #
-BINDIR		= /usr/local/bin
-LIBDIR		= /usr/local/lib
-MANDIR		= /usr/man
-MANSECT		= l
+BINDIR		= $(PREFIX)/bin
+LIBDIR		= $(PREFIX)/lib
+INCDIR		= $(PREFIX)/include
+MANDIR		= $(PREFIX)/man
+MANSECT		= 1
 
 #
 #  Options for submakes
 #
 MAKEOPTS	= $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
-			    MANDIR=$(MANDIR) CC=$(CC) \
-			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
+			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC=$(CC) \
+			    NOINDEX=$(NOINDEX) SYSV=$(SYSV) PREFIX=$(PREFIX) \
+			    CCOMP="$(CCOMP)"
 
 #
 # Override DEBUG on the command line as `DEBUG=-DDEBUG' to enable various
@@ -302,7 +307,7 @@
 		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
 		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
 		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
-CCOMP		= -O
+CCOMP		= -g
 CFLAGS		= $(CCOMP) $(CDEFS)
 #
 #=======================================================================
@@ -311,12 +316,9 @@
 
 BINARIES	= psfaces svfaces xfaces xvfaces
 
-CC		= cc
-MAKE		= make
-
 STDSRCS		= address.c get.c main.c mon.c parsefrom.c rec.c
 STDOBJS		= address.o get.o main.o mon.o parsefrom.o rec.o
-STDLIBS		= compface/libcompface.a $(DNSLIB) $(SGILIBS)
+STDLIBS		= $(LDFLAGS) compface/libcompface.la $(DNSLIB) $(SGILIBS)
 
 COMPFACE	= compface
 FACES		= facedir
@@ -357,25 +359,25 @@
 #  Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
 #  AT&T's XWIN:                    $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
 #
-X11LIBS		= $(X11LIBDIR) -lX11
+X11LIBS		= -lX11
 XVIEWLIBS	= $(XVIEWLIBDIR) -lxview -lolgx -lX11
 
 help:
 		@echo
 		@echo "You need to specify one of the following options:"
 		@echo
-		@echo "  make sunview    - to make the SunView version."
-		@echo "  make news       - to make the NeWS version."
-		@echo "  make x11        - to make the X11 version."
-		@echo "  make xview      - to make the XView version."
+		@echo "  ${MAKE} sunview    - to make the SunView version."
+		@echo "  ${MAKE} news       - to make the NeWS version."
+		@echo "  ${MAKE} x11        - to make the X11 version."
+		@echo "  ${MAKE} xview      - to make the XView version."
 		@echo
 		@echo "This should be followed by:"
 		@echo
-		@echo "  make install"
-		@echo "  make clean"
+		@echo "  ${MAKE} install"
+		@echo "  ${MAKE} clean"
 		@echo
 
-all:		$(BINARIES)
+all:		x11
 
 news:		$(STDOBJS) news.o faces_cps.h
 		(cd compface; $(MAKE) $(MAKEOPTS))
@@ -394,9 +396,8 @@
 x11:		$(STDOBJS) x11.o
 		(cd compface; $(MAKE) $(MAKEOPTS))
 		(cd filters; $(MAKE) $(MAKEOPTS))
-		$(CC) -o xfaces $(CFLAGS) $(STDOBJS) x11.o \
+		$(LIBTOOL) $(CC) -o faces $(CFLAGS) $(STDOBJS) x11.o \
 					$(STDLIBS) $(X11LIBS) $(SVR4LIBS)
-		-cp xfaces faces
 
 xview:		$(STDOBJS) xview.o
 		(cd compface; $(MAKE) $(MAKEOPTS))
@@ -406,21 +407,24 @@
 		-cp xvfaces faces
 
 tables:
-		-mkdir $(FACEDIR)
-		-install -c -m 644 machine.tab $(FACEDIR)
-		-install -c -m 644 people.tab $(FACEDIR)
+		${BSD_INSTALL_DATA_DIR} $(FACEDIR)
+		${BSD_INSTALL_DATA} machine.tab $(FACEDIR)
+		${BSD_INSTALL_DATA} people.tab $(FACEDIR)
 
 install:
+		${MAKE} tables
 		(cd compface; $(MAKE) $(MAKEOPTS) install)
 		(cd filters; $(MAKE) $(MAKEOPTS) install)
 		(cd scripts; $(MAKE) $(MAKEOPTS) install)
-		install -s -m 751 faces $(BINDIR)
-		install -c -m 755 face_update $(BINDIR)
-		install -c -m 755 faces.sendmail $(BINDIR)
-		install -c -m 644 faces.man \
+		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} faces $(BINDIR)
+		${BSD_INSTALL_SCRIPT} face_update $(BINDIR)
+		${BSD_INSTALL_SCRIPT} faces.sendmail $(BINDIR)
+		${BSD_INSTALL_MAN} faces.man \
 				$(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
-		install -c -m 644 face_update.1 \
+		${BSD_INSTALL_MAN} face_update.1 \
 				$(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
+		${BSD_INSTALL_DATA_DIR} $(PREFIX)/lib/X11/app-defaults
+		${BSD_INSTALL_DATA} Faces.ad $(PREFIX)/lib/X11/app-defaults/Faces
 
 clean:
 		(cd compface; $(MAKE) $(MAKEOPTS) clean)