From 13cc643cae29c021fec8a7241c8075e3732eb8b7 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Mon, 9 Feb 2004 11:56:32 +0000
Subject: comment unused lines of configure, rather than leaving an empty if;
 then.

---
 misc/rpm/distinfo         |  4 ++--
 misc/rpm/patches/patch-ac | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'misc/rpm')

diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo
index e0327b3dd0a..8cc044c97b6 100644
--- a/misc/rpm/distinfo
+++ b/misc/rpm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2003/10/19 16:05:21 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/02/09 11:56:32 grant Exp $
 
 SHA1 (rpm-2.5.4.tar.gz) = a7fcd67883aec8d5f17483d5efebe7e5f5453462
 Size (rpm-2.5.4.tar.gz) = 727849 bytes
 SHA1 (patch-aa) = 3ee3193cc8e9043017b1f507b606c72acab77ddb
 SHA1 (patch-ab) = 63635f4f7fd96b4e7a40bfbaffd5673b40db3a13
-SHA1 (patch-ac) = 4dc758cefefb6d97f9217c6c43943883820b1af8
+SHA1 (patch-ac) = fb2e20b2342738eae701e4b75ac695eca810db41
 SHA1 (patch-ba) = edf6708fe7ef3b0e899473a13fe709d8c561e14b
 SHA1 (patch-bb) = dc0ea2dd366b793003218858ca3d67bc285a2089
 SHA1 (patch-bc) = 95a27125f8e17a5433bab273958d49ec3e0f3376
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac
index 16cdb44e92b..3d5711e0df8 100644
--- a/misc/rpm/patches/patch-ac
+++ b/misc/rpm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2001/07/14 06:35:12 jlam Exp $
+$NetBSD: patch-ac,v 1.9 2004/02/09 11:56:32 grant Exp $
 
---- configure.orig	Mon Sep 28 16:50:23 1998
-+++ configure	Sat Jul 14 02:12:00 2001
-@@ -1565,7 +1565,6 @@
+--- configure.orig	1998-09-29 06:50:23.000000000 +1000
++++ configure
+@@ -1565,7 +1565,6 @@ do
  	echo $ac_n "checking for $dir/lib in LIBS""... $ac_c" 1>&6
  echo "configure:1567: checking for $dir/lib in LIBS" >&5
  	if test -d $dir/lib ; then
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.8 2001/07/14 06:35:12 jlam Exp $
  		echo "$ac_t""yes" 1>&6
  	else
  		echo "$ac_t""no" 1>&6
-@@ -1574,7 +1573,6 @@
+@@ -1574,7 +1573,6 @@ echo "configure:1567: checking for $dir/
  	echo $ac_n "checking for $dir/include in INCPATH""... $ac_c" 1>&6
  echo "configure:1576: checking for $dir/include in INCPATH" >&5
  	if test -d $dir/include ; then
@@ -18,14 +18,21 @@ $NetBSD: patch-ac,v 1.8 2001/07/14 06:35:12 jlam Exp $
  		echo "$ac_t""yes" 1>&6
  	else
  		echo "$ac_t""no" 1>&6
-@@ -1585,10 +1583,8 @@
+@@ -1584,12 +1582,11 @@ done
+ echo $ac_n "checking for /usr/ucblib in LIBS""... $ac_c" 1>&6
  echo "configure:1586: checking for /usr/ucblib in LIBS" >&5
  if test -d /usr/ucblib ; then
- 	if test "$build" = "mips-sni-sysv4" ; then
+-	if test "$build" = "mips-sni-sysv4" ; then
 -		addlib /usr/ccs/lib -lc
- 	fi
- 
+-	fi
+-
 -	addlib /usr/ucblib
- 	
+-	
++#	if test "$build" = "mips-sni-sysv4" ; then
++#		addlib /usr/ccs/lib -lc
++#	fi
++#
++#	addlib /usr/ucblib
  	echo "$ac_t""yes" 1>&6
  else
+ 	echo "$ac_t""no" 1>&6
-- 
cgit v1.2.3