(geography/libmemphis02) Fix build, disable gtk-doc. Thanks wiz@

- http://mail-index.netbsd.org/pkgsrc-users/2021/01/18/msg033113.html
- PKGREVISION++

4 files changed, 23 insertions, 32 deletions

diff --git a/geography/libmemphis02/Makefile b/geography/libmemphis02/Makefile
index 05ba3e92968..6a79ba5eb88 100644
--- a/geography/libmemphis02/Makefile
+++ b/geography/libmemphis02/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2021/01/18 12:17:00 mef Exp $
+# $NetBSD: Makefile,v 1.12 2021/01/18 23:50:45 mef Exp $
 
 DISTNAME=	memphis-0.2.3
 PKGNAME=	libmemphis02-0.2.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jiuka/}
 GITHUB_PROJECT=	memphis
@@ -18,18 +18,15 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	aclocal autoconf autoheader automake gmake pkg-config
 
-CONFIGURE_ARGS+=	--enable-gtk-doc
-
 PKGCONFIG_OVERRIDE+=	memphis.pc.in
 
 pre-configure:
 	set -e; cd ${WRKSRC}; \
 	libtoolize --copy; aclocal -I m4; \
-	gtkdocize --copy; autoheader; \
+	autoheader ; \
 	automake -a --foreign -i --add-missing; autoconf
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/libmemphis02/PLIST b/geography/libmemphis02/PLIST
index 22873331a60..eb4b2952317 100644
--- a/geography/libmemphis02/PLIST
+++ b/geography/libmemphis02/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/05/14 19:32:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/01/18 23:50:45 mef Exp $
 include/libmemphis-0.2/memphis/memphis-data-pool.h
 include/libmemphis-0.2/memphis/memphis-debug.h
 include/libmemphis-0.2/memphis/memphis-map.h
@@ -8,24 +8,4 @@ include/libmemphis-0.2/memphis/memphis-rule.h
 include/libmemphis-0.2/memphis/memphis.h
 lib/libmemphis-0.2.la
 lib/pkgconfig/memphis-0.2.pc
-share/gtk-doc/html/libmemphis-0.2/MemphisDataPool.html
-share/gtk-doc/html/libmemphis-0.2/MemphisMap.html
-share/gtk-doc/html/libmemphis-0.2/MemphisRenderer.html
-share/gtk-doc/html/libmemphis-0.2/MemphisRule.html
-share/gtk-doc/html/libmemphis-0.2/MemphisRuleSet.html
-share/gtk-doc/html/libmemphis-0.2/annotation-glossary.html
-share/gtk-doc/html/libmemphis-0.2/api-index-full.html
-share/gtk-doc/html/libmemphis-0.2/ch01.html
-share/gtk-doc/html/libmemphis-0.2/home.png
-share/gtk-doc/html/libmemphis-0.2/index.html
-share/gtk-doc/html/libmemphis-0.2/left-insensitive.png
-share/gtk-doc/html/libmemphis-0.2/left.png
-share/gtk-doc/html/libmemphis-0.2/libmemphis-0.2.devhelp2
-share/gtk-doc/html/libmemphis-0.2/libmemphis-MemphisDebug.html
-share/gtk-doc/html/libmemphis-0.2/object-tree.html
-share/gtk-doc/html/libmemphis-0.2/right-insensitive.png
-share/gtk-doc/html/libmemphis-0.2/right.png
-share/gtk-doc/html/libmemphis-0.2/style.css
-share/gtk-doc/html/libmemphis-0.2/up-insensitive.png
-share/gtk-doc/html/libmemphis-0.2/up.png
 share/memphis-0.2/default-rules.xml
diff --git a/geography/libmemphis02/distinfo b/geography/libmemphis02/distinfo
index 7cccd0ecfb3..e0bf46fa9f8 100644
--- a/geography/libmemphis02/distinfo
+++ b/geography/libmemphis02/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/01/18 12:14:02 mef Exp $
+$NetBSD: distinfo,v 1.8 2021/01/18 23:50:45 mef Exp $
 
 SHA1 (memphis-0.2.3.tar.gz) = dbc2f61e49b996dc9ca91df0de9a08eb7adbfa9b
 RMD160 (memphis-0.2.3.tar.gz) = e00f510a97b4b0adb738dcb0949f65d8a7fe21fb
 SHA512 (memphis-0.2.3.tar.gz) = 5b7d14075e372905fecc602a52893f2bee1d0d40a7fc9ae8c91d1342bc4a979a63d4660f63c95a834dac310ab8702f1f7a09b261fed0a3e0e4579d814925c990
 Size (memphis-0.2.3.tar.gz) = 3417472 bytes
 SHA1 (patch-demos_Makefile.am) = af8cf460b74cd19f8810de4203c048a31c556950
-SHA1 (patch-docs_reference_Makefile.am) = c27326a5bdcccf5b486595666340786215958d54
+SHA1 (patch-docs_reference_Makefile.am) = b036eaca10ff41de4022148130b4ee95523733ca
diff --git a/geography/libmemphis02/patches/patch-docs_reference_Makefile.am b/geography/libmemphis02/patches/patch-docs_reference_Makefile.am
index 1c885359571..6c580c251ee 100644
--- a/geography/libmemphis02/patches/patch-docs_reference_Makefile.am
+++ b/geography/libmemphis02/patches/patch-docs_reference_Makefile.am
@@ -1,9 +1,9 @@
-$NetBSD: patch-docs_reference_Makefile.am,v 1.2 2020/03/11 10:34:23 wiz Exp $
+$NetBSD: patch-docs_reference_Makefile.am,v 1.3 2021/01/18 23:50:45 mef Exp $
 
 * Install versioned docs
 
---- docs/reference/Makefile.am.orig	2010-06-20 13:23:27.000000000 +0000
-+++ docs/reference/Makefile.am
+--- docs/reference/Makefile.am.orig	2010-06-20 22:23:27.000000000 +0900
++++ docs/reference/Makefile.am	2021-01-18 21:43:14.923525337 +0900
 @@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = 1.6
  DOC_MODULE=libmemphis
  
@@ -13,3 +13,17 @@ $NetBSD: patch-docs_reference_Makefile.am,v 1.2 2020/03/11 10:34:23 wiz Exp $
  
  
  # The top-level SGML file. You can change this if you want to.
+@@ -82,11 +82,11 @@ GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_src
+ GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/memphis/libmemphis-0.2.la
+ 
+ # This includes the standard gtk-doc make rules, copied by gtkdocize.
+-include $(top_srcdir)/gtk-doc.make
++#include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST +=
++EXTRA_DIST =
+ 
+ # Files not to distribute
+ # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types