pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/58450: multimedia/liboggz has broken doc option
The following reply was made to PR pkg/58450; it has been noted by GNATS.
From: Rob Whitlock <rwhitlock22%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost,
Thomas Klausner <wiz%gatalith.at@localhost>
Cc: pkg-manager%netbsd.org@localhost,
gnats-admin%netbsd.org@localhost,
pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/58450: multimedia/liboggz has broken doc option
Date: Sat, 20 Jul 2024 16:21:38 -0400
--Apple-Mail=_A48856C2-929C-4317-856F-C6025E07054E
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
> On Jul 20, 2024, at 4:40 AM, Thomas Klausner <wiz%gatalith.at@localhost> wrote:
>=20
> The following reply was made to PR pkg/58450; it has been noted by =
GNATS.
>=20
> From: Thomas Klausner <wiz%gatalith.at@localhost>
> To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
> Cc:=20
> Subject: Re: pkg/58450: multimedia/liboggz has broken doc option
> Date: Sat, 20 Jul 2024 10:36:37 +0200
>=20
> On Sat, Jul 20, 2024 at 08:30:01AM +0000, rwhitlock22%gmail.com@localhost wrote:
>>> Number: 58450
>>> Category: pkg
>>> Synopsis: multimedia/liboggz has broken doc option
>=20
> When I apply your patch I see
>=20
> =3D> Checking file-check results for liboggz-1.1.1nb1
> ERROR: ************************************************************
> ERROR: The following files are in =
/scratch/multimedia/liboggz/work/.destdir/usr/pkg but not in the PLIST:
> ERROR: =
/scratch/multimedia/liboggz/work/.destdir/usr/pkg/share/doc/liboggz/html/a=
nnotated.html
> ERROR: =
/scratch/multimedia/liboggz/work/.destdir/usr/pkg/share/doc/liboggz/html/c=
lasses.html
[snip]
Sorry about that. It turns out the configure script doesn't support =
enabling or disabling the installation of the docs so here's a patch =
that just removes the doc option.
--Apple-Mail=_A48856C2-929C-4317-856F-C6025E07054E
Content-Disposition: attachment;
filename=liboggz.patch
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="liboggz.patch"
Content-Transfer-Encoding: 7bit
? work
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/liboggz/Makefile,v
retrieving revision 1.8
diff -b -u -r1.8 Makefile
--- Makefile 16 Sep 2017 19:27:04 -0000 1.8
+++ Makefile 20 Jul 2024 20:17:46 -0000
@@ -15,6 +15,8 @@
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+
PKGCONFIG_OVERRIDE+= oggz.pc.in
.include "options.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/liboggz/PLIST,v
retrieving revision 1.1
diff -b -u -r1.1 PLIST
--- PLIST 9 May 2013 00:40:12 -0000 1.1
+++ PLIST 20 Jul 2024 20:17:46 -0000
@@ -41,33 +41,26 @@
man/man1/oggz-validate.1
man/man1/oggz.1
share/doc/liboggz/html/annotated.html
-${PLIST.doc}share/doc/liboggz/html/bc_s.png
-${PLIST.doc}share/doc/liboggz/html/bdwn.png
+share/doc/liboggz/html/bc_s.png
+share/doc/liboggz/html/bc_sd.png
share/doc/liboggz/html/classes.html
-${PLIST.doc}share/doc/liboggz/html/closed.png
-${PLIST.doc}share/doc/liboggz/html/dir_000000.html
-${PLIST.doc}share/doc/liboggz/html/dir_000001.html
+share/doc/liboggz/html/clipboard.js
+share/doc/liboggz/html/closed.png
+share/doc/liboggz/html/dir_26974de56ffe22e0ef3b764e67ab9f33.html
+share/doc/liboggz/html/dir_d436eb0fd9de10b54a828ce6435f7e81.html
+share/doc/liboggz/html/doc.svg
+share/doc/liboggz/html/docd.svg
share/doc/liboggz/html/doxygen.css
share/doc/liboggz/html/doxygen.png
-${PLIST.doc}share/doc/liboggz/html/dynsections.js
+share/doc/liboggz/html/doxygen.svg
+share/doc/liboggz/html/doxygen_crawl.html
+share/doc/liboggz/html/dynsections.js
share/doc/liboggz/html/files.html
-${PLIST.doc}share/doc/liboggz/html/forcefeed.png
-${PLIST.doc}share/doc/liboggz/html/ftv2blank.png
-${PLIST.doc}share/doc/liboggz/html/ftv2cl.png
-${PLIST.doc}share/doc/liboggz/html/ftv2doc.png
-${PLIST.doc}share/doc/liboggz/html/ftv2folderclosed.png
-${PLIST.doc}share/doc/liboggz/html/ftv2folderopen.png
-${PLIST.doc}share/doc/liboggz/html/ftv2lastnode.png
-${PLIST.doc}share/doc/liboggz/html/ftv2link.png
-${PLIST.doc}share/doc/liboggz/html/ftv2mlastnode.png
-${PLIST.doc}share/doc/liboggz/html/ftv2mnode.png
-${PLIST.doc}share/doc/liboggz/html/ftv2mo.png
-${PLIST.doc}share/doc/liboggz/html/ftv2node.png
-${PLIST.doc}share/doc/liboggz/html/ftv2ns.png
-${PLIST.doc}share/doc/liboggz/html/ftv2plastnode.png
-${PLIST.doc}share/doc/liboggz/html/ftv2pnode.png
-${PLIST.doc}share/doc/liboggz/html/ftv2splitbar.png
-${PLIST.doc}share/doc/liboggz/html/ftv2vertline.png
+share/doc/liboggz/html/folderclosed.svg
+share/doc/liboggz/html/folderclosedd.svg
+share/doc/liboggz/html/folderopen.svg
+share/doc/liboggz/html/folderopend.svg
+share/doc/liboggz/html/forcefeed.png
share/doc/liboggz/html/functions.html
share/doc/liboggz/html/functions_vars.html
share/doc/liboggz/html/globals.html
@@ -87,13 +80,20 @@
share/doc/liboggz/html/group__seek__api.html
share/doc/liboggz/html/group__seek__semantics.html
share/doc/liboggz/html/group__write__api.html
-${PLIST.doc}share/doc/liboggz/html/hungry.png
+share/doc/liboggz/html/hungry.png
share/doc/liboggz/html/index.html
-${PLIST.doc}share/doc/liboggz/html/jquery.js
+share/doc/liboggz/html/jquery.js
+share/doc/liboggz/html/menu.js
+share/doc/liboggz/html/menudata.js
+share/doc/liboggz/html/minus.svg
+share/doc/liboggz/html/minusd.svg
share/doc/liboggz/html/modules.html
-${PLIST.doc}share/doc/liboggz/html/nav_f.png
-${PLIST.doc}share/doc/liboggz/html/nav_g.png
-${PLIST.doc}share/doc/liboggz/html/nav_h.png
+share/doc/liboggz/html/nav_f.png
+share/doc/liboggz/html/nav_fd.png
+share/doc/liboggz/html/nav_g.png
+share/doc/liboggz/html/nav_h.png
+share/doc/liboggz/html/nav_hd.png
+share/doc/liboggz/html/navtree.css
share/doc/liboggz/html/oggz_8h.html
share/doc/liboggz/html/oggz_8h_source.html
share/doc/liboggz/html/oggz__comments_8h.html
@@ -106,8 +106,8 @@
share/doc/liboggz/html/oggz__io_8h_source.html
share/doc/liboggz/html/oggz__off__t_8h.html
share/doc/liboggz/html/oggz__off__t_8h_source.html
-${PLIST.doc}share/doc/liboggz/html/oggz__off__t__generated_8h.html
-${PLIST.doc}share/doc/liboggz/html/oggz__off__t__generated_8h_source.html
+share/doc/liboggz/html/oggz__off__t__generated_8h.html
+share/doc/liboggz/html/oggz__off__t__generated_8h_source.html
share/doc/liboggz/html/oggz__packet_8h.html
share/doc/liboggz/html/oggz__packet_8h_source.html
share/doc/liboggz/html/oggz__read_8h.html
@@ -120,27 +120,36 @@
share/doc/liboggz/html/oggz__table_8h_source.html
share/doc/liboggz/html/oggz__write_8h.html
share/doc/liboggz/html/oggz__write_8h_source.html
-${PLIST.doc}share/doc/liboggz/html/open.png
+share/doc/liboggz/html/open.png
+share/doc/liboggz/html/plus.svg
+share/doc/liboggz/html/plusd.svg
+share/doc/liboggz/html/resize.js
+share/doc/liboggz/html/splitbar.png
+share/doc/liboggz/html/splitbard.png
share/doc/liboggz/html/structOggzComment.html
share/doc/liboggz/html/structoggz__packet.html
share/doc/liboggz/html/structoggz__position.html
-${PLIST.doc}share/doc/liboggz/html/sync_off.png
-${PLIST.doc}share/doc/liboggz/html/sync_on.png
-${PLIST.doc}share/doc/liboggz/html/tab_a.png
+share/doc/liboggz/html/sync_off.png
+share/doc/liboggz/html/sync_on.png
+share/doc/liboggz/html/tab_a.png
+share/doc/liboggz/html/tab_ad.png
share/doc/liboggz/html/tab_b.gif
-${PLIST.doc}share/doc/liboggz/html/tab_b.png
-${PLIST.doc}share/doc/liboggz/html/tab_h.png
+share/doc/liboggz/html/tab_b.png
+share/doc/liboggz/html/tab_bd.png
+share/doc/liboggz/html/tab_h.png
+share/doc/liboggz/html/tab_hd.png
share/doc/liboggz/html/tab_l.gif
share/doc/liboggz/html/tab_r.gif
-${PLIST.doc}share/doc/liboggz/html/tab_s.png
+share/doc/liboggz/html/tab_s.png
+share/doc/liboggz/html/tab_sd.png
share/doc/liboggz/html/tabs.css
+share/doc/liboggz/html/topics.html
share/doc/liboggz/latex/Makefile
share/doc/liboggz/latex/annotated.tex
-${PLIST.doc}share/doc/liboggz/latex/dir_000000.tex
-${PLIST.doc}share/doc/liboggz/latex/dir_000001.tex
share/doc/liboggz/latex/doxygen.sty
+share/doc/liboggz/latex/etoc_doxygen.sty
share/doc/liboggz/latex/files.tex
-${PLIST.doc}share/doc/liboggz/latex/forcefeed.eps
+share/doc/liboggz/latex/forcefeed.eps
share/doc/liboggz/latex/group__basics.tex
share/doc/liboggz/latex/group__building.tex
share/doc/liboggz/latex/group__configuration.tex
@@ -152,23 +161,39 @@
share/doc/liboggz/latex/group__seek__api.tex
share/doc/liboggz/latex/group__seek__semantics.tex
share/doc/liboggz/latex/group__write__api.tex
-${PLIST.doc}share/doc/liboggz/latex/hungry.eps
+share/doc/liboggz/latex/hungry.eps
share/doc/liboggz/latex/index.tex
+share/doc/liboggz/latex/longtable_doxygen.sty
share/doc/liboggz/latex/modules.tex
share/doc/liboggz/latex/oggz_8h.tex
+share/doc/liboggz/latex/oggz_8h_source.tex
share/doc/liboggz/latex/oggz__comments_8h.tex
+share/doc/liboggz/latex/oggz__comments_8h_source.tex
share/doc/liboggz/latex/oggz__constants_8h.tex
+share/doc/liboggz/latex/oggz__constants_8h_source.tex
share/doc/liboggz/latex/oggz__deprecated_8h.tex
+share/doc/liboggz/latex/oggz__deprecated_8h_source.tex
share/doc/liboggz/latex/oggz__io_8h.tex
+share/doc/liboggz/latex/oggz__io_8h_source.tex
share/doc/liboggz/latex/oggz__off__t_8h.tex
-${PLIST.doc}share/doc/liboggz/latex/oggz__off__t__generated_8h.tex
+share/doc/liboggz/latex/oggz__off__t_8h_source.tex
+share/doc/liboggz/latex/oggz__off__t__generated_8h.tex
+share/doc/liboggz/latex/oggz__off__t__generated_8h_source.tex
share/doc/liboggz/latex/oggz__packet_8h.tex
+share/doc/liboggz/latex/oggz__packet_8h_source.tex
share/doc/liboggz/latex/oggz__read_8h.tex
+share/doc/liboggz/latex/oggz__read_8h_source.tex
share/doc/liboggz/latex/oggz__seek_8h.tex
+share/doc/liboggz/latex/oggz__seek_8h_source.tex
share/doc/liboggz/latex/oggz__stream_8h.tex
+share/doc/liboggz/latex/oggz__stream_8h_source.tex
share/doc/liboggz/latex/oggz__table_8h.tex
+share/doc/liboggz/latex/oggz__table_8h_source.tex
share/doc/liboggz/latex/oggz__write_8h.tex
+share/doc/liboggz/latex/oggz__write_8h_source.tex
share/doc/liboggz/latex/refman.tex
share/doc/liboggz/latex/structOggzComment.tex
share/doc/liboggz/latex/structoggz__packet.tex
share/doc/liboggz/latex/structoggz__position.tex
+share/doc/liboggz/latex/tabu_doxygen.sty
+share/doc/liboggz/latex/topics.tex
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/liboggz/options.mk,v
retrieving revision 1.3
diff -b -u -r1.3 options.mk
--- options.mk 6 Jun 2023 12:42:01 -0000 1.3
+++ options.mk 20 Jul 2024 20:17:46 -0000
@@ -1,19 +1,12 @@
# $NetBSD: options.mk,v 1.3 2023/06/06 12:42:01 riastradh Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.liboggz
-PKG_SUPPORTED_OPTIONS= doc valgrind
+PKG_SUPPORTED_OPTIONS= valgrind
PKG_SUGGESTED_OPTIONS+= # blank
-PLIST_VARS+= doc
+PLIST_VARS+= # blank
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mdoc)
-TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
-PLIST.doc= yes
-.else
-CONFIGURE_ARGS+= HAVE_DOXYGEN=no
-.endif
-
.if !empty(PKG_OPTIONS:Mvalgrind)
TOOL_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
CONFIGURE_ARGS+= --enable-valgrind-testing
--Apple-Mail=_A48856C2-929C-4317-856F-C6025E07054E--
Home |
Main Index |
Thread Index |
Old Index