From: Yixun Lan <dlan@gentoo.org>
To: Thomas Groman <tgroman@nuegia.net>
Cc: gentoo-proxy-maint@lists.gentoo.org, proxy-maint@gentoo.org
Subject: Re: [gentoo-proxy-maint] [PATCH] app-office/plan: add 1.12
Date: Fri, 19 Mar 2021 18:03:26 +0800 [thread overview]
Message-ID: <YFR27vL2UmieiQQw@ofant> (raw)
In-Reply-To: <20210319083746.26605-1-tgroman@nuegia.net>
Hi Thomas:
On 01:37 Fri 19 Mar , Thomas Groman wrote:
> Package-Manager: Portage-3.0.13, Repoman-3.0.2
> ---
> app-office/plan/Manifest | 1 +
> app-office/plan/files/plan-1.10-errno.patch | 11 +
> .../plan/files/plan-1.10-fno-common.patch | 14 ++
> app-office/plan/files/plan-1.10-gentoo.patch | 197 +++++++++++++++++
> .../plan/files/plan-1.10-makefile.patch | 184 ++++++++++++++++
> app-office/plan/files/plan-1.10-webplan.patch | 108 ++++++++++
> app-office/plan/files/plan-1.12-gentoo.patch | 107 ++++++++++
> .../plan/files/plan-1.12-makefile.patch | 199 ++++++++++++++++++
> app-office/plan/metadata.xml | 9 +-
> app-office/plan/plan-1.12.ebuild | 69 ++++++
> 10 files changed, 898 insertions(+), 1 deletion(-)
> create mode 100644 app-office/plan/files/plan-1.10-errno.patch
> create mode 100644 app-office/plan/files/plan-1.10-fno-common.patch
> create mode 100644 app-office/plan/files/plan-1.10-gentoo.patch
> create mode 100644 app-office/plan/files/plan-1.10-makefile.patch
> create mode 100644 app-office/plan/files/plan-1.10-webplan.patch
> create mode 100644 app-office/plan/files/plan-1.12-gentoo.patch
> create mode 100644 app-office/plan/files/plan-1.12-makefile.patch
> create mode 100644 app-office/plan/plan-1.12.ebuild
>
> diff --git a/app-office/plan/Manifest b/app-office/plan/Manifest
> index 1b53f3c15fb..c420cc87b14 100644
> --- a/app-office/plan/Manifest
> +++ b/app-office/plan/Manifest
> @@ -1,2 +1,3 @@
> DIST plan-1.10-patches.txz 6132 BLAKE2B 617c68a012e4757f7ef039557cfe15e04706129501f044005e554a50aa9ebbe9e33e2e406ec5647060a7b67efb81b671c35eb6846d426a26c517c38b10e7eabb SHA512 c0802f12e935d7ab18d89b6c4e8ae8373ca620b8149520b8bc9d9fb8e871ad4c2b0bc0e7ca84c34e72d0a25cb406af51fac1fc1907844867f4fd7fdff8a06d54
> DIST plan-1.10.tar.gz 460150 BLAKE2B a44c79537ff6aae8fa5c65c8b6514f0f37d1417522f4e54823ad14cf6306bb88223377de13f22c365516e2861fa561902e31245c9729786f425140bed30b320d SHA512 fde17ef17f25412cbe69427364f4130564f46a940859066c25d837d14eca6920752b843211192a6c1cdc83be05de9ac57c88424ca555928b67eb219fa8564fe8
> +DIST plan-1.12.tar.gz 439996 BLAKE2B fcdf467b1628fb48b018b6d6664a461296e33977157fda4c54dd48c357c11316c1b573a378a4f8fb2d2de800c67a0a56d112a8238d298fc6ad46169d35342016 SHA512 c2c6cac7f9e88c7cf17e076e5021c83d4db89668ef512da595f713f01131a7ae991be7f5071edfa87189eb4ebce710832cd08c0b1b5e89ae6bff58ca06cb023b
> diff --git a/app-office/plan/files/plan-1.10-errno.patch b/app-office/plan/files/plan-1.10-errno.patch
> new file mode 100644
> index 00000000000..9a3db0cb285
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.10-errno.patch
> @@ -0,0 +1,11 @@
> +diff -Naur plan-1.9.orig/src/g_dbfile.c plan-1.9/src/g_dbfile.c
> +--- plan-1.9.orig/src/g_dbfile.c 2004-06-18 15:03:15.000000000 +0200
> ++++ plan-1.9/src/g_dbfile.c 2004-06-18 15:03:28.000000000 +0200
> +@@ -12,6 +12,7 @@
> + #include <sys/stat.h>
> + #include <assert.h>
> + #include <signal.h>
> ++#include <errno.h>
> + #ifdef DIRECT
> + #include <sys/dir.h>
> + #define dirent direct
> diff --git a/app-office/plan/files/plan-1.10-fno-common.patch b/app-office/plan/files/plan-1.10-fno-common.patch
> new file mode 100644
> index 00000000000..f7a6113a195
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.10-fno-common.patch
> @@ -0,0 +1,14 @@
> +--- a/src/holiday.c
> ++++ b/src/holiday.c
> +@@ -50,11 +50,7 @@
> + extern int yyparse(void);
> +
> +
> +-#if defined(bsdi)||defined(linux)||defined(__NetBSD__)||defined(__FreeBSD__)||defined(HPGCC)||defined(__EMX__)||defined(__OpenBSD__)||defined(MACOSX)
> +-int yylineno;
> +-#else
> + extern int yylineno; /* current line # being parsed */
> +-#endif
> + extern char *yytext; /* current token being parsed */
> + extern FILE *yyin; /* the file the parser reads from */
> + extern BOOL yacc_small; /* small string or on its own line? */
> diff --git a/app-office/plan/files/plan-1.10-gentoo.patch b/app-office/plan/files/plan-1.10-gentoo.patch
> new file mode 100644
> index 00000000000..d890493e893
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.10-gentoo.patch
> @@ -0,0 +1,197 @@
> +diff -ruN plan-1.10.orig/language/plan.help plan-1.10/language/plan.help
> +--- plan-1.10.orig/language/plan.help
> ++++ plan-1.10/language/plan.help
> +@@ -92,7 +92,7 @@
> + * If you run netplan as root, and it can't open its home directory,
> + check whether NOB_UID and NOB_GID in the Makefile really contain
> + the user and group ID of the <nobody> account, and make sure that
> +- <nobody> can access the netplan.dir home directory in $(LIB).
> ++ <nobody> can access the netplan.dir home directory in $(SHARE).
> +
> + * if holidays are not shown in the month view, make sure that your
> + day number font (Plan*calNumberFont) is at least twice as large
> +@@ -188,9 +188,10 @@
> +
> + The calendar program is distributed as four programs and two data
> + files: plan, pland, notifier, netplan, plan.help, and plan_cal.ps.
> +- Plan should be installed in the directory given as DIR in the Makefile,
> +- by default /usr/local/bin, and the others in the directory given as
> +- LIB, also /usr/local/bin by default. The distribution also contains
> ++ Plan, pland, notifier and netplan should be installed in the
> ++ directory given as DIR in the Makefile, by default /usr/bin,
> ++ and the others in the directory given as SHARE,
> ++ /usr/share/plan by default. The distribution also contains
> + .holiday files for various countries.
> +
> + "plan" is the main interactive calendar program that you are using at
> +@@ -239,12 +240,12 @@
> + with the Define Holidays popup in the Config pulldown. For a description
> + of the .dayplan* format, see the plan(4) manpage.
> +
> +- If the LIB directory (specified in the Makefile) contains a file
> ++ If the SHARE directory (specified in the Makefile) contains a file
> + "holiday", it is read after ".holiday" to add system-wide holidays to
> + the user's holiday list.
> +
> + Both plan and pland use the environment variables $PATH, $PLAN_PATH, a
> +- built-in default path, and the directories DIR and LIB specified in the
> ++ built-in default path, and the directories DIR and SHARE specified in the
> + Makefile for locating programs and plan.help.
> + plan does not start netplan automatically; it must already run on the
> + specified hosts.
> +@@ -297,7 +298,7 @@
> + why there are still pland daemons).
> +
> + * netplan cannot be used to access files that are not in its home
> +- directory, /usr/local/lib/netplan by default. Absolute paths are
> ++ directory, /usr/share/plan/netplan.dir by default. Absolute paths are
> + converted to paths relative to the home directory, and paths with
> + ".." are rejected.
> +
> +diff -ruN plan-1.10.orig/misc/Killpland plan-1.10/misc/Killpland
> +--- plan-1.10.orig/misc/Killpland
> ++++ plan-1.10/misc/Killpland
> +@@ -1,4 +1,4 @@
> +-#! /usr/local/bin/perl
> ++#! /usr/bin/perl
> + #
> + # KillPlanD
> + #
> +diff -ruN plan-1.10/misc/netplan.1 plan-1.10/misc/netplan.1
> +--- plan-1.10.orig/misc/netplan.1
> ++++ plan-1.10/misc/netplan.1
> +@@ -11,7 +11,7 @@
> + .B netplan
> + is an IP server that serves calendar data to
> + .BR plan (1)
> +-programs. It maintains a directory, by default /usr/local/lib/netplan.dir
> ++programs. It maintains a directory, by default /usr/share/plan/netplan.dir
> + or /usr/freeware/lib/netplan.dir (SGI) or /usr/lib/plan/netplan.dir
> + (Debian Linux), that contains calendar files and an access list file.
> + .B plan
> +@@ -57,8 +57,8 @@
> + .LP
> + All files accessible to
> + .B netplan
> +-are stored in a directory netplan.dir which resides in the directory LIB
> +-as set in the Makefile, /usr/local/lib or /usr/freeware/lib (SGI) or
> ++are stored in a directory netplan.dir which resides in the directory SHARE
> ++as set in the Makefile, /usr/share/plan or /usr/freeware/lib (SGI) or
> + /usr/lib/plan (Debian Linux) by default.
> + .B netplan
> + will not access any files that are not in this directory or in subdirectories
> +diff -ruN plan-1.10.orig/misc/netplan.boot plan-1.10/misc/netplan.boot
> +--- plan-1.10.orig/misc/netplan.boot
> ++++ plan-1.10/misc/netplan.boot
> +@@ -1,4 +1,4 @@
> +-#! /sbin/sh
> ++#! /bin/sh
> +
> + # Start or stop the Plan Network Server
> + # Michel Bourget Mon Feb 17 10:57:14 EST 1997
> +@@ -14,8 +14,8 @@
> + VERBOSE=
> + fi
> +
> +-DIR=/usr/local/lib
> +-DB=$DIR/netplan.dir
> ++DIR=/usr/bin
> ++DB=/usr/share/plan/netplan.dir
> + DEBUG=0
> + DBGFILE=/var/tmp/netplan.dbg
> +
> +diff -ruN plan-1.10.orig/misc/plan.1 plan-1.10/misc/plan.1
> +--- plan-1.10.orig/misc/plan.1
> ++++ plan-1.10/misc/plan.1
> +@@ -223,15 +223,15 @@
> +
> + .SH FILES
> + .LP
> +-Below, DIR and LIB refer to the installation directories specified at the
> +-beginning of the Makefile when the programs were compiled. By defauly,
> +-they are /usr/local/bin and /usr/local/lib, or /usr/freeware/bin and
> ++Below, DIR and SHARE refer to the installation directories specified at the
> ++beginning of the Makefile when the programs were compiled. By default,
> ++they are /usr/bin and /usr/share/data, or /usr/freeware/bin and
> + /usr/freeware/lib on SGI, or /usr/bin, /usr/sbin, and /usr/lib/plan on
> + Debian Linux, respectively. These are the directories where
> + .BR plan
> + and
> + .BR pland
> +-first search for executables and plan.help (LIB first, then DIR). Next,
> ++first search for executables and plan.help (SHARE first, then DIR). Next,
> + $PLAN_PATH and $PATH are searched, and finally, a built-in search path that
> + also contains "." as its last item.
> + .IP ~/.dayplan
> +@@ -261,50 +261,45 @@
> + The
> + .B plan
> + program.
> +-.IP LIB/pland
> ++.IP DIR/pland
> + The
> + .B pland
> +-daemon. It must be in the DIR or LIB directory, or in one of the directories
> ++daemon. It must be in the DIR or SHARE directory, or in one of the directories
> + in one of the search paths.
> +-.IP LIB/notifier
> ++.IP DIR/notifier
> + The
> + .B notifier
> +-program. It must be in the DIR or LIB directory, or in one of the directories
> ++program. It must be in the DIR or SHARE directory, or in one of the directories
> + in one of the search paths.
> +-.IP LIB/plan.help
> ++.IP SHARE/plan.help
> + The online help texts used by
> + .BR plan .
> +-It must be in the DIR or LIB directory, or in one of the directories
> ++It must be in the DIR or SHARE directory, or in one of the directories
> + in one of the search paths.
> +-.IP LIB/plan.help.X
> ++.IP SHARE/plan.help.X
> + This help file replaces plan.help if the language is set to X in the Config
> + Languages pulldown menu.
> +-.IP LIB/holiday
> ++.IP SHARE/holiday
> + Definition of system standard holidays. They are read before ~/.holiday,
> + and can be overridden in ~/.holiday. They must be edited manually with a
> + text editor.
> +-.IP LIB/plan_cal.ps
> ++.IP SHARE/plan_cal.ps
> + A PostScript skeleton file required for month and year calendar printouts.
> +-.IP LIB/plan.lang.english
> ++.IP SHARE/plan.lang.english
> + The standard message file. All messages used in
> + .B plan
> + must be listed here in ASCII order. If this file is missing, only English
> + messages are supported.
> +-.IP LIB/plan.lang.X
> ++.IP SHARE/plan.lang.X
> + The message file for language X. At startup,
> + .B plan
> +-scans the LIB directory and puts every file X it finds into the Config
> ++scans the SHARE directory and puts every file X it finds into the Config
> + Language pulldown menu. A message is translated by first looking it up in the
> + plan_cal_english file. If the message is found in line n, it is translated
> + by using line n of plan.lang.X instead if X was selected with the Language
> + pulldown. See the Languages item in the online help menu for instructions
> + for creating new language files.
> + .LP
> +-Note that previous versions put all executables into the DIR directory.
> +-Beginning with 1.4.7, all executables except
> +-.B plan
> +-are in LIB. To avoid finding obsolete executables first, LIB is searched
> +-befor DIR.
> + Note that, though
> + .BR netplan (8)
> + supports primitive access control (which requires editing a access
> +diff -ruN plan-1.10.orig/misc/plan2vcs plan-1.10/misc/plan2vcs
> +--- plan-1.10.orig/misc/plan2vcs
> ++++ plan-1.10/misc/plan2vcs
> +@@ -1,4 +1,4 @@
> +-#!/usr/local/bin/perl
> ++#!/usr/bin/perl
> + #
> + # Convert a netplan file to vCalendar.
> + #
> diff --git a/app-office/plan/files/plan-1.10-makefile.patch b/app-office/plan/files/plan-1.10-makefile.patch
> new file mode 100644
> index 00000000000..570e13d3a56
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.10-makefile.patch
> @@ -0,0 +1,184 @@
> +--- a/src/Makefile
> ++++ b/src/Makefile
> +@@ -8,19 +8,19 @@
> + # after "=", this is parsed and rewritten by the configure script.
> + #
> + # # user-callable executable (plan)
> +-DIR=/usr/local/bin
> ++DIR=/usr/bin
> + # # auxiliary programs (pland, notifier, PS)
> +-LIB=/usr/local/lib
> ++LIB=/usr/lib
> + # # help file (plan.help)
> +-SBIN=/usr/local/bin
> ++SBIN=/usr/bin
> + # # system programs (netplan)
> +-HELP=/usr/local/lib
> ++HELP=/usr/share/plan
> + # # netplan expects netplan.dir/ here
> +-NETPLANDIR=/usr/local/lib
> ++NETPLANDIR=/usr/share/plan
> + # # unformatted nroff manpage (plan.[14])
> +-MAN=/usr/local/man/man
> ++MAN=/usr/share/man
> + # # formatted manpage (plan.[14])
> +-CATMAN=/usr/catman/local/cat
> ++CATMAN=/usr/share/catman/local/cat
> + # # subdirectory in home dir, or empty
> + PLANRULE=
> + # # lockfile for plan, %d is uid
> +@@ -32,11 +32,11 @@
> + # # standard Unix lexer
> + LEX=lex
> + # # standard Unix compiler generator
> +-YACC=yacc
> ++YACC=bison -y
> + # # numerical user ID of <nobody> account
> +-NOB_UID=60001
> ++NOB_UID=65534
> + # # default numerical group ID of <nobody>
> +-NOB_GID=60001
> ++NOB_GID=665534
> + # # used by plan to pre-process holiday files,
> + # # plan will check if this file really exists
> + CPP_PATH='/lib/cpp -P -I$(HELP)'
> +@@ -51,11 +51,10 @@
> + JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
> + JAPAN=
> + # # default holiday locale
> +-HOLIDAY=german
> ++HOLIDAY=us
> + # # do NOT define -O2 on DEC OSF/1 machines!
> + # # use -O instead of -O2 on HP and Solaris
> +-DEBUG=-g
> +-DEBUG=-O2
> ++DEBUG=$(CFLAGS)
> + # # what to do without make arguments
> + DEFTARGET=linux
> + #------------------------- end of configuration section ----------------------
> +@@ -143,8 +142,8 @@
> + -DSTDLIBMALLOC
> + OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
> + -DNO_MOTIF -DSTDLIBMALLOC
> +-LINUX_C = -W -Wall -m32 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
> +-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
> ++LINUX_C = -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
> ++LINUX64_C = -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
> + SVR4_C = -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
> + NEWS_C = -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\
> + -DPID_T="int" -Dconst=""
> +@@ -421,15 +420,15 @@
> + env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
> +
> + linux:
> +- -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
> ++ env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
> + @echo --------------------
> + @echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"'
> +
> + linux64:
> +- env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
> ++ env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
> +
> + slinux:
> +- env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all
> ++ env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all
> +
> + news4:
> + make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all
> +@@ -511,41 +510,40 @@
> + S_OBJ = netplan.o netplan_acl.o
> + S_INC = netplan.h netplan_if.h
> +
> +-CCLINE = $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR)
> ++CCLINE = $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR)
> +
> + #---------------------------------------------------------------
> + all: plan pland notifier netplan
> +
> + plan: $(P_OBJ)
> +- $(CCLINE) -o plan $(P_OBJ) $(L1F)
> ++ $(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F)
> +
> + pland: $(D_OBJ)
> +- $(CCLINE) -o pland $(D_OBJ) $(L2F)
> ++ $(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F)
> +
> + notifier: $(N_OBJ)
> +- $(CCLINE) -o notifier $(N_OBJ) $(L1F)
> ++ $(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F)
> +
> + netplan: $(S_OBJ) $(MAKEFILE)
> +- $(CCLINE) -o netplan $(S_OBJ) \
> +- -L/usr/local/lib $(L2F)
> ++ $(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) $(L2F)
> +
> + .c.o:
> + $(CCLINE) -c $<
> +
> + print.o: print.c $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + network.o: network.c netplan_if.h $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + usermenu.o: usermenu.c $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + holiday.o: holiday.c $(MAKEFILE)
> +- $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $<
> +
> + util.o: util.c $(MAKEFILE)
> +- $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
> ++ $(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $<
> +
> + netplan.o: netplan.c netplan_if.h $(MAKEFILE)
> + $(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $<
> +@@ -573,22 +571,24 @@
> +
> + #---------------------------------------------------------------
> + install:
> +- -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
> ++ -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
> + mkdir -p $(DESTDIR)$(DIR)
> +- cp plan $(DESTDIR)$(DIR)
> +- mkdir -p $(DESTDIR)$(LIB)
> +- cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
> +- mkdir -p $(DESTDIR)$(SBIN)
> +- cp netplan $(DESTDIR)$(SBIN)
> +- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
> ++ cp plan pland notifier netplan $(DESTDIR)$(DIR)
> ++ mkdir -p $(DESTDIR)$(SHARE)
> ++ cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(SHARE)
> ++ -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0
> ++ cp ../language/plan.help $(DESTDIR)$(SHARE)
> ++ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
> ++ -chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.*
> ++ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0
> + mkdir -p $(DESTDIR)$(HELP)
> + cp ../language/plan.help $(DESTDIR)$(HELP)
> +- -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
> + -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
> + -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
> + -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
> + mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
> +- -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
> ++ -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
> ++ -chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
> +@@ -598,7 +598,8 @@
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
> +- -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
> ++ mkdir -p $(DESTDIR)$(SHARE)/holiday
> ++ cp ../holiday/* $(DESTDIR)$(SHARE)/holiday
> + -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
> + -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
> + @echo ""
> diff --git a/app-office/plan/files/plan-1.10-webplan.patch b/app-office/plan/files/plan-1.10-webplan.patch
> new file mode 100644
> index 00000000000..8a8676ab0aa
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.10-webplan.patch
> @@ -0,0 +1,108 @@
> +diff -Naur plan-1.9.orig/web/admin.cgi plan-1.9/web/admin.cgi
> +--- plan-1.9.orig/web/admin.cgi 2004-06-18 15:13:25.000000000 +0200
> ++++ plan-1.9/web/admin.cgi 2004-06-18 15:14:03.000000000 +0200
> +@@ -88,8 +88,8 @@
> + $err="User $in{user} already exist \!\!\n";
> + }
> + else {
> +- system("touch /usr/local/lib/netplan.dir/$in{user}");
> +- system("echo $in{server} > /usr/local/lib/netplan.dir/.$in{user}");
> ++ system("touch /usr/share/plan/netplan.dir/$in{user}");
> ++ system("echo $in{server} > /usr/share/plan/netplan.dir/.$in{user}");
> + }
> + }
> + }
> +@@ -103,8 +103,8 @@
> + }
> + }
> + if ( $found == 1 ) {
> +- unlink "/usr/local/lib/netplan.dir/.$in{user}";
> +- unlink "/usr/local/lib/netplan.dir/$in{user}";
> ++ unlink "/usr/share/plan/netplan.dir/.$in{user}";
> ++ unlink "/usr/share/plan/netplan.dir/$in{user}";
> + } else {
> + $err="User $in{user} does not exist \!\n";
> + }
> +diff -Naur plan-1.9.orig/web/common.pl plan-1.9/web/common.pl
> +--- plan-1.9.orig/web/common.pl 2004-06-18 15:13:25.000000000 +0200
> ++++ plan-1.9/web/common.pl 2004-06-18 15:14:03.000000000 +0200
> +@@ -304,7 +304,7 @@
> + # Get the list of user on netplan server
> + #--------------------------------------------------------------------------
> + sub get_group {
> +- open(IN,"/usr/local/bin/plan -W localhost -F | sort |");
> ++ open(IN,"/usr/bin/plan -W localhost -F | sort |");
> + @PlanUsers=<IN>;
> + close(IN);
> +
> +@@ -327,9 +327,9 @@
> + $da=&firstdom($mo,$yr);
> +
> + if ( $jj eq 0 ) {
> +- open ( IN , "/usr/local/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] |" );
> ++ open ( IN , "/usr/bin/plan -W $Who -i -t 1\.$mo\.$yr $days[$mo] |" );
> + } else {
> +- open ( IN , "/usr/local/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 |" );
> ++ open ( IN , "/usr/bin/plan -W $Who -i -t $jj\.$mo\.$yr 1 |" );
> + }
> + @PlanData=<IN>;
> + close(IN);
> +@@ -341,7 +341,7 @@
> + #--------------------------------------------------------------------------
> + sub obtain_user {
> + local(@PlanData);
> +- open ( IN , "/usr/local/bin/plan -W -F | sort | " );
> ++ open ( IN , "/usr/bin/plan -W -F | sort | " );
> + @PlanData=<IN>;
> + close(IN);
> +
> +@@ -369,7 +369,7 @@
> + sub get_holiday {
> + local ($yr) = @_;
> +
> +- open ( IN , "/usr/local/bin/plan -W -H $yr |" );
> ++ open ( IN , "/usr/bin/plan -W -H $yr |" );
> + @PlanHoliday=<IN>;
> + close(IN);
> +
> +diff -Naur plan-1.9.orig/web/help.html plan-1.9/web/help.html
> +--- plan-1.9.orig/web/help.html 2004-06-18 15:13:25.000000000 +0200
> ++++ plan-1.9/web/help.html 2004-06-18 15:14:03.000000000 +0200
> +@@ -25,11 +25,11 @@
> + <LI> You need a <I>netplan</I> server version 1.8 or later running on
> + the same host that the web server running the WebPlan CGI scripts
> + runs on. Its data directory must be named
> +- <I>/usr/local/lib/netplan.dir</I>, which must be writable for the
> ++ <I>/usr/share/plan/netplan.dir</I>, which must be writable for the
> + CGI scripts.<p>
> +
> + <LI> There must be a <I>plan</I> executable version 1.8 or later in the
> +- directory <I>/usr/local/bin</I> on the host that the web server is
> ++ directory <I>/usr/bin</I> on the host that the web server is
> + running on.
> + </UL>
> + <p>There is no way to run the web interface without the help of an HTTP
> +diff -Naur plan-1.9.orig/web/webAdd.cgi plan-1.9/web/webAdd.cgi
> +--- plan-1.9.orig/web/webAdd.cgi 2004-06-18 15:13:25.000000000 +0200
> ++++ plan-1.9/web/webAdd.cgi 2004-06-18 15:14:03.000000000 +0200
> +@@ -129,7 +129,7 @@
> + # user add a \0 appended to it ... that's why data was not passed
> + # to the dam script with system or open() statement
> +
> +- $cmd="/usr/local/bin/plan $start -W $long $rep -u $user \"$data\"";
> ++ $cmd="/usr/bin/plan $start -W $long $rep -u $user \"$data\"";
> + # system("$cmd");
> + open ( IN , "$cmd |");
> + @error=<IN>;
> +diff -Naur plan-1.9.orig/web/webmodDel.cgi plan-1.9/web/webmodDel.cgi
> +--- plan-1.9.orig/web/webmodDel.cgi 2004-06-18 15:13:25.000000000 +0200
> ++++ plan-1.9/web/webmodDel.cgi 2004-06-18 15:14:03.000000000 +0200
> +@@ -33,7 +33,7 @@
> + return;
> + }
> + else {
> +- open ( IN , "/usr/local/bin/plan -W -X $Row $Qui |" );
> ++ open ( IN , "/usr/bin/plan -W -X $Row $Qui |" );
> + @error=<IN>;
> + close(IN);
> + foreach $line ( @error ) {
> diff --git a/app-office/plan/files/plan-1.12-gentoo.patch b/app-office/plan/files/plan-1.12-gentoo.patch
> new file mode 100644
> index 00000000000..3757a484f2c
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.12-gentoo.patch
> @@ -0,0 +1,107 @@
> +From 4b8f513afa8b87bc1eeacfbcc6c2102cb67690b7 Mon Sep 17 00:00:00 2001
> +From: Thomas Groman <tgroman@nuegia.net>
> +Date: Thu, 18 Mar 2021 23:12:28 -0700
> +Subject: [PATCH] gentooization
> +
> +---
> + language/plan.help | 15 ++++++++-------
> + misc/Killpland | 2 +-
> + misc/netplan.boot | 6 +++---
> + misc/plan2vcs | 2 +-
> + 4 files changed, 13 insertions(+), 12 deletions(-)
> +
> +diff --git a/language/plan.help b/language/plan.help
> +index dce7d44..db85be9 100644
> +--- a/language/plan.help
> ++++ b/language/plan.help
> +@@ -92,7 +92,7 @@
> + * If you run netplan as root, and it can't open its home directory,
> + check whether NOB_UID and NOB_GID in the Makefile really contain
> + the user and group ID of the <nobody> account, and make sure that
> +- <nobody> can access the netplan.dir home directory in $(LIB).
> ++ <nobody> can access the netplan.dir home directory in $(SHARE).
> +
> + * if holidays are not shown in the month view, make sure that your
> + day number font (Plan*calNumberFont) is at least twice as large
> +@@ -188,9 +188,10 @@
> +
> + The calendar program is distributed as four programs and two data
> + files: plan, pland, notifier, netplan, plan.help, and plan_cal.ps.
> +- Plan should be installed in the directory given as DIR in the Makefile,
> +- by default /usr/local/bin, and the others in the directory given as
> +- LIB, also /usr/local/bin by default. The distribution also contains
> ++ Plan, pland, notifier and netplan should be installed in the
> ++ directory given as DIR in the Makefile, by default /usr/bin,
> ++ and the others in the directory given as SHARE,
> ++ /usr/share/plan by default. The distribution also contains
> + .holiday files for various countries.
> +
> + "plan" is the main interactive calendar program that you are using at
> +@@ -239,12 +240,12 @@
> + with the Define Holidays popup in the Config pulldown. For a description
> + of the .dayplan* format, see the plan(4) manpage.
> +
> +- If the LIB directory (specified in the Makefile) contains a file
> ++ If the SHARE directory (specified in the Makefile) contains a file
> + "holiday", it is read after ".holiday" to add system-wide holidays to
> + the user's holiday list.
> +
> + Both plan and pland use the environment variables $PATH, $PLAN_PATH, a
> +- built-in default path, and the directories DIR and LIB specified in the
> ++ built-in default path, and the directories DIR and SHARE specified in the
> + Makefile for locating programs and plan.help.
> + plan does not start netplan automatically; it must already run on the
> + specified hosts.
> +@@ -297,7 +298,7 @@
> + why there are still pland daemons).
> +
> + * netplan cannot be used to access files that are not in its home
> +- directory, /usr/local/lib/netplan by default. Absolute paths are
> ++ directory, /usr/share/plan/netplan.dir by default. Absolute paths are
> + converted to paths relative to the home directory, and paths with
> + ".." are rejected.
> +
> +diff --git a/misc/Killpland b/misc/Killpland
> +index f8aac33..dae61dc 100644
> +--- a/misc/Killpland
> ++++ b/misc/Killpland
> +@@ -1,4 +1,4 @@
> +-#! /usr/local/bin/perl
> ++#! /usr/bin/perl
> + #
> + # KillPlanD
> + #
> +diff --git a/misc/netplan.boot b/misc/netplan.boot
> +index 8e7de34..2236487 100644
> +--- a/misc/netplan.boot
> ++++ b/misc/netplan.boot
> +@@ -1,4 +1,4 @@
> +-#! /sbin/sh
> ++#! /bin/sh
> +
> + # Start or stop the Plan Network Server
> + # Michel Bourget Mon Feb 17 10:57:14 EST 1997
> +@@ -17,8 +17,8 @@ else # For a quiet startup and shutdown
> + VERBOSE=
> + fi
> +
> +-DIR=/usr/local/lib
> +-DB=$DIR/netplan.dir
> ++DIR=/usr/bin
> ++DB=/var/lib/plan/netplan.dir
> + DEBUG=0
> + DBGFILE=/var/tmp/netplan.dbg
> +
> +diff --git a/misc/plan2vcs b/misc/plan2vcs
> +index 0f8e531..1f7cef5 100644
> +--- a/misc/plan2vcs
> ++++ b/misc/plan2vcs
> +@@ -1,4 +1,4 @@
> +-#!/usr/local/bin/perl
> ++#!/usr/bin/perl
> + #
> + # Convert a netplan file to vCalendar.
> + #
> +--
> +2.26.2
> +
> diff --git a/app-office/plan/files/plan-1.12-makefile.patch b/app-office/plan/files/plan-1.12-makefile.patch
> new file mode 100644
> index 00000000000..be97e87c43e
> --- /dev/null
> +++ b/app-office/plan/files/plan-1.12-makefile.patch
> @@ -0,0 +1,199 @@
> +From fd19b07f6565631c47944f63dde3783a649b541f Mon Sep 17 00:00:00 2001
> +From: Thomas Groman <tgroman@nuegia.net>
> +Date: Fri, 19 Mar 2021 00:31:37 -0700
> +Subject: [PATCH] makefile
> +
> +---
> + src/Makefile | 76 +++++++++++++++++++++++++++-------------------------
> + 1 file changed, 39 insertions(+), 37 deletions(-)
> +
> +diff --git a/src/Makefile b/src/Makefile
> +index 74690b7..4e79c86 100644
> +--- a/src/Makefile
> ++++ b/src/Makefile
> +@@ -8,19 +8,19 @@
> + # after "=", this is parsed and rewritten by the configure script.
> + #
> + # # user-callable executable (plan)
> +-DIR=/usr/local/bin
> ++DIR=/usr/bin
> + # # auxiliary programs (pland, notifier, PS)
> +-LIB=/usr/local/lib
> ++LIB=/usr/lib
> + # # help file (plan.help)
> +-SBIN=/usr/local/bin
> ++SBIN=/usr/bin
> + # # system programs (netplan)
> +-HELP=/usr/local/lib
> ++HELP=/usr/share/plan
> + # # netplan expects netplan.dir/ here
> +-NETPLANDIR=/usr/local/lib
> ++NETPLANDIR=/usr/share/plan
> + # # unformatted nroff manpage (plan.[14])
> +-MAN=/usr/local/man/man
> ++MAN=/usr/man/man
> + # # formatted manpage (plan.[14])
> +-CATMAN=/usr/catman/local/cat
> ++CATMAN=/usr/share/catman/local/cat
> + # # subdirectory in home dir, or empty
> + PLANRULE=
> + # # lockfile for plan, %d is uid
> +@@ -32,11 +32,11 @@ INCDIR=
> + # # standard Unix lexer
> + LEX=lex
> + # # standard Unix compiler generator
> +-YACC=yacc
> ++YACC=bison -y
> + # # numerical user ID of <nobody> account
> +-NOB_UID=60001
> ++NOB_UID=65534
> + # # default numerical group ID of <nobody>
> +-NOB_GID=60001
> ++NOB_GID=665534
> + # # used by plan to pre-process holiday files,
> + # # plan will check if this file really exists
> + CPP_PATH='/lib/cpp -P -I$(HELP)'
> +@@ -51,11 +51,10 @@ ESCTOJISLATIN=\"\\033\(J\"
> + JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
> + JAPAN=
> + # # default holiday locale
> +-HOLIDAY=german
> ++HOLIDAY=us
> + # # do NOT define -O2 on DEC OSF/1 machines!
> + # # use -O instead of -O2 on HP and Solaris
> +-DEBUG=-g
> +-DEBUG=-O2
> ++DEBUG=$(CFLAGS)
> + # # what to do without make arguments
> + DEFTARGET=linux
> + #------------------------- end of configuration section ----------------------
> +@@ -143,9 +142,9 @@ FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
> + -DSTDLIBMALLOC
> + OBSD_C = -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
> + -DNO_MOTIF -DSTDLIBMALLOC
> +-LINUX_C = -W -Wall -m32 -I/usr/X11R6/include -I/usr/include/X11 \
> ++LINUX_C = -I/usr/X11R6/include -I/usr/include/X11 \
> + -DNOLOCK -DLINUX -Dlinux
> +-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -I/usr/include/X11 \
> ++LINUX64_C = -I/usr/X11R6/include -I/usr/include/X11 \
> + -DNOLOCK -DLINUX -Dlinux
> + DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \
> + -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \
> +@@ -428,18 +427,18 @@ svr4:
> + env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
> +
> + linux:
> +- -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
> ++ -env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
> + @echo --------------------
> + @echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"'
> +
> + linux64:
> +- env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
> ++ env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
> +
> + debian:
> + env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all
> +
> + slinux:
> +- env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all
> ++ env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all
> +
> + news4:
> + make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all
> +@@ -521,41 +520,41 @@ S_SRC = netplan.c netplan_acl.c
> + S_OBJ = netplan.o netplan_acl.o
> + S_INC = netplan.h netplan_if.h
> +
> +-CCLINE = $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR)
> ++CCLINE = $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR)
> +
> + #---------------------------------------------------------------
> + all: plan pland notifier netplan
> +
> + plan: $(P_OBJ)
> +- $(CCLINE) -o plan $(P_OBJ) $(L1F)
> ++ $(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F)
> +
> + pland: $(D_OBJ)
> +- $(CCLINE) -o pland $(D_OBJ) $(L2F)
> ++ $(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F)
> +
> + notifier: $(N_OBJ)
> +- $(CCLINE) -o notifier $(N_OBJ) $(L1F)
> ++ $(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F)
> +
> + netplan: $(S_OBJ) $(MAKEFILE)
> +- $(CCLINE) -o netplan $(S_OBJ) \
> ++ $(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) \
> + -L/usr/local/lib $(L2F)
> +
> + .c.o:
> + $(CCLINE) -c $<
> +
> + print.o: print.c $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + network.o: network.c netplan_if.h $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + usermenu.o: usermenu.c $(MAKEFILE)
> +- $(CCLINE) -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -c -DLIB=\"$(SHARE)\" $<
> +
> + holiday.o: holiday.c $(MAKEFILE)
> +- $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
> ++ $(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $<
> +
> + util.o: util.c $(MAKEFILE)
> +- $(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
> ++ $(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $<
> +
> + netplan.o: netplan.c netplan_if.h $(MAKEFILE)
> + $(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $<
> +@@ -585,20 +584,22 @@ g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h form.h
> + install:
> + -rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
> + mkdir -p $(DESTDIR)$(DIR)
> +- cp plan $(DESTDIR)$(DIR)
> +- mkdir -p $(DESTDIR)$(LIB)
> +- cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
> +- mkdir -p $(DESTDIR)$(SBIN)
> +- cp netplan $(DESTDIR)$(SBIN)
> +- -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
> ++ cp plan pland notifier netplan $(DESTDIR)$(DIR)
> ++ mkdir -p $(DESTDIR)$(SHARE)
> ++ cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(DIR)
> ++ -(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0
> ++ cp ../language/plan.help $(DESTDIR)$(SHARE)
> ++ -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
> ++ -chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.*
> ++ -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0
> + mkdir -p $(DESTDIR)$(HELP)
> + cp ../language/plan.help $(DESTDIR)$(HELP)
> +-# -strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
> + -chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
> + -chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
> + -(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
> + mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
> +- -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
> ++ -chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
> ++ -chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
> +@@ -608,7 +609,8 @@ install:
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
> + -(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
> +- -(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
> ++ mkdir -p $(DESTDIR)$(SHARE)/holiday
> ++ cp ../holiday/* $(DESTDIR)$(SHARE)/holiday
> + -(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
> + -(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
> + @echo ""
> +--
> +2.26.2
> +
> diff --git a/app-office/plan/metadata.xml b/app-office/plan/metadata.xml
> index 7a38bb90096..4b6e6bf799a 100644
> --- a/app-office/plan/metadata.xml
> +++ b/app-office/plan/metadata.xml
> @@ -1,5 +1,12 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
> <pkgmetadata>
> - <!-- maintainer-needed -->
> + <maintainer type="person" proxied="yes">
> + <email>tgroman@nuegia.net</email>
> + <name>Thomas Groman</name>
> + </maintainer>
> + <maintainer type="project" proxied="yes">
> + <email>proxy-maint@gentoo.org</email>
> + <name>Proxy Maintainers</name>
> + </maintainer>
> </pkgmetadata>
> diff --git a/app-office/plan/plan-1.12.ebuild b/app-office/plan/plan-1.12.ebuild
> new file mode 100644
> index 00000000000..5fcac3c7c52
> --- /dev/null
> +++ b/app-office/plan/plan-1.12.ebuild
> @@ -0,0 +1,69 @@
> +# Copyright 1999-2021 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +EAPI=7
> +
> +inherit toolchain-funcs
> +
> +DESCRIPTION="Motif based schedule planner"
> +HOMEPAGE="https://www.bitrot.de/plan.html"
> +SRC_URI="ftp://ftp.bitrot.de/pub/plan/${P}.tar.gz"
> +
> +LICENSE="GPL-2+" #448646
> +SLOT="0"
> +KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
> +
> +RDEPEND="
> + x11-libs/libX11
> + x11-libs/libXt
> + x11-libs/motif:0"
> +DEPEND="${RDEPEND}"
> +BDEPEND="
> + sys-devel/bison
> + sys-devel/flex"
> +
> +#PATCHES=( "${WORKDIR}"/patches )
> +PATCHES=(
> + "$FILESDIR/${PN}-1.10-fno-common.patch"
> + "$FILESDIR/${PN}-1.12-gentoo.patch"
> + "$FILESDIR/${PN}-1.12-makefile.patch"
> + "$FILESDIR/${PN}-1.10-webplan.patch"
> +)
> +
> +src_compile() {
> + emake -C src CC="$(tc-getCC)" SHARE=/usr/share/plan linux
> +}
> +
> +src_install() {
> + emake -C src \
> + DESTDIR="${ED}" \
> + SHARE=/usr/share/plan \
> + install
> + keepdir /usr/share/plan/netplan.dir
> +
> + dodoc HISTORY README
> +
> + pushd misc >/dev/null || die
> + doman netplan.1 plan.1 plan.4
> + insinto /usr/share/${PN}/misc
> + doins netplan.boot BlackWhite Monochrome plan.fti Plan.xpm plan.xpm
> + exeinto /usr/share/${PN}/misc
> + doexe Killpland cvs vsc msschedule2plan plan2vcs
> + popd >/dev/null || die
> +
> + pushd web >/dev/null || die
> + insinto /usr/share/${PN}/web
> + doins help.html bottom.html cgi-lib.pl common.pl holiday_webplan rtsban.jpg
> + exeinto /usr/share/${PN}/web
> + doexe *.cgi
> + popd >/dev/null || die
> +}
> +
> +pkg_postinst() {
> + elog
> + elog " Check /usr/share/${PN}/holiday for examples to set your"
> + elog " ~/.holiday according to your country."
> + elog
> + elog " WebPlan ${PV} can be found in /usr/share/${PN}/web."
> + elog
> +}
> --
> 2.26.2
>
First, thanks for your contribution!~
I vaguely remember there a policy that promxy-maintainer project don't accept new
package due to tight man power resource (correct me if I'm wrong here)
So contributing to guru overlay[1] would be a more feasible way
[1] https://wiki.gentoo.org/wiki/Project:GURU
[2] https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers
--
Yixun Lan (dlan)
Gentoo Linux Developer
GPG Key ID AABEFD55
prev parent reply other threads:[~2021-03-19 10:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 8:37 [gentoo-proxy-maint] [PATCH] app-office/plan: add 1.12 Thomas Groman
2021-03-19 10:03 ` Yixun Lan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YFR27vL2UmieiQQw@ofant \
--to=dlan@gentoo.org \
--cc=gentoo-proxy-maint@lists.gentoo.org \
--cc=proxy-maint@gentoo.org \
--cc=tgroman@nuegia.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox