Makefile diff from current port tree. Hope not too late to implement it.

--- Makefile.old        Mon Apr  6 11:48:06 2020
+++ Makefile    Mon Jun 22 09:46:05 2020
@@ -1,28 +1,27 @@
-# $OpenBSD: Makefile,v 1.15 2020/04/06 08:48:06 pirofti Exp $
+# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $

-COMMENT =      IP-Transparent Tor Hidden Service Connector
+COMMENT =      IP-Transparent Tor and I2P Hidden Service Connector

-V =            0.2.1
-DISTNAME =     onioncat-$V
-REVISION =     2
+V =            0.3.8
+DISTNAME =     onioncat-${V}
+REVISION =     0
 CATEGORIES =   net

-HOMEPAGE =     https://www.cypherpunk.at/onioncat_trac/
+HOMEPAGE =     https://www.onioncat.org

-MAINTAINER=    Paul Irofti <p...@irofti.net>
+MAINTAINER=    Paul Irofti <piro...@openbsd.org>

 # GPLv3
 PERMIT_PACKAGE =               Yes

 WANTLIB =      c pthread

-MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
+MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/

 RUN_DEPENDS =  net/tor

 SEPARATE_BUILD =       Yes
-CONFIGURE_STYLE =      simple
-CONFIGURE_ARGS +=      --mandir=${PREFIX}/man
+CONFIGURE_STYLE =      gnu
 # Do not pick up gawk or mawk
 CONFIGURE_ENV =                AWK=awk


‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Sunday, June 21, 2020 11:06 AM, Paul Irofti <p...@irofti.net> wrote:

> On Sat, Jun 20, 2020 at 10:07:52AM +0000, Martin wrote:
>
> > Improved port of net/onioncat.
> >
> > -   Stability to prevent segmentation faults
> > -   New functionality implemented
> >     Like "distributed virtual switch" functionality;
> >     Additional integrated loopback responders to simplify setup and 
> > debugging
> >
> > -   gcat symlink has been removed completely because of coreutils conflict
> > -   man page has been improved to reflect all the changes made
> >
> > OK?
>
> Hi,
>
> The diff does not apply cleanly. Can you update your ports tree and
> regenerate it? (REVISION=2, not 1)
>
> Thanks,
> Paul
>
> > --- Makefile.old Tue Jul 16 01:58:56 2019
> > +++ Makefile Mon May 18 20:02:26 2020
> > @@ -1,13 +1,13 @@
> >
> > $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:35 sthen Exp $
> >
> > ==========================================================
> >
> > -COMMENT = IP-Transparent Tor Hidden Service Connector
> > +COMMENT = IP-Transparent Tor and I2P Hidden Service Connector
> > -V = 0.2.1
> > -DISTNAME = onioncat-$V
> > -REVISION = 1
> > +V = 0.3.8
> > +DISTNAME = onioncat-${V}
> > +REVISION = 0
> > CATEGORIES = net
> > -HOMEPAGE = https://www.cypherpunk.at/onioncat_trac/
> > +HOMEPAGE = https://www.onioncat.org
> > MAINTAINER= Paul Irofti piro...@openbsd.org
> > @@ -16,13 +16,12 @@
> > WANTLIB = c pthread
> > -MASTER_SITES = http://www.cypherpunk.at/ocat/download/Source/$V/
> > +MASTER_SITES = https://www.cypherpunk.at/ocat/download/Source/0.3/
> > RUN_DEPENDS = net/tor
> > SEPARATE_BUILD = Yes
> > -CONFIGURE_STYLE = simple
> > -CONFIGURE_ARGS += --mandir=${PREFIX}/man
> > +CONFIGURE_STYLE = gnu
> >
> > Do not pick up gawk or mawk
> >
> > ============================
> >
> > CONFIGURE_ENV = AWK=awk
> > --- distinfo.old Wed Jun 24 08:34:54 2015
> > +++ distinfo Mon May 18 20:03:30 2020
> > @@ -1,2 +1,2 @@
> > -SHA256 (onioncat-0.2.1.tar.gz) = 
> > Gge2K3LuZdEOcLly4q3hOH4iMrwGUnR+A76+cjXISo4=
> > -SIZE (onioncat-0.2.1.tar.gz) = 179988
> > +SHA256 (onioncat-0.3.8.tar.gz) = 
> > 9564d10c64161408a573256ba8aece9296499a753cbdae6bfbc3544e72a1d63b
> > +SIZE (onioncat-0.3.8.tar.gz) = 242144
> > --- pkg/DESCR.old Tue Dec 30 16:56:39 2008
> > +++ pkg/DESCR Fri May 15 00:53:34 2020
> > @@ -1,4 +1,4 @@
> > -OnionCat creates a transparent IP layer on top of Tor's hidden services.
> > +OnionCat creates a transparent IP layer on top of Tor or I2P hidden 
> > services.
> > It transmits any kind of IP-based data transparently through the Tor
> > network on a location hidden basis. You can think of it as a
> > point-to-multipoint VPN between hidden services.
> > --- pkg/PLIST.old Mon Oct 25 21:37:52 2010
> > +++ pkg/PLIST Fri May 15 00:53:34 2020
> > @@ -2,4 +2,5 @@
> > @bin bin/ocat
> > @man man/man1/ocat.1
> > share/doc/onioncat/
> > +share/doc/onioncat/Garlicat-HOWTO
> > share/doc/onioncat/README
> > Martin


Reply via email to