Hi,

I updated a few thing upstream.  So, the following diff remove the
useless patches and update the version.

OK?

bye,
Jan

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ucspi-tools/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    11 Jun 2021 16:02:18 -0000      1.10
+++ Makefile    3 Jul 2021 16:37:09 -0000
@@ -2,13 +2,12 @@
 
 COMMENT=       socks proxy and tls support for ucspi
 
-DISTNAME=      ucspi-tools-1.6
-REVISION=      1
+DISTNAME=      ucspi-tools-1.7
 CATEGORIES=    net
 
 GH_ACCOUNT=    younix
 GH_PROJECT=    ucspi
-GH_COMMIT=     1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed
+GH_COMMIT=     329110310c71a08a942b4a36613b6db090df65f4
 
 HOMEPAGE=      https://github.com/younix/ucspi
 MAINTAINER=    Jan Klemkow <j.klem...@wemelug.de>
@@ -18,8 +17,6 @@ PERMIT_PACKAGE=       Yes
 
 WANTLIB += c crypto ssl tls
 
-MAKE_FLAGS=    CC="${CC}" \
-               PORTS_CFLAGS="${CFLAGS}"
 FAKE_FLAGS=    DESTDIR=""
 
 RUN_DEPENDS=   net/ucspi-tcp
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ucspi-tools/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    6 May 2017 15:10:18 -0000       1.6
+++ distinfo    3 Jul 2021 15:05:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (ucspi-tools-1.6-1aa21e6b.tar.gz) = 
R2hnqzVYps9b68lafcpEKzB262dHXGEzklvvR9i5+pA=
-SIZE (ucspi-tools-1.6-1aa21e6b.tar.gz) = 21718
+SHA256 (ucspi-tools-1.7-32911031.tar.gz) = 
i7OQdtxNiLgho1kpnaBQ1FCYa+85UTShgEhD6KBN0Os=
+SIZE (ucspi-tools-1.7-32911031.tar.gz) = 24083
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile      11 Jun 2021 16:02:18 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2021/06/11 16:02:18 sthen Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -6,7 +6,7 @@ TARBALL := ${DISTNAME}.tar.gz
- DEFINES += -D_XOPEN_SOURCE=700
- DEFINES += -D_BSD_SOURCE
- CFLAGS_SSL=`pkg-config --cflags libssl`
--LIBS_TLS ?= -ltls `pkg-config --libs libssl`
-+LIBS_TLS ?= -ltls `pkg-config --libs libcrypto libssl`
- LIBS_SSL = `pkg-config --libs libssl openssl`
- 
- .PHONY: all test clean install
Index: patches/patch-config_mk
===================================================================
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
--- patches/patch-config_mk     14 Mar 2017 01:35:52 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-config_mk,v 1.1 2017/03/14 01:35:52 jca Exp $
---- config.mk.orig     Wed Mar  8 13:40:37 2017
-+++ config.mk  Wed Mar  8 13:40:54 2017
-@@ -8,4 +8,4 @@ VERSION = 1.5
- 
- # compiler
- CC        = cc
--CFLAGS            = -std=c99 -pedantic -Wall -Wextra -g
-+CFLAGS            = -std=c99 -pedantic -Wall -Wextra ${PORTS_CFLAGS}
Index: patches/patch-httpc_c
===================================================================
RCS file: patches/patch-httpc_c
diff -N patches/patch-httpc_c
--- patches/patch-httpc_c       11 Jun 2021 16:02:18 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-httpc_c,v 1.1 2021/06/11 16:02:18 sthen Exp $
-
-Index: httpc.c
---- httpc.c.orig
-+++ httpc.c
-@@ -155,7 +155,7 @@ main(int argc, char *argv[])
-       dprintf(WRITE_FD, "GET %s HTTP/1.1\r\n", uri);
-       if (host != NULL)
-               dprintf(WRITE_FD, "Host: %s\r\n", host);
--      dprintf(WRITE_FD, "Accept-Encoding: gzip\r\n", host);
-+      dprintf(WRITE_FD, "Accept-Encoding: gzip\r\n");
-       dprintf(WRITE_FD, "Connection: close\r\n");
-       dprintf(WRITE_FD, "\r\n");
- 
Index: patches/patch-test_sh
===================================================================
RCS file: patches/patch-test_sh
diff -N patches/patch-test_sh
--- patches/patch-test_sh       9 May 2016 23:03:40 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: patch-test_sh,v 1.1 2016/05/09 23:03:40 jca Exp $
---- test.sh.orig       Tue May 10 01:01:56 2016
-+++ test.sh    Tue May 10 01:02:02 2016
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/bin/env ksh
- 
- . ./tap-functions -u
- 

Reply via email to