small build fix to support PKG_DESTDIR_SUPPORT="user-destdir"

3 files changed, 35 insertions, 11 deletions

diff --git a/news/newsx/distinfo b/news/newsx/distinfo
index 9dc656515e9..b896199f25a 100644
--- a/news/newsx/distinfo
+++ b/news/newsx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/03/19 17:17:05 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/09/12 07:58:12 spz Exp $
 
 SHA1 (newsx-1.6.tar.gz) = e128e89ba161ceb4ab6d652d8c132ae3a33fbb20
 RMD160 (newsx-1.6.tar.gz) = e9d1785ad94510055ffcd5d3d15aeafbc16c4f46
 Size (newsx-1.6.tar.gz) = 302821 bytes
-SHA1 (patch-aa) = b0996217c88e250ed38900ad1f706d16b9900550
-SHA1 (patch-ab) = d3ca5f2231f14b27ff4ee375c1b19b5c158b71be
+SHA1 (patch-aa) = f838977d58f3aa3684bcf2ba198c235b4743cc23
+SHA1 (patch-ab) = 05cecfdfbc4d65d4d51493fc6350e854c67379aa
 SHA1 (patch-ac) = bc188323938a83c8d5bfeefe389fd6c6f3720c2f
 SHA1 (patch-ad) = 2b5c5ede77aab5b5d2f269452f30664b8a270e61
diff --git a/news/newsx/patches/patch-aa b/news/newsx/patches/patch-aa
index c5b0ed18398..a81f357578d 100644
--- a/news/newsx/patches/patch-aa
+++ b/news/newsx/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/03/16 09:48:37 cube Exp $
+$NetBSD: patch-aa,v 1.3 2014/09/12 07:58:12 spz Exp $
 
---- configure.orig	2004-01-11 18:31:22.000000000 +0100
+--- configure.orig	2003-05-18 17:25:34.000000000 +0000
 +++ configure
 @@ -861,6 +861,8 @@ Optional Packages:
    --without-history       do not perform history database lookup
@@ -24,7 +24,20 @@ $NetBSD: patch-aa,v 1.2 2004/03/16 09:48:37 cube Exp $
  # Check whether --with-errlog or --without-errlog was given.
  if test "${with_errlog+set}" = set; then
    withval="$with_errlog"
-@@ -1964,6 +1972,28 @@ echo $ECHO_N "checking history... $ECHO_
+@@ -1890,9 +1898,12 @@ echo $ECHO_N "checking and found INN... 
+ 	    # it has been reported that some INN 2.1 had its own VERSION
+ 	    VERSION_save="$VERSION"
+ 	    VERSION=
++	    # innshellvars sets TMPDIR
++	    TMPDIR_save="$TMPDIR"
+ 	    . $NEWSCONFIG
+ 	    INN_VERSION="$VERSION"
+ 	    VERSION="$VERSION_save"
++	    TMPDIR="$TMPDIR_save"
+ 	    INN_NEWSUMASK=`umask`
+ 	    if test x$NEWSBIN = x ; then
+ 	      echo "$as_me:$LINENO: result: ERROR: $NEWSCONFIG is probably in wrong format" >&5
+@@ -1964,6 +1975,28 @@ echo $ECHO_N "checking history... $ECHO_
  		    HISTORY="$with_history"
  		fi
  	    fi
@@ -53,7 +66,7 @@ $NetBSD: patch-aa,v 1.2 2004/03/16 09:48:37 cube Exp $
  	    if test -f $HISTORY; then
  		if test -f $HISTORY.index; then
  		    echo "$as_me:$LINENO: result: $HISTORY" >&5
-@@ -1999,6 +2029,7 @@ echo "${ECHO_T}Try running makehistory f
+@@ -1999,6 +2032,7 @@ echo "${ECHO_T}Try running makehistory f
  echo "${ECHO_T}ERROR: cannot find database $HISTORY" >&6
  		exit 1
  	    fi
diff --git a/news/newsx/patches/patch-ab b/news/newsx/patches/patch-ab
index 228bf0c1b70..0998d8016b9 100644
--- a/news/newsx/patches/patch-ab
+++ b/news/newsx/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/03/16 09:48:37 cube Exp $
+$NetBSD: patch-ab,v 1.2 2014/09/12 07:58:12 spz Exp $
 
---- configure.ac.orig	2003-05-18 12:57:24.000000000 +0200
+--- configure.ac.orig	2003-05-18 10:57:24.000000000 +0000
 +++ configure.ac
 @@ -278,6 +278,8 @@ AC_ARG_WITH(history, \
  	    if test x$with_history != xno; then
@@ -11,7 +11,18 @@ $NetBSD: patch-ab,v 1.1 2004/03/16 09:48:37 cube Exp $
  AC_ARG_WITH(errlog, \
    [--with-errlog=LOG_XX    do syslog in category LOG_XX],[
  	    if test x$with_errlog = xno; then
-@@ -433,6 +435,21 @@ else
+@@ -375,7 +377,10 @@ else
+ 	    # it has been reported that some INN 2.1 had its own VERSION
+ 	    VERSION_save="$VERSION"
+ 	    VERSION=
++	    # innshellvars sets TMPDIR$
++	    TMPDIR_save="$TMPDIR"$
+ 	    . $NEWSCONFIG
++	    TMPDIR="$TMPDIR_save"$
+ 	    INN_VERSION="$VERSION"
+ 	    VERSION="$VERSION_save"
+ 	    INN_NEWSUMASK=`umask`
+@@ -433,6 +438,21 @@ else
  		    HISTORY="$with_history"
  		fi
  	    fi
@@ -33,7 +44,7 @@ $NetBSD: patch-ab,v 1.1 2004/03/16 09:48:37 cube Exp $
  	    if test -f $HISTORY; then
  		if test -f $HISTORY.index; then
  		    AC_MSG_RESULT($HISTORY, indexed hash)
-@@ -453,6 +470,7 @@ else
+@@ -453,6 +473,7 @@ else
  		AC_MSG_RESULT(ERROR: cannot find database $HISTORY)
  		exit 1
  	    fi