From cfab2d49c95b9ce8b17acd98cce3661ea24d6370 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Fri, 18 Dec 2009 16:14:51 +0000
Subject: - Synchronize .in and .am patches

Reported by:	QAT
---
 net/torsocks/files/patch-Makefile.in | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'net')

diff --git a/net/torsocks/files/patch-Makefile.in b/net/torsocks/files/patch-Makefile.in
index a3646e430fd8..d8a54444b644 100644
--- a/net/torsocks/files/patch-Makefile.in
+++ b/net/torsocks/files/patch-Makefile.in
@@ -1,11 +1,20 @@
---- src/Makefile.in.orig	2009-03-08 15:25:38.000000000 +0100
-+++ src/Makefile.in	2009-03-08 15:25:53.000000000 +0100
-@@ -132,7 +132,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+--- src/Makefile.in.orig	2009-11-08 13:39:45.000000000 +0100
++++ src/Makefile.in	2009-12-18 17:12:56.000000000 +0100
+@@ -143,7 +143,7 @@
+ LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
 -LIBS = -ldl -lc -lresolv
 +LIBS = -lc
  LIBTOOL = @LIBTOOL@
  LIBTOOL_DEPS = @LIBTOOL_DEPS@
- LN_S = @LN_S@
+ LIPO = @LIPO@
+@@ -239,7 +239,7 @@
+ 
+ # Install configuration file
+ usewithtorconfdir = $(CONFDIR)/
+-usewithtorconf_DATA = torsocks.conf
++usewithtorconf_DATA = torsocks.conf.sample
+ 
+ # Install invocation scripts
+ bin_SCRIPTS = torsocks usewithtor
-- 
cgit