Index: head/net/3proxy/Makefile =================================================================== --- head/net/3proxy/Makefile (revision 452681) +++ head/net/3proxy/Makefile (revision 452682) @@ -1,43 +1,43 @@ # Created by: tim@relay.nnn.tstu.ru # $FreeBSD$ PORTNAME= 3proxy -PORTVERSION= 0.8.10 +PORTVERSION= 0.8.11 CATEGORIES= net MAINTAINER= timp87@gmail.com COMMENT= Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP) LICENSE= APACHE20 BSD3CLAUSE GPLv2+ LGPL21+ LICENSE_COMB= dual OPTIONS_DEFINE= DOCS MAKEFILE= Makefile.unix USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_RC_SUBR= 3proxy USE_GITHUB= yes GH_ACCOUNT= z3APA3A PORTDOCS= README post-patch: @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE} post-build: ${MV} ${WRKSRC}/src/proxy ${WRKSRC}/src/httppr ${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8 do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ cd ${WRKSRC}/src/ && ${INSTALL_PROGRAM} 3proxy dighosts ftppr icqpr mycrypt pop3p httppr 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 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: head/net/3proxy/distinfo =================================================================== --- head/net/3proxy/distinfo (revision 452681) +++ head/net/3proxy/distinfo (revision 452682) @@ -1,3 +1,3 @@ TIMESTAMP = 1498592146 -SHA256 (z3APA3A-3proxy-0.8.10_GH0.tar.gz) = 31af5c37bc37c90626ff689e0dcd412bbce19cdd124e3d3a09421898b4f760c2 -SIZE (z3APA3A-3proxy-0.8.10_GH0.tar.gz) = 497026 +SHA256 (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = fc4295e1a462baa61977fcc21747db7861c4e3d0dcca86cbaa3e06017e5c66c9 +SIZE (z3APA3A-3proxy-0.8.11_GH0.tar.gz) = 497117 Index: head/net/3proxy/files/patch-cfg-3proxy.cfg.sample =================================================================== --- head/net/3proxy/files/patch-cfg-3proxy.cfg.sample (revision 452681) +++ head/net/3proxy/files/patch-cfg-3proxy.cfg.sample (nonexistent) @@ -1,22 +0,0 @@ ---- cfg/3proxy.cfg.sample.orig 2016-01-19 22:20:05 UTC -+++ cfg/3proxy.cfg.sample -@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$ - # this example shows you how to include passwd file. For included files - # and 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 - Property changes on: head/net/3proxy/files/patch-cfg-3proxy.cfg.sample ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/3proxy/files/patch-Makefile.unix =================================================================== --- head/net/3proxy/files/patch-Makefile.unix (revision 452681) +++ head/net/3proxy/files/patch-Makefile.unix (revision 452682) @@ -1,26 +1,26 @@ ---- Makefile.unix.orig 2016-01-19 22:20:05 UTC +--- Makefile.unix.orig 2017-10-19 14:54:31 UTC +++ Makefile.unix @@ -8,18 +8,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 = -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS = -c -O2 -pipe -fstack-protector -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL COUT = -o -LN = gcc -LDFLAGS = -O2 -pthread +LN ?= ${CC} +LDFLAGS = -pthread # -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 = + LIBSPREFIX = -l + LIBSSUFFIX = Index: head/net/3proxy/files/patch-cfg_3proxy.cfg.sample =================================================================== --- head/net/3proxy/files/patch-cfg_3proxy.cfg.sample (nonexistent) +++ head/net/3proxy/files/patch-cfg_3proxy.cfg.sample (revision 452682) @@ -0,0 +1,22 @@ +--- cfg/3proxy.cfg.sample.orig 2017-10-20 15:02:38 UTC ++++ cfg/3proxy.cfg.sample +@@ -30,15 +30,15 @@ users 3APA3A:CL:3apa3a "test:CR:$1$qwer$ + # this example shows you how to include passwd file. For included files + # and 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 /var/log/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 + Property changes on: head/net/3proxy/files/patch-cfg_3proxy.cfg.sample ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property