From b3e0f224ac02775969ac64c99bf99f8584dd06a0 Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 14 Feb 2021 17:34:24 +0000 Subject: [PATCH] zoem: update to latest version 11-166 This adds readline support and a number of other usability improvements. Add a simple fix for -fno-common. The project seems dormant since 2011. ok bcallah --- textproc/zoem/Makefile | 8 ++-- textproc/zoem/distinfo | 4 +- textproc/zoem/patches/patch-setversion | 16 ++++++++ textproc/zoem/patches/patch-src_Makefile_in | 11 +++--- textproc/zoem/patches/patch-src_version_h | 13 ++++++ textproc/zoem/pkg/PLIST | 44 +-------------------- 6 files changed, 42 insertions(+), 54 deletions(-) create mode 100644 textproc/zoem/patches/patch-setversion create mode 100644 textproc/zoem/patches/patch-src_version_h diff --git a/textproc/zoem/Makefile b/textproc/zoem/Makefile index 8ff94a19343..87a389e503f 100644 --- a/textproc/zoem/Makefile +++ b/textproc/zoem/Makefile @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.12 2019/07/12 20:50:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2021/02/14 17:34:24 tb Exp $ COMMENT= interpretive macro/programming language -V= 09-149 +V= 11-166 DISTNAME= zoem-${V} PKGNAME= zoem-${V:S,-,_,} CATEGORIES= textproc lang -HOMEPAGE= http://micans.org/zoem/ +HOMEPAGE= https://micans.org/zoem/ # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB= c m +WANTLIB= c m curses readline MASTER_SITES= ${HOMEPAGE}/src/ diff --git a/textproc/zoem/distinfo b/textproc/zoem/distinfo index 3635d7b9d9e..a018adcfdf9 100644 --- a/textproc/zoem/distinfo +++ b/textproc/zoem/distinfo @@ -1,2 +1,2 @@ -SHA256 (zoem-09-149.tar.gz) = cCByIFYp3pM9db86G9TndQIwmiZFHhlGQnyx/Zc8VNU= -SIZE (zoem-09-149.tar.gz) = 570150 +SHA256 (zoem-11-166.tar.gz) = EmeiIq4u6ZipHb5m3xnPmYoOfbRcflmCEEmua3kfN/4= +SIZE (zoem-11-166.tar.gz) = 463646 diff --git a/textproc/zoem/patches/patch-setversion b/textproc/zoem/patches/patch-setversion new file mode 100644 index 00000000000..1f1f71ebeb5 --- /dev/null +++ b/textproc/zoem/patches/patch-setversion @@ -0,0 +1,16 @@ +$OpenBSD: patch-setversion,v 1.1 2021/02/14 17:34:24 tb Exp $ + +Fix for -fno-common + +Index: setversion +--- setversion.orig ++++ setversion +@@ -24,7 +24,7 @@ vsh='src/version.h' + echo -n '' > $vsh + echo '#ifndef zoem_version_h__' >> $vsh + echo '#define zoem_version_h__' >> $vsh +-echo 'char *zoemDateTag;' >> $vsh ++echo 'extern char *zoemDateTag;' >> $vsh + echo '#endif' >> $vsh + + vsc='src/version.c' diff --git a/textproc/zoem/patches/patch-src_Makefile_in b/textproc/zoem/patches/patch-src_Makefile_in index 3e37ebde05e..2e4c8dfed41 100644 --- a/textproc/zoem/patches/patch-src_Makefile_in +++ b/textproc/zoem/patches/patch-src_Makefile_in @@ -1,7 +1,8 @@ -$OpenBSD: patch-src_Makefile_in,v 1.2 2009/12/23 22:09:20 jasper Exp $ ---- src/Makefile.in.orig Fri May 29 14:24:17 2009 -+++ src/Makefile.in Wed Dec 23 21:56:37 2009 -@@ -101,7 +101,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +$OpenBSD: patch-src_Makefile_in,v 1.3 2021/02/14 17:34:24 tb Exp $ +Index: src/Makefile.in +--- src/Makefile.in.orig ++++ src/Makefile.in +@@ -100,7 +100,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -10,7 +11,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2009/12/23 22:09:20 jasper Exp $ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -@@ -158,7 +158,7 @@ ops-env.c ops-constant.c curly.c digest.c entry.c \ +@@ -169,7 +169,7 @@ ops-env.c ops-constant.c curly.c digest.c entry.c \ iface.c source.c sink.c filter.c key.c dict.c ops.c parse.c read.c \ segment.c util.c zoem.c version.c diff --git a/textproc/zoem/patches/patch-src_version_h b/textproc/zoem/patches/patch-src_version_h new file mode 100644 index 00000000000..6ac4442e2f4 --- /dev/null +++ b/textproc/zoem/patches/patch-src_version_h @@ -0,0 +1,13 @@ +$OpenBSD: patch-src_version_h,v 1.1 2021/02/14 17:34:24 tb Exp $ + +Fix for -fno-common + +Index: src/version.h +--- src/version.h.orig ++++ src/version.h +@@ -1,4 +1,4 @@ + #ifndef zoem_version_h__ + #define zoem_version_h__ +-char *zoemDateTag; ++extern char *zoemDateTag; + #endif diff --git a/textproc/zoem/pkg/PLIST b/textproc/zoem/pkg/PLIST index e65362392a9..55b814eecb1 100644 --- a/textproc/zoem/pkg/PLIST +++ b/textproc/zoem/pkg/PLIST @@ -1,11 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:09:20 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.6 2021/02/14 17:34:24 tb Exp $ @bin bin/zoem @man man/man1/zoem.1 -@man man/man7/pud-base.7 -@man man/man7/pud-faq.7 -@man man/man7/pud-man.7 -@man man/man7/pud-ref.7 -@man man/man7/pud.7 share/doc/zoem/ share/doc/zoem/doc/ share/doc/zoem/doc/zoem.azm @@ -13,28 +8,6 @@ share/doc/zoem/doc/zoem.html share/doc/zoem/doc/zoem.ps share/doc/zoem/doc/zum.azm share/doc/zoem/doc/zum.html -share/doc/zoem/mac/ -share/doc/zoem/mac/buzzz.1 -share/doc/zoem/mac/buzzz.azm -share/doc/zoem/mac/buzzz.html -share/doc/zoem/mac/buzzz.ps -share/doc/zoem/mac/buzzz.txt -share/doc/zoem/mac/index.html -share/doc/zoem/mac/pud-base.html -share/doc/zoem/mac/pud-base.ps -share/doc/zoem/mac/pud-base.txt -share/doc/zoem/mac/pud-faq.html -share/doc/zoem/mac/pud-faq.ps -share/doc/zoem/mac/pud-faq.txt -share/doc/zoem/mac/pud-man.html -share/doc/zoem/mac/pud-man.ps -share/doc/zoem/mac/pud-man.txt -share/doc/zoem/mac/pud-ref.html -share/doc/zoem/mac/pud-ref.ps -share/doc/zoem/mac/pud-ref.txt -share/doc/zoem/mac/pud.html -share/doc/zoem/mac/pud.ps -share/doc/zoem/mac/pud.txt share/examples/zoem/ share/examples/zoem/8q.azm share/examples/zoem/8q.ozm @@ -52,11 +25,6 @@ share/examples/zoem/nest.azm share/examples/zoem/nest.ozm share/examples/zoem/power-of-2.azm share/examples/zoem/power-of-2.ozm -share/examples/zoem/pud-base.azm -share/examples/zoem/pud-faq.azm -share/examples/zoem/pud-man.azm -share/examples/zoem/pud-ref.azm -share/examples/zoem/pud.azm share/examples/zoem/reverse.azm share/examples/zoem/reverse.ozm share/examples/zoem/scope.azm @@ -73,13 +41,3 @@ share/examples/zoem/txt-table.azm share/examples/zoem/txt-table.ozm share/examples/zoem/xml.azm share/examples/zoem/xml.ozm -share/zoem/ -share/zoem/mac/ -share/zoem/mac/base.zmm -share/zoem/mac/ctr.zmm -share/zoem/mac/doc.zmm -share/zoem/mac/faq.zmm -share/zoem/mac/man.zmm -share/zoem/mac/ref.zmm -share/zoem/mac/zsd.base.css -share/zoem/mac/zsd.doc.css