[pkgsrc/trunk]: pkgsrc/archivers/pax re-add support for --program-prefix and ...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/51a43f7fe290
branches:  trunk
changeset: 544814:51a43f7fe290
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Sun Jul 20 23:31:50 2008 +0000

description:
re-add support for --program-prefix and NBPAX_PROGRAM_PREFIX pkgsrc var
PR pkg/37989

diffstat:

 archivers/pax/Makefile           |    13 +-
 archivers/pax/PLIST              |    20 +-
 archivers/pax/files/Makefile.in  |    21 +-
 archivers/pax/files/configure    |  4425 +++++++++++++++++++++----------------
 archivers/pax/files/configure.ac |     1 +
 5 files changed, 2490 insertions(+), 1990 deletions(-)

diffs (truncated from 6282 to 300 lines):

diff -r 69071017c27f -r 51a43f7fe290 archivers/pax/Makefile
--- a/archivers/pax/Makefile    Sun Jul 20 23:18:28 2008 +0000
+++ b/archivers/pax/Makefile    Sun Jul 20 23:31:50 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/06/19 18:36:51 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/07/20 23:31:50 dbj Exp $
 
 DISTNAME=              pax-20080110
 CATEGORIES=            archivers
@@ -16,6 +16,15 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+
+.if defined(NBPAX_PROGRAM_PREFIX) && ${NBPAX_PROGRAM_PREFIX} != ""
+CONFIGURE_ARGS+=       --program-prefix=${NBPAX_PROGRAM_PREFIX:Q}
+
+PLIST_SUBST+=          NBPAX_PROGRAM_PREFIX=${NBPAX_PROGRAM_PREFIX:Q}
+BUILD_DEFS+=           NBPAX_PROGRAM_PREFIX
+
+.else
+
 # pax installs "tar" and "cpio"
 .if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX)
 CONFLICTS+=            gcpio-[0-9]*
@@ -24,6 +33,8 @@
 CONFLICTS+=            gtar-base-[0-9]*
 .endif
 
+.endif
+
 GNU_CONFIGURE=         yes
 NO_CHECKSUM=           yes
 
diff -r 69071017c27f -r 51a43f7fe290 archivers/pax/PLIST
--- a/archivers/pax/PLIST       Sun Jul 20 23:18:28 2008 +0000
+++ b/archivers/pax/PLIST       Sun Jul 20 23:31:50 2008 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/14 18:48:43 jlam Exp $
-bin/cpio
-bin/pax
-bin/tar
-man/cat1/cpio.0
-man/cat1/tar.0
-man/cat1/pax.0
-man/man1/cpio.1
-man/man1/pax.1
-man/man1/tar.1
+@comment $NetBSD: PLIST,v 1.3 2008/07/20 23:31:50 dbj Exp $
+bin/${NBPAX_PROGRAM_PREFIX}cpio
+bin/${NBPAX_PROGRAM_PREFIX}pax
+bin/${NBPAX_PROGRAM_PREFIX}tar
+man/cat1/${NBPAX_PROGRAM_PREFIX}cpio.0
+man/cat1/${NBPAX_PROGRAM_PREFIX}tar.0
+man/cat1/${NBPAX_PROGRAM_PREFIX}pax.0
+man/man1/${NBPAX_PROGRAM_PREFIX}cpio.1
+man/man1/${NBPAX_PROGRAM_PREFIX}pax.1
+man/man1/${NBPAX_PROGRAM_PREFIX}tar.1
diff -r 69071017c27f -r 51a43f7fe290 archivers/pax/files/Makefile.in
--- a/archivers/pax/files/Makefile.in   Sun Jul 20 23:18:28 2008 +0000
+++ b/archivers/pax/files/Makefile.in   Sun Jul 20 23:31:50 2008 +0000
@@ -1,9 +1,10 @@
-#      $NetBSD: Makefile.in,v 1.10 2008/03/06 04:45:58 jlam Exp $
+#      $NetBSD: Makefile.in,v 1.11 2008/07/20 23:31:50 dbj Exp $
 
 srcdir=                @srcdir@
 
 DESTDIR=       
 prefix=                @prefix@
+program_transform_name=        @program_transform_name@
 exec_prefix=   @exec_prefix@
 bindir=                @bindir@
 mandir=                @mandir@
@@ -47,12 +48,12 @@
        $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(man1dir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(cat1dir)
-       $(INSTALL) $(PROG) $(DESTDIR)$(bindir)
-       ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/cpio
-       ln -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(bindir)/tar
-       $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$(PROG).1
-       $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$(PROG).0
-       $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/cpio.1
-       $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/cpio.0
-       $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/tar.1
-       $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/tar.0
+       $(INSTALL) $(PROG) $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)')
+       ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo cpio | sed '$(program_transform_name)')
+       ln -f $(DESTDIR)$(bindir)/$$(echo $(PROG) | sed '$(program_transform_name)') $(DESTDIR)$(bindir)/$$(echo tar | sed '$(program_transform_name)')
+       $(INSTALL) -m 444 $(PROG).1 $(DESTDIR)$(man1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1
+       $(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0
+       $(INSTALL) -m 444 cpio.1 $(DESTDIR)$(man1dir)/$$(echo cpio | sed '$(program_transform_name)').1
+       $(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0
+       $(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1
+       $(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0
diff -r 69071017c27f -r 51a43f7fe290 archivers/pax/files/configure
--- a/archivers/pax/files/configure     Sun Jul 20 23:18:28 2008 +0000
+++ b/archivers/pax/files/configure     Sun Jul 20 23:31:50 2008 +0000
@@ -1,83 +1,37 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pax 20040802.
+# Generated by GNU Autoconf 2.61 for pax 20040802.
 #
 # Report bugs to <grant%NetBSD.org@localhost>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
+  setopt NO_GLOB_SUBST
 else
-  as_unset=false
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)$' \| \
-        .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-         /^X\/\(\/\/\)$/{ s//\1/; q; }
-         /^X\/\(\/\).*/{ s//\1/; q; }
-         s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+
+
+# PATH needs CR
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -98,124 +52,466 @@
   rm -f conf$$.sh
 fi
 
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""       $as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
+# Work around bugs in pre-3.0 UWIN ksh.
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+