Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id EBB711A9217 for ; Mon, 18 Jan 2021 23:50:47 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 1B9D484DAA; Mon, 18 Jan 2021 23:50:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 52DC484D55 for ; Mon, 18 Jan 2021 23:50:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hS1LvePpSBvt for ; Mon, 18 Jan 2021 23:50:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 855D184D46 for ; Mon, 18 Jan 2021 23:50:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 79AFCFA9D; Mon, 18 Jan 2021 23:50:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1611013845139550" MIME-Version: 1.0 Date: Mon, 18 Jan 2021 23:50:45 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/geography/libmemphis02 To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20210118235045.79AFCFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1611013845139550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Mon Jan 18 23:50:45 UTC 2021 Modified Files: pkgsrc/geography/libmemphis02: Makefile PLIST distinfo pkgsrc/geography/libmemphis02/patches: patch-docs_reference_Makefile.am Log Message: (geography/libmemphis02) Fix build, disable gtk-doc. Thanks wiz@ - http://mail-index.netbsd.org/pkgsrc-users/2021/01/18/msg033113.html - PKGREVISION++ To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/libmemphis02/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/libmemphis02/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/libmemphis02/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1611013845139550 Content-Disposition: inline Content-Length: 5579 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/libmemphis02/Makefile diff -u pkgsrc/geography/libmemphis02/Makefile:1.11 pkgsrc/geography/libmemphis02/Makefile:1.12 --- pkgsrc/geography/libmemphis02/Makefile:1.11 Mon Jan 18 12:17:00 2021 +++ pkgsrc/geography/libmemphis02/Makefile Mon Jan 18 23:50:45 2021 @@ -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" Index: pkgsrc/geography/libmemphis02/PLIST diff -u pkgsrc/geography/libmemphis02/PLIST:1.4 pkgsrc/geography/libmemphis02/PLIST:1.5 --- pkgsrc/geography/libmemphis02/PLIST:1.4 Thu May 14 19:32:12 2020 +++ pkgsrc/geography/libmemphis02/PLIST Mon Jan 18 23:50:45 2021 @@ -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-r 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: pkgsrc/geography/libmemphis02/distinfo diff -u pkgsrc/geography/libmemphis02/distinfo:1.7 pkgsrc/geography/libmemphis02/distinfo:1.8 --- pkgsrc/geography/libmemphis02/distinfo:1.7 Mon Jan 18 12:14:02 2021 +++ pkgsrc/geography/libmemphis02/distinfo Mon Jan 18 23:50:45 2021 @@ -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 Index: pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am diff -u pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am:1.2 pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am:1.3 --- pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am:1.2 Wed Mar 11 10:34:23 2020 +++ pkgsrc/geography/libmemphis02/patches/patch-docs_reference_Makefile.am Mon Jan 18 23:50:45 2021 @@ -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.a # 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 --_----------=_1611013845139550--