Hi ports,
The attached diff updates jgmenu to the latest release.
Update summary:
https://github.com/johanmalm/jgmenu/releases/tag/v3.0
https://github.com/johanmalm/jgmenu/releases/tag/v2.2
I reviewed the current changelog in regards to base-clang, base-gcc and
the compiler options. I could not find where the "@install" was patched
to "install" to understand the reasoning, but continued the change in
the new patch-Makefile. There were some @install entries in a Makefile
section to install in a users home directory that I did not think had
any effect and did not patch those out.
Builds, runs in amd64-current and tested
openbox jgmenu lx
cwm jgmenu pmenu
cwm jgmenu --init theme=greeneye
Critique, suggestions, additional testing and consideration for updating
appreciated
--
J. Scott Heppler
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 17 May 2019 16:45:28 -0000 1.5
+++ Makefile 25 May 2019 20:27:03 -0000
@@ -5,8 +5,7 @@ CATEGORIES = x11
GH_ACCOUNT = johanmalm
GH_PROJECT = jgmenu
-GH_TAGNAME = v2.1
-REVISION = 1
+GH_TAGNAME = v3.0
# GPLv2 only
PERMIT_PACKAGE_CDROM = 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 25 May 2019 20:27:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-3.0.tar.gz) = pXeLEQKMlVDN3/9eStCysxWOmb0+jTarRP3hx/Vn3YU=
+SIZE (jgmenu-3.0.tar.gz) = 338357
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 25 May 2019 20:27:03 -0000
@@ -12,7 +12,7 @@ Index: Makefile
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: ;
+@@ -109,16 +109,16 @@ $(DEPDIR)/%.d: ;
.PRECIOUS: $(DEPDIR)/%.d
install: checkdeps $(PROGS)
@@ -36,9 +36,63 @@ 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
# We are not brave enough to uninstall in /usr/, /usr/local/ etc
+ uninstall:
+@@ -142,41 +142,41 @@ endif
+ @-rmdir ~/.local/share/icons 2>/dev/null || true
+
+ clean:
+- @$(RM) $(PROGS) *.o *.a $(DEPDIR)/*.d checkdeps
+- @$(RM) -r .d/
+- @$(MAKE) --no-print-directory -C tests/ clean
+- @$(MAKE) --no-print-directory -C tests/helper/ clean
++ $(RM) $(PROGS) *.o *.a $(DEPDIR)/*.d checkdeps
++ $(RM) -r .d/
++ $(MAKE) --no-print-directory -C tests/ clean
++ $(MAKE) --no-print-directory -C tests/helper/ clean
+
+ test:
+- @$(MAKE) --no-print-directory -C tests/helper/ all
+- @$(MAKE) --no-print-directory -C tests/ prove
++ $(MAKE) --no-print-directory -C tests/helper/ all
++ $(MAKE) --no-print-directory -C tests/ prove
+
+ ex:
+- @$(MAKE) --no-print-directory -C examples/ all
++ $(MAKE) --no-print-directory -C examples/ all
+
+ check:
+- @./scripts/checkpatch-wrapper.sh src/*.c
+- @./scripts/checkpatch-wrapper.sh src/*.h
++ ./scripts/checkpatch-wrapper.sh src/*.c
++ ./scripts/checkpatch-wrapper.sh src/*.h
+
+ REQUIRED_BINS := pkg-config xml2-config
+ REQUIRED_LIBS := x11 xrandr cairo pango pangocairo librsvg-2.0
+ checkdeps:
+- @echo ' CHECK build dependencies'
+- @for b in $(REQUIRED_BINS); do \
++ echo ' CHECK build dependencies'
++ for b in $(REQUIRED_BINS); do \
+ type $${b} >/dev/null 2>&1 || echo "warn: require ($${b})"; \
+ done
+- @for l in $(REQUIRED_LIBS); do \
++ for l in $(REQUIRED_LIBS); do \
+ pkg-config $${l} || echo "fatal: require ($${l})"; \
+ done
+- @if ! pkg-config "libmenu-cache >= 1.1.0" "glib-2.0"; then \
++ if ! pkg-config "libmenu-cache >= 1.1.0" "glib-2.0"; then \
+ echo " - Cannot install lx module as build dependencies
are missing"; \
+ echo " libmenu-cache >= 1.1.0 and glib-2.0 are needed"; \
+ echo " This will not prevent you from running jgmenu"; \
+ fi
+- @touch checkdeps
++ touch checkdeps
+
+ print-%:
+- @echo '$*=$($*)'
++ echo '$*=$($*)'
+
+ SRCS = $(patsubst ./%,%,$(shell find ./src -maxdepth 1 -name '*.c' -print))
+ include $(wildcard $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRCS))))
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 25 May 2019 20:27:03 -0000
@@ -1,17 +1,19 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/02/26 16:16:05 sthen Exp $
+@comment $OpenBSD: PLIST,v$
@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
@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-lx.1
@man man/man1/jgmenu-ob.1
@man man/man1/jgmenu-pmenu.1
