textproc/zoem -fno-common fix

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

textproc/zoem -fno-common fix

Theo Buehler-3
Straightforward fix. The version.h header is oth generated and packaged,
I thought it better to fix both the generating script and the header.

Upstream has been dormant during the past decade, but they have updated
their homepage to use TLS.

Basic macros still work.

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:50:17 -0000 1.12
+++ Makefile 4 Feb 2021 20:26:17 -0000
@@ -6,8 +6,9 @@ V= 09-149
 DISTNAME= zoem-${V}
 PKGNAME= zoem-${V:S,-,_,}
 CATEGORIES= textproc lang
+REVISION= 0
 
-HOMEPAGE= http://micans.org/zoem/
+HOMEPAGE= https://micans.org/zoem/
 
 # GPLv2
 PERMIT_PACKAGE= Yes
Index: patches/patch-setversion
===================================================================
RCS file: patches/patch-setversion
diff -N patches/patch-setversion
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setversion 4 Feb 2021 20:21:24 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: setversion
+--- setversion.orig
++++ setversion
+@@ -25,8 +25,8 @@ vsh='src/version.h'
+ echo -n '' > $vsh
+ echo '#ifndef zoem_version_h__' >> $vsh
+ echo '#define zoem_version_h__' >> $vsh
+-echo 'char *zoemDateTag;' >> $vsh
+-echo 'char *zoemNumTag;' >> $vsh
++echo 'extern char *zoemDateTag;' >> $vsh
++echo 'extern char *zoemNumTag;' >> $vsh
+ echo '#endif' >> $vsh
+
+ vsc='src/version.c'
Index: patches/patch-src_version_h
===================================================================
RCS file: patches/patch-src_version_h
diff -N patches/patch-src_version_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_version_h 4 Feb 2021 20:36:08 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix for -fno-common
+
+Index: src/version.h
+--- src/version.h.orig
++++ src/version.h
+@@ -1,5 +1,5 @@
+ #ifndef zoem_version_h__
+ #define zoem_version_h__
+-char *zoemDateTag;
+-char *zoemNumTag;
++extern char *zoemDateTag;
++extern char *zoemNumTag;
+ #endif

Reply | Threaded
Open this post in threaded view
|

Re: textproc/zoem -fno-common fix

Theo Buehler-3
On Thu, Feb 04, 2021 at 09:39:19PM +0100, Theo Buehler wrote:
> Straightforward fix. The version.h header is oth generated and packaged,
> I thought it better to fix both the generating script and the header.
>
> Upstream has been dormant during the past decade, but they have updated
> their homepage to use TLS.
>
> Basic macros still work.

Right after sending I noticed that there is a later version. It adds
readline support, so it's a bit of an improvement. -fno-common fix is
essentially the same as before. Basic functionality still works.

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:50:17 -0000 1.12
+++ Makefile 4 Feb 2021 20:56:03 -0000
@@ -2,16 +2,16 @@
 
 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/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/zoem/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jan 2015 03:15:32 -0000 1.9
+++ distinfo 4 Feb 2021 20:47:35 -0000
@@ -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
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/zoem/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 23 Dec 2009 22:09:20 -0000 1.2
+++ patches/patch-src_Makefile_in 4 Feb 2021 20:49:15 -0000
@@ -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@
+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 20
  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
 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zoem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 23 Dec 2009 22:09:20 -0000 1.5
+++ pkg/PLIST 4 Feb 2021 20:50:51 -0000
@@ -1,11 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:09:20 jasper 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

Reply | Threaded
Open this post in threaded view
|

Re: textproc/zoem -fno-common fix

Theo Buehler-3
On Thu, Feb 04, 2021 at 10:02:09PM +0100, Theo Buehler wrote:

> On Thu, Feb 04, 2021 at 09:39:19PM +0100, Theo Buehler wrote:
> > Straightforward fix. The version.h header is oth generated and packaged,
> > I thought it better to fix both the generating script and the header.
> >
> > Upstream has been dormant during the past decade, but they have updated
> > their homepage to use TLS.
> >
> > Basic macros still work.
>
> Right after sending I noticed that there is a later version. It adds
> readline support, so it's a bit of an improvement. -fno-common fix is
> essentially the same as before. Basic functionality still works.

Sigh. I forgot cvs add.

Here's the update that actually includes the simple -fno-common fix...

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:50:17 -0000 1.12
+++ Makefile 4 Feb 2021 20:56:03 -0000
@@ -2,16 +2,16 @@
 
 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/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/zoem/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jan 2015 03:15:32 -0000 1.9
+++ distinfo 4 Feb 2021 20:47:35 -0000
@@ -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
Index: patches/patch-setversion
===================================================================
RCS file: patches/patch-setversion
diff -N patches/patch-setversion
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setversion 4 Feb 2021 20:49:40 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+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'
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/zoem/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 23 Dec 2009 22:09:20 -0000 1.2
+++ patches/patch-src_Makefile_in 4 Feb 2021 20:49:15 -0000
@@ -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@
+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 20
  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
 
Index: patches/patch-src_version_h
===================================================================
RCS file: patches/patch-src_version_h
diff -N patches/patch-src_version_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_version_h 4 Feb 2021 20:50:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zoem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 23 Dec 2009 22:09:20 -0000 1.5
+++ pkg/PLIST 4 Feb 2021 20:50:51 -0000
@@ -1,11 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:09:20 jasper 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

Reply | Threaded
Open this post in threaded view
|

Re: textproc/zoem -fno-common fix

Theo Buehler-3
On Mon, Feb 08, 2021 at 11:17:15AM +0100, Theo Buehler wrote:

> On Thu, Feb 04, 2021 at 10:02:09PM +0100, Theo Buehler wrote:
> > On Thu, Feb 04, 2021 at 09:39:19PM +0100, Theo Buehler wrote:
> > > Straightforward fix. The version.h header is oth generated and packaged,
> > > I thought it better to fix both the generating script and the header.
> > >
> > > Upstream has been dormant during the past decade, but they have updated
> > > their homepage to use TLS.
> > >
> > > Basic macros still work.
> >
> > Right after sending I noticed that there is a later version. It adds
> > readline support, so it's a bit of an improvement. -fno-common fix is
> > essentially the same as before. Basic functionality still works.
>
> Sigh. I forgot cvs add.
>
> Here's the update that actually includes the simple -fno-common fix...

Anyone willing to take a look at this?

I'm going to commit this soon.

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/zoem/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:50:17 -0000 1.12
+++ Makefile 4 Feb 2021 20:56:03 -0000
@@ -2,16 +2,16 @@
 
 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/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/zoem/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 18 Jan 2015 03:15:32 -0000 1.9
+++ distinfo 4 Feb 2021 20:47:35 -0000
@@ -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
Index: patches/patch-setversion
===================================================================
RCS file: patches/patch-setversion
diff -N patches/patch-setversion
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setversion 4 Feb 2021 20:49:40 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+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'
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/zoem/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 23 Dec 2009 22:09:20 -0000 1.2
+++ patches/patch-src_Makefile_in 4 Feb 2021 20:49:15 -0000
@@ -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@
+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 20
  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
 
Index: patches/patch-src_version_h
===================================================================
RCS file: patches/patch-src_version_h
diff -N patches/patch-src_version_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_version_h 4 Feb 2021 20:50:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/zoem/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 23 Dec 2009 22:09:20 -0000 1.5
+++ pkg/PLIST 4 Feb 2021 20:50:51 -0000
@@ -1,11 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.5 2009/12/23 22:09:20 jasper 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

Reply | Threaded
Open this post in threaded view
|

Re: textproc/zoem -fno-common fix

Brian Callahan-6
On Sunday, February 14th, 2021 at 12:07 PM, Theo Buehler <[hidden email]> wrote:

> On Mon, Feb 08, 2021 at 11:17:15AM +0100, Theo Buehler wrote:
>
> > On Thu, Feb 04, 2021 at 10:02:09PM +0100, Theo Buehler wrote:
> >
> > > On Thu, Feb 04, 2021 at 09:39:19PM +0100, Theo Buehler wrote:
> > >
> > > > Straightforward fix. The version.h header is oth generated and packaged,
> > > >
> > > > I thought it better to fix both the generating script and the header.
> > > >
> > > > Upstream has been dormant during the past decade, but they have updated
> > > >
> > > > their homepage to use TLS.
> > > >
> > > > Basic macros still work.
> > >
> > > Right after sending I noticed that there is a later version. It adds
> > >
> > > readline support, so it's a bit of an improvement. -fno-common fix is
> > >
> > > essentially the same as before. Basic functionality still works.
> >
> > Sigh. I forgot cvs add.
> >
> > Here's the update that actually includes the simple -fno-common fix...
>
> Anyone willing to take a look at this?
>
> I'm going to commit this soon.
>

ok bcallah@