[patch] gentooization

plan-1.12-gentoo.patch (text/plain), 3.69 KB, created by Thomas Groman on 2021-03-19 07:41:07 UTC

From 4b8f513afa8b87bc1eeacfbcc6c2102cb67690b7 Mon Sep 17 00:00:00 2001
From: Thomas Groman <[e-mail]>
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