support
Reply-To:
Organization:
Hi ports,
In response to Christian Weisgerber's request for 6.6 port updates,
attached is a diff to update jgmenu from 2.1 to 3.4.
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/3.4.txt
As indicated in the release notes, jgmenu can be built as an Xfce4
plugin. The attached diff does not list any Xfce4 build dependencies so
the Xfce4 panel plugin will not be built.
My rationale for not including:
1) The plugin should be under the Xfce4 umbrella
2) Xfce4 alreadey has a nice menu + x11/xfce4-whisker
This builds and runs on amd64-current.
I will serve as an unofficial port maintainer but I'm really trying to
limit my internet footprint and would prefer my email address not be
published widely. This also applies to tint2 which I also recently
submitted an update.
--
J. Scott Heppler
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 12 Jul 2019 20:51:14 -0000 1.6
+++ Makefile 5 Oct 2019 13:27:50 -0000
@@ -5,8 +5,7 @@ CATEGORIES = x11
GH_ACCOUNT = johanmalm
GH_PROJECT = jgmenu
-GH_TAGNAME = v2.1
-REVISION = 1
+GH_TAGNAME = v3.4
# GPLv2 only
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 26 Feb 2019 16:16:05 -0000 1.2
+++ distinfo 5 Oct 2019 13:27:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-3.4.tar.gz) = lzSRp1YpbmZSCHTzXFkNjC3lQXr8/E9RF8R+NYQcsXE=
+SIZE (jgmenu-3.4.tar.gz) = 355689
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile 26 Feb 2019 16:16:05 -0000 1.1
+++ patches/patch-Makefile 5 Oct 2019 13:27:50 -0000
@@ -1,18 +1,18 @@
-$OpenBSD: patch-Makefile,v 1.1 2019/02/26 16:16:05 sthen Exp $
+$OpenBSD$
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -24,7 +24,7 @@ else
+@@ -27,7 +27,7 @@ else
datarootdir= $(prefix)/share
endif
--CFLAGS += -g -Wall -Os -std=gnu89
-+CFLAGS += -Wall -std=gnu89
+-CFLAGS += -g -Wall -Os -std=gnu99
++CFLAGS += -Wall -Os -std=gnu99
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: ;
+@@ -116,17 +116,17 @@ $(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d
install: checkdeps $(PROGS)
@@ -26,6 +26,7 @@ Index: Makefile
- @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)
@@ -36,9 +37,7 @@ Index: Makefile
+ 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: patches/patch-docs_manual_Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/patches/patch-docs_manual_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-docs_manual_Makefile
--- patches/patch-docs_manual_Makefile 3 Feb 2019 15:47:09 -0000 1.1.1.1
+++ patches/patch-docs_manual_Makefile 5 Oct 2019 13:27:50 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-docs_manual_Makefile,v 1.1.1.1 2019/02/03 15:47:09 bcallah Exp
$
+$OpenBSD$
Index: docs/manual/Makefile
--- docs/manual/Makefile.orig
+++ docs/manual/Makefile
-@@ -11,7 +11,7 @@ man7pages = jgmenututorial.7
+@@ -4,7 +4,7 @@ man7pages = jgmenututorial.7 jgmenuunicode.7
manpages = $(man1pages) $(man7pages)
prefix ?= /usr/local
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/jgmenu/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 26 Feb 2019 16:16:05 -0000 1.2
+++ pkg/PLIST 5 Oct 2019 13:27:50 -0000
@@ -2,22 +2,27 @@
@bin bin/jgmenu
bin/jgmenu_run
lib/jgmenu/
-lib/jgmenu/jgmenu-config.py
+@bin lib/jgmenu/jgmenu-apps
+@bin lib/jgmenu/jgmenu-config
@bin lib/jgmenu/jgmenu-greeneye
+lib/jgmenu/jgmenu-hide-app.sh
@bin lib/jgmenu/jgmenu-i18n
lib/jgmenu/jgmenu-init.sh
@bin lib/jgmenu/jgmenu-lx
@bin lib/jgmenu/jgmenu-ob
+@bin lib/jgmenu/jgmenu-obtheme
lib/jgmenu/jgmenu-pmenu.py
@bin lib/jgmenu/jgmenu-socket
+lib/jgmenu/jgmenu-themes.sh
lib/jgmenu/jgmenu-unity-hack.py
-@man man/man1/jgmenu-config.1
+@man man/man1/jgmenu-apps.1
@man man/man1/jgmenu-lx.1
@man man/man1/jgmenu-ob.1
@man man/man1/jgmenu-pmenu.1
@man man/man1/jgmenu.1
@man man/man1/jgmenu_run.1
@man man/man7/jgmenututorial.7
+@man man/man7/jgmenuunicode.7
share/applications/jgmenu.desktop
share/doc/pkg-readmes/${PKGSTEM}
share/icons/hicolor/scalable/apps/jgmenu.svg
