[arch-commits] CVS update of arch/build/base/man (3 files)

Dan McGee dan at archlinux.org
Tue Jun 5 11:37:42 EDT 2007


    Date: Tuesday, June 5, 2007 @ 11:37:42
  Author: dan
    Path: /home/cvs-arch/arch/build/base/man

Modified: PKGBUILD (1.33 -> 1.34)
 Removed: makewhatis-1.6b.sh (1.1) man.patch (1.3)

upgpkg: man 1.6e-2
Fix FS 5991, 6352, 5349


--------------------+
 PKGBUILD           |   28 +--
 makewhatis-1.6b.sh |  421 ---------------------------------------------------
 man.patch          |   21 --
 3 files changed, 10 insertions(+), 460 deletions(-)


Index: arch/build/base/man/PKGBUILD
diff -u arch/build/base/man/PKGBUILD:1.33 arch/build/base/man/PKGBUILD:1.34
--- arch/build/base/man/PKGBUILD:1.33	Mon Dec 11 15:04:30 2006
+++ arch/build/base/man/PKGBUILD	Tue Jun  5 11:37:42 2007
@@ -1,34 +1,26 @@
-# $Id: PKGBUILD,v 1.33 2006/12/11 20:04:30 judd Exp $
+# $Id: PKGBUILD,v 1.34 2007/06/05 15:37:42 dan Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=man
 pkgver=1.6e
-pkgrel=1
+pkgrel=2
 pkgdesc="A utility for reading man pages"
 arch=(i686 x86_64)
 url="http://primates.ximian.com/~flucifredi/man/"
+license=('GPL')
 depends=('groff' 'less' 'gzip' 'awk' 'coreutils' 'bash')
+backup=(etc/man.conf)
 source=(http://primates.ximian.com/~flucifredi/man/man-$pkgver.tar.gz \
-  whatis.cron.daily man.patch man-troff.patch makewhatis-1.6b.sh)
+        whatis.cron.daily man-troff.patch)
 md5sums=('d8187cd756398baefc48ba7d60ff6a8a' 'b86a5f2dd87c6be30421a8813547229d'\
-         '2411a276711bded2c93fbb8d9575d8d2' '21541cb3073259f7fb9335675ca41b0e'\
-         'd362ba7eb0fa891d9923a2f50fb9b00e')
+         '21541cb3073259f7fb9335675ca41b0e')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  #patch -Np1 -i ../man.patch || return 1
   patch -Np1 -i ../man-troff.patch || return 1
-  ./configure -d +lang all
+  ./configure -confdir='/etc' -d +lang all
   make || return 1
+  make PREFIX=$startdir/pkg install || return 1
+
+  #install whatis cron script
   install -D -m744 ../whatis.cron.daily $startdir/pkg/etc/cron.daily/whatis
-  mkdir -p $startdir/pkg/usr/{bin,sbin,share/locale}
-  cd src
-  make PREFIX=$startdir/pkg install
-  cd ../man2html
-  make PREFIX=$startdir/pkg install
-  cd ../man
-  make PREFIX=$startdir/pkg installsubdirs
-  cd ../msgs
-  make PREFIX=$startdir/pkg install
-  # Use the makewhatis from 1.6b -- the 1.6c one is broken
-  install -D -m754 ../../makewhatis-1.6b.sh $startdir/pkg/usr/sbin/makewhatis
 }
Index: arch/build/base/man/makewhatis-1.6b.sh
diff -u arch/build/base/man/makewhatis-1.6b.sh:1.1 arch/build/base/man/makewhatis-1.6b.sh:removed
--- arch/build/base/man/makewhatis-1.6b.sh:1.1	Mon Feb  6 00:05:54 2006
+++ arch/build/base/man/makewhatis-1.6b.sh	Tue Jun  5 11:37:42 2007
@@ -1,421 +0,0 @@
-#!/bin/sh
-# makewhatis: create the whatis database
-# Created: Sun Jun 14 10:49:37 1992
-# Revised: Sat Jan  8 14:12:37 1994 by faith at cs.unc.edu
-# Revised: Sat Mar 23 17:56:18 1996 by micheal at actrix.gen.nz
-# Copyright 1992, 1993, 1994 Rickard E. Faith (faith at cs.unc.edu)
-# May be freely distributed and modified as long as copyright is retained.
-#
-# Wed Dec 23 13:27:50 1992: Rik Faith (faith at cs.unc.edu) applied changes
-# based on Mitchum DSouza (mitchum.dsouza at mrc-apu.cam.ac.uk) cat patches.
-# Also, cleaned up code and make it work with NET-2 doc pages.
-#
-# makewhatis-1.4: aeb 940802, 941007, 950417
-# Fixed so that the -c option works correctly for the cat pages
-# on my machine. Fix for -u by Nan Zou (nan at ksu.ksu.edu).
-# Many minor changes.
-# The -s option is undocumented, and may well disappear again.
-#
-# Sat Mar 23 1996: Michael Hamilton (michael at actrix.gen.nz).
-# I changed the script to invoke gawk only once for each directory tree.
-# This speeds things up considerably (from 30 minutes down to 1.5 minutes
-# on my 486DX66).
-# 960401 - aeb: slight adaptation to work correctly with cat pages.
-# 960510 - added fixes by brennan at raven.ca.boeing.com, author of mawk.
-# 971012 - replaced "test -z" - it doesnt work on SunOS 4.1.3_U1.
-# 980710 - be more careful with TMPFILE
-# 000323 - do not change PATH, better treatment of catpages - Bryan Henderson
-# 011117 - avoid suspicious filenames
-# 030310 - find files only; fix LAPACK cruft; no /usr/man default;
-#	use /dev/stderr instead of /dev/tty; handle files with strange names;
-#	add support for chinese, hungarian, indonesian, japanese, korean,
-#	polish, russian (Thierry Vignaud);
-#
-# Note for Slackware users: "makewhatis -v -w -c" will work.
-#
-# makewhatis aeb 030801 (from man-1.6b)
-
-program=`basename $0`
-
-# In case both /usr/man and /usr/share/man exist, the former is local
-# and should be first.
-# It is a bug to add /var/cache/man to DEFCATPATH.
-dm=
-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
-do
-    if [ -d $d ]; then
-	if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
-    fi
-done
-DEFMANPATH=$dm
-dc=
-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
-do
-    if [ -d $d ]; then
-	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
-    fi
-done
-DEFCATPATH=$dc
-
-DEFMANPATH=/usr/man
-DEFCATPATH=/usr/man/preformat:/usr/man
-
-# In case /usr is read-only, make /usr/foo/whatis (etc) a symlink to
-# something like /var/cache/man/foo-whatis.
-# Some distributions make a single big /var/cache/man/whatis file,
-# but that leads to problems and bugs.
-
-# AWK=/usr/bin/gawk
-AWK=/bin/awk
-
-# Find a place for our temporary files. If security is not a concern, use
-#	TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
-# Of course makewhatis should only have the required permissions
-# (for reading and writing directories like /usr/man).
-# We try here to be careful (and avoid preconstructed symlinks)
-# in case makewhatis is run as root, by creating a subdirectory of /tmp.
-
-TMPFILEDIR=/tmp/whatis.tmp.dir.$$
-rm -rf TMPFILEDIR
-if ! mkdir -m 0700 $TMPFILEDIR; then
-    echo Could not create $TMPFILEDIR
-    exit 1;
-fi
-TMPFILE=$TMPFILEDIR/w
-
-# make sure TMPFILEDIR is deleted if program is killed or terminates
-# (just delete this line if your shell doesnt know about trap)
-trap "rm -rf $TMPFILEDIR" 0 1 2 3 15
-
-# default find arg: no directories, no empty files
-findarg0="-type f -size +0"
-
-topath=manpath
-
-defmanpath=$DEFMANPATH
-defcatpath=
-
-sections="1 2 3 4 5 6 7 8 9 n l"
-
-for name in "$@"
-do
-if [ -n "$setsections" ]; then
-	setsections=
-	sections=$name
-	continue
-fi
-case $name in
-    --version|-V)
-	echo "$program from man-1.6b"
-	exit 0;;
-    -c) topath=catpath
-	defmanpath=
-	defcatpath=$DEFCATPATH
-	continue;;
-    -s) setsections=1
-	continue;;
-    -u) findarg="-ctime 0"
-	update=1
-	continue;;
-    -v) verbose=1
-	continue;;
-    -w) manpath=`man --path`
-	catpath=$manpath
-	continue;;
-    -*) echo "Usage: makewhatis [-u] [-v] [-w] [manpath] [-c [catpath]]"
-	echo "       This will build the whatis database for the man pages"
-	echo "       found in manpath and the cat pages found in catpath."
-	echo "       -u: update database with new pages"
-	echo "       -v: verbose"
-	echo "       -w: use manpath obtained from \`man --path\`"
-	echo "       [manpath]: man directories (default: $DEFMANPATH)"
-	echo "       [catpath]: cat directories (default: the first existing"
-	echo "           directory in $DEFCATPATH)"
-	exit;;
-     *) if [ -d $name ]
-	then
-	    eval $topath="\$$topath":$name
-	else
-	    echo "No such directory $name"
-	    exit
-	fi;;
-esac
-done
-
-manpath=`echo ${manpath-$defmanpath} | tr : ' '`
-if [ x"$catpath" = x ]; then
-   for d in `echo $defcatpath | tr : ' '`
-   do
-      if [ -d $d ]; then catpath=$d; break; fi
-   done
-fi
-catpath=`echo ${catpath} | tr : ' '`
-
-# first truncate all the whatis files that will be created new,
-# then only update - we might visit the same directory twice
-if [ x$update = x ]; then
-   for pages in man cat
-   do
-      eval path="\$$pages"path
-      for mandir in $path
-      do
-	 cp /dev/null $mandir/whatis
-      done
-   done
-fi
-
-for pages in man cat
-do
-   export pages
-   eval path="\$$pages"path
-   for mandir in $path
-   do
-     if [ x$verbose != x ]; then
-	echo "about to enter $mandir" > /dev/stderr
-     fi
-     if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
-	if [ x$verbose != x ]; then
-	   echo skipping $mandir - we did it already > /dev/stderr
-	fi
-     else      
-       here=`pwd`
-       cd $mandir
-       for i in $sections
-       do
-	 if [ -d ${pages}$i ]
-	 then
-	    cd ${pages}$i
-	    section=$i
-	    curdir=$mandir/${pages}$i
-	    export section verbose curdir
-	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
-
-	    function readline() {
-	      if (use_zcat || use_bzcat) {
-		result = (pipe_cmd | getline);
-		if (result < 0) {
-		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-		}
-	      } else {
-		result = (getline < filename);
-		if (result < 0) {
-		  print "Read file error: " filename " " ERRNO > "/dev/stderr";
-		}
-	      }
-	      return result;
-	    }
-	    
-	    function closeline() {
-	      if (use_zcat || use_bzcat) {
-		return close(pipe_cmd);
-	      } else {
-		return close(filename);
-	      }
-	    }
-	    
-	    function do_one() {
-	      insh = 0; thisjoin = 1; done = 0;
-	      entire_line = "";
-
-	      if (verbose) {
-		print "adding " filename > "/dev/stderr"
-	      }
-	      
-	      use_zcat = match(filename,"\\.Z$") ||
-			 match(filename,"\\.z$") || match(filename,"\\.gz$");
-	      if (!use_zcat)
-		use_bzcat = match(filename,"\\.bz2");
-	      if (use_zcat || use_bzcat) {
-		filename_no_gz = substr(filename, 0, RSTART - 1);
-	      } else {
-		filename_no_gz = filename;
-	      }
-	      match(filename_no_gz, "/[^/]+$");
-	      progname = substr(filename, RSTART + 1, RLENGTH - 1);
-	      if (match(progname, "\\." section "[A-Za-z]+")) {
-		actual_section = substr(progname, RSTART + 1, RLENGTH - 1);
-	      } else {
-		actual_section = section;
-	      }
-	      sub(/\..*/, "", progname);
-	      if (use_zcat || use_bzcat) {
-		if (use_zcat) {
-		  pipe_cmd = "zcat \"" filename "\"";
-		} else {
-		  pipe_cmd = "bzcat \"" filename "\"";
-		}
-		# try to avoid suspicious stuff
-		if (filename ~ /[;&|`$(]/) {
-		  print "ignored strange file name " filename " in " curdir > "/dev/stderr";
-		  return;
-		}
-	      }
-	    
-	      while (!done && readline() > 0) {
-		gsub(/.\b/, "");
-		if (($1 ~ /^\.[Ss][Hh]/ &&
-		  ($2 ~ /[Nn][Aa][Mm][Ee]/ ||
-		   $2 ~ /^JMÉNO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ ||
-		   $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ ||
-		   $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ ||
-		   $2 ~ /^N[ÉE]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾Á°/ ||
-		   $2 ~ /^̾¾Î/ || $2 ~ /^À̸§/ || $2 ~ /^NAZWA/ ||
-		   $2 ~ /^îáú÷áîéå/ || $2 ~ /^Ãû³Æ/ || $2 ~ /^¦WºÙ/ ||
-		   $2 ~ /^NOME/ || $2 ~ /^NAAM/)) ||
-		  (pages == "cat" && $1 ~ /^NAME/)) {
-		    if (!insh) {
-		      insh = 1;
-		    } else {
-		      done = 1;
-		    }
-		} else if (insh) {
-		  if ($1 ~ /^\.[Ss][HhYS]/ ||
-		    (pages == "cat" &&
-		    ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
-		     $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
-		     $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
-		     $0 ~ /^[^ ]/))) {
-		      # end insh for Synopsis, Syntax, but also for
-		      # DESCRIPTION (e.g., XFree86.1x),
-		      # COMMAND (e.g., xspread.1)
-		      # OVERVIEW (e.g., TclCommandWriting.3)
-		      # STRUCTURES (e.g., XEvent.3x)
-		      # INTRODUCTION (e.g., TclX.n)
-		      # and anything at all that begins in Column 1, so 
-		      # is probably a section header.
-		    done = 1;
-		  } else {
-		    if ($0 ~ progname"-") {  # Fix old cat pages
-			sub(progname"-", progname" - ");
-		    }
-		    if ($0 ~ /[^ \\]-$/) {
-		      sub(/-$/, "");	  # Handle Hyphenations
-		      nextjoin = 1;
-		    } else if ($0 ~ /\\c$/) {
-		      sub(/\\c$/, "");	  # Handle Continuations
-		      nextjoin = 1;
-		    } else
-		      nextjoin = 0;
-
-		    sub(/^.[IB] /, "");       # Kill bold and italics
-		    sub(/^.BI /, "");         #
-		    sub(/^.SM /, "");         # Kill small
-		    sub(/^.Nm /, "");         # Kill bold
-		    sub(/^.Tn /, "");         # Kill normal
-	            sub(/^.Li /, "");         # Kill .Li
-	            sub(/^.Dq /, "");         # Kill .Dq
-	            sub(/^.Nd */, "- ");      # Convert .Nd to dash
-		    sub(/\\\".*/, "");        # Trim pending comments
-		    sub(/  *$/, "");          # Trim pending spaces
-		    sub(/^\.$/, "");          # Kill blank comments
-		    sub(/^'"'"'.*/, "");      # Kill comment/troff lines
-		    sub(/^.in .*/, "");       # Kill various macros
-		    sub(/^.ti .*/, "");
-		    sub(/^.ta .*/, "");
-		    sub(/^.Vb .*/, "");
-		    sub(/^.[PLTH]P$/, "");    # .PP/.LP/.TP/.HP
-		    sub(/^.Pp$/, "");
-		    sub(/^.[iI]X .*$/, "");
-		    sub(/^.nolinks$/, "");
-		    sub(/^.B$/, "");
-		    sub(/^.nf$/, "");
-
-		    if (($1 ~ /^\.../ || $1 == "") &&
-		        (entire_line ~ / - / || entire_line ~ / \\- /)) {
-		      # Assume that this ends the description of one line
-		      # Sometimes there are several descriptions in one page,
-		      # as in outb(2).
-		      handle_entire_line();
-		      entire_line = "";
-		      thisjoin = 1;
-		    } else {
-		      if (thisjoin) {
-			entire_line = entire_line $0;
-		      } else {
-			entire_line = entire_line " " $0;
-		      }
-		      thisjoin = nextjoin;
-		    }
-		  }
-		}
-	      }
-	      handle_entire_line();
-	      closeline();
-	    }
-
-	    function handle_entire_line() {
-	      x = entire_line;             # Keep it short
-
-	      gsub(/\015/, "", x);         # Kill DOS remains
-	      gsub(/	/, " ", x);        # Translate tabs to spaces
-	      gsub(/  +/, " ", x);         # Collapse spaces
-	      gsub(/ *, */, ", ", x);      # Fix comma spacings
-	      sub(/^ /, "", x);            # Kill initial spaces
-	      sub(/ $/, "", x);            # Kill trailing spaces
-	      sub(/__+/, "_", x);          # Collapse underscores
-
-	      gsub(/\\f\(../, "", x);         # Kill font changes
-	      gsub(/\\f[PRIB0123]/, "", x);   # Kill font changes
-	      gsub(/\\s[-+0-9]*/, "", x);     # Kill size changes
-	      gsub(/\\&/, "", x);             # Kill \&
-	      gsub(/\\\|/, "", x);            # Kill \|
-	      gsub(/\\\((ru|ul)/, "_", x);    # Translate
-	      gsub(/\\\((mi|hy|em)/, "-", x); # Translate
-	      gsub(/\\\*\(../, "", x);        # Kill troff strings
-	      gsub(/\\/, "", x);              # Kill all backslashes
-	      gsub(/"/, "", x);               # Kill quotes (from .Nd "foo bar")
-	      sub(/<h1 align=center>/, "", x);# Yuk! HTML cruft
-	      gsub(/\000.*/, "X", x);         # Binary cruft in LAPACK pages
-	      gsub(/  +/, " ", x);            # Collapse spaces (again)
-	      sub(/^ /, "", x);               # Kill initial spaces (again)
-	      sub(/ $/, "", x);               # Kill trailing spaces (again)
-	      sub(/\.$/, "", x);              # Kill trailing period
-
-	      if (!match(x, / - /))
-		return;
-
-	      after_dash = substr(x, RSTART);
-	      head = substr(x, 1, RSTART-1) ", ";
-	      while (match(head, /, /)) {
-		prog = substr(head, 1, RSTART-1);
-		head = substr(head, RSTART+2);
-		if (prog != progname)
-		  prog = prog " [" progname "]";
-		printf "%-*s (%s) %s\n", 20, prog, actual_section, after_dash;
-	      }
-	    }
-
-	    {			# Main action - process each filename read in.
-	      filename = $0;
-	      do_one();
-	    }
-	    ' pages=$pages section=$section verbose=$verbose curdir=$curdir
-	    cd ..
-	 fi
-       done > $TMPFILE
-
-       cd $here
-
-       # kludge for Slackware's /usr/man/preformat
-       if [ $mandir = /usr/man/preformat ]
-       then
-	 mandir1=/usr/man
-       else
-	 mandir1=$mandir
-       fi
-
-       if [ -f ${mandir1}/whatis ]
-       then
-	 cat ${mandir1}/whatis >> $TMPFILE
-       fi
-       tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis
-
-       chmod 644 ${mandir1}/whatis
-       rm $TMPFILE
-     fi
-   done
-done
-
-# remove tempdir
-rm -rf $TMPFILEDIR
-
Index: arch/build/base/man/man.patch
diff -u arch/build/base/man/man.patch:1.3 arch/build/base/man/man.patch:removed
--- arch/build/base/man/man.patch:1.3	Fri Jul 23 16:25:53 2004
+++ arch/build/base/man/man.patch	Tue Jun  5 11:37:42 2007
@@ -1,21 +0,0 @@
-diff -Naur man-1.5n-orig/src/makewhatis.sh man-1.5n/src/makewhatis.sh
---- man-1.5n-orig/src/makewhatis.sh	2003-08-03 12:39:39.000000000 -0700
-+++ man-1.5n/src/makewhatis.sh	2004-07-23 13:23:49.000000000 -0700
-@@ -57,13 +57,16 @@
- done
- DEFCATPATH=$dc
- 
-+DEFMANPATH=/usr/man
-+DEFCATPATH=/usr/man/preformat:/usr/man
-+
- # In case /usr is read-only, make /usr/foo/whatis (etc) a symlink to
- # something like /var/cache/man/foo-whatis.
- # Some distributions make a single big /var/cache/man/whatis file,
- # but that leads to problems and bugs.
- 
- # AWK=/usr/bin/gawk
--AWK=%awk%
-+AWK=/bin/awk
- 
- # Find a place for our temporary files. If security is not a concern, use
- #	TMPFILE=/tmp/whatis$$; TMPFILEDIR=none




More information about the arch-commits mailing list