Re: git: 2b9b771202b2 - main - www/luakit-devel: update to 2.3.1-6

Hello,

Yes, you are right
pkg version -t 2.3.1.6,1 2.3.26,1 == <

-DISTVERSION= 2.3-26
+DISTVERSION= 2.3.1-6

This will cause problems in the future and we cannot bump PORTEPOCH for
this reason.

I can't think for a diferent solution for suffix -xy.

Any hint to avoid portepoch bumping?

Cheers

Baptiste Daroussin <bapt@freebsd.org> escreveu no dia quinta, 13/10/2022
à(s) 14:45:

> On Wed, Oct 12, 2022 at 07:08:36PM +0000, Nuno Teixeira wrote:
> > The branch main has been updated by eduardo:
> >
> > URL:
> https://cgit.FreeBSD.org/ports/commit/?id=2b9b771202b22799c41a530a17a603497aa2fa2a
> >
> > commit 2b9b771202b22799c41a530a17a603497aa2fa2a
> > Author:     Marco Beishuizen <mbeis@xs4all.nl>
> > AuthorDate: 2022-10-12 18:48:23 +0000
> > Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
> > CommitDate: 2022-10-12 19:08:22 +0000
> >
> >     www/luakit-devel: update to 2.3.1-6
> >
>
> This distversion is converted to 2.3.1.6
> The previous one 2.3-26 will make a version of 2.3.26 for the package.
>
> It means for pkg it goes backward.
>
> Please fix
>
> Best regards,
> Bapt
> >      - Fix DOCS option installation
> >
> >     PR:             266991
> > ---
> >  www/luakit-devel/Makefile  |  11 ++-
> >  www/luakit-devel/distinfo  |   6 +-
> >  www/luakit-devel/pkg-plist | 227
> ---------------------------------------------
> >  3 files changed, 11 insertions(+), 233 deletions(-)
> >
> > diff --git a/www/luakit-devel/Makefile b/www/luakit-devel/Makefile
> > index d27bc8cede44..0b955d2a5dd4 100644
> > --- a/www/luakit-devel/Makefile
> > +++ b/www/luakit-devel/Makefile
> > @@ -1,8 +1,9 @@
> > -PORTNAME=    luakit-devel
> > -DISTVERSION= 2.3-26
> > -DISTVERSIONSUFFIX=   -g6cac833
> > +PORTNAME=    luakit
> > +DISTVERSION= 2.3.1-6
> > +DISTVERSIONSUFFIX=   -ge9c7693
> >  PORTEPOCH=   1
> >  CATEGORIES=  www
> > +PKGNAMESUFFIX=       -devel
> >
> >  MAINTAINER=  mbeis@xs4all.nl
> >  COMMENT=     Fast, small, webkit2 based browser framework extensible
> with Lua
> > @@ -17,6 +18,7 @@ NOT_FOR_ARCHS_REASON_sparc64=       Does not install
> on sparc64
> >  BUILD_DEPENDS=       help2man:misc/help2man \
> >               ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
> >  LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
> > +             libharfbuzz.so:print/harfbuzz \
> >               libsoup-2.4.so:devel/libsoup \
> >               libfreetype.so:print/freetype2 \
> >               libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
> > @@ -32,6 +34,9 @@ USE_GNOME=  cairo gdkpixbuf2 glib20 gtk30
> >
> >  CONFLICTS_INSTALL=   luakit
> >
> > +PORTDATA=    *
> > +PORTDOCS=    *
> > +
> >  OPTIONS_DEFINE=      DOCS LUAJIT
> >  LUAJIT_DESC= Use the Just-In-Time compiler for lua
> >  LUAJIT_LIB_DEPENDS=  libluajit-5.1.so:lang/luajit
> > diff --git a/www/luakit-devel/distinfo b/www/luakit-devel/distinfo
> > index e6e91ef3fac8..6890c630d7a7 100644
> > --- a/www/luakit-devel/distinfo
> > +++ b/www/luakit-devel/distinfo
> > @@ -1,3 +1,3 @@
> > -TIMESTAMP = 1645281802
> > -SHA256 (luakit-luakit-2.3-26-g6cac833_GH0.tar.gz) =
> d90484b6582fb11f4fe44f81aae9754a81f664d15e0aaf7a523739726c30ca5f
> > -SIZE (luakit-luakit-2.3-26-g6cac833_GH0.tar.gz) = 507055
> > +TIMESTAMP = 1665578757
> > +SHA256 (luakit-luakit-2.3.1-6-ge9c7693_GH0.tar.gz) =
> 892cd5975bbf63af83493bdb92d9c4eb527bcf0de63f731fde60b4199a057d43
> > +SIZE (luakit-luakit-2.3.1-6-ge9c7693_GH0.tar.gz) = 507307
> > diff --git a/www/luakit-devel/pkg-plist b/www/luakit-devel/pkg-plist
> > index 0cc8066139e1..efc8dc544588 100644
> > --- a/www/luakit-devel/pkg-plist
> > +++ b/www/luakit-devel/pkg-plist
> > @@ -4,232 +4,5 @@ etc/xdg/luakit/theme.lua
> >  lib/luakit/luakit.so
> >  man/man1/luakit.1.gz
> >  share/applications/luakit.desktop
> > -share/doc/luakit/AUTHORS
> > -share/doc/luakit/COPYING.GPLv3
> > -share/doc/luakit/README.md
> > -share/doc/luakit/classes/dom_document.html
> > -share/doc/luakit/classes/dom_element.html
> > -share/doc/luakit/classes/download.html
> > -share/doc/luakit/classes/page.html
> > -share/doc/luakit/classes/regex.html
> > -share/doc/luakit/classes/sqlite3.html
> > -share/doc/luakit/classes/stylesheet.html
> > -share/doc/luakit/classes/timer.html
> > -share/doc/luakit/classes/widget.html
> > -share/doc/luakit/classes/widget:box.html
> > -share/doc/luakit/classes/widget:drawing_area.html
> > -share/doc/luakit/classes/widget:entry.html
> > -share/doc/luakit/classes/widget:event_box.html
> > -share/doc/luakit/classes/widget:image.html
> > -share/doc/luakit/classes/widget:label.html
> > -share/doc/luakit/classes/widget:notebook.html
> > -share/doc/luakit/classes/widget:overlay.html
> > -share/doc/luakit/classes/widget:paned.html
> > -share/doc/luakit/classes/widget:scrolled.html
> > -share/doc/luakit/classes/widget:socket.html
> > -share/doc/luakit/classes/widget:spinner.html
> > -share/doc/luakit/classes/widget:webview.html
> > -share/doc/luakit/classes/widget:window.html
> > -share/doc/luakit/index.html
> > -share/doc/luakit/modules/adblock.html
> > -share/doc/luakit/modules/adblock_chrome.html
> > -share/doc/luakit/modules/binds.html
> > -share/doc/luakit/modules/binds_chrome.html
> > -share/doc/luakit/modules/bookmarks.html
> > -share/doc/luakit/modules/bookmarks_chrome.html
> > -share/doc/luakit/modules/chrome.html
> > -share/doc/luakit/modules/clear_data.html
> > -share/doc/luakit/modules/cmdhist.html
> > -share/doc/luakit/modules/completion.html
> > -share/doc/luakit/modules/domain_props.html
> > -share/doc/luakit/modules/downloads.html
> > -share/doc/luakit/modules/downloads_chrome.html
> > -share/doc/luakit/modules/editor.html
> > -share/doc/luakit/modules/error_page.html
> > -share/doc/luakit/modules/follow.html
> > -share/doc/luakit/modules/follow_selected.html
> > -share/doc/luakit/modules/formfiller.html
> > -share/doc/luakit/modules/go_input.html
> > -share/doc/luakit/modules/go_next_prev.html
> > -share/doc/luakit/modules/go_up.html
> > -share/doc/luakit/modules/gopher.html
> > -share/doc/luakit/modules/help_chrome.html
> > -share/doc/luakit/modules/hide_scrollbars.html
> > -share/doc/luakit/modules/history.html
> > -share/doc/luakit/modules/history_chrome.html
> > -share/doc/luakit/modules/image_css.html
> > -share/doc/luakit/modules/introspector_chrome.html
> > -share/doc/luakit/modules/ipc.html
> > -share/doc/luakit/modules/keysym.html
> > -share/doc/luakit/modules/log_chrome.html
> > -share/doc/luakit/modules/lousy.bind.html
> > -share/doc/luakit/modules/lousy.load.html
> > -share/doc/luakit/modules/lousy.mode.html
> > -share/doc/luakit/modules/lousy.pickle.html
> > -share/doc/luakit/modules/lousy.signal.html
> > -share/doc/luakit/modules/lousy.theme.html
> > -share/doc/luakit/modules/lousy.uri.html
> > -share/doc/luakit/modules/lousy.util.html
> > -share/doc/luakit/modules/lousy.widget.buf.html
> > -share/doc/luakit/modules/lousy.widget.common.html
> > -share/doc/luakit/modules/lousy.widget.hist.html
> > -share/doc/luakit/modules/lousy.widget.html
> > -share/doc/luakit/modules/lousy.widget.menu.html
> > -share/doc/luakit/modules/lousy.widget.progress.html
> > -share/doc/luakit/modules/lousy.widget.scroll.html
> > -share/doc/luakit/modules/lousy.widget.ssl.html
> > -share/doc/luakit/modules/lousy.widget.tab.html
> > -share/doc/luakit/modules/lousy.widget.tabi.html
> > -share/doc/luakit/modules/lousy.widget.tablist.html
> > -share/doc/luakit/modules/lousy.widget.tgname.html
> > -share/doc/luakit/modules/lousy.widget.uri.html
> > -share/doc/luakit/modules/lousy.widget.zoom.html
> > -share/doc/luakit/modules/luakit.html
> > -share/doc/luakit/modules/luakit.unique.html
> > -share/doc/luakit/modules/modes.html
> > -share/doc/luakit/modules/msg.html
> > -share/doc/luakit/modules/newtab_chrome.html
> > -share/doc/luakit/modules/noscript.html
> > -share/doc/luakit/modules/open_editor.html
> > -share/doc/luakit/modules/proxy.html
> > -share/doc/luakit/modules/quickmarks.html
> > -share/doc/luakit/modules/readline.html
> > -share/doc/luakit/modules/referer_control_wm.html
> > -share/doc/luakit/modules/search.html
> > -share/doc/luakit/modules/select.html
> > -share/doc/luakit/modules/select_wm.html
> > -share/doc/luakit/modules/session.html
> > -share/doc/luakit/modules/settings.html
> > -share/doc/luakit/modules/settings_chrome.html
> > -share/doc/luakit/modules/soup.html
> > -share/doc/luakit/modules/styles.html
> > -share/doc/luakit/modules/tab_favicons.html
> > -share/doc/luakit/modules/tabgroups.html
> > -share/doc/luakit/modules/tabhistory.html
> > -share/doc/luakit/modules/tabmenu.html
> > -share/doc/luakit/modules/taborder.html
> > -share/doc/luakit/modules/tests.lib.html
> > -share/doc/luakit/modules/undoclose.html
> > -share/doc/luakit/modules/unique_instance.html
> > -share/doc/luakit/modules/userscripts.html
> > -share/doc/luakit/modules/utf8.html
> > -share/doc/luakit/modules/vertical_tabs.html
> > -share/doc/luakit/modules/view_source.html
> > -share/doc/luakit/modules/viewpdf.html
> > -share/doc/luakit/modules/webinspector.html
> > -share/doc/luakit/modules/webview.html
> > -share/doc/luakit/modules/window.html
> > -share/doc/luakit/modules/xdg.html
> > -share/doc/luakit/pages/01-authors.html
> > -share/doc/luakit/pages/02-faq.html
> > -share/doc/luakit/pages/03-quick-start-guide.html
> > -share/doc/luakit/pages/04-migration-guide.html
> > -share/doc/luakit/pages/05-configuration.html
> > -share/doc/luakit/pages/06-tests.html
> > -share/doc/luakit/pages/07-build-debian-package.html
> > -share/luakit/lib/adblock.lua
> > -share/luakit/lib/adblock_chrome.lua
> > -share/luakit/lib/adblock_wm.lua
> > -share/luakit/lib/binds.lua
> > -share/luakit/lib/binds_chrome.lua
> > -share/luakit/lib/bookmarks.lua
> > -share/luakit/lib/bookmarks_chrome.lua
> > -share/luakit/lib/chrome.lua
> > -share/luakit/lib/chrome_wm.lua
> > -share/luakit/lib/clear_data.lua
> > -share/luakit/lib/cmdhist.lua
> > -share/luakit/lib/completion.lua
> > -share/luakit/lib/domain_props.lua
> > -share/luakit/lib/downloads.lua
> > -share/luakit/lib/downloads_chrome.lua
> > -share/luakit/lib/editor.lua
> > -share/luakit/lib/error_page.lua
> > -share/luakit/lib/error_page_wm.lua
> > -share/luakit/lib/follow.lua
> > -share/luakit/lib/follow_selected.lua
> > -share/luakit/lib/follow_selected_wm.lua
> > -share/luakit/lib/follow_wm.lua
> > -share/luakit/lib/formfiller.lua
> > -share/luakit/lib/formfiller_wm.lua
> > -share/luakit/lib/go_input.lua
> > -share/luakit/lib/go_next_prev.lua
> > -share/luakit/lib/go_up.lua
> > -share/luakit/lib/gopher.lua
> > -share/luakit/lib/help_chrome.lua
> > -share/luakit/lib/hide_scrollbars.lua
> > -share/luakit/lib/history.lua
> > -share/luakit/lib/history_chrome.lua
> > -share/luakit/lib/image_css.lua
> > -share/luakit/lib/image_css_wm.lua
> > -share/luakit/lib/introspector_chrome.lua
> > -share/luakit/lib/keysym.lua
> > -share/luakit/lib/log_chrome.lua
> > -share/luakit/lib/lousy/bind.lua
> > -share/luakit/lib/lousy/init.lua
> > -share/luakit/lib/lousy/load.lua
> > -share/luakit/lib/lousy/mode.lua
> > -share/luakit/lib/lousy/pickle.lua
> > -share/luakit/lib/lousy/signal.lua
> > -share/luakit/lib/lousy/theme.lua
> > -share/luakit/lib/lousy/uri.lua
> > -share/luakit/lib/lousy/util.lua
> > -share/luakit/lib/lousy/widget/buf.lua
> > -share/luakit/lib/lousy/widget/common.lua
> > -share/luakit/lib/lousy/widget/hist.lua
> > -share/luakit/lib/lousy/widget/init.lua
> > -share/luakit/lib/lousy/widget/menu.lua
> > -share/luakit/lib/lousy/widget/progress.lua
> > -share/luakit/lib/lousy/widget/scroll.lua
> > -share/luakit/lib/lousy/widget/ssl.lua
> > -share/luakit/lib/lousy/widget/tab.lua
> > -share/luakit/lib/lousy/widget/tabi.lua
> > -share/luakit/lib/lousy/widget/tablist.lua
> > -share/luakit/lib/lousy/widget/tgname.lua
> > -share/luakit/lib/lousy/widget/uri.lua
> > -share/luakit/lib/lousy/widget/zoom.lua
> > -share/luakit/lib/markdown.lua
> > -share/luakit/lib/modes.lua
> > -share/luakit/lib/newtab_chrome.lua
> > -share/luakit/lib/noscript.lua
> > -share/luakit/lib/open_editor.lua
> > -share/luakit/lib/proxy.lua
> > -share/luakit/lib/quickmarks.lua
> > -share/luakit/lib/readline.lua
> > -share/luakit/lib/referer_control_wm.lua
> > -share/luakit/lib/search.lua
> > -share/luakit/lib/select.lua
> > -share/luakit/lib/select_wm.lua
> > -share/luakit/lib/session.lua
> > -share/luakit/lib/settings.lua
> > -share/luakit/lib/settings_chrome.lua
> > -share/luakit/lib/styles.lua
> > -share/luakit/lib/tab_favicons.lua
> > -share/luakit/lib/tabgroups.lua
> > -share/luakit/lib/tabhistory.lua
> > -share/luakit/lib/tabmenu.lua
> > -share/luakit/lib/taborder.lua
> > -share/luakit/lib/undoclose.lua
> > -share/luakit/lib/unique_instance.lua
> > -share/luakit/lib/userscripts.lua
> > -share/luakit/lib/vertical_tabs.lua
> > -share/luakit/lib/view_source.lua
> > -share/luakit/lib/viewpdf.lua
> > -share/luakit/lib/webinspector.lua
> > -share/luakit/lib/webview.lua
> > -share/luakit/lib/webview_wm.lua
> > -share/luakit/lib/window.lua
> > -share/luakit/resources/icons/COPYING
> > -share/luakit/resources/icons/tab-icon-chrome.png
> > -share/luakit/resources/icons/tab-icon-chrome@2x.png
> > -share/luakit/resources/icons/tab-icon-crash.png
> > -share/luakit/resources/icons/tab-icon-crash@2x.png
> > -share/luakit/resources/icons/tab-icon-error.png
> > -share/luakit/resources/icons/tab-icon-error@2x.png
> > -share/luakit/resources/icons/tab-icon-page.png
> > -share/luakit/resources/icons/tab-icon-page@2x.png
> > -share/luakit/resources/icons/tab-icon-private.png
> > -share/luakit/resources/icons/tab-icon-private@2x.png
> > -share/luakit/resources/icons/tab-icon-security-error.png
> > -share/luakit/resources/icons/tab-icon-security-error@2x.png
> >  share/pixmaps/luakit.png
> >  share/pixmaps/luakit.svg
>


-- 
Nuno Teixeira
FreeBSD Committer (ports)