Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
Got carried away deleting. Added back LIB_DEPENDS = x11/gnome/libsrvg Revisions Makefile.inc patched Python modules/menu-cache removed from Makefile pkg-readme removed CONFIGURE_STYLE= simple -- J. Scott Heppler ? x11/jgmenu/patches/patch-Makefile_inc Index: x11/jgmenu/Makefile === RCS file: /cvs/ports/x11/jgmenu/Makefile,v retrieving revision 1.13 diff -u -p -u -r1.13 Makefile --- x11/jgmenu/Makefile 13 Nov 2022 15:30:22 - 1.13 +++ x11/jgmenu/Makefile 22 Nov 2022 00:12:55 - @@ -3,30 +3,24 @@ CATEGORIES = x11 GH_ACCOUNT = johanmalm GH_PROJECT = jgmenu -GH_TAGNAME = v2.1 -REVISION = 6 +GH_TAGNAME = v4.4.1 # GPLv2 only PERMIT_PACKAGE = Yes WANTLIB = X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m menu-cache pango-1.0 +WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m pango-1.0 WANTLIB += pangocairo-1.0 png pthread rsvg-2 xml2 z # base-gcc does not understand all the warnings COMPILER = base-clang ports-gcc -MODULES = lang/python -MODPY_BUILDDEP = No -MODPY_SETUPTOOLS = No - -LIB_DEPENDS = x11/gnome/librsvg \ - x11/menu-cache +LIB_DEPENDS = x11/gnome/librsvg RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -CONFIGURE_STYLE = none +CONFIGURE_STYLE = simple USE_GMAKE =Yes MAKE_FLAGS = VERBOSE=1 Index: x11/jgmenu/distinfo === RCS file: /cvs/ports/x11/jgmenu/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- x11/jgmenu/distinfo 26 Feb 2019 16:16:05 - 1.2 +++ x11/jgmenu/distinfo 22 Nov 2022 00:12:55 - @@ -1,2 +1,2 @@ -SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8= -SIZE (jgmenu-2.1.tar.gz) = 330256 +SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI= +SIZE (jgmenu-4.4.1.tar.gz) = 382258 Index: x11/jgmenu/patches/patch-Makefile === RCS file: /cvs/ports/x11/jgmenu/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-Makefile --- x11/jgmenu/patches/patch-Makefile 11 Mar 2022 20:16:09 - 1.2 +++ x11/jgmenu/patches/patch-Makefile 22 Nov 2022 00:12:55 - @@ -1,42 +1,32 @@ Index: Makefile --- Makefile.orig +++ Makefile -@@ -24,7 +24,7 @@ else - datarootdir= $(prefix)/share - endif - --CFLAGS += -g -Wall -Os -std=gnu89 -+CFLAGS += -Wall -std=gnu89 - CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \ - -Wold-style-definition -Woverflow -Wpointer-arith \ - -Wstrict-prototypes -Wunused -Wvla -Wunused-result -@@ -100,18 +100,18 @@ $(DEPDIR)/%.d: ; +@@ -80,17 +80,17 @@ $(DEPDIR)/%.d: ; .PRECIOUS: $(DEPDIR)/%.d - install: checkdeps $(PROGS) + install: $(PROGS) - @install -d $(DESTDIR)$(bindir) - @install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -- @install -d $(DESTDIR)$(libexecdir) -- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) +- @install -d $(DESTDIR)$(libexecdir)/jgmenu +- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu +- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu - @$(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install - @install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -d $(DESTDIR)$(datarootdir)/applications/ - @install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ +- @for dir in $(CONTRIB_DIRS); do \ + install -d $(DESTDIR)$(bindir) + install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -+ install -d $(DESTDIR)$(libexecdir) -+ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -+ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) ++ install -d $(DESTDIR)$(libexecdir)/jgmenu ++ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu ++ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu + $(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install + install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -d $(DESTDIR)$(datarootdir)/applications/ + install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ - ifeq ($(NO_LX),1) -- @echo "info: lx module not included as libmenu-cache >=1.1.0 not found" -+ echo "info:
Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
Revisions Makefile.inc patched Python modules/menu-cache removed from Makefile pkg-readme removed CONFIGURE_STYLE= simple -- J. Scott Heppler ? x11/jgmenu/patches/patch-Makefile_inc Index: x11/jgmenu/Makefile === RCS file: /cvs/ports/x11/jgmenu/Makefile,v retrieving revision 1.13 diff -u -p -u -r1.13 Makefile --- x11/jgmenu/Makefile 13 Nov 2022 15:30:22 - 1.13 +++ x11/jgmenu/Makefile 21 Nov 2022 23:17:25 - @@ -3,30 +3,22 @@ CATEGORIES = x11 GH_ACCOUNT = johanmalm GH_PROJECT = jgmenu -GH_TAGNAME = v2.1 -REVISION = 6 +GH_TAGNAME = v4.4.1 # GPLv2 only PERMIT_PACKAGE = Yes WANTLIB = X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m menu-cache pango-1.0 +WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m pango-1.0 WANTLIB += pangocairo-1.0 png pthread rsvg-2 xml2 z # base-gcc does not understand all the warnings COMPILER = base-clang ports-gcc -MODULES = lang/python -MODPY_BUILDDEP = No -MODPY_SETUPTOOLS = No - -LIB_DEPENDS = x11/gnome/librsvg \ - x11/menu-cache - RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -CONFIGURE_STYLE = none +CONFIGURE_STYLE = simple USE_GMAKE =Yes MAKE_FLAGS = VERBOSE=1 Index: x11/jgmenu/distinfo === RCS file: /cvs/ports/x11/jgmenu/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- x11/jgmenu/distinfo 26 Feb 2019 16:16:05 - 1.2 +++ x11/jgmenu/distinfo 21 Nov 2022 23:17:25 - @@ -1,2 +1,2 @@ -SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8= -SIZE (jgmenu-2.1.tar.gz) = 330256 +SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI= +SIZE (jgmenu-4.4.1.tar.gz) = 382258 Index: x11/jgmenu/patches/patch-Makefile === RCS file: /cvs/ports/x11/jgmenu/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-Makefile --- x11/jgmenu/patches/patch-Makefile 11 Mar 2022 20:16:09 - 1.2 +++ x11/jgmenu/patches/patch-Makefile 21 Nov 2022 23:17:25 - @@ -1,42 +1,32 @@ Index: Makefile --- Makefile.orig +++ Makefile -@@ -24,7 +24,7 @@ else - datarootdir= $(prefix)/share - endif - --CFLAGS += -g -Wall -Os -std=gnu89 -+CFLAGS += -Wall -std=gnu89 - CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \ - -Wold-style-definition -Woverflow -Wpointer-arith \ - -Wstrict-prototypes -Wunused -Wvla -Wunused-result -@@ -100,18 +100,18 @@ $(DEPDIR)/%.d: ; +@@ -80,17 +80,17 @@ $(DEPDIR)/%.d: ; .PRECIOUS: $(DEPDIR)/%.d - install: checkdeps $(PROGS) + install: $(PROGS) - @install -d $(DESTDIR)$(bindir) - @install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -- @install -d $(DESTDIR)$(libexecdir) -- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) +- @install -d $(DESTDIR)$(libexecdir)/jgmenu +- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu +- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu - @$(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install - @install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -d $(DESTDIR)$(datarootdir)/applications/ - @install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ +- @for dir in $(CONTRIB_DIRS); do \ + install -d $(DESTDIR)$(bindir) + install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -+ install -d $(DESTDIR)$(libexecdir) -+ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -+ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) ++ install -d $(DESTDIR)$(libexecdir)/jgmenu ++ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu ++ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu + $(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install + install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -d $(DESTDIR)$(datarootdir)/applications/ + install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ - ifeq ($(NO_LX),1) -- @echo "info: lx module not included as libmenu-cache >=1.1.0 not found" -+ echo "info: lx module not included as libmenu-cache >=1.1.0 not found" - endif ++ for dir in $(CONTRIB_DIRS); do
Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
On 2022/11/21 12:11:24 -0800, "Heppler, J. Scott" wrote: > I debated breaking the port down into flavors but really did not have a > sense about what OpenBSD users would use. Personally, the lightest > fastest option is what I would use. > > Since --with-lx is the default, it will throw a build error. Hum, I don't follow you here. For me it builds fine, and since --with-lx is not the default the configure script doesn't even try to look for menu-cache (which is great!) I guess that the pmenu is similarly disabled because it wasn't enabled at via a configure switch. > I'm not > sure what OpenBSD policy is toward a "multi-tool" port that does not > install with all needed dependencies for each one its "tools". it really depends. In a case like this however if we want to enable pmenu and lx I'd just enable them in the configure and add a RUN_DEPENDS for pmenu. jgmenu already has a RUN_DEPENDS on desktop-file-utils and x11/gtk+3, so pmenu is not a big addition. however, both pmenu and lx was moved to contrib/ in favour of the new menu generator since 4.0, that's why I'd just use that. From some quick testing it seems to work just as fine as menu-cache, and it's also the default now... > If I > recall correctly, the README arose to indicate -lx needed the > installation of menu-cache and gnome/mate menu packages. Perhaps just > distilling the README down to a man page reference and the need for > gnome/mate menus apps/lx and menu-cache for lx itself? Nope, it did not. We have some package that has optional dependency that is used only at runtime but it's considered hardly useful or too big for most cases and so it's documented in the readme. (see the readme of devel/git for example.) if this were the case for jgmenu I wouldn't object, but it's not. > I've been using -apps, via my own builds and in Arch for several years - I > think it is fairly mature. It also has the fewest dependencies so it > essentially makes lx and pymenu obsolete. > > In addition to the other changes, I'd like to try to split the port into > jgmenu and jgmenu-apps. I'm an occasional porter and this will be my > 1st attempt at flavors. Humm... I'm not sure. Why should it be splitted in jgmenu and jgmenu-apps? (what could be useful to package separately, and MULTI_PACKAGES would help, is the xfce4 panel applet, that would be interesting.) > Last question > https://www.openbsd.org/faq/ports/guide.html#Ideal > Suggested CONFIGURE+STYLE = gnu - will "simple" work with > MULTI_PACKAGES/FLAVORS ? Yes, it will work. CONFIGURE_STYLE just tells the port infrastructure how to do one step of the building, FLAVORS is a way to control what to build and MULTI_PACKAGES a way to specify which things ends up in which package; they're all different mechanisms more or less independent.
Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
I debated breaking the port down into flavors but really did not have a
sense about what OpenBSD users would use. Personally, the lightest
fastest option is what I would use.
Since --with-lx is the default, it will throw a build error. I'm not
sure what OpenBSD policy is toward a "multi-tool" port that does not
install with all needed dependencies for each one its "tools". If I
recall correctly, the README arose to indicate -lx needed the
installation of menu-cache and gnome/mate menu packages. Perhaps just
distilling the README down to a man page reference and the need for
gnome/mate menus apps/lx and menu-cache for lx itself?
I've been using -apps, via my own builds and in Arch for several years - I
think it is fairly mature. It also has the fewest dependencies so it
essentially makes lx and pymenu obsolete.
In addition to the other changes, I'd like to try to split the port into
jgmenu and jgmenu-apps. I'm an occasional porter and this will be my
1st attempt at flavors.
Last question
https://www.openbsd.org/faq/ports/guide.html#Ideal
Suggested CONFIGURE+STYLE = gnu - will "simple" work with
MULTI_PACKAGES/FLAVORS ?
I planned on modeling the port on evince evince--light.
Thanks
On Nov 21, 2022: 20:01, Omar Polo wrote:
Hello,
On 2022/11/20 16:13:11 -0800, "Heppler, J. Scott" wrote:
The attached diff updates jgmenu.
Thanks for updating jgmenu!
The update matches Debian testing and is one minor version beyond
FreeBSD.
This update add a fourth method of menu generation - apps. "apps" is an
internal menu generator that duplicates the function of x11/menu-cache
while being significantly faster.
Builds/runs amd64. make ports-lib-depends-check produced
Extra/ menu-cache.1
This means that a port listed as LIB_DEPENDS isn't actually used. In
this case, the jgmenu executable is not linked to libmenu-cache.
The configure script needs --with-lx (or --all) to enable
libmenu-cache support. I don't have a strong opinion on whether to
enable libmenu cache, but I'm propending to not having it enabled
since it's the upstream default and other package repositories are
doing the same (looking at alpine for example, freebsd hides it behind
a user option.)
pkg/README updated for apps.
I'd argue that the pkg/README is quite useless. It doesn't add
anything to the manpages and there isn't some special OpenBSD-specific
or anyway trick setup to. I'd just delete it rather than try to
maintain it.
Using CONFIGURE_STYLE = gnu in this case is slightly wrong. The
configure script seems to honour some GNU autoconf parameter (--with-*
and --prefix) but it's a hand-written one, so I'd go with `simple'
plus CONFIGURE_ARGS.
Makefile.inc needs a patch to drop the hardcoded -Os.
nitpick: the github repository moved to jgmenu/jgmenu.
works fine here, but I never touched the configuration, so further
testing is welcome :)
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile13 Nov 2022 15:30:22 - 1.13
+++ Makefile21 Nov 2022 18:29:29 -
@@ -1,17 +1,16 @@
COMMENT = freedesktop-compliant menu for openbox and tint2
CATEGORIES =x11
-GH_ACCOUNT = johanmalm
+GH_ACCOUNT = jgmenu
GH_PROJECT =jgmenu
-GH_TAGNAME = v2.1
-REVISION = 6
+GH_TAGNAME = v4.4.1
# GPLv2 only
PERMIT_PACKAGE =Yes
-WANTLIB = X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m menu-cache pango-1.0
-WANTLIB += pangocairo-1.0 png pthread rsvg-2 xml2 z
+WANTLIB += X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m pango-1.0 pangocairo-1.0
+WANTLIB += png pthread rsvg-2 xml2 z
# base-gcc does not understand all the warnings
COMPILER = base-clang ports-gcc
@@ -20,13 +19,13 @@ MODULES = lang/python
MODPY_BUILDDEP =No
MODPY_SETUPTOOLS = No
-LIB_DEPENDS = x11/gnome/librsvg \
- x11/menu-cache
+LIB_DEPENDS = x11/gnome/librsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-CONFIGURE_STYLE = none
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS += --prefix="${PREFIX}"
USE_GMAKE = Yes
MAKE_FLAGS =VERBOSE=1
Index: distinfo
===
RCS file: /home/cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Feb 2019 16:16:05 - 1.2
+++ distinfo21 Nov 2022 14:12:01 -
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI=
+SIZE (jgmenu-4.4.1.tar.gz) = 382258
Index: patches/patch-Makefile
===
RCS file:
Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
Hello,
On 2022/11/20 16:13:11 -0800, "Heppler, J. Scott" wrote:
> The attached diff updates jgmenu.
Thanks for updating jgmenu!
> The update matches Debian testing and is one minor version beyond
> FreeBSD.
>
> This update add a fourth method of menu generation - apps. "apps" is an
> internal menu generator that duplicates the function of x11/menu-cache
> while being significantly faster.
>
> Builds/runs amd64. make ports-lib-depends-check produced
> Extra/ menu-cache.1
This means that a port listed as LIB_DEPENDS isn't actually used. In
this case, the jgmenu executable is not linked to libmenu-cache.
The configure script needs --with-lx (or --all) to enable
libmenu-cache support. I don't have a strong opinion on whether to
enable libmenu cache, but I'm propending to not having it enabled
since it's the upstream default and other package repositories are
doing the same (looking at alpine for example, freebsd hides it behind
a user option.)
> pkg/README updated for apps.
I'd argue that the pkg/README is quite useless. It doesn't add
anything to the manpages and there isn't some special OpenBSD-specific
or anyway trick setup to. I'd just delete it rather than try to
maintain it.
Using CONFIGURE_STYLE = gnu in this case is slightly wrong. The
configure script seems to honour some GNU autoconf parameter (--with-*
and --prefix) but it's a hand-written one, so I'd go with `simple'
plus CONFIGURE_ARGS.
Makefile.inc needs a patch to drop the hardcoded -Os.
nitpick: the github repository moved to jgmenu/jgmenu.
works fine here, but I never touched the configuration, so further
testing is welcome :)
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile13 Nov 2022 15:30:22 - 1.13
+++ Makefile21 Nov 2022 18:29:29 -
@@ -1,17 +1,16 @@
COMMENT = freedesktop-compliant menu for openbox and tint2
CATEGORIES = x11
-GH_ACCOUNT = johanmalm
+GH_ACCOUNT = jgmenu
GH_PROJECT = jgmenu
-GH_TAGNAME = v2.1
-REVISION = 6
+GH_TAGNAME = v4.4.1
# GPLv2 only
PERMIT_PACKAGE = Yes
-WANTLIB = X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m menu-cache pango-1.0
-WANTLIB += pangocairo-1.0 png pthread rsvg-2 xml2 z
+WANTLIB += X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m pango-1.0 pangocairo-1.0
+WANTLIB += png pthread rsvg-2 xml2 z
# base-gcc does not understand all the warnings
COMPILER = base-clang ports-gcc
@@ -20,13 +19,13 @@ MODULES = lang/python
MODPY_BUILDDEP = No
MODPY_SETUPTOOLS = No
-LIB_DEPENDS = x11/gnome/librsvg \
- x11/menu-cache
+LIB_DEPENDS = x11/gnome/librsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-CONFIGURE_STYLE = none
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS += --prefix="${PREFIX}"
USE_GMAKE =Yes
MAKE_FLAGS = VERBOSE=1
Index: distinfo
===
RCS file: /home/cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Feb 2019 16:16:05 - 1.2
+++ distinfo21 Nov 2022 14:12:01 -
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI=
+SIZE (jgmenu-4.4.1.tar.gz) = 382258
Index: patches/patch-Makefile
===
RCS file: /home/cvs/ports/x11/jgmenu/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 11 Mar 2022 20:16:09 - 1.2
+++ patches/patch-Makefile 21 Nov 2022 14:12:01 -
@@ -1,42 +1,32 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -24,7 +24,7 @@ else
- datarootdir= $(prefix)/share
- endif
-
--CFLAGS += -g -Wall -Os -std=gnu89
-+CFLAGS += -Wall -std=gnu89
- CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \
- -Wold-style-definition -Woverflow -Wpointer-arith \
- -Wstrict-prototypes -Wunused -Wvla -Wunused-result
-@@ -100,18 +100,18 @@ $(DEPDIR)/%.d: ;
+@@ -80,17 +80,17 @@ $(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d
- install: checkdeps $(PROGS)
+ install: $(PROGS)
- @install -d $(DESTDIR)$(bindir)
- @install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir)
-- @install -d $(DESTDIR)$(libexecdir)
-- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC)
$(DESTDIR)$(libexecdir)
-- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)
+- @install -d $(DESTDIR)$(libexecdir)/jgmenu
+- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC)
$(DESTDIR)$(libexecdir)/jgmenu
+-
[UPDATE} jgmenu-2.1 -> jgmenu-4.4.1
The attached diff updates jgmenu. The update matches Debian testing and is one minor version beyond FreeBSD. This update add a fourth method of menu generation - apps. "apps" is an internal menu generator that duplicates the function of x11/menu-cache while being significantly faster. Builds/runs amd64. make ports-lib-depends-check produced Extra/ menu-cache.1 pkg/README updated for apps. -- J. Scott Heppler Index: x11/jgmenu/Makefile === RCS file: /cvs/ports/x11/jgmenu/Makefile,v retrieving revision 1.13 diff -u -p -u -r1.13 Makefile --- x11/jgmenu/Makefile 13 Nov 2022 15:30:22 - 1.13 +++ x11/jgmenu/Makefile 20 Nov 2022 23:34:02 - @@ -3,8 +3,7 @@ CATEGORIES =x11 GH_ACCOUNT = johanmalm GH_PROJECT = jgmenu -GH_TAGNAME = v2.1 -REVISION = 6 +GH_TAGNAME = v4.4.1 # GPLv2 only PERMIT_PACKAGE = Yes @@ -26,7 +25,7 @@ LIB_DEPENDS = x11/gnome/librsvg \ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -CONFIGURE_STYLE = none +CONFIGURE_STYLE = gnu USE_GMAKE =Yes MAKE_FLAGS = VERBOSE=1 Index: x11/jgmenu/distinfo === RCS file: /cvs/ports/x11/jgmenu/distinfo,v retrieving revision 1.2 diff -u -p -u -r1.2 distinfo --- x11/jgmenu/distinfo 26 Feb 2019 16:16:05 - 1.2 +++ x11/jgmenu/distinfo 20 Nov 2022 23:34:02 - @@ -1,2 +1,2 @@ -SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8= -SIZE (jgmenu-2.1.tar.gz) = 330256 +SHA256 (jgmenu-4.4.1.tar.gz) = FkGU652nzO3M+0d5ZWCyprD3NK5sXDh47BhPfP5/jzI= +SIZE (jgmenu-4.4.1.tar.gz) = 382258 Index: x11/jgmenu/patches/patch-Makefile === RCS file: /cvs/ports/x11/jgmenu/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-Makefile --- x11/jgmenu/patches/patch-Makefile 11 Mar 2022 20:16:09 - 1.2 +++ x11/jgmenu/patches/patch-Makefile 20 Nov 2022 23:34:02 - @@ -1,42 +1,32 @@ Index: Makefile --- Makefile.orig +++ Makefile -@@ -24,7 +24,7 @@ else - datarootdir= $(prefix)/share - endif - --CFLAGS += -g -Wall -Os -std=gnu89 -+CFLAGS += -Wall -std=gnu89 - CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \ - -Wold-style-definition -Woverflow -Wpointer-arith \ - -Wstrict-prototypes -Wunused -Wvla -Wunused-result -@@ -100,18 +100,18 @@ $(DEPDIR)/%.d: ; +@@ -80,17 +80,17 @@ $(DEPDIR)/%.d: ; .PRECIOUS: $(DEPDIR)/%.d - install: checkdeps $(PROGS) + install: $(PROGS) - @install -d $(DESTDIR)$(bindir) - @install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -- @install -d $(DESTDIR)$(libexecdir) -- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) +- @install -d $(DESTDIR)$(libexecdir)/jgmenu +- @install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu +- @./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu - @$(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install - @install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -d $(DESTDIR)$(datarootdir)/applications/ - @install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ - @install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ +- @for dir in $(CONTRIB_DIRS); do \ + install -d $(DESTDIR)$(bindir) + install -m755 jgmenu src/jgmenu_run $(DESTDIR)$(bindir) -+ install -d $(DESTDIR)$(libexecdir) -+ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir) -+ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir) ++ install -d $(DESTDIR)$(libexecdir)/jgmenu ++ install -m755 $(PROGS_LIBEXEC) $(SCRIPTS_LIBEXEC) $(DESTDIR)$(libexecdir)/jgmenu ++ ./scripts/set-exec-path.sh $(DESTDIR)$(bindir)/jgmenu_run $(libexecdir)/jgmenu + $(MAKE) --no-print-directory -C docs/manual/ prefix=$(prefix) install + install -d $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -d $(DESTDIR)$(datarootdir)/applications/ + install -m644 ./data/jgmenu.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/ + install -m644 ./data/jgmenu.desktop $(DESTDIR)$(datarootdir)/applications/ - ifeq ($(NO_LX),1) -- @echo "info: lx module not included as libmenu-cache >=1.1.0 not found" -+ echo "info: lx module not included as libmenu-cache >=1.1.0 not found" - endif ++ for dir in $(CONTRIB_DIRS); do \ + $(MAKE) -C contrib/$$dir install || exit 1; \ + done - # We are not brave enough to uninstall in /usr/, /usr/local/ etc Index:
