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