[PATCH] (geography/libmemphis02)

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Sorry for serveral (many) confusing commits:

Here is my adhoc fix removing gtk-doc
-- 
Makoto Fujiwara
mef%NetBSD.org@localhost
makoto%if.t.u-tokyo.ac.jp@localhost
Key fingerprint = 0BFA FAEB EAD1 90BA 7498  8F85 6809 9E0B B7EF A12E
----
pkgsrc freshness:
http://www.ki.nu/~makoto/pkgsrc/check-update/HEAD/00_Summary.html

Index: libmemphis02/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/geography/libmemphis02/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libmemphis02/Makefile	18 Jan 2021 12:17:00 -0000	1.11
+++ libmemphis02/Makefile	18 Jan 2021 12:53:19 -0000
@@ -18,14 +18,14 @@
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	aclocal autoconf autoheader automake gmake pkg-config
 
-CONFIGURE_ARGS+=	--enable-gtk-doc
+#ONFIGURE_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"
Index: libmemphis02/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/geography/libmemphis02/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- libmemphis02/PLIST	14 May 2020 19:32:12 -0000	1.4
+++ libmemphis02/PLIST	18 Jan 2021 12:53:19 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/05/14 19:32:12 joerg Exp $
+@comment $NetBSD$
 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.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
Index: libmemphis02/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/geography/libmemphis02/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- libmemphis02/distinfo	18 Jan 2021 12:14:02 -0000	1.7
+++ libmemphis02/distinfo	18 Jan 2021 12:53:19 -0000
@@ -5,4 +5,4 @@
 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
Index: libmemphis02/patches/patch-docs_reference_Makefile.am
===================================================================
RCS file: /cvsroot/pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 patch-docs_reference_Makefile.am
--- libmemphis02/patches/patch-docs_reference_Makefile.am	11 Mar 2020 10:34:23 -0000	1.2
+++ libmemphis02/patches/patch-docs_reference_Makefile.am	18 Jan 2021 12:53:19 -0000
@@ -2,8 +2,8 @@
 
 * 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 @@
  
  
  # 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