Attachment 157205 Details for Bug 188374 – without bin/proxy prevents conflict with the libproxy

[patch] without bin/proxy prevents conflict with the libproxy

patch-3proxy-0.7.1.2-bin-proxy (text/plain), 7.37 KB, created by Igor Zabelin on 2015-05-27 21:42:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Zabelin

Created: 2015-05-27 21:42:42 UTC

Size: 7.37 KB

patch

obsolete

>diff -urN 3proxy/Makefile 3proxy.0.7-bin-proxy/Makefile
>--- 3proxy/Makefile	2015-03-26 02:51:05.000000000 +0300
>+++ 3proxy.0.7-bin-proxy/Makefile	2015-05-27 23:50:01.171554000 +0300
>@@ -2,11 +2,9 @@
> # $FreeBSD: head/net/3proxy/Makefile 382278 2015-03-25 23:51:05Z marino $
> 
> PORTNAME=	3proxy
>-PORTVERSION=	0.6.1
>-PORTREVISION=	1
>+PORTVERSION=	0.7.1.2
> CATEGORIES=	net
>-MASTER_SITES=	http://3proxy.ru/${PORTVERSION}/ \
>-		http://security.nnov.ru/soft/3proxy/${PORTVERSION}/
>+MASTER_SITES=	http://github.com/z3APA3A/3proxy/archive/v${PORTVERSION}.tar.gz?dummy=/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
>@@ -14,27 +12,24 @@
> LICENSE=	APACHE20 BSD2CLAUSE GPLv2 GPLv3 LGPL21 LGPL3
> LICENSE_COMB=	dual
> 
>-CONFLICTS_INSTALL=	libproxy-[0-9]*
>-
> OPTIONS_DEFINE=	DOCS
> 
> MAKEFILE=	Makefile.unix
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
> USE_RC_SUBR=	3proxy
>-USES=		tar:tgz
> 
>-PORTDOCS=	Readme
>+PORTDOCS=	README
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ ${STAGEDIR}${DOCSDIR}/
>-	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p proxy smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
>+	cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy countersutil dighosts ftppr icqpr msnpr mycrypt pop3p smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
> 	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
> 	cd ${WRKSRC}/src/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
> 	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
>-	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 proxy.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
>+	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
> 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
> 
> .include <bsd.port.mk>
>diff -urN 3proxy/distinfo 3proxy.0.7-bin-proxy/distinfo
>--- 3proxy/distinfo	2014-01-22 19:30:13.000000000 +0400
>+++ 3proxy.0.7-bin-proxy/distinfo	2015-05-27 23:45:53.217527000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (3proxy-0.6.1.tgz) = 10f8804258791e80353a334dc9b80473a02c6dda939de76451e655f643aadd7f
>-SIZE (3proxy-0.6.1.tgz) = 480160
>+SHA256 (3proxy-0.7.1.2.tar.gz) = 85c5cadad1878855c382622787f787d5c2c30bdea0a240f7d35cfd8abe30b746
>+SIZE (3proxy-0.7.1.2.tar.gz) = 468593
>diff -urN 3proxy/files/patch-man 3proxy.0.7-bin-proxy/files/patch-man
>--- 3proxy/files/patch-man	1970-01-01 03:00:00.000000000 +0300
>+++ 3proxy.0.7-bin-proxy/files/patch-man	2015-05-28 00:16:58.450830000 +0300
>@@ -0,0 +1,108 @@
>+diff -urN man/3proxy.8 man-proxy/3proxy.8
>+--- man/3proxy.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/3proxy.8	2015-05-28 00:14:13.238731000 +0300
>+@@ -140,7 +140,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy.cfg(3), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
>++3proxy.cfg(3), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8),
>+ kill(1), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+diff -urN man/3proxy.cfg.3 man-proxy/3proxy.cfg.3
>+--- man/3proxy.cfg.3	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/3proxy.cfg.3	2015-05-28 00:14:22.522957000 +0300
>+@@ -884,7 +884,7 @@
>+ 
>+ 
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH TRIVIA
>+diff -urN man/ftppr.8 man-proxy/ftppr.8
>+--- man/ftppr.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/ftppr.8	2015-05-28 00:14:30.209904000 +0300
>+@@ -75,7 +75,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>++3proxy(8), pop3p(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/icqpr.8 man-proxy/icqpr.8
>+--- man/icqpr.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/icqpr.8	2015-05-28 00:14:39.103286000 +0300
>+@@ -68,7 +68,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/pop3p.8 man-proxy/pop3p.8
>+--- man/pop3p.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/pop3p.8	2015-05-28 00:14:46.772184000 +0300
>+@@ -71,7 +71,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/smtpp.8 man-proxy/smtpp.8
>+--- man/smtpp.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/smtpp.8	2015-05-28 00:14:53.824641000 +0300
>+@@ -72,7 +72,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), ftppr(8), proxy(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), tcppm(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/socks.8 man-proxy/socks.8
>+--- man/socks.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/socks.8	2015-05-28 00:15:01.069890000 +0300
>+@@ -67,7 +67,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), pop3p(8), tcppm(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/tcppm.8 man-proxy/tcppm.8
>+--- man/tcppm.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/tcppm.8	2015-05-28 00:15:12.000497000 +0300
>+@@ -61,7 +61,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>+diff -urN man/udppm.8 man-proxy/udppm.8
>+--- man/udppm.8	2015-02-17 16:09:13.000000000 +0300
>++++ man-proxy/udppm.8	2015-05-28 00:15:21.005146000 +0300
>+@@ -67,7 +67,7 @@
>+ Report all bugs to
>+ .BR 3proxy@security.nnov.ru
>+ .SH SEE ALSO
>+-3proxy(8), proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>++3proxy(8), ftppr(8), socks(8), pop3p(8), udppm(8), syslogd(8),
>+ .br
>+ http://3proxy.ru/
>+ .SH AUTHORS
>diff -urN 3proxy/pkg-descr 3proxy.0.7-bin-proxy/pkg-descr
>--- 3proxy/pkg-descr	2014-01-22 19:44:51.000000000 +0400
>+++ 3proxy.0.7-bin-proxy/pkg-descr	2015-05-27 23:45:53.217655000 +0300
>@@ -15,6 +15,6 @@
> 3proxy is FreeWare. It can be used under terms of GNU/GPL or under it own
> license (please read License Agreement).
> 
>-For licensing or commercial support please e-mail to 3proxy@security.nnov.ru
>+For licensing or commercial support please e-mail to 3proxy@3proxy.ru
> 
>-WWW: http://www.security.nnov.ru/soft/3proxy/
>+WWW: http://3proxy.ru/
>diff -urN 3proxy/pkg-plist 3proxy.0.7-bin-proxy/pkg-plist
>--- 3proxy/pkg-plist	2014-11-22 17:43:23.000000000 +0300
>+++ 3proxy.0.7-bin-proxy/pkg-plist	2015-05-27 23:49:33.387627000 +0300
>@@ -6,7 +6,6 @@
> bin/msnpr
> bin/mycrypt
> bin/pop3p
>-bin/proxy
> bin/smtpp
> bin/socks
> bin/tcppm
>@@ -19,7 +18,6 @@
> man/man8/3proxy.8.gz
> man/man8/ftppr.8.gz
> man/man8/pop3p.8.gz
>-man/man8/proxy.8.gz
> man/man8/socks.8.gz
> man/man8/tcppm.8.gz
> man/man8/udppm.8.gz

Actions: View | Diff

Attachments on bug 188374: 141553 | 146068 | 146716 | 153142 | 153143 | 155089 | 155118 | 157205 | 157213 | 157726