Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (0813a784e8cce70fb3cbb0f0876aff9164eec071)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (0813a784e8cce70fb3cbb0f0876aff9164eec071)
  • Date: Sat, 27 Oct 2007 06:38:59 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

doc/man/BUILD | 4 +---
doc/man/DETAILS | 2 +-
doc/man/HISTORY | 8 ++++++++
doc/man/PRE_BUILD | 3 +++
doc/man/man.conf.patch | 22 +++++++++-------------
5 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit 0813a784e8cce70fb3cbb0f0876aff9164eec071
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

man: fixed man paths so it doesn't take 5+ seconds to launch man

diff --git a/doc/man/BUILD b/doc/man/BUILD
index 5f28f09..7b347d4 100755
--- a/doc/man/BUILD
+++ b/doc/man/BUILD
@@ -1,6 +1,4 @@
./configure $OPTS -d +lang all &&
make_single &&
make &&
-make_normal &&
-
-patch -p 0 < $SCRIPT_DIRECTORY/man.conf.patch
+make_normal
diff --git a/doc/man/DETAILS b/doc/man/DETAILS
index d539532..5c2b1fb 100755
--- a/doc/man/DETAILS
+++ b/doc/man/DETAILS
@@ -1,6 +1,6 @@
SPELL=man
VERSION=1.6e
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:8604b37798f807eb74c7947d483212c394f5e13293e064dc615a9fd28c60f5733c4033d293c75bb10be1a18c9f45c80e3fbe170f34bc7e1382c0a9e2c29a4a2e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/man/HISTORY b/doc/man/HISTORY
index ed145ea..152e6d8 100644
--- a/doc/man/HISTORY
+++ b/doc/man/HISTORY
@@ -1,3 +1,11 @@
+2007-10-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * BUILD, PRE_BUILD: moved man.conf patching to PRE_BUILD
+ * DETAILS: PATCHLEVEL++
+ * man.conf.patch: added j2sdk and perl man paths, removed the
+ /usr/share/*/man and /usr/lib/*/man paths as they cause man to
+ open 3000+ files on every run, delaying it by several seconds,
+ any paths missing should be added explicitly instead
+
2006-11-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.6e

diff --git a/doc/man/PRE_BUILD b/doc/man/PRE_BUILD
new file mode 100755
index 0000000..3c25769
--- /dev/null
+++ b/doc/man/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/man.conf.patch
diff --git a/doc/man/man.conf.patch b/doc/man/man.conf.patch
index 4e076c8..37ae880 100644
--- a/doc/man/man.conf.patch
+++ b/doc/man/man.conf.patch
@@ -1,6 +1,6 @@
---- src/man.conf.old 2005-04-29 10:57:05.000000000 +0200
-+++ src/man.conf 2005-04-29 11:10:45.000000000 +0200
-@@ -40,7 +40,7 @@
+--- src/man.conf.in.old 2007-10-27 13:29:07.000000000 +0200
++++ src/man.conf.in 2007-10-27 13:31:00.000000000 +0200
+@@ -36,11 +36,14 @@
#
# Every automatically generated MANPATH includes these fields
#
@@ -9,18 +9,14 @@
MANPATH /usr/share/man
MANPATH /usr/local/man
MANPATH /usr/local/share/man
-@@ -49,8 +49,8 @@
- # Uncomment if you want to include one of these by default
+ MANPATH /usr/X11R6/man
++MANPATH /usr/lib/j2sdk/man
++MANPATH /usr/share/site_perl/man
++MANPATH /usr/share/vendor_perl/man
#
- # MANPATH /opt/*/man
--# MANPATH /usr/lib/*/man
--# MANPATH /usr/share/*/man
-+MANPATH /usr/lib/*/man
-+MANPATH /usr/share/*/man
- # MANPATH /usr/kerberos/man
+ # Uncomment if you want to include one of these by default
#
- # Set up PATH to MANPATH mapping
-@@ -75,7 +75,7 @@
+@@ -71,7 +74,7 @@
# NOAUTOPATH keeps man from automatically adding directories that look like
# manual page directories to the path.
#



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (0813a784e8cce70fb3cbb0f0876aff9164eec071), Arwed von Merkatz, 10/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page