Hi all,
update jgmenu to latest version. Uses configure now. Tested on amd64 and works
fine for me.
mbk Uwe
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- Makefile 3 Jul 2020 21:13:22 -0000 1.7
+++ Makefile 8 Sep 2020 20:18:37 -0000
@@ -5,8 +5,7 @@ CATEGORIES = x11
GH_ACCOUNT = johanmalm
GH_PROJECT = jgmenu
-GH_TAGNAME = v2.1
-REVISION = 2
+GH_TAGNAME = v4.2.1
# GPLv2 only
PERMIT_PACKAGE = Yes
@@ -29,7 +28,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: distinfo
===================================================================
RCS file: /cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo 26 Feb 2019 16:16:05 -0000 1.2
+++ distinfo 8 Sep 2020 20:18:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-4.2.1.tar.gz) = jOMlC2pybwaBJqC3XgKmyq/PZRuMbvWbMo/3CoFHP8U=
+SIZE (jgmenu-4.2.1.tar.gz) = 378061
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-Makefile
--- patches/patch-Makefile 26 Feb 2019 16:16:05 -0000 1.1
+++ patches/patch-Makefile 8 Sep 2020 20:18:37 -0000
@@ -3,42 +3,32 @@ $OpenBSD: patch-Makefile,v 1.1 2019/02/2
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: ;
+@@ -78,17 +78,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: patches/patch-Makefile_inc
===================================================================
RCS file: patches/patch-Makefile_inc
diff -N patches/patch-Makefile_inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_inc 8 Sep 2020 20:18:37 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile.inc
+--- Makefile.inc.orig
++++ Makefile.inc
+@@ -15,7 +15,7 @@ else
+ datarootdir= $(prefix)/share
+ endif
+
+-CFLAGS += -g -Wall -Os -std=gnu99
++CFLAGS += -Wall -std=gnu99
+ CFLAGS += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \
+ -Wold-style-definition -Woverflow -Wpointer-arith \
+ -Wstrict-prototypes -Wunused -Wvla -Wunused-result
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 -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 8 Sep 2020 20:18:37 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-docs_manual_Makefile,v 1
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: patches/patch-src_jgmenu_run
===================================================================
RCS file: patches/patch-src_jgmenu_run
diff -N patches/patch-src_jgmenu_run
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_jgmenu_run 8 Sep 2020 20:18:37 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/jgmenu_run
+--- src/jgmenu_run.orig
++++ src/jgmenu_run
+@@ -58,7 +58,7 @@ then
+ if test -e ${JGMENU_LOCKFILE}
+ then
+ send_tint2_env_vars_to_jgmenu
+- if killall -SIGUSR1 jgmenu >/dev/null 2>&1
++ if pkill -USR1 jgmenu >/dev/null 2>&1
+ then
+ exit 0
+ else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/jgmenu/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 26 Feb 2019 16:16:05 -0000 1.2
+++ pkg/PLIST 8 Sep 2020 20:18:37 -0000
@@ -2,22 +2,26 @@
@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
-lib/jgmenu/jgmenu-pmenu.py
+@bin lib/jgmenu/jgmenu-obtheme
@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-i18n.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
