pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/geeqie geeqie: remove unneeded patch and Make...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/159da0dc4dde
branches:  trunk
changeset: 412709:159da0dc4dde
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 11 14:38:00 2020 +0000

description:
geeqie: remove unneeded patch and Makefile targt

Now that gnome-doc-utils is fixed, it's not necessary any longer.

diffstat:

 graphics/geeqie/Makefile                      |   6 ++----
 graphics/geeqie/distinfo                      |   3 +--
 graphics/geeqie/patches/patch-doc_Makefile.am |  21 ---------------------
 3 files changed, 3 insertions(+), 27 deletions(-)

diffs (63 lines):

diff -r ab9abaff8d4b -r 159da0dc4dde graphics/geeqie/Makefile
--- a/graphics/geeqie/Makefile  Wed Mar 11 14:37:24 2020 +0000
+++ b/graphics/geeqie/Makefile  Wed Mar 11 14:38:00 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2020/03/11 11:08:42 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2020/03/11 14:38:00 wiz Exp $
 
 DISTNAME=      geeqie-1.5.1
 PKGREVISION=   3
@@ -25,13 +25,11 @@
 pre-configure:
        cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
 
-post-build:
-       cd ${WRKSRC}/doc && ${MAKE_PROGRAM} html
-
 .include "options.mk"
 
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_API_DEPENDS.gnome-doc-utils+=        gnome-doc-utils>=0.20.10nb4
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ab9abaff8d4b -r 159da0dc4dde graphics/geeqie/distinfo
--- a/graphics/geeqie/distinfo  Wed Mar 11 14:37:24 2020 +0000
+++ b/graphics/geeqie/distinfo  Wed Mar 11 14:38:00 2020 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2020/03/11 11:08:42 wiz Exp $
+$NetBSD: distinfo,v 1.19 2020/03/11 14:38:00 wiz Exp $
 
 SHA1 (geeqie-1.5.1.tar.xz) = fe14b122744a4297e9e98a9cfc5821f2b5e6e1ce
 RMD160 (geeqie-1.5.1.tar.xz) = 90627c49e53d9389bcbb8feec5315cd02a5ea616
 SHA512 (geeqie-1.5.1.tar.xz) = 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac
 Size (geeqie-1.5.1.tar.xz) = 1587116 bytes
 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
-SHA1 (patch-doc_Makefile.am) = 5f85c689505b9981cd9d61e3cdd5860c2b7c3a60
 SHA1 (patch-src_layout__util.c) = a6894c578b98bccde256ac88869c9149f3acc79a
diff -r ab9abaff8d4b -r 159da0dc4dde graphics/geeqie/patches/patch-doc_Makefile.am
--- a/graphics/geeqie/patches/patch-doc_Makefile.am     Wed Mar 11 14:37:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-doc_Makefile.am,v 1.3 2020/03/11 10:54:43 wiz Exp $
-
-Generate html docs in build phase (instead of install phase).
-gnome-doc-tool seems to ignore "-o html" so manually generate
-the same effect.
-
-Solves PLIST problem due to missing html files.
-
-This is not known to be reported upstream.
-
---- doc/Makefile.am.orig       2017-12-31 12:31:21.000000000 +0000
-+++ doc/Makefile.am
-@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook
- html/GuideIndex.html: docbook/GuideIndex.xml
-       rm -rf html; mkdir html; cp $(srcdir)/icons/* html/
-       if [ -x "$(GNOME_DOC_TOOL)" ]; then \
--              "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
-+              cd html && "$(GNOME_DOC_TOOL)" html $(srcdir)/../docbook/GuideIndex.xml ; \
-       else \
-               echo "gnome-doc-tool not found, html is not built" ; \
-       fi



Home | Main Index | Thread Index | Old Index