Attachment #153142 for bug #188374




# $FreeBSD: head/net/3proxy/Makefile 367152 2014-09-03 04:29:13Z sunpoet $

PORTNAME=	3proxy
PORTVERSION=	0.7.1.2
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	http://3proxy.ru/${PORTVERSION}/ \
		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
WRKSRC=		${WRKDIR}/${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)

MAKE_ENV=	PTHREAD_LIBS=-pthread
MAKEFILE=	Makefile.unix
USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
USE_RC_SUBR=	threeproxy
USES=		tar:tgz

PORTDOCS=	Readme

Lines 1-2 Link Here

(-)/usr/home/timp/temp/3proxy_new/distinfo (-2 / +2 lines)
1	SHA256 (3proxy-0.6.1.tgz) = 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f	1	SHA256 (3proxy-0.7.1.2.tgz) = e1157aab3ff8215a3b1f35c61a9d6011e60ad38b52d9f74a1fc4cae14ba16a31
2	SIZE (3proxy-0.6.1.tgz) = 480160	2	SIZE (3proxy-0.7.1.2.tgz) = 478532




#!/bin/sh
# $FreeBSD: head/net/3proxy/files/3proxy.in 340872 2014-01-24 00:14:07Z mat $

# PROVIDE: threeproxy
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown

# Define these threeproxy_* variables in one of these files:
#	/etc/rc.conf
#	/etc/rc.conf.local
#	/etc/rc.conf.d/threeproxy
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE

threeproxy_enable=${threeproxy_enable-"NO"}
threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}

. /etc/rc.subr

name="threeproxy"
rcvar=threeproxy_enable
command="%%PREFIX%%/bin/3proxy"

load_rc_config $name

start_cmd="echo \"Starting ${name}.\";	${command} ${threeproxy_flags}"

run_rc_command "$1"




--- Makefile.unix.orig	2015-02-18 13:14:25.211448033 +0300
+++ Makefile.unix	2015-02-18 13:15:31.043552706 +0300
@@ -9,18 +9,18 @@
 # library support. Add -DSAFESQL for poorely written ODBC library / drivers.
 
 BUILDDIR =
-CC = gcc
+CC ?= gcc
 
 # you may need -L/usr/pkg/lib for older NetBSD versions
-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
 COUT = -o 
-LN = gcc
-LDFLAGS = -Wall -O2 -pthread
+LN ?= ${CC}
+LDFLAGS = -Wall ${PTHREAD_LIBS}
 # -lpthreads may be reuqired on some platforms instead of -pthreads
 # -ldl or -lld may be required for some platforms
 DCFLAGS = -fpic
 DLFLAGS = -shared
-DLSUFFICS = .ld.so
+DLSUFFICS = .so
 LIBS =
 LNOUT = -o 
 EXESUFFICS =




--- cfg/3proxy.cfg.sample.orig	2015-02-18 13:18:10.602433754 +0300
+++ cfg/3proxy.cfg.sample	2015-02-18 13:19:50.319430619 +0300
@@ -30,15 +30,15 @@
 # this example shows you how to include passwd file. For included files
 # <CR> and <LF> are treated as field separators.
 
-#daemon
+daemon
 # now we will not depend on any console (daemonize). daemon must be given
 # before any significant command on *nix.
 
-service
+#service
 # service is required under NT if you want 3proxy to start as service
 
-#log /usr/local/etc/3proxy/logs/3proxy.log D
-log c:\3proxy\logs\3proxy.log D
+log /var/log/3proxy.log D
+#log c:\3proxy\logs\3proxy.log D
 # log allows to specify log file location and rotation, D means logfile
 # is created daily
 




#!/bin/sh
# $FreeBSD: head/net/3proxy/files/3proxy.in 340872 2014-01-24 00:14:07Z mat $

# PROVIDE: threeproxy
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown

# Define these threeproxy_* variables in one of these files:
#	/etc/rc.conf
#	/etc/rc.conf.local
#	/etc/rc.conf.d/threeproxy
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE

threeproxy_enable=${threeproxy_enable-"NO"}
threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}

. /etc/rc.subr

name="threeproxy"
rcvar=threeproxy_enable
command="%%PREFIX%%/bin/3proxy"

load_rc_config $name

start_cmd="echo \"Starting ${name}.\";	${command} ${threeproxy_flags}"

run_rc_command "$1"

Return to bug 188374

Lines 2-12 Link Here

(-)/usr/home/timp/temp/3proxy_new/Makefile (-3 / +3 lines)
2	# $FreeBSD: head/net/3proxy/Makefile 367152 2014-09-03 04:29:13Z sunpoet $	2	# $FreeBSD: head/net/3proxy/Makefile 367152 2014-09-03 04:29:13Z sunpoet $
3		3
4	PORTNAME= 3proxy	4	PORTNAME= 3proxy
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.7.1.2
6	PORTREVISION= 1
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= http://3proxy.ru/${PORTVERSION}/ \	7	MASTER_SITES= http://3proxy.ru/${PORTVERSION}/ \
9	http://security.nnov.ru/soft/3proxy/${PORTVERSION}/	8	http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
		9	WRKSRC= ${WRKDIR}/${PORTNAME}
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)	12	COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
Lines 21-27 Link Here
21	MAKE_ENV= PTHREAD_LIBS=-pthread	21	MAKE_ENV= PTHREAD_LIBS=-pthread
22	MAKEFILE= Makefile.unix	22	MAKEFILE= Makefile.unix
23	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}	23	USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}
24	USE_RC_SUBR= 3proxy	24	USE_RC_SUBR= threeproxy
25	USES= tar:tgz	25	USES= tar:tgz
26		26
27	PORTDOCS= Readme	27	PORTDOCS= Readme

Lines 1-29 Link Here

(-)/usr/home/timp/temp/3proxy_new/files/3proxy.in (-29 lines)
1	#!/bin/sh
2	# $FreeBSD: head/net/3proxy/files/3proxy.in 340872 2014-01-24 00:14:07Z mat $
3
4	# PROVIDE: threeproxy
5	# REQUIRE: DAEMON
6	# BEFORE: LOGIN
7	# KEYWORD: shutdown
8
9	# Define these threeproxy_* variables in one of these files:
10	# /etc/rc.conf
11	# /etc/rc.conf.local
12	# /etc/rc.conf.d/threeproxy
13	#
14	# DO NOT CHANGE THESE DEFAULT VALUES HERE
15
16	threeproxy_enable=${threeproxy_enable-"NO"}
17	threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}
18
19	. /etc/rc.subr
20
21	name="threeproxy"
22	rcvar=threeproxy_enable
23	command="%%PREFIX%%/bin/3proxy"
24
25	load_rc_config $name
26
27	start_cmd="echo \"Starting ${name}.\"; ${command} ${threeproxy_flags}"
28
29	run_rc_command "$1"

Lines 1-26 Link Here

(-)/usr/home/timp/temp/3proxy_new/files/patch-Makefile.unix (-25 / +25 lines)
1	--- Makefile.unix.orig 2007-04-10 20:29:25.000000000 +0400	1	--- Makefile.unix.orig 2015-02-18 13:14:25.211448033 +0300
2	+++ Makefile.unix 2009-03-23 13:53:24.000000000 +0300	2	+++ Makefile.unix 2015-02-18 13:15:31.043552706 +0300
3	@@ -9,18 +9,18 @@	3	@@ -9,18 +9,18 @@
4	# library support. Add -DSAFESQL for poorely written ODBC library / drivers.	4	# library support. Add -DSAFESQL for poorely written ODBC library / drivers.
5		5
6	BUILDDIR =	6	BUILDDIR =
7	-CC = gcc	7	-CC = gcc
8	+CC ?= gcc	8	+CC ?= gcc
9		9
10	# you may need -L/usr/pkg/lib for older NetBSD versions	10	# you may need -L/usr/pkg/lib for older NetBSD versions
11	-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL	11	-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
12	+CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL	12	+CFLAGS = -Wall -c %%CFLAGS%% ${PTHREAD_CFLAGS} -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
13	COUT = -o	13	COUT = -o
14	-LN = gcc	14	-LN = gcc
15	-LDFLAGS = -Wall -O2 -pthread	15	-LDFLAGS = -Wall -O2 -pthread
16	+LN ?= ${CC}	16	+LN ?= ${CC}
17	+LDFLAGS = -Wall ${PTHREAD_LIBS}	17	+LDFLAGS = -Wall ${PTHREAD_LIBS}
18	# -lpthreads may be reuqired on some platforms instead of -pthreads	18	# -lpthreads may be reuqired on some platforms instead of -pthreads
19	# -ldl or -lld may be required for some platforms	19	# -ldl or -lld may be required for some platforms
20	DCFLAGS = -fpic	20	DCFLAGS = -fpic
21	DLFLAGS = -shared	21	DLFLAGS = -shared
22	-DLSUFFICS = .ld.so	22	-DLSUFFICS = .ld.so
23	+DLSUFFICS = .so	23	+DLSUFFICS = .so
24	LIBS =	24	LIBS =
25	LNOUT = -o	25	LNOUT = -o
26	EXESUFFICS =	26	EXESUFFICS =

Lines 1-22 Link Here

(-)/usr/home/timp/temp/3proxy_new/files/patch-cfg-3proxy.cfg.sample (-21 / +21 lines)
1	--- cfg/3proxy.cfg.sample.orig Mon May 30 11:16:19 2005	1	--- cfg/3proxy.cfg.sample.orig 2015-02-18 13:18:10.602433754 +0300
2	+++ cfg/3proxy.cfg.sample Mon May 30 11:17:18 2005	2	+++ cfg/3proxy.cfg.sample 2015-02-18 13:19:50.319430619 +0300
3	@@ -30,15 +30,15 @@	3	@@ -30,15 +30,15 @@
4	# this example shows you how to include passwd file. For included files	4	# this example shows you how to include passwd file. For included files
5	# <CR> and <LF> are treated as field separators.	5	# <CR> and <LF> are treated as field separators.
6		6
7	-#daemon	7	-#daemon
8	+daemon	8	+daemon
9	# now we will not depend on any console (daemonize). daemon must be given	9	# now we will not depend on any console (daemonize). daemon must be given
10	# before any significant command on *nix.	10	# before any significant command on *nix.
11		11
12	-service	12	-service
13	+#service	13	+#service
14	# service is required under NT if you want 3proxy to start as service	14	# service is required under NT if you want 3proxy to start as service
15		15
16	-#log /usr/local/etc/3proxy/logs/3proxy.log D	16	-#log /usr/local/etc/3proxy/logs/3proxy.log D
17	-log c:\3proxy\logs\3proxy.log D	17	-log c:\3proxy\logs\3proxy.log D
18	+log /var/log/3proxy.log D	18	+log /var/log/3proxy.log D
19	+#log c:\3proxy\logs\3proxy.log D	19	+#log c:\3proxy\logs\3proxy.log D
20	# log allows to specify log file location and rotation, D means logfile	20	# log allows to specify log file location and rotation, D means logfile
21	# is created daily	21	# is created daily
22		22