On Thu, 04 Jun 2026 21:13:21 +0200, Theo Buehler <tb@theobuehler.org> wrote: > > The dumb diff below makes sysutils/modlogan build. With plenty of > remaining warnings. The errors come from a systematic mistake pervading > the code base: gzopen returns gzFile, not gzFile *. So we get to change > ~30 files with a trivial *-removal patch. > > This could be avoided with a dirty preprocessor trick in config.h.in: > > typedef struct gzFile_s mlgzFile; > #define gzFile mlgzFile > > Then we need to #undef gzFile twice where they accidentally got it > right. 10% patches, 1000% yuck factor. > > ModLogAn was declared dead in 2006: > > https://web.archive.org/web/20061005153345/http://jan.kneschke.de/projects/modlogan/ > > I think it's time for the boatswain's call. Maybe retire it? Only we and FreeBSD actually has it, at least from Repology point of view: https://repology.org/project/modlogan/versions > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/modlogan/Makefile,v > diff -u -p -r1.38 Makefile > --- Makefile 25 Jul 2025 14:33:56 -0000 1.38 > +++ Makefile 4 Jun 2026 18:38:39 -0000 > @@ -1,10 +1,10 @@ > COMMENT= modular log analyzer > > DISTNAME= modlogan-0.8.13 > -REVISION= 13 > +REVISION= 14 > CATEGORIES= sysutils www > > -HOMEPAGE= http://jan.kneschke.de/projects/modlogan/ > +HOMEPAGE= https://jan.kneschke.de/projects/modlogan/ > > SITES= ${HOMEPAGE}/download/ > > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/sysutils/modlogan/patches/patch-configure,v > diff -u -p -r1.3 patch-configure > --- patches/patch-configure 11 Mar 2022 19:57:42 -0000 1.3 > +++ patches/patch-configure 4 Jun 2026 18:32:40 -0000 > @@ -1,6 +1,7 @@ > ---- configure.orig Mon Apr 21 23:13:06 2003 > -+++ configure Mon Apr 21 23:13:31 2003 > -@@ -16778,7 +16778,7 @@ echo $ECHO_N "checking gd and its deps.. > +Index: configure > +--- configure.orig > ++++ configure > +@@ -26622,7 +26622,7 @@ echo $ECHO_N "checking gd and its deps... $ECHO_C" >&6 > HAVE_LIBGD=false > > # gd + png support > Index: patches/patch-src_datatypes_brokenlink_datatype_c > =================================================================== > RCS file: patches/patch-src_datatypes_brokenlink_datatype_c > diff -N patches/patch-src_datatypes_brokenlink_datatype_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_datatypes_brokenlink_datatype_c 4 Jun 2026 18:32:40 -0000 > @@ -0,0 +1,12 @@ > +Index: src/datatypes/brokenlink/datatype.c > +--- src/datatypes/brokenlink/datatype.c.orig > ++++ src/datatypes/brokenlink/datatype.c > +@@ -39,7 +39,7 @@ > + > + extern size_t mem_mdata_type_count[M_DATA_TYPE_IPPLWATCH]; > + > +-int mdata_BrokenLink_to_xml(gzFile *fd, mdata *data) { > ++int mdata_BrokenLink_to_xml(gzFile fd, mdata *data) { > + #define WR(x,f) \ > + gzprintf(fd, "<%s>%"#f"</%s>\n", #x, data->data.brokenlink.x, #x); > + #define WRS(x,f) \ > Index: patches/patch-src_datatypes_brokenlink_datatype_h > =================================================================== > RCS file: patches/patch-src_datatypes_brokenlink_datatype_h > diff -N patches/patch-src_datatypes_brokenlink_datatype_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_datatypes_brokenlink_datatype_h 4 Jun 2026 18:32:40 -0000 > @@ -0,0 +1,12 @@ > +Index: src/datatypes/brokenlink/datatype.h > +--- src/datatypes/brokenlink/datatype.h.orig > ++++ src/datatypes/brokenlink/datatype.h > +@@ -30,7 +30,7 @@ > + > + #include "mdatatypes.h" > + > +-int mdata_BrokenLink_to_xml(gzFile *fd, mdata *data); > ++int mdata_BrokenLink_to_xml(gzFile fd, mdata *data); > + int mdata_BrokenLink_from_xml(void *user_data, m_tag tagtype, const xmlChar *value, const xmlChar **attrs); > + > + mdata *mdata_BrokenLink_create(const char *key, > Index: patches/patch-src_datatypes_count_datatype_c > =================================================================== > RCS file: patches/patch-src_datatypes_count_datatype_c > diff -N patches/patch-src_datatypes_count_datatype_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_datatypes_count_datatype_c 4 Jun 2026 18:32:40 -0000 > @@ -0,0 +1,12 @@ > +Index: src/datatypes/count/datatype.c > +--- src/datatypes/count/datatype.c.orig > ++++ src/datatypes/count/datatype.c > +@@ -38,7 +38,7 @@ > + /* begin of Count */ > + extern size_t mem_mdata_type_count[M_DATA_TYPE_IPPLWATCH]; > + > +-int mdata_Count_to_xml(gzFile *fd, mdata *data) { > ++int mdata_Count_to_xml(gzFile fd, mdata *data) { > + #define WR(x,f) \ > + gzprintf(fd, "<%s>%"#f"</%s>\n", #x, data->data.count.x, #x); > + > Index: patches/patch-src_datatypes_count_datatype_h > =================================================================== > RCS file: patches/patch-src_datatypes_count_datatype_h > diff -N patches/patch-src_datatypes_count_datatype_h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_datatypes_count_datatype_h 4 Jun 2026 18:32:40 -0000 > @@ -0,0 +1,12 @@ > +Index: src/datatypes/count/datatype.h > +--- src/datatypes/count/datatype.h.orig > ++++ src/datatypes/count/datatype.h > +@@ -30,7 +30,7 @@ > + > + #include "mdatatypes.h" > + > +-int mdata_Count_to_xml(gzFile *fd, mdata *data); > ++int mdata_Count_to_xml(gzFile fd, mdata *data); > + int mdata_Count_from_xml(void *user_data, int tagtype, const xmlChar *value, const xmlChar **attrs); > + > + mdata *mdata_Count_init(); > Index: patches/patch-src_datatypes_ipplwatch_datatype_c > =================================================================== > RCS file: patches/patch-src_datatypes_ipplwatch_datatype_c > diff -N patches/patch-src_datatypes_ipplwatch_datatype_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_datatypes_ipplwatch_datatype_c 4 Jun 2026 18:32:40 -0000 > @@ -0,0 +1,12 @@ > +Index: src/datatypes/ipplwatch/datatype.c > +--- src/datatypes/ipplwatch/datatype.c.orig > ++++ src/datatypes/ipplwatch/datatype.c > +@@ -44,7 +44,7 @@ > + #define DEBUG_SETDATA > +
No comments:
Post a Comment