From owner-dev-commits-ports-all@freebsd.org Wed Sep 29 07:43:02 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C54CF66E4A5; Wed, 29 Sep 2021 07:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HK7df4x6gz4fcH; Wed, 29 Sep 2021 07:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86047143E9; Wed, 29 Sep 2021 07:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18T7h2Hg021629; Wed, 29 Sep 2021 07:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18T7h28Q021628; Wed, 29 Sep 2021 07:43:02 GMT (envelope-from git) Date: Wed, 29 Sep 2021 07:43:02 GMT Message-Id: <202109290743.18T7h28Q021628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: d0a322bbd673 - main - net/3proxy: Minor cleanup in Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0a322bbd673b43cdc0594e669a85b9bbf5a8491 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2021 07:43:02 -0000 The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0a322bbd673b43cdc0594e669a85b9bbf5a8491 commit d0a322bbd673b43cdc0594e669a85b9bbf5a8491 Author: Daniel Engberg AuthorDate: 2021-09-29 07:33:22 +0000 Commit: Daniel Engberg 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