On Fri, Oct 13, 2023 at 12:39:11PM +0000, Klemens Nanni wrote: > The current port is quite dusty and the update works just fine for me on > amd64, no longer requiring any patches. > > dict(1) works against dict.org and my own dictd(8), /etc/dictd.conf and > local .dict.dz/.index files, as expected. > > Poking at .dz and .dict files with dictzip(1) also works, otherwise I'm > still new to RFC 2229 A Dictionary Server Protocol. > > More tests in existing setups? > Feedback? Objection? OK? > > Update diff below, one new library from the same HOMEPAGE/SITE attached:
Ping after education/freedict/ landed. > Information for inst:libmaa-1.4.7 > > Comment: > library for low-level data structures > > Required by: > dictd-client-1.13.1 > dictd-server-1.13.1 > > Description: > The libmaa library provides many low-level data structures which are > helpful for writing compilers, including hash tables, sets, lists, > debugging support, and memory management. Although libmaa was designed > and implemented as a foundation for the Khepera Transformation System, > the data structures are generally applicable to a wide range of > programming > problems. > > The memory management routines are especially helpful for improving the > performance of memory-intensive applications. > > Maintainer: The OpenBSD ports mailing-list <ports@openbsd.org> > > WWW: https://www.dict.org Index: Makefile =================================================================== RCS file: /cvs/ports/net/dictd/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile 27 Sep 2023 14:18:04 -0000 1.16 +++ Makefile 13 Oct 2023 12:11:35 -0000 @@ -1,41 +1,40 @@ COMMENT-main= Dictionary Server Protocol client COMMENT-server= Dictionary Server Protocol server -V= 1.9.15 +V= 1.13.1 DISTNAME= dictd-$V PKGNAME-main= dictd-client-$V PKGNAME-server= dictd-server-$V -REVISION-main= 3 -REVISION-server=1 CATEGORIES= net education -HOMEPAGE= http://www.dict.org +HOMEPAGE= https://www.dict.org # GPL v2 PERMIT_PACKAGE= Yes -WANTLIB= c z +WANTLIB= c maa z SITES= ${SITE_SOURCEFORGE:=dict/} +LIB_DEPENDS= devel/libmaa + USE_GMAKE= Yes +SEPARATE_BUILD= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --without-local-zlib \ - --enable-dictorg +CONFIGURE_ENV= LDFLAGS=${LDFLAGS:Q} MULTI_PACKAGES= -main -server NO_TEST= Yes -pre-build: - @sed -i -e "s,/etc,${SYSCONFDIR},g;" \ - -e "s,/usr/sbin,${LOCALBASE}/sbin,g;" \ - -e "s,/usr/share,${LOCALBASE}/share,g" ${WRKSRC}/*.[18] +EXAMPLEDIR= ${PREFIX}/share/examples/dictd + +CFLAGS += -I/usr/local/include +LDFLAGS += -L/usr/local/lib post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dictd/ - ${INSTALL_DATA} ${WRKSRC}/example* \ - ${PREFIX}/share/examples/dictd + ${INSTALL_DATA_DIR} ${EXAMPLEDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLEDIR}/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/dictd/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 18 Jan 2015 03:14:38 -0000 1.3 +++ distinfo 13 Oct 2023 12:11:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (dictd-1.9.15.tar.gz) = TFnsBmBE83elkGnZvAEwRfxQKhy+b/Ohri8CKo7zgVw= -SIZE (dictd-1.9.15.tar.gz) = 741597 +SHA256 (dictd-1.13.1.tar.gz) = 5PGmfRaJTYSUVp19yUQsFcw4wBHyuWMcfxzGInZlKhs= +SIZE (dictd-1.13.1.tar.gz) = 395619 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 11 Mar 2022 19:45:53 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- Makefile.in.orig Mon Dec 13 20:12:55 2004 -+++ Makefile.in Sat May 22 13:49:16 2010 -@@ -300,6 +300,7 @@ install.dictfmt: dictfmt dictfmt_index2word dictfmt_in - $(INSTALL_DATA) dictfmt_index2word.1 $(DESTDIR)$(man1_prefix); \ - $(INSTALL_DATA) dictfmt_index2suffix.1 $(DESTDIR)$(man1_prefix); \ - $(INSTALL_DATA) dictunformat.1 $(DESTDIR)$(man1_prefix); \ -+ $(INSTALL_DATA) dictfmt_virtual.1 $(DESTDIR)$(man1_prefix); \ - test _$(USE_PLUGIN) != _ && \ - $(INSTALL_SCRIPT) dictfmt_plugin $(DESTDIR)$(bindir) || true - Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ ---- configure.orig Sat Apr 15 12:30:38 2006 -+++ configure Sat Apr 15 12:30:41 2006 -@@ -2484,7 +2484,6 @@ fi - - REALCC="$CC" - if test "$CC" = gcc; then -- CFLAGS='-g -O' - WCFLAGS='-Wall' - case "$host" in - *linux*) -@@ -2495,8 +2494,6 @@ if test "$CC" = gcc; then - esac - # Silence flex/bison output - SCFLAGS="-Wno-implicit -Wno-unused" --else -- CFLAGS='-g' - fi - - local_dmalloc=0 Index: patches/patch-decl_h =================================================================== RCS file: patches/patch-decl_h diff -N patches/patch-decl_h --- patches/patch-decl_h 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- decl.h.orig Tue Apr 18 15:20:35 2006 -+++ decl.h Tue Apr 18 15:20:45 2006 -@@ -28,7 +28,7 @@ - declarations for standard library calls. We provide them here for - situations that we know about. */ - --#if defined(__sparc__) && !defined(__linux__) -+#if defined(__sparc__) && !defined(__linux__) && !defined(__OpenBSD__) - /* Both SunOS and Solaris */ - extern int getrusage( int who, struct rusage * ); - extern void bcopy( const void *, void *, int ); Index: patches/patch-dictP_h =================================================================== RCS file: patches/patch-dictP_h diff -N patches/patch-dictP_h --- patches/patch-dictP_h 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- dictP.h.orig Sat May 22 23:32:37 2010 -+++ dictP.h Sat May 22 23:33:27 2010 -@@ -55,6 +55,7 @@ - #define __FUNCTION__ __FILE__ - #endif - -+#if 0 - /* AIX requires this to be the first thing in the file. */ - #if defined(__svr4__) && defined(__sgi__) && !HAVE_ALLOCA_H /* IRIX */ - # undef HAVE_ALLOCA_H -@@ -73,6 +74,7 @@ - # endif - # endif - # endif -+#endif - #endif - - /* Get string functions */ Index: patches/patch-libmaa_configure =================================================================== RCS file: patches/patch-libmaa_configure diff -N patches/patch-libmaa_configure --- patches/patch-libmaa_configure 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- libmaa/configure.orig Sat Apr 15 12:30:24 2006 -+++ libmaa/configure Sat Apr 15 12:30:26 2006 -@@ -2501,10 +2501,7 @@ fi - - REALCC="$CC" - if test "$CC" = gcc; then -- CFLAGS='-g -O' - WCFLAGS='-Wall -pedantic' --else -- CFLAGS='-g' - fi - - needs_xmalloc=1 Index: patches/patch-libmaa_decl_h =================================================================== RCS file: patches/patch-libmaa_decl_h diff -N patches/patch-libmaa_decl_h --- patches/patch-libmaa_decl_h 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- libmaa/decl.h.orig Tue Apr 18 15:21:21 2006 -+++ libmaa/decl.h Tue Apr 18 15:21:31 2006 -@@ -28,7 +28,7 @@ - declarations for standard library calls. We provide them here for - situations that we know about. */ - --#if defined(__sparc__) && !defined(linux) -+#if defined(__sparc__) && !defined(linux) && !defined(__OpenBSD__) - #include <sys/resource.h> - /* Both SunOS and Solaris */ - extern int getrusage( int who, struct rusage * ); Index: patches/patch-libmaa_maaP_h =================================================================== RCS file: patches/patch-libmaa_maaP_h diff -N patches/patch-libmaa_maaP_h --- patches/patch-libmaa_maaP_h 11 Mar 2022 19:45:53 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- libmaa/maaP.h.orig Sat May 22 23:52:39 2010 -+++ libmaa/maaP.h Sat May 22 23:52:56 2010 -@@ -33,6 +33,7 @@ - #define __FUNCTION__ __FILE__ - #endif - -+#if 0 - /* AIX requires this to be the first thing in the file. */ - #if HAVE_ALLOCA_H - # include <alloca.h> -@@ -46,6 +47,7 @@ - # endif - #endif - -+#endif - /* Get string functions */ - #if STDC_HEADERS - # include <string.h> Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/dictd/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- pkg/PLIST-main 11 Mar 2022 19:45:53 -0000 1.2 +++ pkg/PLIST-main 13 Oct 2023 12:11:35 -0000 @@ -1,8 +1,8 @@ @conflict p5-Net-Dict-* @pkgpath net/dictd -bin/dict +@bin bin/dict +bin/dict_lookup bin/dictl @man man/man1/dict.1 +@man man/man1/dict_lookup.1 @man man/man1/dictl.1 -share/examples/dictd/ -share/examples/dictd/example.dictrc Index: pkg/PLIST-server =================================================================== RCS file: /cvs/ports/net/dictd/pkg/PLIST-server,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-server --- pkg/PLIST-server 11 Mar 2022 19:45:53 -0000 1.2 +++ pkg/PLIST-server 13 Oct 2023 12:11:35 -0000 @@ -1,28 +1,28 @@ bin/colorit bin/dictdplugin-config -bin/dictfmt +@bin bin/dictfmt bin/dictfmt_index2suffix bin/dictfmt_index2word -bin/dictfmt_plugin -bin/dictfmt_virtual bin/dictunformat -bin/dictzip +@bin bin/dictzip include/dictdplugin.h @man man/man1/colorit.1 @man man/man1/dictfmt.1 @man man/man1/dictfmt_index2suffix.1 @man man/man1/dictfmt_index2word.1 -@man man/man1/dictfmt_virtual.1 @man man/man1/dictunformat.1 @man man/man1/dictzip.1 @man man/man8/dictd.8 -sbin/dictd +@bin sbin/dictd share/examples/dictd/ -share/examples/dictd/example.conf -share/examples/dictd/example.site -share/examples/dictd/example2.conf -share/examples/dictd/example3.conf -share/examples/dictd/example_complex.conf -share/examples/dictd/example_plugin_dbi.conf -share/examples/dictd/example_popen.conf -share/examples/dictd/example_virtual.conf +share/examples/dictd/dict1.conf +share/examples/dictd/dictd1.conf +share/examples/dictd/dictd2.conf +share/examples/dictd/dictd3.conf +share/examples/dictd/dictd4.conf +share/examples/dictd/dictd_complex.conf +share/examples/dictd/dictd_mime.conf +share/examples/dictd/dictd_plugin_dbi.conf +share/examples/dictd/dictd_popen.conf.in +share/examples/dictd/dictd_site.txt +share/examples/dictd/dictd_virtual.conf
libmaa.tgz
Description: application/tar-gz
