> On Feb 18, 2021, at 6:19 PM, Theo Buehler <t...@theobuehler.org> wrote:
>
> On Fri, Feb 19, 2021 at 12:09:18AM +0100, Theo Buehler wrote:
>> The project has moved to github and is somewhat active there.
>>
>> In particular it merged a gcc-10 fix. It doesn't do releases, so I just
>> picked HEAD. fomalib.h has modified structs and function signatures,
>> so I bumped the major.
>>
>> I added a BDEP on devel/bison which might be avoidable but I haven't
>> tried.
>>
>> Lightly tested on amd64.
>
> I should just have set DISTNAME.
I think it would be better to set the package version to 0.9.18 like in the
project’s Makefile.
That way if the project ever does do a release we don’t have to bump EPOCH.
Until then we can continue to resync with git head by bumping REVISION.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/foma/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:47:40 -0000 1.8
> +++ Makefile 18 Feb 2021 23:15:24 -0000
> @@ -2,21 +2,24 @@
>
> COMMENT = finite-state compiler and C library
>
> -DISTNAME = foma-0.9.17
> -REVISION = 1
> +DISTNAME = foma-20200928
>
> -SHARED_LIBS += foma 0.1 # 0.9.16
> +SHARED_LIBS += foma 1.0
>
> CATEGORIES = math devel
>
> -HOMEPAGE = https://bitbucket.org/mhulden/foma
> +GH_ACCOUNT = mhulden
> +GH_PROJECT = foma
> +GH_COMMIT = 7a996b08f5bbcf2d41ca17f40b028ac617f2fa6a
>
> # Apache 2.0
> PERMIT_PACKAGE = Yes
>
> WANTLIB += c curses readline z
>
> -MASTER_SITES = https://bitbucket.org/mhulden/foma/downloads/
> +BUILD_DEPENDS = devel/bison
> +
> +WRKSRC = ${WRKDIST}/foma
>
> MAKE_FLAGS = CC="${CC}" \
> CFLAGS="${CFLAGS}" \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/foma/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 12 May 2017 14:38:18 -0000 1.2
> +++ distinfo 18 Feb 2021 23:14:40 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (foma-0.9.17.tar.gz) = cXYUmbg695zcgbi3OtKiod2Qx0ZmU+6Jun3Jhj/fdPA=
> -SIZE (foma-0.9.17.tar.gz) = 333693
> +SHA256 (foma-20200928-7a996b08.tar.gz) =
> awECEPtEERRysSL3/8OfWLW1YO1Q1oTDjXcD6DX2CqQ=
> +SIZE (foma-20200928-7a996b08.tar.gz) = 176857
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile 12 May 2017 14:38:18 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,47 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.3 2017/05/12 14:38:18 benoit Exp $
> -
> -Generate shared libraries correctly.
> -
> -Index: Makefile
> ---- Makefile.orig
> -+++ Makefile
> -@@ -18,6 +18,7 @@ FLOOKUPLDFLAGS = libfoma.a -lz
> - CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
> - FOMAOBJS = foma.o stack.o iface.o lex.interface.o
> - LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o
> topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o
> constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o
> stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.tab.o
> -+SHLIBOBJS = $(LIBOBJS:.o=.so)
> -
> - all: libfoma foma flookup cgflookup
> -
> -@@ -64,10 +65,10 @@ LIBS = $(SHAREDLIBV) $(STATICLIB)
> -
> - libfoma: $(SHAREDLIBV)
> -
> --$(SHAREDLIBV): $(LIBOBJS)
> -+$(SHAREDLIBV): $(LIBOBJS) $(SHLIBOBJS)
> - $(AR) $(ARFLAGS) $(STATICLIB) $(LIBOBJS)
> - $(RANLIB) $(STATICLIB)
> -- $(CC) $(CFLAGS) -shared -Wl,$(DFLAG),$(SHAREDLIBM) -o $(SHAREDLIBV)
> $(LIBOBJS) $(LDFLAGS)
> -+ $(CC) $(CFLAGS) -shared -o $(SHAREDLIBV) $(SHLIBOBJS) $(LDFLAGS)
> -
> - install: foma libfoma
> - -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
> -@@ -81,14 +82,15 @@ install: foma libfoma
> - cd $(libdir); chmod 755 $(LIBS); \
> - if test -f $(libdir)/$(SHAREDLIB); then rm $(libdir)/$(SHAREDLIB); fi
> - if test -f $(libdir)/$(SHAREDLIBM); then rm $(libdir)/$(SHAREDLIBM); fi
> -- cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir); \
> -- ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true) \
> -- >/dev/null 2>&1; \
> -
> - $(OBJS): foma.h
> -
> - .c.o:
> - $(CC) $(CFLAGS) -c $< -o $@
> -+
> -+.SUFFIXES: .so
> -+.c.so:
> -+ $(CC) $(CFLAGS) -fPIC -c $< -o $@
> -
> - lex.yy.c: regex.l regex.tab.h
> - $(LEX) regex.l
> Index: patches/patch-flookup_c
> ===================================================================
> RCS file: patches/patch-flookup_c
> diff -N patches/patch-flookup_c
> --- patches/patch-flookup_c 20 Oct 2012 04:34:32 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> -$OpenBSD: patch-flookup_c,v 1.1.1.1 2012/10/20 04:34:32 bentley Exp $
> ---- flookup.c.orig Wed Oct 10 03:07:37 2012
> -+++ flookup.c Wed Oct 10 03:07:53 2012
> -@@ -21,6 +21,7 @@
> - #include <limits.h>
> - #include <getopt.h>
> - #include <unistd.h>
> -+#include <netinet/in.h>
> - #include <sys/types.h>
> - #include <sys/socket.h>
> - #include <arpa/inet.h>
> Index: patches/patch-foma_Makefile
> ===================================================================
> RCS file: patches/patch-foma_Makefile
> diff -N patches/patch-foma_Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-foma_Makefile 18 Feb 2021 22:39:36 -0000
> @@ -0,0 +1,47 @@
> +$OpenBSD$
> +
> +Index: foma/Makefile
> +--- foma/Makefile.orig
> ++++ foma/Makefile
> +@@ -19,6 +19,7 @@ FLOOKUPLDFLAGS = libfoma.a -lz
> + CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
> + FOMAOBJS = foma.o stack.o iface.o lex.interface.o
> + LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o
> topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o
> constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o
> stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.o
> ++SHLIBOBJS = $(LIBOBJS:.o=.so)
> +
> + all: libfoma foma flookup cgflookup
> +
> +@@ -65,10 +66,10 @@ LIBS = $(SHAREDLIBV) $(STATICLIB)
> +
> + libfoma: $(SHAREDLIBV)
> +
> +-$(SHAREDLIBV): $(LIBOBJS)
> ++$(SHAREDLIBV): $(LIBOBJS) $(SHLIBOBJS)
> + $(AR) $(ARFLAGS) $(STATICLIB) $(LIBOBJS)
> + $(RANLIB) $(STATICLIB)
> +- $(CC) $(CFLAGS) -shared -Wl,$(DFLAG),$(SHAREDLIBM) -o $(SHAREDLIBV)
> $(LIBOBJS) $(LDFLAGS)
> ++ $(CC) $(CFLAGS) -shared -o $(SHAREDLIBV) $(SHLIBOBJS) $(LDFLAGS)
> +
> + install: foma libfoma libfoma.pc
> + -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
> +@@ -84,9 +85,6 @@ install: foma libfoma libfoma.pc
> + cd $(libdir); chmod 755 $(LIBS); \
> + if test -f $(libdir)/$(SHAREDLIB); then rm $(libdir)/$(SHAREDLIB); fi
> + if test -f $(libdir)/$(SHAREDLIBM); then rm $(libdir)/$(SHAREDLIBM); fi
> +- cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir); \
> +- ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true) \
> +- >/dev/null 2>&1; \
> +
> + $(OBJS): foma.h
> +
> +@@ -104,6 +102,10 @@ libfoma.pc:
> +
> + .c.o:
> + $(CC) $(CFLAGS) -c $< -o $@
> ++
> ++.SUFFIXES: .so
> ++.c.so:
> ++ $(CC) $(CFLAGS) -fPIC -c $< -o $@
> +
> + lex.yy.c: regex.l regex.h
> + $(LEX) regex.l
> Index: patches/patch-foma_flookup_c
> ===================================================================
> RCS file: patches/patch-foma_flookup_c
> diff -N patches/patch-foma_flookup_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-foma_flookup_c 18 Feb 2021 22:34:02 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: foma/flookup.c
> +--- foma/flookup.c.orig
> ++++ foma/flookup.c
> +@@ -21,6 +21,7 @@
> + #include <limits.h>
> + #include <getopt.h>
> + #include <unistd.h>
> ++#include <netinet/in.h>
> + #include <sys/types.h>
> + #include <sys/socket.h>
> + #include <arpa/inet.h>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/foma/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 22 Mar 2013 18:10:59 -0000 1.2
> +++ pkg/PLIST 18 Feb 2021 22:52:46 -0000
> @@ -4,5 +4,6 @@
> @bin bin/foma
> include/fomalib.h
> include/fomalibconf.h
> -lib/libfoma.a
> +@static-lib lib/libfoma.a
> @lib lib/libfoma.so.${LIBfoma_VERSION}
> +lib/pkgconfig/libfoma.pc
>
