Date: Wed, 29 Sep 2021 07:43:02 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d0a322bbd673 - main - net/3proxy: Minor cleanup in Makefile Message-ID: <202109290743.18T7h28Q021628@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0a322bbd673b43cdc0594e669a85b9bbf5a8491 commit d0a322bbd673b43cdc0594e669a85b9bbf5a8491 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2021-09-29 07:33:22 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2021-09-29 07:42:27 +0000 net/3proxy: Minor cleanup in Makefile Use official/correct repo Reduce patching Don't override LDFLAGS from Ports framework PR: 256960 Approved by: port maintainer timeout (2+ months), arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D32217 --- net/3proxy/Makefile | 4 +--- net/3proxy/distinfo | 6 +++--- net/3proxy/files/patch-Makefile.FreeBSD | 10 ++++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile index 3309fa043db5..759568050ac5 100644 --- a/net/3proxy/Makefile +++ b/net/3proxy/Makefile @@ -12,9 +12,8 @@ LICENSE_COMB= dual USES= cpe -USE_RC_SUBR= 3proxy USE_GITHUB= yes -GH_ACCOUNT= z3APA3A +USE_RC_SUBR= 3proxy MAKEFILE= Makefile.FreeBSD @@ -28,7 +27,6 @@ OPTIONS_DEFINE= DOCS 3PROXY_LOGDIR= /var/log/${PORTNAME} post-patch: - @${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample @${REINPLACE_CMD} -E -e 's| proxy( ?\(8\))| httppr\1|' ${WRKSRC}/man/* @${REINPLACE_CMD} -E -e 's|([^P] "?)proxy|\1httppr|' ${WRKSRC}/man/proxy.8 diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo index 541d63152f25..558357781644 100644 --- a/net/3proxy/distinfo +++ b/net/3proxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625251720 -SHA256 (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = b497f74d6cc7ee58ff824457427acc02c6f7a102e483816fbb1b2494942ef983 -SIZE (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = 610340 +TIMESTAMP = 1625343847 +SHA256 (3proxy-3proxy-0.9.4_GH0.tar.gz) = b497f74d6cc7ee58ff824457427acc02c6f7a102e483816fbb1b2494942ef983 +SIZE (3proxy-3proxy-0.9.4_GH0.tar.gz) = 610340 diff --git a/net/3proxy/files/patch-Makefile.FreeBSD b/net/3proxy/files/patch-Makefile.FreeBSD index 27c2a3b9a6ef..df90951823c1 100644 --- a/net/3proxy/files/patch-Makefile.FreeBSD +++ b/net/3proxy/files/patch-Makefile.FreeBSD @@ -1,15 +1,17 @@ --- Makefile.FreeBSD.orig 2021-07-01 16:59:57 UTC +++ Makefile.FreeBSD -@@ -10,10 +10,10 @@ +@@ -10,11 +10,11 @@ BUILDDIR = ../bin/ CC ?= gcc -CFLAGS = -c -O -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS += -c -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL COUT = -o LN ?= ${CC} -LDFLAGS = -pthread -O -fno-strict-aliasing -+LDFLAGS = -pthread - # -lpthreads may be reuqired on some platforms instead of -pthreads +-# -lpthreads may be reuqired on some platforms instead of -pthreads ++LDFLAGS += -pthread ++# -lpthreads may be required on some platforms instead of -pthreads # -ldl or -lld may be required for some platforms DCFLAGS = -fPIC + DLFLAGS = -shared
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109290743.18T7h28Q021628>