Re: git: 95665bb506b0 - main - textproc/rarian: Resurrect and upgrade to 0.8.5
- In reply to: Don Lewis : "git: 95665bb506b0 - main - textproc/rarian: Resurrect and upgrade to 0.8.5"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Jan 2024 21:55:03 UTC
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