Date: Mon, 01 Jan 2024 22:55:03 +0100 From: Daniel Engberg <daniel.engberg.lists@pyret.net> To: Don Lewis <truckman@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 95665bb506b0 - main - textproc/rarian: Resurrect and upgrade to 0.8.5 Message-ID: <c8e928afddc458f1e5857913ba5964f2@mail.infomaniak.com> In-Reply-To: <202401012136.401LaS2Z080770@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2024-01-01T22:36:28.000+01:00, Don Lewis <truckman@FreeBSD.org> wrote: > The branch main has been updated by truckman: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=95665bb506b043720d7ebf1c8331ae8629a7153d > > commit 95665bb506b043720d7ebf1c8331ae8629a7153d > > Author: Don Lewis <truckman@FreeBSD.org> > > AuthorDate: 2024-01-01 02:23:18 +0000 > > Commit: Don Lewis <truckman@FreeBSD.org> > > CommitDate: 2024-01-01 21:35:43 +0000 > > textproc/rarian: Resurrect and upgrade to 0.8.5 > > > > Rarian has moved to a new upstream site and is being maintained. > > > > python is only needed for uploading upstream releases. > > --- > > MOVED | 1 - > > Mk/Uses/gnome.mk [http://gnome.mk] | 15 +++++++ > > textproc/Makefile | 1 + > > textproc/rarian/Makefile | 48 ++++++++++++++++++++++ > > textproc/rarian/distinfo | 3 ++ > > textproc/rarian/files/patch-util_Makefile.am [http://Makefile.am] | 11 +++++ > > .../rarian/files/patch-util_rarian-sk-config.in [http://rarian-sk-config.in] | 20 +++++++++ > > .../rarian/files/patch-util_rarian-sk-rebuild.in [http://rarian-sk-rebuild.in] | 18 ++++++++ > > .../rarian/files/patch-util_rarian-sk-update.in [http://rarian-sk-update.in] | 18 ++++++++ > > textproc/rarian/pkg-descr | 9 ++++ > > textproc/rarian/pkg-plist | 48 ++++++++++++++++++++++ > > 11 files changed, 191 insertions(+), 1 deletion(-) > > diff --git a/MOVED b/MOVED > > index 6a56144f2775..20e8f67d4702 100644 > > --- a/MOVED > > +++ b/MOVED > > @@ -6483,7 +6483,6 @@ databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reache > > net-im/pidgin-bs|net-im/pidgin-bot-sentry|2022-03-13|Project was renamed > > math/qalculate|math/qalculate-gtk|2022-03-14|Renamed to match upstream naming > > deskutils/nautilus-actions||2022-03-15|Abandonware > > -textproc/rarian||2022-03-15|Abandonware > > devel/ORBit2||2022-03-15|Gnome2 library unused anymore > > games/pushover|games/domino-chain|2022-03-17|Chase upstream rename > > graphics/darktable38|graphics/darktable|2022-03-19|Darktable was upgraded to 3.8, separate port no longer needed > > diff --git a/Mk/Uses/gnome.mk [http://gnome.mk] b/Mk/Uses/gnome.mk [http://gnome.mk] > > index 70d601ce853d..1628f3b8fb09 100644 > > --- a/Mk/Uses/gnome.mk [http://gnome.mk] > > +++ b/Mk/Uses/gnome.mk [http://gnome.mk] > > @@ -42,6 +42,10 @@ > > # add the following to your Makefile: > > # "GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml". > > # > > +# INSTALLS_OMF - If set, bsd.gnome.mk [http://bsd.gnome.mk] will automatically scan pkg-plist > > +# file and add apropriate @postexec/@postunexec directives for > > +# each .omf file found to track OMF registration database. > > +# > > # MAINTAINER: gnome@FreeBSD.org > > > > .if !defined(_INCLUDE_USES_GNOME_MK) > > @@ -423,5 +427,16 @@ gnome-post-gconf-schemas: > > PLIST_FILES+= ${GLIB_SCHEMAS:C,^,share/glib-2.0/schemas/,} > > . endif > > > > +. if defined(INSTALLS_OMF) > > +_USES_install+= 690:gnome-post-omf > > +gnome-post-omf: > > + @for i in `${GREP} "\.omf$$" ${TMPPLIST}`; do \ > > + ${ECHO_CMD} "@postexec scrollkeeper-install -q %D/$${i} 2>/dev/null || /usr/bin/true" \ > > + >> ${TMPPLIST}; \ > > + ${ECHO_CMD} "@postunexec scrollkeeper-uninstall -q %D/$${i} 2>/dev/null || /usr/bin/true" \ > > + >> ${TMPPLIST}; \ > > + done > > +. endif > > + > > .endif > > # End of use part. > > diff --git a/textproc/Makefile b/textproc/Makefile > > index 2582dca0305f..6420842add6e 100644 > > --- a/textproc/Makefile > > +++ b/textproc/Makefile > > @@ -1662,6 +1662,7 @@ > > SUBDIR += randlm > > SUBDIR += rapidxml > > SUBDIR += raptor2 > > + SUBDIR += rarian > > SUBDIR += rasqal > > SUBDIR += re-flex > > SUBDIR += re_graph > > diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile > > new file mode 100644 > > index 000000000000..2a06610757e7 > > --- /dev/null > > +++ b/textproc/rarian/Makefile > > @@ -0,0 +1,48 @@ > > +PORTNAME= rarian > > +PORTVERSION= 0.8.5 > > +PORTREVISION= 6 > > +CATEGORIES= textproc gnome > > + > > +MAINTAINER= truckman@FreeBSD.org > > +COMMENT= OMF help system based on the Freedesktop specification > > +WWW= https://rarian.freedesktop.org/ > > + > > +LICENSE= GPLv2+ LGPL21+ ZLIB > > +LICENSE_COMB= multi > > +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.UTILS > > +LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB > > +LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING > > + > > +BUILD_DEPENDS= ${LOCALBASE}/bin/getopt:misc/getopt \ > > + bash:shells/bash \ > > + xsltproc:textproc/libxslt \ > > + docbook-xml>0:textproc/docbook-xml \ > > + ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl > > +LIB_DEPENDS= libtinyxml.so:textproc/tinyxml [http://libtinyxml.so:textproc/tinyxml] > > +RUN_DEPENDS= ${LOCALBASE}/bin/getopt:misc/getopt \ > > + bash:shells/bash \ > > + xsltproc:textproc/libxslt \ > > + docbook-xml>0:textproc/docbook-xml \ > > + ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl > > + > > +USES= autoreconf gmake gnome libtool localbase pathfix pkgconfig tar:bzip2 > > +USE_GITLAB= yes > > +GL_SITE= https://gitlab.freedesktop.org > > +GL_TAGNAME= 0.8.5 > > +USE_LDCONFIG= yes > > +GNU_CONFIGURE= yes > > +CONFIGURE_ARGS= --localstatedir=/var \ > > + --with-convert-dir=${LOCALBASE}/share/omf \ > > + --with-default-data-dirs="${LOCALBASE}/share:/usr/share" \ > > + --with-default-infopath="${LOCALBASE}/info:${LOCALBASE}/share/info" \ > > + --with-default-manpath="/usr/share/man:${LOCALBASE}/share/man:${LOCALBASE}/man" \ > > + --with-gnu-getopt=${LOCALBASE}/bin/getopt \ > > + --with-localstate-subdir=db/rarian \ > > + --with-metadata-dir=${DOCSDIR} > > + > > +INSTALL_TARGET= install-strip > > + > > +post-patch: > > + @${REINPLACE_CMD} -e 's|`getopt|`${LOCALBASE}/bin/getopt|' ${WRKSRC}/util/rarian-sk-update.in [http://rarian-sk-update.in] > > + > > +.include <bsd.port.mk> [http://bsd.port.mk>]; > > diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo > > new file mode 100644 > > index 000000000000..d08566a105b4 > > --- /dev/null > > +++ b/textproc/rarian/distinfo > > @@ -0,0 +1,3 @@ > > +TIMESTAMP = 1704136985 > > +SHA256 (rarian-0.8.5.tar.bz2) = 93cf05e6bf51af169d0b32a2dc03f9a0f7895cae4e58b1a9b75777c040e9be0f > > +SIZE (rarian-0.8.5.tar.bz2) = 91098 > > diff --git a/textproc/rarian/files/patch-util_Makefile.am [http://Makefile.am] b/textproc/rarian/files/patch-util_Makefile.am [http://Makefile.am] > > new file mode 100644 > > index 000000000000..268a703d359a > > --- /dev/null > > +++ b/textproc/rarian/files/patch-util_Makefile.am [http://Makefile.am] > > @@ -0,0 +1,11 @@ > > +--- util/Makefile.am.orig [http://Makefile.am.orig] 2023-12-09 03:14:08 UTC > > ++++ util/Makefile.am [http://Makefile.am] > > +@@ -122,7 +122,7 @@ endif > > + @cd $(DESTDIR)$(bindir); ln -s rarian-sk-rebuild scrollkeeper-rebuilddb > > + @cd $(DESTDIR)$(bindir); ln -s rarian-sk-install scrollkeeper-uninstall > > + @cd $(DESTDIR)$(bindir); ln -s rarian-sk-update scrollkeeper-update > > +- @mkdir -p $(DESTDIR)/$(localstatedir)/lib/rarian > > ++ @mkdir -p $(DESTDIR)/$(localstatedir)/db/rarian > > + if ENABLE_SKDB_UPDATE > > + @echo "Translating current database" > > + @$(DESTDIR)$(bindir)/rarian-sk-update > > diff --git a/textproc/rarian/files/patch-util_rarian-sk-config.in [http://rarian-sk-config.in] b/textproc/rarian/files/patch-util_rarian-sk-config.in [http://rarian-sk-config.in] > > new file mode 100644 > > index 000000000000..5ef60061b194 > > --- /dev/null > > +++ b/textproc/rarian/files/patch-util_rarian-sk-config.in [http://rarian-sk-config.in] > > @@ -0,0 +1,20 @@ > > +--- util/rarian-sk-config.in.orig [http://rarian-sk-config.in.orig] 2023-12-09 03:14:08 UTC > > ++++ util/rarian-sk-config.in [http://rarian-sk-config.in] > > +@@ -8,7 +8,7 @@ convert_dir=@CONVERT_DIR@ > > + exec_prefix=@exec_prefix@ > > + bindir=@bindir@ > > + convert_dir=@CONVERT_DIR@ > > +-statedir=@localstatedir@/lib/rarian > > ++statedir=@localstatedir@/db/rarian > > + datarootdir=@datarootdir@ > > + datadir=@datadir@ > > + output_dir=${datadir}/help > > +@@ -47,7 +47,7 @@ case "$1" in > > + print_help > > + ;; > > + --version ) > > +- echo $package_version \(Rarian replacement for scrollkeeper-config\) > > ++ echo $package_version > > + ;; > > + --prefix ) > > + echo $prefix > > diff --git a/textproc/rarian/files/patch-util_rarian-sk-rebuild.in [http://rarian-sk-rebuild.in] b/textproc/rarian/files/patch-util_rarian-sk-rebuild.in [http://rarian-sk-rebuild.in] > > new file mode 100644 > > index 000000000000..988e09816309 > > --- /dev/null > > +++ b/textproc/rarian/files/patch-util_rarian-sk-rebuild.in [http://rarian-sk-rebuild.in] > > @@ -0,0 +1,18 @@ > > +--- util/rarian-sk-rebuild.in.orig [http://rarian-sk-rebuild.in.orig] 2023-12-09 03:14:08 UTC > > ++++ util/rarian-sk-rebuild.in [http://rarian-sk-rebuild.in] > > +@@ -9,7 +9,7 @@ datarootdir=@datarootdir@ > > + bindir=@bindir@ > > + convert_dir=@CONVERT_DIR@ > > + datarootdir=@datarootdir@ > > +-statedir=@localstatedir@/lib/rarian > > ++statedir=@localstatedir@/db/rarian > > + datadir=@datadir@ > > + output_dir=${datadir}/help > > + package_version=@PACKAGE_VERSION@ > > +@@ -35,4 +35,4 @@ $bindir/rarian-sk-update -v --clean-index -o $convert_ > > + > > + $bindir/rarian-sk-update -v --clean-index -o $convert_string > > + > > +-fi > > +\ No newline at end of file > > ++fi > > diff --git a/textproc/rarian/files/patch-util_rarian-sk-update.in [http://rarian-sk-update.in] b/textproc/rarian/files/patch-util_rarian-sk-update.in [http://rarian-sk-update.in] > > new file mode 100644 > > index 000000000000..53babb9d8fd0 > > --- /dev/null > > +++ b/textproc/rarian/files/patch-util_rarian-sk-update.in [http://rarian-sk-update.in] > > @@ -0,0 +1,18 @@ > > +--- util/rarian-sk-update.in.orig [http://rarian-sk-update.in.orig] 2023-12-09 03:14:08 UTC > > ++++ util/rarian-sk-update.in [http://rarian-sk-update.in] > > +@@ -19,7 +19,7 @@ bindir=@bindir@ > > + prefix=@prefix@ > > + exec_prefix=@exec_prefix@ > > + bindir=@bindir@ > > +-statedir=@localstatedir@/lib/rarian > > ++statedir=@localstatedir@/db/rarian > > + convert_dir=@CONVERT_DIR@ > > + datarootdir=@datarootdir@ > > + datadir=@datadir@ > > +@@ -422,4 +422,4 @@ rm -rf $tmpdir > > + fi > > + rm -rf $tmpdir > > + > > +-fi # ENABLE_OMF_READ > > +\ No newline at end of file > > ++fi # ENABLE_OMF_READ > > diff --git a/textproc/rarian/pkg-descr b/textproc/rarian/pkg-descr > > new file mode 100644 > > index 000000000000..e60b1e98e756 > > --- /dev/null > > +++ b/textproc/rarian/pkg-descr > > @@ -0,0 +1,9 @@ > > +Rarian is designed to be a replacement for scrollkeeper. It is > > +currently undergoing heavy development. As of writing, rarian can be > > +installed in place of scrollkeeper and everything will work okay. > > + > > +Rarian manages documentation metadata (as specified by the Open Source > > +Metadata Framework (OMF) and provides a simple API to allow help browsers > > +to find, sort, and search the document catalog. It will also be able to > > +communicate with catalog servers on the Net to search for documents which > > +are not on the local system. > > diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist > > new file mode 100644 > > index 000000000000..099407701e9e > > --- /dev/null > > +++ b/textproc/rarian/pkg-plist > > @@ -0,0 +1,48 @@ > > +bin/rarian-example > > +bin/rarian-sk-config > > +bin/rarian-sk-extract > > +bin/rarian-sk-gen-uuid > > +bin/rarian-sk-get-cl > > +bin/rarian-sk-get-content-list > > +bin/rarian-sk-get-extended-content-list > > +bin/rarian-sk-get-scripts > > +bin/rarian-sk-install > > +bin/rarian-sk-migrate > > +bin/rarian-sk-preinstall > > +bin/rarian-sk-rebuild > > +bin/rarian-sk-update > > +bin/scrollkeeper-config > > +bin/scrollkeeper-extract > > +bin/scrollkeeper-gen-seriesid > > +bin/scrollkeeper-get-cl > > +bin/scrollkeeper-get-content-list > > +bin/scrollkeeper-get-extended-content-list > > +bin/scrollkeeper-get-index-from-docpath > > +bin/scrollkeeper-get-toc-from-docpath > > +bin/scrollkeeper-get-toc-from-id > > +bin/scrollkeeper-install > > +bin/scrollkeeper-preinstall > > +bin/scrollkeeper-rebuilddb > > +bin/scrollkeeper-uninstall > > +bin/scrollkeeper-update > > +include/rarian/rarian-info.h > > +include/rarian/rarian-main.h > > +include/rarian/rarian-man.h > > +include/rarian/rarian-reg-utils.h > > +include/rarian/rarian.h > > +lib/librarian.a > > +lib/librarian.so [http://librarian.so] > > +lib/librarian.so.0 [http://librarian.so.0] > > +lib/librarian.so.0.0.0 [http://librarian.so.0.0.0] > > +libdata/pkgconfig/rarian.pc > > +share/help/rarian.document > > +share/librarian/Templates/C/scrollkeeper_cl.xml > > +share/librarian/manual/help-spec-0.2.xml > > +share/librarian/manual/index.xhtml > > +share/librarian/manual/rar-lib.xhtml > > +share/librarian/manual/rar-mdf.xhtml > > +share/librarian/manual/rar-skcompat.xhtml > > +share/librarian/rarian-sk-cl.xml > > +@dir /var/db/rarian > > +@postunexec rmdir /var/db/rarian/* 2>/dev/null || true > > +@postexec %%PREFIX%%/bin/rarian-sk-update || true Hi, Please use DISTVERSION instead of PORTVERSION for consistency with Porters Handbook. PORTREVISION is incorrectly set to 6, which is probably too late to fix now :/ Please also use the static release archive provided by upstream rather than USE_GITLAB https://gitlab.freedesktop.org/rarian/rarian/-/releases --> https://gitlab.freedesktop.org/rarian/rarian/-/releases/0.8.5/downloads/assets/rarian-0.8.5.tar.bz2 There's a stray reference to USES= gnome ? Fedora also lists more deps which you might want to look into https://src.fedoraproject.org/rpms/rarian/blob/rawhide/f/rarian.spec#_11 Best regards, Daniel [-- Attachment #2 --] <div>On 2024-01-01T22:36:28.000+01:00, Don Lewis <truckman@FreeBSD.org> wrote:<br></div><div class="ik_mail_quote answerContentMessage"><blockquote class="ws-ng-quote"><pre style="white-space: normal;"><div>The branch main has been updated by truckman:<br></div><div><br></div><div>URL: <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://cgit.FreeBSD.org/ports/commit/?id=95665bb506b043720d7ebf1c8331ae8629a7153d" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=95665bb506b043720d7ebf1c8331ae8629a7153d</a><br></div><div><br></div><div>commit 95665bb506b043720d7ebf1c8331ae8629a7153d<br></div><div>Author: Don Lewis <<a class="defaultMailLink" href="mailto:truckman@FreeBSD.org">truckman@FreeBSD.org</a>><br></div><div>AuthorDate: 2024-01-01 02:23:18 +0000<br></div><div>Commit: Don Lewis <<a class="defaultMailLink" href="mailto:truckman@FreeBSD.org">truckman@FreeBSD.org</a>><br></div><div>CommitDate: 2024-01-01 21:35:43 +0000<br></div><div><br></div><div> textproc/rarian: Resurrect and upgrade to 0.8.5<br></div><div> <br></div><div> Rarian has moved to a new upstream site and is being maintained.<br></div><div> <br></div><div> python is only needed for uploading upstream releases.<br></div><div>---<br></div><div> MOVED | 1 -<br></div><div> Mk/Uses/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://gnome.mk" target="_blank">gnome.mk</a> | 15 +++++++<br></div><div> textproc/Makefile | 1 +<br></div><div> textproc/rarian/Makefile | 48 ++++++++++++++++++++++<br></div><div> textproc/rarian/distinfo | 3 ++<br></div><div> textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am" target="_blank">Makefile.am</a> | 11 +++++<br></div><div> .../rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in" target="_blank">rarian-sk-config.in</a> | 20 +++++++++<br></div><div> .../rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in" target="_blank">rarian-sk-rebuild.in</a> | 18 ++++++++<br></div><div> .../rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a> | 18 ++++++++<br></div><div> textproc/rarian/pkg-descr | 9 ++++<br></div><div> textproc/rarian/pkg-plist | 48 ++++++++++++++++++++++<br></div><div> 11 files changed, 191 insertions(+), 1 deletion(-)<br></div><div><br></div><div>diff --git a/MOVED b/MOVED<br></div><div>index 6a56144f2775..20e8f67d4702 100644<br></div><div>--- a/MOVED<br></div><div>+++ b/MOVED<br></div><div>@@ -6483,7 +6483,6 @@ databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reache<br></div><div> net-im/pidgin-bs|net-im/pidgin-bot-sentry|2022-03-13|Project was renamed<br></div><div> math/qalculate|math/qalculate-gtk|2022-03-14|Renamed to match upstream naming<br></div><div> deskutils/nautilus-actions||2022-03-15|Abandonware<br></div><div>-textproc/rarian||2022-03-15|Abandonware<br></div><div> devel/ORBit2||2022-03-15|Gnome2 library unused anymore<br></div><div> games/pushover|games/domino-chain|2022-03-17|Chase upstream rename<br></div><div> graphics/darktable38|graphics/darktable|2022-03-19|Darktable was upgraded to 3.8, separate port no longer needed<br></div><div>diff --git a/Mk/Uses/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://gnome.mk" target="_blank">gnome.mk</a> b/Mk/Uses/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://gnome.mk" target="_blank">gnome.mk</a><br></div><div>index 70d601ce853d..1628f3b8fb09 100644<br></div><div>--- a/Mk/Uses/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://gnome.mk" target="_blank">gnome.mk</a><br></div><div>+++ b/Mk/Uses/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://gnome.mk" target="_blank">gnome.mk</a><br></div><div>@@ -42,6 +42,10 @@<br></div><div> # add the following to your Makefile:<br></div><div> # "GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml".<br></div><div> #<br></div><div>+# INSTALLS_OMF - If set, <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://bsd.gnome.mk" target="_blank">bsd.gnome.mk</a> will automatically scan pkg-plist<br></div><div>+# file and add apropriate @postexec/@postunexec directives for<br></div><div>+# each .omf file found to track OMF registration database.<br></div><div>+#<br></div><div> # MAINTAINER: <a class="defaultMailLink" href="mailto:gnome@FreeBSD.org">gnome@FreeBSD.org</a><br></div><div> <br></div><div> .if !defined(_INCLUDE_USES_GNOME_MK)<br></div><div>@@ -423,5 +427,16 @@ gnome-post-gconf-schemas:<br></div><div> PLIST_FILES+= ${GLIB_SCHEMAS:C,^,share/glib-2.0/schemas/,}<br></div><div> . endif<br></div><div> <br></div><div>+. if defined(INSTALLS_OMF)<br></div><div>+_USES_install+= 690:gnome-post-omf<br></div><div>+gnome-post-omf:<br></div><div>+ @for i in `${GREP} "\.omf$$" ${TMPPLIST}`; do \<br></div><div>+ ${ECHO_CMD} "@postexec scrollkeeper-install -q %D/$${i} 2>/dev/null || /usr/bin/true" \<br></div><div>+ >> ${TMPPLIST}; \<br></div><div>+ ${ECHO_CMD} "@postunexec scrollkeeper-uninstall -q %D/$${i} 2>/dev/null || /usr/bin/true" \<br></div><div>+ >> ${TMPPLIST}; \<br></div><div>+ done<br></div><div>+. endif<br></div><div>+<br></div><div> .endif<br></div><div> # End of use part.<br></div><div>diff --git a/textproc/Makefile b/textproc/Makefile<br></div><div>index 2582dca0305f..6420842add6e 100644<br></div><div>--- a/textproc/Makefile<br></div><div>+++ b/textproc/Makefile<br></div><div>@@ -1662,6 +1662,7 @@<br></div><div> SUBDIR += randlm<br></div><div> SUBDIR += rapidxml<br></div><div> SUBDIR += raptor2<br></div><div>+ SUBDIR += rarian<br></div><div> SUBDIR += rasqal<br></div><div> SUBDIR += re-flex<br></div><div> SUBDIR += re_graph<br></div><div>diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile<br></div><div>new file mode 100644<br></div><div>index 000000000000..2a06610757e7<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/Makefile<br></div><div>@@ -0,0 +1,48 @@<br></div><div>+PORTNAME= rarian<br></div><div>+PORTVERSION= 0.8.5<br></div><div>+PORTREVISION= 6<br></div><div>+CATEGORIES= textproc gnome<br></div><div>+<br></div><div>+MAINTAINER= <a class="defaultMailLink" href="mailto:truckman@FreeBSD.org">truckman@FreeBSD.org</a><br></div><div>+COMMENT= OMF help system based on the Freedesktop specification<br></div><div>+WWW= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://rarian.freedesktop.org/" target="_blank">https://rarian.freedesktop.org/</a><br></div><div>+<br></div><div>+LICENSE= GPLv2+ LGPL21+ ZLIB<br></div><div>+LICENSE_COMB= multi<br></div><div>+LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.UTILS<br></div><div>+LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB<br></div><div>+LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING<br></div><div>+<br></div><div>+BUILD_DEPENDS= ${LOCALBASE}/bin/getopt:misc/getopt \<br></div><div>+ bash:shells/bash \<br></div><div>+ xsltproc:textproc/libxslt \<br></div><div>+ docbook-xml>0:textproc/docbook-xml \<br></div><div>+ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl<br></div><div>+LIB_DEPENDS= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://libtinyxml.so:textproc/tinyxml" target="_blank">libtinyxml.so:textproc/tinyxml</a><br></div><div>+RUN_DEPENDS= ${LOCALBASE}/bin/getopt:misc/getopt \<br></div><div>+ bash:shells/bash \<br></div><div>+ xsltproc:textproc/libxslt \<br></div><div>+ docbook-xml>0:textproc/docbook-xml \<br></div><div>+ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl<br></div><div>+<br></div><div>+USES= autoreconf gmake gnome libtool localbase pathfix pkgconfig tar:bzip2<br></div><div>+USE_GITLAB= yes<br></div><div>+GL_SITE= <a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="https://gitlab.freedesktop.org" target="_blank">https://gitlab.freedesktop.org</a><br></div><div>+GL_TAGNAME= 0.8.5<br></div><div>+USE_LDCONFIG= yes<br></div><div>+GNU_CONFIGURE= yes<br></div><div>+CONFIGURE_ARGS= --localstatedir=/var \<br></div><div>+ --with-convert-dir=${LOCALBASE}/share/omf \<br></div><div>+ --with-default-data-dirs="${LOCALBASE}/share:/usr/share" \<br></div><div>+ --with-default-infopath="${LOCALBASE}/info:${LOCALBASE}/share/info" \<br></div><div>+ --with-default-manpath="/usr/share/man:${LOCALBASE}/share/man:${LOCALBASE}/man" \<br></div><div>+ --with-gnu-getopt=${LOCALBASE}/bin/getopt \<br></div><div>+ --with-localstate-subdir=db/rarian \<br></div><div>+ --with-metadata-dir=${DOCSDIR}<br></div><div>+<br></div><div>+INSTALL_TARGET= install-strip<br></div><div>+<br></div><div>+post-patch:<br></div><div>+ @${REINPLACE_CMD} -e 's|`getopt|`${LOCALBASE}/bin/getopt|' ${WRKSRC}/util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a><br></div><div>+<br></div><div>+.include <<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://bsd.port.mk>" target="_blank">bsd.port.mk></a>;<br></div><div>diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo<br></div><div>new file mode 100644<br></div><div>index 000000000000..d08566a105b4<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/distinfo<br></div><div>@@ -0,0 +1,3 @@<br></div><div>+TIMESTAMP = 1704136985<br></div><div>+SHA256 (rarian-0.8.5.tar.bz2) = 93cf05e6bf51af169d0b32a2dc03f9a0f7895cae4e58b1a9b75777c040e9be0f<br></div><div>+SIZE (rarian-0.8.5.tar.bz2) = 91098<br></div><div>diff --git a/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am" target="_blank">Makefile.am</a> b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am" target="_blank">Makefile.am</a><br></div><div>new file mode 100644<br></div><div>index 000000000000..268a703d359a<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am" target="_blank">Makefile.am</a><br></div><div>@@ -0,0 +1,11 @@<br></div><div>+--- util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am.orig" target="_blank">Makefile.am.orig</a> 2023-12-09 03:14:08 UTC<br></div><div>++++ util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://Makefile.am" target="_blank">Makefile.am</a><br></div><div>+@@ -122,7 +122,7 @@ endif<br></div><div>+ @cd $(DESTDIR)$(bindir); ln -s rarian-sk-rebuild scrollkeeper-rebuilddb<br></div><div>+ @cd $(DESTDIR)$(bindir); ln -s rarian-sk-install scrollkeeper-uninstall<br></div><div>+ @cd $(DESTDIR)$(bindir); ln -s rarian-sk-update scrollkeeper-update<br></div><div>+- @mkdir -p $(DESTDIR)/$(localstatedir)/lib/rarian<br></div><div>++ @mkdir -p $(DESTDIR)/$(localstatedir)/db/rarian<br></div><div>+ if ENABLE_SKDB_UPDATE<br></div><div>+ @echo "Translating current database"<br></div><div>+ @$(DESTDIR)$(bindir)/rarian-sk-update<br></div><div>diff --git a/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in" target="_blank">rarian-sk-config.in</a> b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in" target="_blank">rarian-sk-config.in</a><br></div><div>new file mode 100644<br></div><div>index 000000000000..5ef60061b194<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in" target="_blank">rarian-sk-config.in</a><br></div><div>@@ -0,0 +1,20 @@<br></div><div>+--- util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in.orig" target="_blank">rarian-sk-config.in.orig</a> 2023-12-09 03:14:08 UTC<br></div><div>++++ util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-config.in" target="_blank">rarian-sk-config.in</a><br></div><div>+@@ -8,7 +8,7 @@ convert_dir=@CONVERT_DIR@<br></div><div>+ exec_prefix=@exec_prefix@<br></div><div>+ bindir=@bindir@<br></div><div>+ convert_dir=@CONVERT_DIR@<br></div><div>+-statedir=@localstatedir@/lib/rarian<br></div><div>++statedir=@localstatedir@/db/rarian<br></div><div>+ datarootdir=@datarootdir@<br></div><div>+ datadir=@datadir@<br></div><div>+ output_dir=${datadir}/help<br></div><div>+@@ -47,7 +47,7 @@ case "$1" in<br></div><div>+ print_help<br></div><div>+ ;;<br></div><div>+ --version )<br></div><div>+- echo $package_version \(Rarian replacement for scrollkeeper-config\)<br></div><div>++ echo $package_version<br></div><div>+ ;;<br></div><div>+ --prefix )<br></div><div>+ echo $prefix<br></div><div>diff --git a/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in" target="_blank">rarian-sk-rebuild.in</a> b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in" target="_blank">rarian-sk-rebuild.in</a><br></div><div>new file mode 100644<br></div><div>index 000000000000..988e09816309<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in" target="_blank">rarian-sk-rebuild.in</a><br></div><div>@@ -0,0 +1,18 @@<br></div><div>+--- util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in.orig" target="_blank">rarian-sk-rebuild.in.orig</a> 2023-12-09 03:14:08 UTC<br></div><div>++++ util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-rebuild.in" target="_blank">rarian-sk-rebuild.in</a><br></div><div>+@@ -9,7 +9,7 @@ datarootdir=@datarootdir@<br></div><div>+ bindir=@bindir@<br></div><div>+ convert_dir=@CONVERT_DIR@<br></div><div>+ datarootdir=@datarootdir@<br></div><div>+-statedir=@localstatedir@/lib/rarian<br></div><div>++statedir=@localstatedir@/db/rarian<br></div><div>+ datadir=@datadir@<br></div><div>+ output_dir=${datadir}/help<br></div><div>+ package_version=@PACKAGE_VERSION@<br></div><div>+@@ -35,4 +35,4 @@ $bindir/rarian-sk-update -v --clean-index -o $convert_<br></div><div>+ <br></div><div>+ $bindir/rarian-sk-update -v --clean-index -o $convert_string<br></div><div>+ <br></div><div>+-fi<br></div><div>+\ No newline at end of file<br></div><div>++fi<br></div><div>diff --git a/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a> b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a><br></div><div>new file mode 100644<br></div><div>index 000000000000..53babb9d8fd0<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/files/patch-util_<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a><br></div><div>@@ -0,0 +1,18 @@<br></div><div>+--- util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in.orig" target="_blank">rarian-sk-update.in.orig</a> 2023-12-09 03:14:08 UTC<br></div><div>++++ util/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://rarian-sk-update.in" target="_blank">rarian-sk-update.in</a><br></div><div>+@@ -19,7 +19,7 @@ bindir=@bindir@<br></div><div>+ prefix=@prefix@<br></div><div>+ exec_prefix=@exec_prefix@<br></div><div>+ bindir=@bindir@<br></div><div>+-statedir=@localstatedir@/lib/rarian<br></div><div>++statedir=@localstatedir@/db/rarian<br></div><div>+ convert_dir=@CONVERT_DIR@<br></div><div>+ datarootdir=@datarootdir@<br></div><div>+ datadir=@datadir@<br></div><div>+@@ -422,4 +422,4 @@ rm -rf $tmpdir<br></div><div>+ fi<br></div><div>+ rm -rf $tmpdir<br></div><div>+ <br></div><div>+-fi # ENABLE_OMF_READ<br></div><div>+\ No newline at end of file<br></div><div>++fi # ENABLE_OMF_READ<br></div><div>diff --git a/textproc/rarian/pkg-descr b/textproc/rarian/pkg-descr<br></div><div>new file mode 100644<br></div><div>index 000000000000..e60b1e98e756<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/pkg-descr<br></div><div>@@ -0,0 +1,9 @@<br></div><div>+Rarian is designed to be a replacement for scrollkeeper. It is<br></div><div>+currently undergoing heavy development. As of writing, rarian can be<br></div><div>+installed in place of scrollkeeper and everything will work okay.<br></div><div>+<br></div><div>+Rarian manages documentation metadata (as specified by the Open Source<br></div><div>+Metadata Framework (OMF) and provides a simple API to allow help browsers<br></div><div>+to find, sort, and search the document catalog. It will also be able to<br></div><div>+communicate with catalog servers on the Net to search for documents which<br></div><div>+are not on the local system.<br></div><div>diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist<br></div><div>new file mode 100644<br></div><div>index 000000000000..099407701e9e<br></div><div>--- /dev/null<br></div><div>+++ b/textproc/rarian/pkg-plist<br></div><div>@@ -0,0 +1,48 @@<br></div><div>+bin/rarian-example<br></div><div>+bin/rarian-sk-config<br></div><div>+bin/rarian-sk-extract<br></div><div>+bin/rarian-sk-gen-uuid<br></div><div>+bin/rarian-sk-get-cl<br></div><div>+bin/rarian-sk-get-content-list<br></div><div>+bin/rarian-sk-get-extended-content-list<br></div><div>+bin/rarian-sk-get-scripts<br></div><div>+bin/rarian-sk-install<br></div><div>+bin/rarian-sk-migrate<br></div><div>+bin/rarian-sk-preinstall<br></div><div>+bin/rarian-sk-rebuild<br></div><div>+bin/rarian-sk-update<br></div><div>+bin/scrollkeeper-config<br></div><div>+bin/scrollkeeper-extract<br></div><div>+bin/scrollkeeper-gen-seriesid<br></div><div>+bin/scrollkeeper-get-cl<br></div><div>+bin/scrollkeeper-get-content-list<br></div><div>+bin/scrollkeeper-get-extended-content-list<br></div><div>+bin/scrollkeeper-get-index-from-docpath<br></div><div>+bin/scrollkeeper-get-toc-from-docpath<br></div><div>+bin/scrollkeeper-get-toc-from-id<br></div><div>+bin/scrollkeeper-install<br></div><div>+bin/scrollkeeper-preinstall<br></div><div>+bin/scrollkeeper-rebuilddb<br></div><div>+bin/scrollkeeper-uninstall<br></div><div>+bin/scrollkeeper-update<br></div><div>+include/rarian/rarian-info.h<br></div><div>+include/rarian/rarian-main.h<br></div><div>+include/rarian/rarian-man.h<br></div><div>+include/rarian/rarian-reg-utils.h<br></div><div>+include/rarian/rarian.h<br></div><div>+lib/librarian.a<br></div><div>+lib/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://librarian.so" target="_blank">librarian.so</a><br></div><div>+lib/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://librarian.so.0" target="_blank">librarian.so.0</a><br></div><div>+lib/<a data-ik="ik-secure" rel="noopener noreferrer" class="defaultMailLink" href="http://librarian.so.0.0.0" target="_blank">librarian.so.0.0.0</a><br></div><div>+libdata/pkgconfig/rarian.pc<br></div><div>+share/help/rarian.document<br></div><div>+share/librarian/Templates/C/scrollkeeper_cl.xml<br></div><div>+share/librarian/manual/help-spec-0.2.xml<br></div><div>+share/librarian/manual/index.xhtml<br></div><div>+share/librarian/manual/rar-lib.xhtml<br></div><div>+share/librarian/manual/rar-mdf.xhtml<br></div><div>+share/librarian/manual/rar-skcompat.xhtml<br></div><div>+share/librarian/rarian-sk-cl.xml<br></div><div>+@dir /var/db/rarian<br></div><div>+@postunexec rmdir /var/db/rarian/* 2>/dev/null || true<br></div><div>+@postexec %%PREFIX%%/bin/rarian-sk-update || true<br></div></pre></blockquote></div><div>Hi,<br></div><div><br></div><div>Please use DISTVERSION instead of PORTVERSION for consistency with Porters Handbook.<br></div><div><br></div><div>PORTREVISION is incorrectly set to 6, which is probably too late to fix now :/<br></div><div><br></div><div>Please also use the static release archive provided by upstream rather than USE_GITLAB<br></div><div><a href="https://gitlab.freedesktop.org/rarian/rarian/-/releases" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://gitlab.freedesktop.org/rarian/rarian/-/releases</a>; --> <a href="https://gitlab.freedesktop.org/rarian/rarian/-/releases/0.8.5/downloads/assets/rarian-0.8.5.tar.bz2" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://gitlab.freedesktop.org/rarian/rarian/-/releases/0.8.5/downloads/assets/rarian-0.8.5.tar.bz2</a><br></div><div><br></div><div>There's a stray reference to USES= gnome ?<br></div><div><br></div><div>Fedora also lists more deps which you might want to look into<br></div><div><a href="https://src.fedoraproject.org/rpms/rarian/blob/rawhide/f/rarian.spec#_11" target="_blank" rel="noopener noreferrer" data-ik="ik-secure">https://src.fedoraproject.org/rpms/rarian/blob/rawhide/f/rarian.spec#_11</a><br></div><div><br></div><div>Best regards,<br></div><div>Daniel<br></div><div ><div><br></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c8e928afddc458f1e5857913ba5964f2>