summaryrefslogtreecommitdiff
path: root/deskutils/plan/files/patch-ab
blob: d74cff7d2b8b56855f9a717942495f9c41580fc2 (plain) (blame)
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
--- Makefile.orig	Wed Jul  7 13:24:27 1999
+++ Makefile	Thu Jul  8 23:19:14 1999
@@ -7,16 +7,22 @@
 # DO NOT put blanks before and after "=", this is parsed and rewritten by the
 # configure script.
 #
+DOCBASE = $(PREFIX)/share/doc/plan
+#
 #				# user-callable executable (plan)
-DIR=/usr/local/bin
+DIR=$(PREFIX)/bin
 #				# auxiliary programs (pland, notifier, netplan)
-LIB=/usr/local/lib
+LIB=$(PREFIX)/share
+#				# Example holiday files
+EXAMPLES=$(DOCBASE)/examples
+#				# doc files
+DOCS=$(DOCBASE)
 #				# help file (plan.help)
-HELP=/usr/local/lib
+HELP=$(DOCBASE)
 #				# netplan expects netplan.dir/ here
-NETPLANDIR=/usr/local/lib
+NETPLANDIR=$(LIB)
 #				# unformatted nroff manpage (plan.[14])
-MAN=/usr/local/man
+MAN=$(PREFIX)/man/man
 #				# formatted manpage (plan.[14])
 CATMAN=/usr/catman/local/cat
 #				# subdirectory in home dir, or empty
@@ -32,9 +38,9 @@
 #				# standard Unix compiler generator
 YACC=yacc
 #				# numerical user ID of <nobody> account
-NOB_UID=60001
+NOB_UID=65534
 #				# default numerical group ID of <nobody>
-NOB_GID=60001
+NOB_GID=65534
 # 				# used by plan to pre-process holiday files,
 #				# plan will check if this file really exists
 CPP_PATH='/lib/cpp -P -I$(HELP)'
@@ -47,11 +53,15 @@
 #				# uncomment this for Japanese version of plan
 #				# JAPAN requires X11R5 and a Japanese env.
 JAPANDEFS="-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS='ja_JP.SJIS' -DLOCALE_EUC='ja_JP.EUC'"
+.if defined(JAPANESE)
+JAPAN = -DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 \
+	-DLOCALE_SJIS=\"ja_JP.SJIS\" -DLOCALE_EUC=\"ja_JP.EUC\"
+.endif
 JAPAN=
 #				# default holiday locale
 HOLIDAY=german
 #				# do NOT define -O2 on DEC OSF/1 machines!
-DEBUG=-O2
+DEBUG=${CFLAGS}
 #				# what to do without make arguments
 DEFTARGET=linux
 #------------------------- end of configuration section ----------------------
@@ -222,8 +232,10 @@
 BSDIG_L2= -L/usr/X11/lib -lc
 NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
 NBSD_L2	= -L/usr/X11R6/lib -lc
-FBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11 -lXext -lSM -lICE -lXpm
-FBSD_L2	= -L/usr/X11R6/lib -lc
+FBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
+FBSD_L2 = -lc
+OBSD_L1 = -L$(X11BASE)/lib ${MOTIFLIB} -lXt -lSM -lICE -lX11 -lXext -lc
+OBSD_L2 = -lc
 LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11
 LINUX_L2= -lc
 SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
@@ -291,7 +303,8 @@
 	@echo "  make bsdi      BSDI/386"
 	@echo "  make bsdig     BSDI/386 with gcc"
 	@echo "  make netbsd    NetBSD/i386 1.0A (maybe others too)"
-	@echo "  make freebsd   FreeBSD 2.x"
+	@echo "  make freebsd   FreeBSD 3.x"
+	@echo "  make openbsd   OpenBSD 2.x"
 	@echo "  make svr4      SVR4 Using gcc"
 	@echo "  make news4     Sony NEWS-OS4.x"
 	@echo "  make news4g    Sony NEWS-OS4.x with gcc"
@@ -421,6 +434,9 @@
 freebsd:
 	env CF="$(FBSD_C)" L1F="$(FBSD_L1)" L2F="$(FBSD_L2)" MYCC=${CC} make all
 
+openbsd:
+	env CF="$(OBSD_C)" L1F="$(OBSD_L1)" L2F="$(OBSD_L2)" MYCC=${CC} make all
+ 
 svr4:
 	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
 
@@ -533,7 +549,7 @@
 	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DLIB=\"$(LIB)\" $<
 
 holiday.o: holiday.c $(MAKEFILE)
-	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
+	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(DOCS)\" $<
 
 util.o: util.c $(MAKEFILE)
 	$(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
@@ -564,31 +580,25 @@
 
 #---------------------------------------------------------------
 install:
-	cp plan $(DIR)
-	-rm -f $(DIR)/pland $(DIR)/notifier
-	cp pland notifier netplan ../misc/plan_cal.ps ../language/* $(LIB)
-	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(LIB)) || exit 0
-	cp ../language/plan.help $(HELP)
-	-strip $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
-	-chmod 755 $(DIR)/plan $(LIB)/pland $(LIB)/notifier $(LIB)/netplan
-	-chmod 644 $(HELP)/plan.help $(LIB)/plan_cal.ps $(LIB)/plan.lang.*
-	-(test x'$(JAPAN)' != x && chmod 644 $(LIB)/plan_calSJ.ps) || exit 0
+	${INSTALL} -d $(DOCBASE)
+	${INSTALL} -d $(EXAMPLES)
+	${BSD_INSTALL_PROGRAM} pland $(DIR) 
+	${BSD_INSTALL_PROGRAM} notifier netplan plan $(DIR)
+	${BSD_INSTALL_SCRIPT} ../misc/Killpland $(DIR)
+	${BSD_INSTALL_MAN} ../language/plan.help ../misc/plan_cal.ps \
+	  ../misc/Monochrome ../misc/BlackWhite $(DOCS)
+	${BSD_INSTALL_SCRIPT} -c -m 755 ../misc/Mkdoc ../misc/Mkdoc.nawk $(DOCS)
+	-test x$(JAPAN) != x && ${BSD_INSTALL_MAN} ../misc/plan_calSJ.ps $(DOCS)
+
 	-mkdir $(NETPLANDIR)/netplan.dir
 	-chmod 700 $(NETPLANDIR)/netplan.dir
-	-(test -x `which nroff` && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
-	-(test -x `which nroff` && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
-	-(test -x `which nroff` && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
-	-(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/plan) || exit 0
-	-(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/plan) || exit 0
-	-(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/netplan) || exit 0
-	-(test -d $(CATMAN)1 && cp ../misc/plan.1cat $(CATMAN)1/plan) || exit 0
-	-(test -d $(CATMAN)4 && cp ../misc/plan.4cat $(CATMAN)4/plan) || exit 0
-	-(test -d $(CATMAN)1 && cp ../misc/netplan.1cat $(CATMAN)1/netplan) || exit 0
-	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
-	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
-	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
-	@echo ""
-	@echo "use ../holiday/* as templates for your ~/.holiday file"
+	-(test -d $(MAN)1 && cp ../misc/plan.1 $(MAN)1/) || exit 0
+	-(test -d $(MAN)4 && cp ../misc/plan.4 $(MAN)4/) || exit 0
+	-(test -d $(MAN)1 && cp ../misc/netplan.1 $(MAN)1/) || exit 0
+	${BSD_INSTALL_MAN} ../README $(DOCBASE)
+	${BSD_INSTALL_DATA} ../holiday/holiday_* $(EXAMPLES)
+	${ECHO} ""
+	${ECHO} "Use " $(EXAMPLES)"/holiday/* as templates for your ~/.holiday file"
 
 clean:
 	-rm -f *.o