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