Fri Sep 12 07:58:12 2014 UTC ()
small build fix to support PKG_DESTDIR_SUPPORT="user-destdir"


(spz)
diff -r1.5 -r1.6 pkgsrc/news/newsx/distinfo
diff -r1.2 -r1.3 pkgsrc/news/newsx/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/news/newsx/patches/patch-ab
cvs diff -r1.5 -r1.6 pkgsrc/news/newsx/distinfo (expand / switch to unified diff)

--- pkgsrc/news/newsx/distinfo 2010/03/19 17:17:05 1.5
+++ pkgsrc/news/newsx/distinfo 2014/09/12 07:58:12 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2010/03/19 17:17:05 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2014/09/12 07:58:12 spz Exp $
2 2
3SHA1 (newsx-1.6.tar.gz) = e128e89ba161ceb4ab6d652d8c132ae3a33fbb20 3SHA1 (newsx-1.6.tar.gz) = e128e89ba161ceb4ab6d652d8c132ae3a33fbb20
4RMD160 (newsx-1.6.tar.gz) = e9d1785ad94510055ffcd5d3d15aeafbc16c4f46 4RMD160 (newsx-1.6.tar.gz) = e9d1785ad94510055ffcd5d3d15aeafbc16c4f46
5Size (newsx-1.6.tar.gz) = 302821 bytes 5Size (newsx-1.6.tar.gz) = 302821 bytes
6SHA1 (patch-aa) = b0996217c88e250ed38900ad1f706d16b9900550 6SHA1 (patch-aa) = f838977d58f3aa3684bcf2ba198c235b4743cc23
7SHA1 (patch-ab) = d3ca5f2231f14b27ff4ee375c1b19b5c158b71be 7SHA1 (patch-ab) = 05cecfdfbc4d65d4d51493fc6350e854c67379aa
8SHA1 (patch-ac) = bc188323938a83c8d5bfeefe389fd6c6f3720c2f 8SHA1 (patch-ac) = bc188323938a83c8d5bfeefe389fd6c6f3720c2f
9SHA1 (patch-ad) = 2b5c5ede77aab5b5d2f269452f30664b8a270e61 9SHA1 (patch-ad) = 2b5c5ede77aab5b5d2f269452f30664b8a270e61
cvs diff -r1.2 -r1.3 pkgsrc/news/newsx/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/news/newsx/patches/patch-aa 2004/03/16 09:48:37 1.2
+++ pkgsrc/news/newsx/patches/patch-aa 2014/09/12 07:58:12 1.3
@@ -1,40 +1,53 @@ @@ -1,40 +1,53 @@
1$NetBSD: patch-aa,v 1.2 2004/03/16 09:48:37 cube Exp $ 1$NetBSD: patch-aa,v 1.3 2014/09/12 07:58:12 spz Exp $
2 2
3--- configure.orig 2004-01-11 18:31:22.000000000 +0100 3--- configure.orig 2003-05-18 17:25:34.000000000 +0000
4+++ configure 4+++ configure
5@@ -861,6 +861,8 @@ Optional Packages: 5@@ -861,6 +861,8 @@ Optional Packages:
6 --without-history do not perform history database lookup 6 --without-history do not perform history database lookup
7 --with-history=FILE use FILE as history database 7 --with-history=FILE use FILE as history database
8 \ 8 \
9+ --with-history-mode={indexed|tagged} set history hash mode 9+ --with-history-mode={indexed|tagged} set history hash mode
10+\ 10+\
11 --with-errlog=LOG_XX do syslog in category LOG_XX 11 --with-errlog=LOG_XX do syslog in category LOG_XX
12 \ 12 \
13 --with-inhosts=DIR use DIR as in.hosts directory 13 --with-inhosts=DIR use DIR as in.hosts directory
14@@ -1743,6 +1745,12 @@ _ACEOF 14@@ -1743,6 +1745,12 @@ _ACEOF
15  15
16 fi 16 fi
17  17
18+# Check whether --with-history-mode or --without-history-mode was given. 18+# Check whether --with-history-mode or --without-history-mode was given.
19+if test "${with_history_mode+set}" = set; then 19+if test "${with_history_mode+set}" = set; then
20+ withval="$with_history_mode" 20+ withval="$with_history_mode"
21+ 21+
22+fi; 22+fi;
23+ 23+
24 # Check whether --with-errlog or --without-errlog was given. 24 # Check whether --with-errlog or --without-errlog was given.
25 if test "${with_errlog+set}" = set; then 25 if test "${with_errlog+set}" = set; then
26 withval="$with_errlog" 26 withval="$with_errlog"
27@@ -1964,6 +1972,28 @@ echo $ECHO_N "checking history... $ECHO_ 27@@ -1890,9 +1898,12 @@ echo $ECHO_N "checking and found INN...
 28 # it has been reported that some INN 2.1 had its own VERSION
 29 VERSION_save="$VERSION"
 30 VERSION=
 31+ # innshellvars sets TMPDIR
 32+ TMPDIR_save="$TMPDIR"
 33 . $NEWSCONFIG
 34 INN_VERSION="$VERSION"
 35 VERSION="$VERSION_save"
 36+ TMPDIR="$TMPDIR_save"
 37 INN_NEWSUMASK=`umask`
 38 if test x$NEWSBIN = x ; then
 39 echo "$as_me:$LINENO: result: ERROR: $NEWSCONFIG is probably in wrong format" >&5
 40@@ -1964,6 +1975,28 @@ echo $ECHO_N "checking history... $ECHO_
28 HISTORY="$with_history" 41 HISTORY="$with_history"
29 fi 42 fi
30 fi 43 fi
31+ if test x$with_history_mode != x; then 44+ if test x$with_history_mode != x; then
32+ case x$with_history_mode in 45+ case x$with_history_mode in
33+ xindexed ) 46+ xindexed )
34+ echo "$as_me:$LINENO: result: $HISTORY" >&5 47+ echo "$as_me:$LINENO: result: $HISTORY" >&5
35+echo "${ECHO_T}$HISTORY" >&6 48+echo "${ECHO_T}$HISTORY" >&6
36+ ;; 49+ ;;
37+ xtagged ) 50+ xtagged )
38+ echo "$as_me:$LINENO: result: $HISTORY" >&5 51+ echo "$as_me:$LINENO: result: $HISTORY" >&5
39+echo "${ECHO_T}$HISTORY" >&6 52+echo "${ECHO_T}$HISTORY" >&6
40+ 53+
@@ -43,21 +56,21 @@ $NetBSD: patch-aa,v 1.2 2004/03/16 09:48 @@ -43,21 +56,21 @@ $NetBSD: patch-aa,v 1.2 2004/03/16 09:48
43+_ACEOF 56+_ACEOF
44+ 57+
45+ ;; 58+ ;;
46+ * ) 59+ * )
47+ echo "$as_me:$LINENO: result: ERROR: unknown hash mode $with_history_mode" >&5 60+ echo "$as_me:$LINENO: result: ERROR: unknown hash mode $with_history_mode" >&5
48+echo "${ECHO_T}ERROR: unknown hash mode $with_history_mode" >&6 61+echo "${ECHO_T}ERROR: unknown hash mode $with_history_mode" >&6
49+ exit 1 62+ exit 1
50+ ;; 63+ ;;
51+ esac 64+ esac
52+ else 65+ else
53 if test -f $HISTORY; then 66 if test -f $HISTORY; then
54 if test -f $HISTORY.index; then 67 if test -f $HISTORY.index; then
55 echo "$as_me:$LINENO: result: $HISTORY" >&5 68 echo "$as_me:$LINENO: result: $HISTORY" >&5
56@@ -1999,6 +2029,7 @@ echo "${ECHO_T}Try running makehistory f 69@@ -1999,6 +2032,7 @@ echo "${ECHO_T}Try running makehistory f
57 echo "${ECHO_T}ERROR: cannot find database $HISTORY" >&6 70 echo "${ECHO_T}ERROR: cannot find database $HISTORY" >&6
58 exit 1 71 exit 1
59 fi 72 fi
60+ fi 73+ fi
61 fi 74 fi
62  75
63 echo "$as_me:$LINENO: checking locks" >&5 76 echo "$as_me:$LINENO: checking locks" >&5
cvs diff -r1.1 -r1.2 pkgsrc/news/newsx/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/news/newsx/patches/patch-ab 2004/03/16 09:48:37 1.1
+++ pkgsrc/news/newsx/patches/patch-ab 2014/09/12 07:58:12 1.2
@@ -1,43 +1,54 @@ @@ -1,43 +1,54 @@
1$NetBSD: patch-ab,v 1.1 2004/03/16 09:48:37 cube Exp $ 1$NetBSD: patch-ab,v 1.2 2014/09/12 07:58:12 spz Exp $
2 2
3--- configure.ac.orig 2003-05-18 12:57:24.000000000 +0200 3--- configure.ac.orig 2003-05-18 10:57:24.000000000 +0000
4+++ configure.ac 4+++ configure.ac
5@@ -278,6 +278,8 @@ AC_ARG_WITH(history, \ 5@@ -278,6 +278,8 @@ AC_ARG_WITH(history, \
6 if test x$with_history != xno; then 6 if test x$with_history != xno; then
7 AC_DEFINE_UNQUOTED(WITH_HISTORY, 1, [perform history database lookup]) 7 AC_DEFINE_UNQUOTED(WITH_HISTORY, 1, [perform history database lookup])
8 fi 8 fi
9+AC_ARG_WITH(history-mode, \ 9+AC_ARG_WITH(history-mode, \
10+ [--with-history-mode={indexed|tagged} set history hash mode]) 10+ [--with-history-mode={indexed|tagged} set history hash mode])
11 AC_ARG_WITH(errlog, \ 11 AC_ARG_WITH(errlog, \
12 [--with-errlog=LOG_XX do syslog in category LOG_XX],[ 12 [--with-errlog=LOG_XX do syslog in category LOG_XX],[
13 if test x$with_errlog = xno; then 13 if test x$with_errlog = xno; then
14@@ -433,6 +435,21 @@ else 14@@ -375,7 +377,10 @@ else
 15 # it has been reported that some INN 2.1 had its own VERSION
 16 VERSION_save="$VERSION"
 17 VERSION=
 18+ # innshellvars sets TMPDIR$
 19+ TMPDIR_save="$TMPDIR"$
 20 . $NEWSCONFIG
 21+ TMPDIR="$TMPDIR_save"$
 22 INN_VERSION="$VERSION"
 23 VERSION="$VERSION_save"
 24 INN_NEWSUMASK=`umask`
 25@@ -433,6 +438,21 @@ else
15 HISTORY="$with_history" 26 HISTORY="$with_history"
16 fi 27 fi
17 fi 28 fi
18+ if test x$with_history_mode != x; then 29+ if test x$with_history_mode != x; then
19+ case x$with_history_mode in 30+ case x$with_history_mode in
20+ xindexed ) 31+ xindexed )
21+ AC_MSG_RESULT($HISTORY, indexed hash) 32+ AC_MSG_RESULT($HISTORY, indexed hash)
22+ ;; 33+ ;;
23+ xtagged ) 34+ xtagged )
24+ AC_MSG_RESULT($HISTORY, tagged hash) 35+ AC_MSG_RESULT($HISTORY, tagged hash)
25+ AC_DEFINE_UNQUOTED(DO_TAGGED_HASH, 1, [for INN 2.x and dbz v.6]) 36+ AC_DEFINE_UNQUOTED(DO_TAGGED_HASH, 1, [for INN 2.x and dbz v.6])
26+ ;; 37+ ;;
27+ * ) 38+ * )
28+ AC_MSG_RESULT(ERROR: unknown hash mode $with_history_mode) 39+ AC_MSG_RESULT(ERROR: unknown hash mode $with_history_mode)
29+ exit 1 40+ exit 1
30+ ;; 41+ ;;
31+ esac 42+ esac
32+ else 43+ else
33 if test -f $HISTORY; then 44 if test -f $HISTORY; then
34 if test -f $HISTORY.index; then 45 if test -f $HISTORY.index; then
35 AC_MSG_RESULT($HISTORY, indexed hash) 46 AC_MSG_RESULT($HISTORY, indexed hash)
36@@ -453,6 +470,7 @@ else 47@@ -453,6 +473,7 @@ else
37 AC_MSG_RESULT(ERROR: cannot find database $HISTORY) 48 AC_MSG_RESULT(ERROR: cannot find database $HISTORY)
38 exit 1 49 exit 1
39 fi 50 fi
40+ fi 51+ fi
41 fi 52 fi
42  53
43 dnl AC_MSG_CHECKING(error log) 54 dnl AC_MSG_CHECKING(error log)