1 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
2 |
--- |
3 |
app-office/plan/Manifest | 1 + |
4 |
app-office/plan/files/plan-1.10-errno.patch | 11 + |
5 |
.../plan/files/plan-1.10-fno-common.patch | 14 ++ |
6 |
app-office/plan/files/plan-1.10-gentoo.patch | 197 +++++++++++++++++ |
7 |
.../plan/files/plan-1.10-makefile.patch | 184 ++++++++++++++++ |
8 |
app-office/plan/files/plan-1.10-webplan.patch | 108 ++++++++++ |
9 |
app-office/plan/files/plan-1.12-gentoo.patch | 107 ++++++++++ |
10 |
.../plan/files/plan-1.12-makefile.patch | 199 ++++++++++++++++++ |
11 |
app-office/plan/metadata.xml | 9 +- |
12 |
app-office/plan/plan-1.12.ebuild | 69 ++++++ |
13 |
10 files changed, 898 insertions(+), 1 deletion(-) |
14 |
create mode 100644 app-office/plan/files/plan-1.10-errno.patch |
15 |
create mode 100644 app-office/plan/files/plan-1.10-fno-common.patch |
16 |
create mode 100644 app-office/plan/files/plan-1.10-gentoo.patch |
17 |
create mode 100644 app-office/plan/files/plan-1.10-makefile.patch |
18 |
create mode 100644 app-office/plan/files/plan-1.10-webplan.patch |
19 |
create mode 100644 app-office/plan/files/plan-1.12-gentoo.patch |
20 |
create mode 100644 app-office/plan/files/plan-1.12-makefile.patch |
21 |
create mode 100644 app-office/plan/plan-1.12.ebuild |
22 |
|
23 |
diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest |
24 |
index 1b53f3c15fb..c420cc87b14 100644 |
25 |
--- a/app-office/plan/Manifest |
26 |
+++ b/app-office/plan/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST plan-1.10-patches.txz 6132 BLAKE2B 617c68a012e4757f7ef039557cfe15e04706129501f044005e554a50aa9ebbe9e33e2e406ec5647060a7b67efb81b671c35eb6846d426a26c517c38b10e7eabb SHA512 c0802f12e935d7ab18d89b6c4e8ae8373ca620b8149520b8bc9d9fb8e871ad4c2b0bc0e7ca84c34e72d0a25cb406af51fac1fc1907844867f4fd7fdff8a06d54 |
29 |
DIST plan-1.10.tar.gz 460150 BLAKE2B a44c79537ff6aae8fa5c65c8b6514f0f37d1417522f4e54823ad14cf6306bb88223377de13f22c365516e2861fa561902e31245c9729786f425140bed30b320d SHA512 fde17ef17f25412cbe69427364f4130564f46a940859066c25d837d14eca6920752b843211192a6c1cdc83be05de9ac57c88424ca555928b67eb219fa8564fe8 |
30 |
+DIST plan-1.12.tar.gz 439996 BLAKE2B fcdf467b1628fb48b018b6d6664a461296e33977157fda4c54dd48c357c11316c1b573a378a4f8fb2d2de800c67a0a56d112a8238d298fc6ad46169d35342016 SHA512 c2c6cac7f9e88c7cf17e076e5021c83d4db89668ef512da595f713f01131a7ae991be7f5071edfa87189eb4ebce710832cd08c0b1b5e89ae6bff58ca06cb023b |
31 |
diff --git a/app-office/plan/files/plan-1.10-errno.patch b/app-office/plan/files/plan-1.10-errno.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..9a3db0cb285 |
34 |
--- /dev/null |
35 |
+++ b/app-office/plan/files/plan-1.10-errno.patch |
36 |
@@ -0,0 +1,11 @@ |
37 |
+diff -Naur plan-1.9.orig/src/g_dbfile.c plan-1.9/src/g_dbfile.c |
38 |
+--- plan-1.9.orig/src/g_dbfile.c 2004-06-18 15:03:15.000000000 +0200 |
39 |
++++ plan-1.9/src/g_dbfile.c 2004-06-18 15:03:28.000000000 +0200 |
40 |
+@@ -12,6 +12,7 @@ |
41 |
+ #include <sys/stat.h> |
42 |
+ #include <assert.h> |
43 |
+ #include <signal.h> |
44 |
++#include <errno.h> |
45 |
+ #ifdef DIRECT |
46 |
+ #include <sys/dir.h> |
47 |
+ #define dirent direct |
48 |
diff --git a/app-office/plan/files/plan-1.10-fno-common.patch b/app-office/plan/files/plan-1.10-fno-common.patch |
49 |
new file mode 100644 |
50 |
index 00000000000..f7a6113a195 |
51 |
--- /dev/null |
52 |
+++ b/app-office/plan/files/plan-1.10-fno-common.patch |
53 |
@@ -0,0 +1,14 @@ |
54 |
+--- a/src/holiday.c |
55 |
++++ b/src/holiday.c |
56 |
+@@ -50,11 +50,7 @@ |
57 |
+ extern int yyparse(void); |
58 |
+ |
59 |
+ |
60 |
+-#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||defined(MACOSX) |
61 |
+-int yylineno; |
62 |
+-#else |
63 |
+ extern int yylineno; /* current line # being parsed */ |
64 |
+-#endif |
65 |
+ extern char *yytext; /* current token being parsed */ |
66 |
+ extern FILE *yyin; /* the file the parser reads from */ |
67 |
+ extern BOOL yacc_small; /* small string or on its own line? */ |
68 |
diff --git a/app-office/plan/files/plan-1.10-gentoo.patch b/app-office/plan/files/plan-1.10-gentoo.patch |
69 |
new file mode 100644 |
70 |
index 00000000000..d890493e893 |
71 |
--- /dev/null |
72 |
+++ b/app-office/plan/files/plan-1.10-gentoo.patch |
73 |
@@ -0,0 +1,197 @@ |
74 |
+diff -ruN plan-1.10.orig/language/plan.help plan-1.10/language/plan.help |
75 |
+--- plan-1.10.orig/language/plan.help |
76 |
++++ plan-1.10/language/plan.help |
77 |
+@@ -92,7 +92,7 @@ |
78 |
+ * If you run netplan as root, and it can't open its home directory, |
79 |
+ check whether NOB_UID and NOB_GID in the Makefile really contain |
80 |
+ the user and group ID of the <nobody> account, and make sure that |
81 |
+- <nobody> can access the netplan.dir home directory in $(LIB). |
82 |
++ <nobody> can access the netplan.dir home directory in $(SHARE). |
83 |
+ |
84 |
+ * if holidays are not shown in the month view, make sure that your |
85 |
+ day number font (Plan*calNumberFont) is at least twice as large |
86 |
+@@ -188,9 +188,10 @@ |
87 |
+ |
88 |
+ The calendar program is distributed as four programs and two data |
89 |
+ files: plan, pland, notifier, netplan, plan.help, and plan_cal.ps. |
90 |
+- Plan should be installed in the directory given as DIR in the Makefile, |
91 |
+- by default /usr/local/bin, and the others in the directory given as |
92 |
+- LIB, also /usr/local/bin by default. The distribution also contains |
93 |
++ Plan, pland, notifier and netplan should be installed in the |
94 |
++ directory given as DIR in the Makefile, by default /usr/bin, |
95 |
++ and the others in the directory given as SHARE, |
96 |
++ /usr/share/plan by default. The distribution also contains |
97 |
+ .holiday files for various countries. |
98 |
+ |
99 |
+ "plan" is the main interactive calendar program that you are using at |
100 |
+@@ -239,12 +240,12 @@ |
101 |
+ with the Define Holidays popup in the Config pulldown. For a description |
102 |
+ of the .dayplan* format, see the plan(4) manpage. |
103 |
+ |
104 |
+- If the LIB directory (specified in the Makefile) contains a file |
105 |
++ If the SHARE directory (specified in the Makefile) contains a file |
106 |
+ "holiday", it is read after ".holiday" to add system-wide holidays to |
107 |
+ the user's holiday list. |
108 |
+ |
109 |
+ Both plan and pland use the environment variables $PATH, $PLAN_PATH, a |
110 |
+- built-in default path, and the directories DIR and LIB specified in the |
111 |
++ built-in default path, and the directories DIR and SHARE specified in the |
112 |
+ Makefile for locating programs and plan.help. |
113 |
+ plan does not start netplan automatically; it must already run on the |
114 |
+ specified hosts. |
115 |
+@@ -297,7 +298,7 @@ |
116 |
+ why there are still pland daemons). |
117 |
+ |
118 |
+ * netplan cannot be used to access files that are not in its home |
119 |
+- directory, /usr/local/lib/netplan by default. Absolute paths are |
120 |
++ directory, /usr/share/plan/netplan.dir by default. Absolute paths are |
121 |
+ converted to paths relative to the home directory, and paths with |
122 |
+ ".." are rejected. |
123 |
+ |
124 |
+diff -ruN plan-1.10.orig/misc/Killpland plan-1.10/misc/Killpland |
125 |
+--- plan-1.10.orig/misc/Killpland |
126 |
++++ plan-1.10/misc/Killpland |
127 |
+@@ -1,4 +1,4 @@ |
128 |
+-#! /usr/local/bin/perl |
129 |
++#! /usr/bin/perl |
130 |
+ # |
131 |
+ # KillPlanD |
132 |
+ # |
133 |
+diff -ruN plan-1.10/misc/netplan.1 plan-1.10/misc/netplan.1 |
134 |
+--- plan-1.10.orig/misc/netplan.1 |
135 |
++++ plan-1.10/misc/netplan.1 |
136 |
+@@ -11,7 +11,7 @@ |
137 |
+ .B netplan |
138 |
+ is an IP server that serves calendar data to |
139 |
+ .BR plan (1) |
140 |
+-programs. It maintains a directory, by default /usr/local/lib/netplan.dir |
141 |
++programs. It maintains a directory, by default /usr/share/plan/netplan.dir |
142 |
+ or /usr/freeware/lib/netplan.dir (SGI) or /usr/lib/plan/netplan.dir |
143 |
+ (Debian Linux), that contains calendar files and an access list file. |
144 |
+ .B plan |
145 |
+@@ -57,8 +57,8 @@ |
146 |
+ .LP |
147 |
+ All files accessible to |
148 |
+ .B netplan |
149 |
+-are stored in a directory netplan.dir which resides in the directory LIB |
150 |
+-as set in the Makefile, /usr/local/lib or /usr/freeware/lib (SGI) or |
151 |
++are stored in a directory netplan.dir which resides in the directory SHARE |
152 |
++as set in the Makefile, /usr/share/plan or /usr/freeware/lib (SGI) or |
153 |
+ /usr/lib/plan (Debian Linux) by default. |
154 |
+ .B netplan |
155 |
+ will not access any files that are not in this directory or in subdirectories |
156 |
+diff -ruN plan-1.10.orig/misc/netplan.boot plan-1.10/misc/netplan.boot |
157 |
+--- plan-1.10.orig/misc/netplan.boot |
158 |
++++ plan-1.10/misc/netplan.boot |
159 |
+@@ -1,4 +1,4 @@ |
160 |
+-#! /sbin/sh |
161 |
++#! /bin/sh |
162 |
+ |
163 |
+ # Start or stop the Plan Network Server |
164 |
+ # Michel Bourget Mon Feb 17 10:57:14 EST 1997 |
165 |
+@@ -14,8 +14,8 @@ |
166 |
+ VERBOSE= |
167 |
+ fi |
168 |
+ |
169 |
+-DIR=/usr/local/lib |
170 |
+-DB=$DIR/netplan.dir |
171 |
++DIR=/usr/bin |
172 |
++DB=/usr/share/plan/netplan.dir |
173 |
+ DEBUG=0 |
174 |
+ DBGFILE=/var/tmp/netplan.dbg |
175 |
+ |
176 |
+diff -ruN plan-1.10.orig/misc/plan.1 plan-1.10/misc/plan.1 |
177 |
+--- plan-1.10.orig/misc/plan.1 |
178 |
++++ plan-1.10/misc/plan.1 |
179 |
+@@ -223,15 +223,15 @@ |
180 |
+ |
181 |
+ .SH FILES |
182 |
+ .LP |
183 |
+-Below, DIR and LIB refer to the installation directories specified at the |
184 |
+-beginning of the Makefile when the programs were compiled. By defauly, |
185 |
+-they are /usr/local/bin and /usr/local/lib, or /usr/freeware/bin and |
186 |
++Below, DIR and SHARE refer to the installation directories specified at the |
187 |
++beginning of the Makefile when the programs were compiled. By default, |
188 |
++they are /usr/bin and /usr/share/data, or /usr/freeware/bin and |
189 |
+ /usr/freeware/lib on SGI, or /usr/bin, /usr/sbin, and /usr/lib/plan on |
190 |
+ Debian Linux, respectively. These are the directories where |
191 |
+ .BR plan |
192 |
+ and |
193 |
+ .BR pland |
194 |
+-first search for executables and plan.help (LIB first, then DIR). Next, |
195 |
++first search for executables and plan.help (SHARE first, then DIR). Next, |
196 |
+ $PLAN_PATH and $PATH are searched, and finally, a built-in search path that |
197 |
+ also contains "." as its last item. |
198 |
+ .IP ~/.dayplan |
199 |
+@@ -261,50 +261,45 @@ |
200 |
+ The |
201 |
+ .B plan |
202 |
+ program. |
203 |
+-.IP LIB/pland |
204 |
++.IP DIR/pland |
205 |
+ The |
206 |
+ .B pland |
207 |
+-daemon. It must be in the DIR or LIB directory, or in one of the directories |
208 |
++daemon. It must be in the DIR or SHARE directory, or in one of the directories |
209 |
+ in one of the search paths. |
210 |
+-.IP LIB/notifier |
211 |
++.IP DIR/notifier |
212 |
+ The |
213 |
+ .B notifier |
214 |
+-program. It must be in the DIR or LIB directory, or in one of the directories |
215 |
++program. It must be in the DIR or SHARE directory, or in one of the directories |
216 |
+ in one of the search paths. |
217 |
+-.IP LIB/plan.help |
218 |
++.IP SHARE/plan.help |
219 |
+ The online help texts used by |
220 |
+ .BR plan . |
221 |
+-It must be in the DIR or LIB directory, or in one of the directories |
222 |
++It must be in the DIR or SHARE directory, or in one of the directories |
223 |
+ in one of the search paths. |
224 |
+-.IP LIB/plan.help.X |
225 |
++.IP SHARE/plan.help.X |
226 |
+ This help file replaces plan.help if the language is set to X in the Config |
227 |
+ Languages pulldown menu. |
228 |
+-.IP LIB/holiday |
229 |
++.IP SHARE/holiday |
230 |
+ Definition of system standard holidays. They are read before ~/.holiday, |
231 |
+ and can be overridden in ~/.holiday. They must be edited manually with a |
232 |
+ text editor. |
233 |
+-.IP LIB/plan_cal.ps |
234 |
++.IP SHARE/plan_cal.ps |
235 |
+ A PostScript skeleton file required for month and year calendar printouts. |
236 |
+-.IP LIB/plan.lang.english |
237 |
++.IP SHARE/plan.lang.english |
238 |
+ The standard message file. All messages used in |
239 |
+ .B plan |
240 |
+ must be listed here in ASCII order. If this file is missing, only English |
241 |
+ messages are supported. |
242 |
+-.IP LIB/plan.lang.X |
243 |
++.IP SHARE/plan.lang.X |
244 |
+ The message file for language X. At startup, |
245 |
+ .B plan |
246 |
+-scans the LIB directory and puts every file X it finds into the Config |
247 |
++scans the SHARE directory and puts every file X it finds into the Config |
248 |
+ Language pulldown menu. A message is translated by first looking it up in the |
249 |
+ plan_cal_english file. If the message is found in line n, it is translated |
250 |
+ by using line n of plan.lang.X instead if X was selected with the Language |
251 |
+ pulldown. See the Languages item in the online help menu for instructions |
252 |
+ for creating new language files. |
253 |
+ .LP |
254 |
+-Note that previous versions put all executables into the DIR directory. |
255 |
+-Beginning with 1.4.7, all executables except |
256 |
+-.B plan |
257 |
+-are in LIB. To avoid finding obsolete executables first, LIB is searched |
258 |
+-befor DIR. |
259 |
+ Note that, though |
260 |
+ .BR netplan (8) |
261 |
+ supports primitive access control (which requires editing a access |
262 |
+diff -ruN plan-1.10.orig/misc/plan2vcs plan-1.10/misc/plan2vcs |
263 |
+--- plan-1.10.orig/misc/plan2vcs |
264 |
++++ plan-1.10/misc/plan2vcs |
265 |
+@@ -1,4 +1,4 @@ |
266 |
+-#!/usr/local/bin/perl |
267 |
++#!/usr/bin/perl |
268 |
+ # |
269 |
+ # Convert a netplan file to vCalendar. |
270 |
+ # |
271 |
diff --git a/app-office/plan/files/plan-1.10-makefile.patch b/app-office/plan/files/plan-1.10-makefile.patch |
272 |
new file mode 100644 |
273 |
index 00000000000..570e13d3a56 |
274 |
--- /dev/null |
275 |
+++ b/app-office/plan/files/plan-1.10-makefile.patch |
276 |
@@ -0,0 +1,184 @@ |
277 |
+--- a/src/Makefile |
278 |
++++ b/src/Makefile |
279 |
+@@ -8,19 +8,19 @@ |
280 |
+ # after "=", this is parsed and rewritten by the configure script. |
281 |
+ # |
282 |
+ # # user-callable executable (plan) |
283 |
+-DIR=/usr/local/bin |
284 |
++DIR=/usr/bin |
285 |
+ # # auxiliary programs (pland, notifier, PS) |
286 |
+-LIB=/usr/local/lib |
287 |
++LIB=/usr/lib |
288 |
+ # # help file (plan.help) |
289 |
+-SBIN=/usr/local/bin |
290 |
++SBIN=/usr/bin |
291 |
+ # # system programs (netplan) |
292 |
+-HELP=/usr/local/lib |
293 |
++HELP=/usr/share/plan |
294 |
+ # # netplan expects netplan.dir/ here |
295 |
+-NETPLANDIR=/usr/local/lib |
296 |
++NETPLANDIR=/usr/share/plan |
297 |
+ # # unformatted nroff manpage (plan.[14]) |
298 |
+-MAN=/usr/local/man/man |
299 |
++MAN=/usr/share/man |
300 |
+ # # formatted manpage (plan.[14]) |
301 |
+-CATMAN=/usr/catman/local/cat |
302 |
++CATMAN=/usr/share/catman/local/cat |
303 |
+ # # subdirectory in home dir, or empty |
304 |
+ PLANRULE= |
305 |
+ # # lockfile for plan, %d is uid |
306 |
+@@ -32,11 +32,11 @@ |
307 |
+ # # standard Unix lexer |
308 |
+ LEX=lex |
309 |
+ # # standard Unix compiler generator |
310 |
+-YACC=yacc |
311 |
++YACC=bison -y |
312 |
+ # # numerical user ID of <nobody> account |
313 |
+-NOB_UID=60001 |
314 |
++NOB_UID=65534 |
315 |
+ # # default numerical group ID of <nobody> |
316 |
+-NOB_GID=60001 |
317 |
++NOB_GID=665534 |
318 |
+ # # used by plan to pre-process holiday files, |
319 |
+ # # plan will check if this file really exists |
320 |
+ CPP_PATH='/lib/cpp -P -I$(HELP)' |
321 |
+@@ -51,11 +51,10 @@ |
322 |
+ JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC' |
323 |
+ JAPAN= |
324 |
+ # # default holiday locale |
325 |
+-HOLIDAY=german |
326 |
++HOLIDAY=us |
327 |
+ # # do NOT define -O2 on DEC OSF/1 machines! |
328 |
+ # # use -O instead of -O2 on HP and Solaris |
329 |
+-DEBUG=-g |
330 |
+-DEBUG=-O2 |
331 |
++DEBUG=$(CFLAGS) |
332 |
+ # # what to do without make arguments |
333 |
+ DEFTARGET=linux |
334 |
+ #------------------------- end of configuration section ---------------------- |
335 |
+@@ -143,8 +142,8 @@ |
336 |
+ -DSTDLIBMALLOC |
337 |
+ OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ |
338 |
+ -DNO_MOTIF -DSTDLIBMALLOC |
339 |
+-LINUX_C = -W -Wall -m32 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux |
340 |
+-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux |
341 |
++LINUX_C = -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux |
342 |
++LINUX64_C = -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux |
343 |
+ SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP |
344 |
+ NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\ |
345 |
+ -DPID_T="int" -Dconst="" |
346 |
+@@ -421,15 +420,15 @@ |
347 |
+ env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all |
348 |
+ |
349 |
+ linux: |
350 |
+- -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all |
351 |
++ env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all |
352 |
+ @echo -------------------- |
353 |
+ @echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"' |
354 |
+ |
355 |
+ linux64: |
356 |
+- env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all |
357 |
++ env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all |
358 |
+ |
359 |
+ slinux: |
360 |
+- env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all |
361 |
++ env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all |
362 |
+ |
363 |
+ news4: |
364 |
+ make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all |
365 |
+@@ -511,41 +510,40 @@ |
366 |
+ S_OBJ = netplan.o netplan_acl.o |
367 |
+ S_INC = netplan.h netplan_if.h |
368 |
+ |
369 |
+-CCLINE = $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) |
370 |
++CCLINE = $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR) |
371 |
+ |
372 |
+ #--------------------------------------------------------------- |
373 |
+ all: plan pland notifier netplan |
374 |
+ |
375 |
+ plan: $(P_OBJ) |
376 |
+- $(CCLINE) -o plan $(P_OBJ) $(L1F) |
377 |
++ $(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F) |
378 |
+ |
379 |
+ pland: $(D_OBJ) |
380 |
+- $(CCLINE) -o pland $(D_OBJ) $(L2F) |
381 |
++ $(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F) |
382 |
+ |
383 |
+ notifier: $(N_OBJ) |
384 |
+- $(CCLINE) -o notifier $(N_OBJ) $(L1F) |
385 |
++ $(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F) |
386 |
+ |
387 |
+ netplan: $(S_OBJ) $(MAKEFILE) |
388 |
+- $(CCLINE) -o netplan $(S_OBJ) \ |
389 |
+- -L/usr/local/lib $(L2F) |
390 |
++ $(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) $(L2F) |
391 |
+ |
392 |
+ .c.o: |
393 |
+ $(CCLINE) -c $< |
394 |
+ |
395 |
+ print.o: print.c $(MAKEFILE) |
396 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
397 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
398 |
+ |
399 |
+ network.o: network.c netplan_if.h $(MAKEFILE) |
400 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
401 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
402 |
+ |
403 |
+ usermenu.o: usermenu.c $(MAKEFILE) |
404 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
405 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
406 |
+ |
407 |
+ holiday.o: holiday.c $(MAKEFILE) |
408 |
+- $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $< |
409 |
++ $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $< |
410 |
+ |
411 |
+ util.o: util.c $(MAKEFILE) |
412 |
+- $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< |
413 |
++ $(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $< |
414 |
+ |
415 |
+ netplan.o: netplan.c netplan_if.h $(MAKEFILE) |
416 |
+ $(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $< |
417 |
+@@ -573,22 +571,24 @@ |
418 |
+ |
419 |
+ #--------------------------------------------------------------- |
420 |
+ install: |
421 |
+- -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan |
422 |
++ -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan |
423 |
+ mkdir -p $(DESTDIR)$(DIR) |
424 |
+- cp plan $(DESTDIR)$(DIR) |
425 |
+- mkdir -p $(DESTDIR)$(LIB) |
426 |
+- cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB) |
427 |
+- mkdir -p $(DESTDIR)$(SBIN) |
428 |
+- cp netplan $(DESTDIR)$(SBIN) |
429 |
+- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0 |
430 |
++ cp plan pland notifier netplan $(DESTDIR)$(DIR) |
431 |
++ mkdir -p $(DESTDIR)$(SHARE) |
432 |
++ cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(SHARE) |
433 |
++ -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0 |
434 |
++ cp ../language/plan.help $(DESTDIR)$(SHARE) |
435 |
++ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan |
436 |
++ -chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.* |
437 |
++ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0 |
438 |
+ mkdir -p $(DESTDIR)$(HELP) |
439 |
+ cp ../language/plan.help $(DESTDIR)$(HELP) |
440 |
+- -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan |
441 |
+ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan |
442 |
+ -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.* |
443 |
+ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0 |
444 |
+ mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir |
445 |
+- -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0 |
446 |
++ -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir |
447 |
++ -chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir |
448 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0 |
449 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0 |
450 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0 |
451 |
+@@ -598,7 +598,8 @@ |
452 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0 |
453 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0 |
454 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0 |
455 |
+- -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0 |
456 |
++ mkdir -p $(DESTDIR)$(SHARE)/holiday |
457 |
++ cp ../holiday/* $(DESTDIR)$(SHARE)/holiday |
458 |
+ -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0 |
459 |
+ -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0 |
460 |
+ @echo "" |
461 |
diff --git a/app-office/plan/files/plan-1.10-webplan.patch b/app-office/plan/files/plan-1.10-webplan.patch |
462 |
new file mode 100644 |
463 |
index 00000000000..8a8676ab0aa |
464 |
--- /dev/null |
465 |
+++ b/app-office/plan/files/plan-1.10-webplan.patch |
466 |
@@ -0,0 +1,108 @@ |
467 |
+diff -Naur plan-1.9.orig/web/admin.cgi plan-1.9/web/admin.cgi |
468 |
+--- plan-1.9.orig/web/admin.cgi 2004-06-18 15:13:25.000000000 +0200 |
469 |
++++ plan-1.9/web/admin.cgi 2004-06-18 15:14:03.000000000 +0200 |
470 |
+@@ -88,8 +88,8 @@ |
471 |
+ $err="User $in{user} already exist \!\!\n"; |
472 |
+ } |
473 |
+ else { |
474 |
+- system("touch /usr/local/lib/netplan.dir/$in{user}"); |
475 |
+- system("echo $in{server} > /usr/local/lib/netplan.dir/.$in{user}"); |
476 |
++ system("touch /usr/share/plan/netplan.dir/$in{user}"); |
477 |
++ system("echo $in{server} > /usr/share/plan/netplan.dir/.$in{user}"); |
478 |
+ } |
479 |
+ } |
480 |
+ } |
481 |
+@@ -103,8 +103,8 @@ |
482 |
+ } |
483 |
+ } |
484 |
+ if ( $found == 1 ) { |
485 |
+- unlink "/usr/local/lib/netplan.dir/.$in{user}"; |
486 |
+- unlink "/usr/local/lib/netplan.dir/$in{user}"; |
487 |
++ unlink "/usr/share/plan/netplan.dir/.$in{user}"; |
488 |
++ unlink "/usr/share/plan/netplan.dir/$in{user}"; |
489 |
+ } else { |
490 |
+ $err="User $in{user} does not exist \!\n"; |
491 |
+ } |
492 |
+diff -Naur plan-1.9.orig/web/common.pl plan-1.9/web/common.pl |
493 |
+--- plan-1.9.orig/web/common.pl 2004-06-18 15:13:25.000000000 +0200 |
494 |
++++ plan-1.9/web/common.pl 2004-06-18 15:14:03.000000000 +0200 |
495 |
+@@ -304,7 +304,7 @@ |
496 |
+ # Get the list of user on netplan server |
497 |
+ #-------------------------------------------------------------------------- |
498 |
+ sub get_group { |
499 |
+- open(IN,"/usr/local/bin/plan -W localhost -F | sort |"); |
500 |
++ open(IN,"/usr/bin/plan -W localhost -F | sort |"); |
501 |
+ @PlanUsers=<IN>; |
502 |
+ close(IN); |
503 |
+ |
504 |
+@@ -327,9 +327,9 @@ |
505 |
+ $da=&firstdom($mo,$yr); |
506 |
+ |
507 |
+ if ( $jj eq 0 ) { |
508 |
+- open ( IN , "/usr/local/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] |" ); |
509 |
++ open ( IN , "/usr/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] |" ); |
510 |
+ } else { |
511 |
+- open ( IN , "/usr/local/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 |" ); |
512 |
++ open ( IN , "/usr/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 |" ); |
513 |
+ } |
514 |
+ @PlanData=<IN>; |
515 |
+ close(IN); |
516 |
+@@ -341,7 +341,7 @@ |
517 |
+ #-------------------------------------------------------------------------- |
518 |
+ sub obtain_user { |
519 |
+ local(@PlanData); |
520 |
+- open ( IN , "/usr/local/bin/plan -W -F | sort | " ); |
521 |
++ open ( IN , "/usr/bin/plan -W -F | sort | " ); |
522 |
+ @PlanData=<IN>; |
523 |
+ close(IN); |
524 |
+ |
525 |
+@@ -369,7 +369,7 @@ |
526 |
+ sub get_holiday { |
527 |
+ local ($yr) = @_; |
528 |
+ |
529 |
+- open ( IN , "/usr/local/bin/plan -W -H $yr |" ); |
530 |
++ open ( IN , "/usr/bin/plan -W -H $yr |" ); |
531 |
+ @PlanHoliday=<IN>; |
532 |
+ close(IN); |
533 |
+ |
534 |
+diff -Naur plan-1.9.orig/web/help.html plan-1.9/web/help.html |
535 |
+--- plan-1.9.orig/web/help.html 2004-06-18 15:13:25.000000000 +0200 |
536 |
++++ plan-1.9/web/help.html 2004-06-18 15:14:03.000000000 +0200 |
537 |
+@@ -25,11 +25,11 @@ |
538 |
+ <LI> You need a <I>netplan</I> server version 1.8 or later running on |
539 |
+ the same host that the web server running the WebPlan CGI scripts |
540 |
+ runs on. Its data directory must be named |
541 |
+- <I>/usr/local/lib/netplan.dir</I>, which must be writable for the |
542 |
++ <I>/usr/share/plan/netplan.dir</I>, which must be writable for the |
543 |
+ CGI scripts.<p> |
544 |
+ |
545 |
+ <LI> There must be a <I>plan</I> executable version 1.8 or later in the |
546 |
+- directory <I>/usr/local/bin</I> on the host that the web server is |
547 |
++ directory <I>/usr/bin</I> on the host that the web server is |
548 |
+ running on. |
549 |
+ </UL> |
550 |
+ <p>There is no way to run the web interface without the help of an HTTP |
551 |
+diff -Naur plan-1.9.orig/web/webAdd.cgi plan-1.9/web/webAdd.cgi |
552 |
+--- plan-1.9.orig/web/webAdd.cgi 2004-06-18 15:13:25.000000000 +0200 |
553 |
++++ plan-1.9/web/webAdd.cgi 2004-06-18 15:14:03.000000000 +0200 |
554 |
+@@ -129,7 +129,7 @@ |
555 |
+ # user add a \0 appended to it ... that's why data was not passed |
556 |
+ # to the dam script with system or open() statement |
557 |
+ |
558 |
+- $cmd="/usr/local/bin/plan $start -W $long $rep -u $user \"$data\""; |
559 |
++ $cmd="/usr/bin/plan $start -W $long $rep -u $user \"$data\""; |
560 |
+ # system("$cmd"); |
561 |
+ open ( IN , "$cmd |"); |
562 |
+ @error=<IN>; |
563 |
+diff -Naur plan-1.9.orig/web/webmodDel.cgi plan-1.9/web/webmodDel.cgi |
564 |
+--- plan-1.9.orig/web/webmodDel.cgi 2004-06-18 15:13:25.000000000 +0200 |
565 |
++++ plan-1.9/web/webmodDel.cgi 2004-06-18 15:14:03.000000000 +0200 |
566 |
+@@ -33,7 +33,7 @@ |
567 |
+ return; |
568 |
+ } |
569 |
+ else { |
570 |
+- open ( IN , "/usr/local/bin/plan -W -X $Row $Qui |" ); |
571 |
++ open ( IN , "/usr/bin/plan -W -X $Row $Qui |" ); |
572 |
+ @error=<IN>; |
573 |
+ close(IN); |
574 |
+ foreach $line ( @error ) { |
575 |
diff --git a/app-office/plan/files/plan-1.12-gentoo.patch b/app-office/plan/files/plan-1.12-gentoo.patch |
576 |
new file mode 100644 |
577 |
index 00000000000..3757a484f2c |
578 |
--- /dev/null |
579 |
+++ b/app-office/plan/files/plan-1.12-gentoo.patch |
580 |
@@ -0,0 +1,107 @@ |
581 |
+From 4b8f513afa8b87bc1eeacfbcc6c2102cb67690b7 Mon Sep 17 00:00:00 2001 |
582 |
+From: Thomas Groman <tgroman@××××××.net> |
583 |
+Date: Thu, 18 Mar 2021 23:12:28 -0700 |
584 |
+Subject: [PATCH] gentooization |
585 |
+ |
586 |
+--- |
587 |
+ language/plan.help | 15 ++++++++------- |
588 |
+ misc/Killpland | 2 +- |
589 |
+ misc/netplan.boot | 6 +++--- |
590 |
+ misc/plan2vcs | 2 +- |
591 |
+ 4 files changed, 13 insertions(+), 12 deletions(-) |
592 |
+ |
593 |
+diff --git a/language/plan.help b/language/plan.help |
594 |
+index dce7d44..db85be9 100644 |
595 |
+--- a/language/plan.help |
596 |
++++ b/language/plan.help |
597 |
+@@ -92,7 +92,7 @@ |
598 |
+ * If you run netplan as root, and it can't open its home directory, |
599 |
+ check whether NOB_UID and NOB_GID in the Makefile really contain |
600 |
+ the user and group ID of the <nobody> account, and make sure that |
601 |
+- <nobody> can access the netplan.dir home directory in $(LIB). |
602 |
++ <nobody> can access the netplan.dir home directory in $(SHARE). |
603 |
+ |
604 |
+ * if holidays are not shown in the month view, make sure that your |
605 |
+ day number font (Plan*calNumberFont) is at least twice as large |
606 |
+@@ -188,9 +188,10 @@ |
607 |
+ |
608 |
+ The calendar program is distributed as four programs and two data |
609 |
+ files: plan, pland, notifier, netplan, plan.help, and plan_cal.ps. |
610 |
+- Plan should be installed in the directory given as DIR in the Makefile, |
611 |
+- by default /usr/local/bin, and the others in the directory given as |
612 |
+- LIB, also /usr/local/bin by default. The distribution also contains |
613 |
++ Plan, pland, notifier and netplan should be installed in the |
614 |
++ directory given as DIR in the Makefile, by default /usr/bin, |
615 |
++ and the others in the directory given as SHARE, |
616 |
++ /usr/share/plan by default. The distribution also contains |
617 |
+ .holiday files for various countries. |
618 |
+ |
619 |
+ "plan" is the main interactive calendar program that you are using at |
620 |
+@@ -239,12 +240,12 @@ |
621 |
+ with the Define Holidays popup in the Config pulldown. For a description |
622 |
+ of the .dayplan* format, see the plan(4) manpage. |
623 |
+ |
624 |
+- If the LIB directory (specified in the Makefile) contains a file |
625 |
++ If the SHARE directory (specified in the Makefile) contains a file |
626 |
+ "holiday", it is read after ".holiday" to add system-wide holidays to |
627 |
+ the user's holiday list. |
628 |
+ |
629 |
+ Both plan and pland use the environment variables $PATH, $PLAN_PATH, a |
630 |
+- built-in default path, and the directories DIR and LIB specified in the |
631 |
++ built-in default path, and the directories DIR and SHARE specified in the |
632 |
+ Makefile for locating programs and plan.help. |
633 |
+ plan does not start netplan automatically; it must already run on the |
634 |
+ specified hosts. |
635 |
+@@ -297,7 +298,7 @@ |
636 |
+ why there are still pland daemons). |
637 |
+ |
638 |
+ * netplan cannot be used to access files that are not in its home |
639 |
+- directory, /usr/local/lib/netplan by default. Absolute paths are |
640 |
++ directory, /usr/share/plan/netplan.dir by default. Absolute paths are |
641 |
+ converted to paths relative to the home directory, and paths with |
642 |
+ ".." are rejected. |
643 |
+ |
644 |
+diff --git a/misc/Killpland b/misc/Killpland |
645 |
+index f8aac33..dae61dc 100644 |
646 |
+--- a/misc/Killpland |
647 |
++++ b/misc/Killpland |
648 |
+@@ -1,4 +1,4 @@ |
649 |
+-#! /usr/local/bin/perl |
650 |
++#! /usr/bin/perl |
651 |
+ # |
652 |
+ # KillPlanD |
653 |
+ # |
654 |
+diff --git a/misc/netplan.boot b/misc/netplan.boot |
655 |
+index 8e7de34..2236487 100644 |
656 |
+--- a/misc/netplan.boot |
657 |
++++ b/misc/netplan.boot |
658 |
+@@ -1,4 +1,4 @@ |
659 |
+-#! /sbin/sh |
660 |
++#! /bin/sh |
661 |
+ |
662 |
+ # Start or stop the Plan Network Server |
663 |
+ # Michel Bourget Mon Feb 17 10:57:14 EST 1997 |
664 |
+@@ -17,8 +17,8 @@ else # For a quiet startup and shutdown |
665 |
+ VERBOSE= |
666 |
+ fi |
667 |
+ |
668 |
+-DIR=/usr/local/lib |
669 |
+-DB=$DIR/netplan.dir |
670 |
++DIR=/usr/bin |
671 |
++DB=/var/lib/plan/netplan.dir |
672 |
+ DEBUG=0 |
673 |
+ DBGFILE=/var/tmp/netplan.dbg |
674 |
+ |
675 |
+diff --git a/misc/plan2vcs b/misc/plan2vcs |
676 |
+index 0f8e531..1f7cef5 100644 |
677 |
+--- a/misc/plan2vcs |
678 |
++++ b/misc/plan2vcs |
679 |
+@@ -1,4 +1,4 @@ |
680 |
+-#!/usr/local/bin/perl |
681 |
++#!/usr/bin/perl |
682 |
+ # |
683 |
+ # Convert a netplan file to vCalendar. |
684 |
+ # |
685 |
+-- |
686 |
+2.26.2 |
687 |
+ |
688 |
diff --git a/app-office/plan/files/plan-1.12-makefile.patch b/app-office/plan/files/plan-1.12-makefile.patch |
689 |
new file mode 100644 |
690 |
index 00000000000..be97e87c43e |
691 |
--- /dev/null |
692 |
+++ b/app-office/plan/files/plan-1.12-makefile.patch |
693 |
@@ -0,0 +1,199 @@ |
694 |
+From fd19b07f6565631c47944f63dde3783a649b541f Mon Sep 17 00:00:00 2001 |
695 |
+From: Thomas Groman <tgroman@××××××.net> |
696 |
+Date: Fri, 19 Mar 2021 00:31:37 -0700 |
697 |
+Subject: [PATCH] makefile |
698 |
+ |
699 |
+--- |
700 |
+ src/Makefile | 76 +++++++++++++++++++++++++++------------------------- |
701 |
+ 1 file changed, 39 insertions(+), 37 deletions(-) |
702 |
+ |
703 |
+diff --git a/src/Makefile b/src/Makefile |
704 |
+index 74690b7..4e79c86 100644 |
705 |
+--- a/src/Makefile |
706 |
++++ b/src/Makefile |
707 |
+@@ -8,19 +8,19 @@ |
708 |
+ # after "=", this is parsed and rewritten by the configure script. |
709 |
+ # |
710 |
+ # # user-callable executable (plan) |
711 |
+-DIR=/usr/local/bin |
712 |
++DIR=/usr/bin |
713 |
+ # # auxiliary programs (pland, notifier, PS) |
714 |
+-LIB=/usr/local/lib |
715 |
++LIB=/usr/lib |
716 |
+ # # help file (plan.help) |
717 |
+-SBIN=/usr/local/bin |
718 |
++SBIN=/usr/bin |
719 |
+ # # system programs (netplan) |
720 |
+-HELP=/usr/local/lib |
721 |
++HELP=/usr/share/plan |
722 |
+ # # netplan expects netplan.dir/ here |
723 |
+-NETPLANDIR=/usr/local/lib |
724 |
++NETPLANDIR=/usr/share/plan |
725 |
+ # # unformatted nroff manpage (plan.[14]) |
726 |
+-MAN=/usr/local/man/man |
727 |
++MAN=/usr/man/man |
728 |
+ # # formatted manpage (plan.[14]) |
729 |
+-CATMAN=/usr/catman/local/cat |
730 |
++CATMAN=/usr/share/catman/local/cat |
731 |
+ # # subdirectory in home dir, or empty |
732 |
+ PLANRULE= |
733 |
+ # # lockfile for plan, %d is uid |
734 |
+@@ -32,11 +32,11 @@ INCDIR= |
735 |
+ # # standard Unix lexer |
736 |
+ LEX=lex |
737 |
+ # # standard Unix compiler generator |
738 |
+-YACC=yacc |
739 |
++YACC=bison -y |
740 |
+ # # numerical user ID of <nobody> account |
741 |
+-NOB_UID=60001 |
742 |
++NOB_UID=65534 |
743 |
+ # # default numerical group ID of <nobody> |
744 |
+-NOB_GID=60001 |
745 |
++NOB_GID=665534 |
746 |
+ # # used by plan to pre-process holiday files, |
747 |
+ # # plan will check if this file really exists |
748 |
+ CPP_PATH='/lib/cpp -P -I$(HELP)' |
749 |
+@@ -51,11 +51,10 @@ ESCTOJISLATIN=\"\\033\(J\" |
750 |
+ JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC' |
751 |
+ JAPAN= |
752 |
+ # # default holiday locale |
753 |
+-HOLIDAY=german |
754 |
++HOLIDAY=us |
755 |
+ # # do NOT define -O2 on DEC OSF/1 machines! |
756 |
+ # # use -O instead of -O2 on HP and Solaris |
757 |
+-DEBUG=-g |
758 |
+-DEBUG=-O2 |
759 |
++DEBUG=$(CFLAGS) |
760 |
+ # # what to do without make arguments |
761 |
+ DEFTARGET=linux |
762 |
+ #------------------------- end of configuration section ---------------------- |
763 |
+@@ -143,9 +142,9 @@ FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ |
764 |
+ -DSTDLIBMALLOC |
765 |
+ OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\ |
766 |
+ -DNO_MOTIF -DSTDLIBMALLOC |
767 |
+-LINUX_C = -W -Wall -m32 -I/usr/X11R6/include -I/usr/include/X11 \ |
768 |
++LINUX_C = -I/usr/X11R6/include -I/usr/include/X11 \ |
769 |
+ -DNOLOCK -DLINUX -Dlinux |
770 |
+-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -I/usr/include/X11 \ |
771 |
++LINUX64_C = -I/usr/X11R6/include -I/usr/include/X11 \ |
772 |
+ -DNOLOCK -DLINUX -Dlinux |
773 |
+ DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \ |
774 |
+ -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \ |
775 |
+@@ -428,18 +427,18 @@ svr4: |
776 |
+ env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all |
777 |
+ |
778 |
+ linux: |
779 |
+- -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all |
780 |
++ -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all |
781 |
+ @echo -------------------- |
782 |
+ @echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"' |
783 |
+ |
784 |
+ linux64: |
785 |
+- env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all |
786 |
++ env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all |
787 |
+ |
788 |
+ debian: |
789 |
+ env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all |
790 |
+ |
791 |
+ slinux: |
792 |
+- env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all |
793 |
++ env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all |
794 |
+ |
795 |
+ news4: |
796 |
+ make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all |
797 |
+@@ -521,41 +520,41 @@ S_SRC = netplan.c netplan_acl.c |
798 |
+ S_OBJ = netplan.o netplan_acl.o |
799 |
+ S_INC = netplan.h netplan_if.h |
800 |
+ |
801 |
+-CCLINE = $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR) |
802 |
++CCLINE = $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR) |
803 |
+ |
804 |
+ #--------------------------------------------------------------- |
805 |
+ all: plan pland notifier netplan |
806 |
+ |
807 |
+ plan: $(P_OBJ) |
808 |
+- $(CCLINE) -o plan $(P_OBJ) $(L1F) |
809 |
++ $(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F) |
810 |
+ |
811 |
+ pland: $(D_OBJ) |
812 |
+- $(CCLINE) -o pland $(D_OBJ) $(L2F) |
813 |
++ $(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F) |
814 |
+ |
815 |
+ notifier: $(N_OBJ) |
816 |
+- $(CCLINE) -o notifier $(N_OBJ) $(L1F) |
817 |
++ $(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F) |
818 |
+ |
819 |
+ netplan: $(S_OBJ) $(MAKEFILE) |
820 |
+- $(CCLINE) -o netplan $(S_OBJ) \ |
821 |
++ $(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) \ |
822 |
+ -L/usr/local/lib $(L2F) |
823 |
+ |
824 |
+ .c.o: |
825 |
+ $(CCLINE) -c $< |
826 |
+ |
827 |
+ print.o: print.c $(MAKEFILE) |
828 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
829 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
830 |
+ |
831 |
+ network.o: network.c netplan_if.h $(MAKEFILE) |
832 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
833 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
834 |
+ |
835 |
+ usermenu.o: usermenu.c $(MAKEFILE) |
836 |
+- $(CCLINE) -c -DLIB=\"$(LIB)\" $< |
837 |
++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $< |
838 |
+ |
839 |
+ holiday.o: holiday.c $(MAKEFILE) |
840 |
+- $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $< |
841 |
++ $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $< |
842 |
+ |
843 |
+ util.o: util.c $(MAKEFILE) |
844 |
+- $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $< |
845 |
++ $(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $< |
846 |
+ |
847 |
+ netplan.o: netplan.c netplan_if.h $(MAKEFILE) |
848 |
+ $(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $< |
849 |
+@@ -585,20 +584,22 @@ g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h form.h |
850 |
+ install: |
851 |
+ -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan |
852 |
+ mkdir -p $(DESTDIR)$(DIR) |
853 |
+- cp plan $(DESTDIR)$(DIR) |
854 |
+- mkdir -p $(DESTDIR)$(LIB) |
855 |
+- cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB) |
856 |
+- mkdir -p $(DESTDIR)$(SBIN) |
857 |
+- cp netplan $(DESTDIR)$(SBIN) |
858 |
+- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0 |
859 |
++ cp plan pland notifier netplan $(DESTDIR)$(DIR) |
860 |
++ mkdir -p $(DESTDIR)$(SHARE) |
861 |
++ cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(DIR) |
862 |
++ -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0 |
863 |
++ cp ../language/plan.help $(DESTDIR)$(SHARE) |
864 |
++ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan |
865 |
++ -chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.* |
866 |
++ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0 |
867 |
+ mkdir -p $(DESTDIR)$(HELP) |
868 |
+ cp ../language/plan.help $(DESTDIR)$(HELP) |
869 |
+-# -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan |
870 |
+ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan |
871 |
+ -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.* |
872 |
+ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0 |
873 |
+ mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir |
874 |
+- -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0 |
875 |
++ -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir |
876 |
++ -chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir |
877 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0 |
878 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0 |
879 |
+ -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0 |
880 |
+@@ -608,7 +609,8 @@ install: |
881 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0 |
882 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0 |
883 |
+ -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0 |
884 |
+- -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0 |
885 |
++ mkdir -p $(DESTDIR)$(SHARE)/holiday |
886 |
++ cp ../holiday/* $(DESTDIR)$(SHARE)/holiday |
887 |
+ -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0 |
888 |
+ -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0 |
889 |
+ @echo "" |
890 |
+-- |
891 |
+2.26.2 |
892 |
+ |
893 |
diff --git a/app-office/plan/metadata.xml b/app-office/plan/metadata.xml |
894 |
index 7a38bb90096..4b6e6bf799a 100644 |
895 |
--- a/app-office/plan/metadata.xml |
896 |
+++ b/app-office/plan/metadata.xml |
897 |
@@ -1,5 +1,12 @@ |
898 |
<?xml version="1.0" encoding="UTF-8"?> |
899 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
900 |
<pkgmetadata> |
901 |
- <!-- maintainer-needed --> |
902 |
+ <maintainer type="person" proxied="yes"> |
903 |
+ <email>tgroman@××××××.net</email> |
904 |
+ <name>Thomas Groman</name> |
905 |
+ </maintainer> |
906 |
+ <maintainer type="project" proxied="yes"> |
907 |
+ <email>proxy-maint@g.o</email> |
908 |
+ <name>Proxy Maintainers</name> |
909 |
+ </maintainer> |
910 |
</pkgmetadata> |
911 |
diff --git a/app-office/plan/plan-1.12.ebuild b/app-office/plan/plan-1.12.ebuild |
912 |
new file mode 100644 |
913 |
index 00000000000..5fcac3c7c52 |
914 |
--- /dev/null |
915 |
+++ b/app-office/plan/plan-1.12.ebuild |
916 |
@@ -0,0 +1,69 @@ |
917 |
+# Copyright 1999-2021 Gentoo Authors |
918 |
+# Distributed under the terms of the GNU General Public License v2 |
919 |
+ |
920 |
+EAPI=7 |
921 |
+ |
922 |
+inherit toolchain-funcs |
923 |
+ |
924 |
+DESCRIPTION="Motif based schedule planner" |
925 |
+HOMEPAGE="https://www.bitrot.de/plan.html" |
926 |
+SRC_URI="ftp://ftp.bitrot.de/pub/plan/${P}.tar.gz" |
927 |
+ |
928 |
+LICENSE="GPL-2+" #448646 |
929 |
+SLOT="0" |
930 |
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
931 |
+ |
932 |
+RDEPEND=" |
933 |
+ x11-libs/libX11 |
934 |
+ x11-libs/libXt |
935 |
+ x11-libs/motif:0" |
936 |
+DEPEND="${RDEPEND}" |
937 |
+BDEPEND=" |
938 |
+ sys-devel/bison |
939 |
+ sys-devel/flex" |
940 |
+ |
941 |
+#PATCHES=( "${WORKDIR}"/patches ) |
942 |
+PATCHES=( |
943 |
+ "$FILESDIR/${PN}-1.10-fno-common.patch" |
944 |
+ "$FILESDIR/${PN}-1.12-gentoo.patch" |
945 |
+ "$FILESDIR/${PN}-1.12-makefile.patch" |
946 |
+ "$FILESDIR/${PN}-1.10-webplan.patch" |
947 |
+) |
948 |
+ |
949 |
+src_compile() { |
950 |
+ emake -C src CC="$(tc-getCC)" SHARE=/usr/share/plan linux |
951 |
+} |
952 |
+ |
953 |
+src_install() { |
954 |
+ emake -C src \ |
955 |
+ DESTDIR="${ED}" \ |
956 |
+ SHARE=/usr/share/plan \ |
957 |
+ install |
958 |
+ keepdir /usr/share/plan/netplan.dir |
959 |
+ |
960 |
+ dodoc HISTORY README |
961 |
+ |
962 |
+ pushd misc >/dev/null || die |
963 |
+ doman netplan.1 plan.1 plan.4 |
964 |
+ insinto /usr/share/${PN}/misc |
965 |
+ doins netplan.boot BlackWhite Monochrome plan.fti Plan.xpm plan.xpm |
966 |
+ exeinto /usr/share/${PN}/misc |
967 |
+ doexe Killpland cvs vsc msschedule2plan plan2vcs |
968 |
+ popd >/dev/null || die |
969 |
+ |
970 |
+ pushd web >/dev/null || die |
971 |
+ insinto /usr/share/${PN}/web |
972 |
+ doins help.html bottom.html cgi-lib.pl common.pl holiday_webplan rtsban.jpg |
973 |
+ exeinto /usr/share/${PN}/web |
974 |
+ doexe *.cgi |
975 |
+ popd >/dev/null || die |
976 |
+} |
977 |
+ |
978 |
+pkg_postinst() { |
979 |
+ elog |
980 |
+ elog " Check /usr/share/${PN}/holiday for examples to set your" |
981 |
+ elog " ~/.holiday according to your country." |
982 |
+ elog |
983 |
+ elog " WebPlan ${PV} can be found in /usr/share/${PN}/web." |
984 |
+ elog |
985 |
+} |
986 |
-- |
987 |
2.26.2 |