net-proxy/3proxy: fix broken patch, #547234

Gentoo-bug: 547234
Package-Manager: portage-2.2.28
Signed-off-by: Sam Jorna <wraeth@gentoo.org>

diff --git a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch
index 28b0be2aa1207e353ed100ca701a1438e6995ec5..715992bdc9d8ee7d15e484c5ccc447427add5706 100644 (file)
--- a/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch
+++ b/net-proxy/3proxy/files/3proxy-0.7.1.2-gentoo.patch
@@ -1,43 +1,43 @@
 --- Makefile.Linux.orig        2015-04-18 01:55:14.195955388 +0300
 +++ Makefile.Linux     2015-04-21 02:30:16.835282128 +0300
 @@ -11,11 +11,11 @@
- BUILDDIR =
- CC = gcc
- 
--CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS += -Wall -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
- COUT = -o 
- LN = gcc
- DCFLAGS = -fpic
--LDFLAGS = -Wall -O2 -pthread
-+LDFLAGS += -Wall -pthread
- DLFLAGS = -shared
- DLSUFFICS = .ld.so
- # -lpthreads may be reuqired on some platforms instead of -pthreads
+ BUILDDIR =\r
+ CC = gcc\r
+ \r
+-CFLAGS = -Wall -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL\r
++CFLAGS += -Wall -g -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL\r
+ COUT = -o \r
+ LN = gcc\r
+ DCFLAGS = -fpic\r
+-LDFLAGS = -Wall -O2 -pthread\r
++LDFLAGS += -Wall -pthread\r
+ DLFLAGS = -shared\r
+ DLSUFFICS = .ld.so\r
+ # -lpthreads may be reuqired on some platforms instead of -pthreads\r
 @@ -38,12 +38,12 @@
- include Makefile.inc
- 
- allplugins:
--      @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;   cd ../.. ; done
-+      @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;        cd ../.. ; done
- 
- DESTDIR               =
--prefix                = /usr/local
-+prefix                =
- exec_prefix   = $(prefix)
--man_prefix    = $(prefix)/share
-+man_prefix    = $(prefix)/usr/share
- 
- INSTALL               = /usr/bin/install
- INSTALL_BIN   = $(INSTALL) -m 755
+ include Makefile.inc\r
+ \r
+ allplugins:\r
+-      @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;   cd ../.. ; done\r
++      @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ;        cd ../.. ; done\r
+ \r
+ DESTDIR               =\r
+-prefix                = /usr/local\r
++prefix                =\r
+ exec_prefix   = $(prefix)\r
+-man_prefix    = $(prefix)/share\r
++man_prefix    = $(prefix)/usr/share\r
+ \r
+ INSTALL               = /usr/bin/install\r
+ INSTALL_BIN   = $(INSTALL) -m 755\r
 --- src/stringtable.c.orig     2015-04-21 02:23:10.895258697 +0300
 +++ src/stringtable.c  2015-04-21 02:23:31.141926478 +0300
 @@ -38,7 +38,7 @@
- /* 24 */      NULL,
- #ifndef TPROXY_CONF
- #ifndef _WIN32
--/* 25 */      (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",
-+/* 25 */      (unsigned char *)"/etc/3proxy/3proxy.cfg",
- #else
- /* 25 */      (unsigned char *)"3proxy.cfg",
- #endif
+ /* 24 */      NULL,\r
+ #ifndef TPROXY_CONF\r
+ #ifndef _WIN32\r
+-/* 25 */      (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg",\r
++/* 25 */      (unsigned char *)"/etc/3proxy/3proxy.cfg",\r
+ #else\r
+ /* 25 */      (unsigned char *)"3proxy.cfg",\r
+ #endif\r