libmowgli: Update to 2.1.3

Changes: 8+ years worth

(Not used by anything, currently a leaf package... chat/atheme uses
internal copy.)

5 files changed, 73 insertions, 94 deletions

diff --git a/devel/libmowgli/Makefile b/devel/libmowgli/Makefile
index 1090c5abedb..d86b5c8bd67 100644
--- a/devel/libmowgli/Makefile
+++ b/devel/libmowgli/Makefile
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.9 2017/08/01 17:40:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2019/11/22 00:12:34 nia Exp $
 
-DISTNAME=	libmowgli-0.7.1
+DISTNAME=	libmowgli-2.1.3
 CATEGORIES=	devel
-#MASTER_SITES=	http://distfiles.atheme.org/
-MASTER_SITES=	http://mirror.billymays.us/libmowgli/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=atheme/}
+GITHUB_PROJECT=	libmowgli-2
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	jfranz@bsdprojects.net
-#HOMEPAGE=	http://www.atheme.org/projects/mowgli
+HOMEPAGE=	https://github.com/atheme/libmowgli-2
 COMMENT=	Development framework for C (like GLib)
+LICENSE=	isc
 
 PREV_PKGPATH=	devel/mowgli
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	gmake pkg-config
 
-PKGCONFIG_OVERRIDE+=	libmowgli.pc.in
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+
+PKGCONFIG_OVERRIDE+=	libmowgli-2.pc.in
 
 # Explicitly disable epoll on illumos, provided for Linux compat only.
 CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_ctl=no
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmowgli/PLIST b/devel/libmowgli/PLIST
index cee83fd3897..348eae90dc0 100644
--- a/devel/libmowgli/PLIST
+++ b/devel/libmowgli/PLIST
@@ -1,39 +1,56 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:48:54 joerg Exp $
-include/libmowgli/mowgli.h
-include/libmowgli/mowgli_alloc.h
-include/libmowgli/mowgli_allocation_policy.h
-include/libmowgli/mowgli_allocator.h
-include/libmowgli/mowgli_argstack.h
-include/libmowgli/mowgli_assert.h
-include/libmowgli/mowgli_bitvector.h
-include/libmowgli/mowgli_config.h
-include/libmowgli/mowgli_dictionary.h
-include/libmowgli/mowgli_error_backtrace.h
-include/libmowgli/mowgli_exception.h
-include/libmowgli/mowgli_formatter.h
-include/libmowgli/mowgli_global_storage.h
-include/libmowgli/mowgli_hash.h
-include/libmowgli/mowgli_heap.h
-include/libmowgli/mowgli_hook.h
-include/libmowgli/mowgli_init.h
-include/libmowgli/mowgli_ioevent.h
-include/libmowgli/mowgli_iterator.h
-include/libmowgli/mowgli_list.h
-include/libmowgli/mowgli_logger.h
-include/libmowgli/mowgli_mempool.h
-include/libmowgli/mowgli_module.h
-include/libmowgli/mowgli_object.h
-include/libmowgli/mowgli_object_class.h
-include/libmowgli/mowgli_object_messaging.h
-include/libmowgli/mowgli_object_metadata.h
-include/libmowgli/mowgli_patricia.h
-include/libmowgli/mowgli_queue.h
-include/libmowgli/mowgli_random.h
-include/libmowgli/mowgli_signal.h
-include/libmowgli/mowgli_spinlock.h
-include/libmowgli/mowgli_stdinc.h
-include/libmowgli/mowgli_string.h
-lib/libmowgli.so
-lib/libmowgli.so.2
-lib/libmowgli.so.2.0.0
-lib/pkgconfig/libmowgli.pc
+@comment $NetBSD: PLIST,v 1.4 2019/11/22 00:12:34 nia Exp $
+include/libmowgli-2/base/argstack.h
+include/libmowgli-2/base/bitvector.h
+include/libmowgli-2/base/formatter.h
+include/libmowgli-2/base/hash.h
+include/libmowgli-2/base/hook.h
+include/libmowgli-2/base/memslice.h
+include/libmowgli-2/base/mowgli_signal.h
+include/libmowgli-2/base/random.h
+include/libmowgli-2/container/dictionary.h
+include/libmowgli-2/container/index.h
+include/libmowgli-2/container/list.h
+include/libmowgli-2/container/patricia.h
+include/libmowgli-2/container/queue.h
+include/libmowgli-2/core/alloc.h
+include/libmowgli-2/core/allocation_policy.h
+include/libmowgli-2/core/allocator.h
+include/libmowgli-2/core/assert.h
+include/libmowgli-2/core/bootstrap.h
+include/libmowgli-2/core/heap.h
+include/libmowgli-2/core/iterator.h
+include/libmowgli-2/core/logger.h
+include/libmowgli-2/core/mowgli_string.h
+include/libmowgli-2/core/process.h
+include/libmowgli-2/core/stdinc.h
+include/libmowgli-2/dns/dns.h
+include/libmowgli-2/dns/evloop_res.h
+include/libmowgli-2/dns/evloop_reslib.h
+include/libmowgli-2/eventloop/eventloop.h
+include/libmowgli-2/ext/confparse.h
+include/libmowgli-2/ext/error_backtrace.h
+include/libmowgli-2/ext/getopt_long.h
+include/libmowgli-2/ext/global_storage.h
+include/libmowgli-2/ext/json-inline.h
+include/libmowgli-2/ext/json.h
+include/libmowgli-2/ext/proctitle.h
+include/libmowgli-2/ext/program_opts.h
+include/libmowgli-2/linebuf/linebuf.h
+include/libmowgli-2/module/module.h
+include/libmowgli-2/mowgli.h
+include/libmowgli-2/object/class.h
+include/libmowgli-2/object/message.h
+include/libmowgli-2/object/metadata.h
+include/libmowgli-2/object/object.h
+include/libmowgli-2/platform/attributes.h
+include/libmowgli-2/platform/cacheline.h
+include/libmowgli-2/platform/constructor.h
+include/libmowgli-2/platform/machine.h
+include/libmowgli-2/platform/win32/win32_stdinc.h
+include/libmowgli-2/thread/mutex.h
+include/libmowgli-2/thread/thread.h
+include/libmowgli-2/vio/vio.h
+lib/libmowgli-2.so
+lib/libmowgli-2.so.0
+lib/libmowgli-2.so.0.0.0
+lib/pkgconfig/libmowgli-2.pc
diff --git a/devel/libmowgli/distinfo b/devel/libmowgli/distinfo
index b8cf4edf88c..12f9a7ecb28 100644
--- a/devel/libmowgli/distinfo
+++ b/devel/libmowgli/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:43 agc Exp $
+$NetBSD: distinfo,v 1.7 2019/11/22 00:12:34 nia Exp $
 
-SHA1 (libmowgli-0.7.1.tgz) = 62ef22d3ff101e369c6424a130a7af83a840deee
-RMD160 (libmowgli-0.7.1.tgz) = 4795045e65f0ac51ff6c77e070183f262fe7e85e
-SHA512 (libmowgli-0.7.1.tgz) = 81bd2467a15f5f243bc214fb6329a3632bc53a871183af36b919c568a50fd2314c56226f7c913f1a41538bae489e626bdc5fda0c21795a5a8b30bc1a49303f8b
-Size (libmowgli-0.7.1.tgz) = 124251 bytes
-SHA1 (patch-aa) = 52b2333527afe320b492bd6196d4b09fd8222fc7
-SHA1 (patch-ab) = 9a704f70f6daf8e0d3601ee6e09f6af871fc987c
+SHA1 (libmowgli-2.1.3.tar.gz) = 5972c980b7e7981d2e36e6038e2bf9c99775e1e1
+RMD160 (libmowgli-2.1.3.tar.gz) = 148f26f9b4fc6912fa950b177b503713a8f6ba0b
+SHA512 (libmowgli-2.1.3.tar.gz) = bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
+Size (libmowgli-2.1.3.tar.gz) = 227742 bytes
diff --git a/devel/libmowgli/patches/patch-aa b/devel/libmowgli/patches/patch-aa
deleted file mode 100644
index f4ec338e197..00000000000
--- a/devel/libmowgli/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/09/19 12:19:42 obache Exp $
-
-simplify, works with /bin/sh.
-
---- configure.orig	2010-07-14 03:43:16.000000000 +0000
-+++ configure
-@@ -4204,7 +4204,7 @@ fi
- 
- 
- 
--	${as_echo:="echo"} "${as_me:="configure"}: touching .deps files"
-+	${as_echo} "${as_me}: touching .deps files"
- 	for i in $(find . -name Makefile); do
- 		DEPSFILE="$(dirname $i)/.deps"
- 		test -f "$DEPSFILE" && rm "$DEPSFILE"
diff --git a/devel/libmowgli/patches/patch-ab b/devel/libmowgli/patches/patch-ab
deleted file mode 100644
index 10d9a53bcf1..00000000000
--- a/devel/libmowgli/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/04/21 20:29:20 hans Exp $
-
---- configure.orig	Thu Apr 21 23:01:02 2011
-+++ configure	Thu Apr 21 23:03:01 2011
-@@ -3231,7 +3231,7 @@
- $as_echo "Solaris" >&6; }
- 			LIB_CPPFLAGS='-DPIC'
- 			LIB_CFLAGS='-fPIC'
--			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}'
- 			LIB_PREFIX='lib'
- 			LIB_SUFFIX='.so'
- 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-@@ -3239,8 +3239,8 @@
- 			PLUGIN_CFLAGS='-fPIC'
- 			PLUGIN_LDFLAGS='-shared -fPIC'
- 			PLUGIN_SUFFIX='.so'
--			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
--			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
- 			CLEAN_LIB=''
- 			;;
- 		openbsd* | mirbsd*)