Re: Minor firefox-esr 7.5 ID's as 7.4

[Heppler, J. Scott]

More info.

I did a manual upgrade and used pkg_add -u to update firefox-esr.
I removed the package and reinstalled.  Recursively deleted ~/.mozilla
and firefox-esr now correctly ID's as OpenBSD - 7.5

I was initially concerned that the build info had not been updated.  For
some reason pkg_update did not replace the package for 7.5.  I expect
this will correct in 7.5 on the next firefox-esr update.

Regards

---

J. Scott Heppler

Minor firefox-esr 7.5 ID's as 7.4

[Heppler, J. Scott]

This is minor but after upgrading to 7.5
firefox-esr > Help > About Firefox

ID as OpenBSD - 7.4

dmesg:
OpenBSD 7.5 (GENERIC.MP) #82: Wed Mar 20 15:48:40 MDT 2024
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

 pkg_info firefox-esr
Information for inst:firefox-esr-115.9.1


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Openbox crash fix for 7.4-stable and -current

[Heppler, J. Scott]

Re: https://marc.info/?l=openbsd-ports=169790467230751=2

In regards to the linked 7.4 release discussion on the ports mailing
list; it looks like the heavy lifting was done with corrective patches
provided to the maintainer.  The submitters built their own upgrade and
reported the exit full screen crash was fixed.  I believe the submitters
were respecting the maintainers ownership and they did not submit
patches.  In the interim, the maintainer just said "OK" and current
entered a "disruptive" phase.

I have a vested interest in fixing the package in stable and going
forward.  I'm willing to submit an upgrade patch if it does not step on
anyone's ego.

I'm running stable only but can install current on an old machine.

Questions:
Would a patch generated in stable be enough or does the project want
patches for both stable/current?

I'm guessing ports should not be affected by the disruptive phase in
base.  If a current patch is needed will there be any issues?

I'm wondering if maintenance going forward would be simplified by using
either Debian patched source or possibly link the more minimal and
likely more up-to-date Arch linux patches?

Thanks

--
J. Scott Heppler

Re: [UPDATE-BUMP] x11/jgmenu 2.1 -> 4.4.1

[Heppler, J. Scott]

I think I have everything in the attached diff
portcheck just shows jgmenu-unity-hack.py


--
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//Makefile13 Nov 2022 15:30:22 -  1.13
+++ x11/jgmenu//Makefile25 Nov 2022 16:42:55 -
@@ -1,32 +1,26 @@
 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 += 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//distinfo26 Feb 2019 16:16:05 -  1.2
+++ x11/jgmenu//distinfo25 Nov 2022 16:42: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  25 Nov 2022 16:42: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: lx module not 

Re: [UPDATE-BUMP] x11/jgmenu 2.1 -> 4.4.1

[Heppler, J. Scott]

Yes, I don't port frequently enough.  *.diff with patch-Makefile_inc
attached.

On Nov 24, 2022: 16:52, Peter Hessler wrote:

:? x11/jgmenu/patches/patch-Makefile_inc

Did you forget to cvs add this file to include it in the diff?

-peter


--
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 24 Nov 2022 15:44:43 -
@@ -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 24 Nov 2022 15:44:43 -
@@ -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   24 Nov 2022 15:44:43 -
@@ -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 

[UPDATE-BUMP] x11/jgmenu 2.1 -> 4.4.1

[Heppler, J. Scott]

Updates jgmenu to 4.4.1.  This update now generates a FreeDesktop
compliant menu using internal code rather than x11/menu-cache.  Python
generated menus and parsing x11/openbox menu.xml files was not enabled
in this build.  With the simplified code, the pkg-readme was no longer
needed and was removed.  Passed portcheck and
check-indirect-dependencies.


--
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 

Re: [UPDATE} jgmenu-2.1 -> jgmenu-4.4.1

[Heppler, J. Scott]

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

[Heppler, J. Scott]

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

[Heppler, J. Scott]

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

[UPDATE} jgmenu-2.1 -> jgmenu-4.4.1

[Heppler, J. Scott]

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: 

Re: x11/openbox diff for py3-xdg

[Heppler, J. Scott]

Benoit mentioned difficulties in updating ancillary openbox ports.

Arch linux has been aggressive in removing Python2 and gtk+2

x11/obconf was patched to gtk+3 and libglade removed:
https://github.com/archlinux/svntogit-community/tree/packages/obconf/trunk

x11/obmenu could be dropped as there are other openbox menu generators;
x11/menumaker, x11/jgmenu
Arch AUR does have a git pull of obmenu2 with gtk+3/python3
https://aur.archlinux.org/packages/obmenu2-git

I don't use obconf or obmenu but would be willing to try to update
obconf with the Arch Linux patches.

Scott

On Nov 07, 2022: 22:21, Stuart Henderson wrote:

On 2022/11/04 12:45, Heppler, J. Scott wrote:

Attached is a diff that upgrades py-xdg to py3-xdg in openbox.
Tested on amd64.

Thanks to Stuart Henderson for the python 2to3 magic.


re-CC'ing maintainer (who was CC'd when I sent my diff earlier).


Index: x11/openbox/Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile
--- x11/openbox/Makefile1 Apr 2022 19:09:43 -   1.88
+++ x11/openbox/Makefile4 Nov 2022 19:11:05 -
@@ -1,7 +1,7 @@
 COMMENT =  small, fast & usable window manager

 V =3.6.1
-REVISION = 9
+REVISION = 10
 DISTNAME = openbox-${V}
 SHARED_LIBS += obrender12.0# 32.0
 SHARED_LIBS += obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
 MASTER_SITES = ${HOMEPAGE}dist/openbox/

 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
 LIB_DEPENDS += devel/gettext,-runtime \
devel/pango \
@@ -50,10 +49,11 @@ MODPY_ADJ_FILES =data/autostart/openbox-

 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = --docdir=${PREFIX}/share/examples/openbox
-CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}"


Why change CONFIGURE_ENV? (There's no reason to remove it, and there's
a chance that doing so will break the port on some archs).

Otherwise it's basically the same as my diff.

I don't use this, but if $MAINTAINER is ok then it would be nice to
get rid of py2 from x11/openbox and devel/py-xdg. (x11/obmenu will be more
tricky).


Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile7 Nov 2022 22:12:54 -
@@ -1,7 +1,7 @@
COMMENT =   small, fast & usable window manager

V = 3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME =  openbox-${V}
SHARED_LIBS +=  obrender12.0# 32.0
SHARED_LIBS +=  obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES =  ${HOMEPAGE}dist/openbox/

MODULES =   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS +=  devel/gettext,-runtime \
devel/pango \
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}

pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart

.include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   7 Nov 2022 22:12:54 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delet

[Revised Update] x11/tint2 gtk+3 v2

[Heppler, J. Scott]

Removed redundant @pkgpath x11/tint in the attachment.

Sorry for the noise.

--
J. Scott Heppler
Index: x11/tint2/Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- x11/tint2/Makefile  27 Mar 2022 16:23:07 -  1.17
+++ x11/tint2/Makefile  4 Nov 2022 21:08:19 -
@@ -2,11 +2,10 @@ ONLY_FOR_ARCHS=   ${APM_ARCHS}
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.7
+V= 17.0.2
 CATEGORIES=x11
 DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
-REVISION=  0
 
 # GPLv2 only
 PERMIT_PACKAGE=Yes
@@ -15,10 +14,9 @@ MASTER_SITES=https://gitlab.com/o9000/t
 
 WANTLIB =  Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2
-WANTLIB += startup-notification-1 z
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
+WANTLIB += rsvg-2 startup-notification-1 z
 
 BUILD_DEPENDS= devel/gettext,-tools
 
@@ -26,7 +24,7 @@ LIB_DEPENDS=  devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
graphics/imlib2 \
-   x11/gtk+2
+   x11/gtk+3
 
 MODULES=   devel/cmake \
x11/gnome
Index: x11/tint2/distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- x11/tint2/distinfo  18 Oct 2019 12:50:00 -  1.5
+++ x11/tint2/distinfo  4 Nov 2022 21:08:19 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.7.tar.gz) = K34MBCW/H3f4l0jnKVqb3ABvGM4LWBSAIv4p4UBau28=
-SIZE (tint2-16.7.tar.gz) = 551146
+SHA256 (tint2-17.0.2.tar.gz) = +H8UfhdtMvMfEvwXN/dfVMTG93lhxqJhXvnWTLKc4kw=
+SIZE (tint2-17.0.2.tar.gz) = 553697
Index: x11/tint2/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-CMakeLists_txt
--- x11/tint2/patches/patch-CMakeLists_txt  11 Mar 2022 20:17:26 -  
1.5
+++ x11/tint2/patches/patch-CMakeLists_txt  4 Nov 2022 21:08:19 -
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -289,8 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -292,8 +292,7 @@ target_link_libraries(tint2-send ${X11_LIBRARIES})
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
Index: x11/tint2/pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -r1.8 PLIST
--- x11/tint2/pkg/PLIST 11 Mar 2022 20:17:26 -  1.8
+++ x11/tint2/pkg/PLIST 4 Nov 2022 21:08:19 -
@@ -44,6 +44,6 @@ share/locale/pl/LC_MESSAGES/tint2conf.mo
 share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
 share/mime/packages/tint2conf.xml
-@tag update-desktop-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor
 @tag update-mime-database
+@tag update-desktop-database

Revised diff for gtk+3 x11/tint2

[Heppler, J. Scott]

In the PLIST, I kept the old @pkgpath x11/tint entries even though it
has been quite awhile since the port was renamed tint -tint2.

This revision cleans up the /etc/xdg/tint2 entry compared to the prior
email.

Thanks
--
J. Scott Heppler
Index: x11/tint2/Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- x11/tint2/Makefile  27 Mar 2022 16:23:07 -  1.17
+++ x11/tint2/Makefile  4 Nov 2022 20:19:16 -
@@ -2,11 +2,10 @@ ONLY_FOR_ARCHS=   ${APM_ARCHS}
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.7
+V= 17.0.2
 CATEGORIES=x11
 DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
-REVISION=  0
 
 # GPLv2 only
 PERMIT_PACKAGE=Yes
@@ -15,10 +14,9 @@ MASTER_SITES=https://gitlab.com/o9000/t
 
 WANTLIB =  Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2
-WANTLIB += startup-notification-1 z
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
+WANTLIB += rsvg-2 startup-notification-1 z
 
 BUILD_DEPENDS= devel/gettext,-tools
 
@@ -26,7 +24,7 @@ LIB_DEPENDS=  devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
graphics/imlib2 \
-   x11/gtk+2
+   x11/gtk+3
 
 MODULES=   devel/cmake \
x11/gnome
Index: x11/tint2/distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- x11/tint2/distinfo  18 Oct 2019 12:50:00 -  1.5
+++ x11/tint2/distinfo  4 Nov 2022 20:19:16 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.7.tar.gz) = K34MBCW/H3f4l0jnKVqb3ABvGM4LWBSAIv4p4UBau28=
-SIZE (tint2-16.7.tar.gz) = 551146
+SHA256 (tint2-17.0.2.tar.gz) = +H8UfhdtMvMfEvwXN/dfVMTG93lhxqJhXvnWTLKc4kw=
+SIZE (tint2-17.0.2.tar.gz) = 553697
Index: x11/tint2/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-CMakeLists_txt
--- x11/tint2/patches/patch-CMakeLists_txt  11 Mar 2022 20:17:26 -  
1.5
+++ x11/tint2/patches/patch-CMakeLists_txt  4 Nov 2022 20:19:16 -
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -289,8 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -292,8 +292,7 @@ target_link_libraries(tint2-send ${X11_LIBRARIES})
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
Index: x11/tint2/pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -r1.8 PLIST
--- x11/tint2/pkg/PLIST 11 Mar 2022 20:17:26 -  1.8
+++ x11/tint2/pkg/PLIST 4 Nov 2022 20:19:16 -
@@ -1,4 +1,5 @@
 @pkgpath x11/tint
+@pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
 @man man/man1/tint2.1
@@ -44,6 +45,6 @@ share/locale/pl/LC_MESSAGES/tint2conf.mo
 share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
 share/mime/packages/tint2conf.xml
-@tag update-desktop-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor
 @tag update-mime-database
+@tag update-desktop-database

Re: x11/tint2 update to 17.0.2/gtk+3

[Heppler, J. Scott]

Just found a typo in a patch.  Please ignore this.  I'll resubmit.
--
J. Scott Heppler

x11/tint2 update to 17.0.2/gtk+3

[Heppler, J. Scott]

The attached *.diff updates tint2 to the latest and last version.
https://gitlab.com/o9000/tint2
gtk+3 builds/runs amd64.

Thanks

--
J. Scott Heppler
Index: x11/tint2/Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- x11/tint2/Makefile  27 Mar 2022 16:23:07 -  1.17
+++ x11/tint2/Makefile  4 Nov 2022 19:12:48 -
@@ -2,11 +2,10 @@ ONLY_FOR_ARCHS=   ${APM_ARCHS}
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.7
+V= 17.0.2
 CATEGORIES=x11
 DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
-REVISION=  0
 
 # GPLv2 only
 PERMIT_PACKAGE=Yes
@@ -15,10 +14,9 @@ MASTER_SITES=https://gitlab.com/o9000/t
 
 WANTLIB =  Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2
-WANTLIB += startup-notification-1 z
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread
+WANTLIB += rsvg-2 startup-notification-1 z
 
 BUILD_DEPENDS= devel/gettext,-tools
 
@@ -26,7 +24,7 @@ LIB_DEPENDS=  devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
graphics/imlib2 \
-   x11/gtk+2
+   x11/gtk+3
 
 MODULES=   devel/cmake \
x11/gnome
Index: x11/tint2/distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- x11/tint2/distinfo  18 Oct 2019 12:50:00 -  1.5
+++ x11/tint2/distinfo  4 Nov 2022 19:12:48 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.7.tar.gz) = K34MBCW/H3f4l0jnKVqb3ABvGM4LWBSAIv4p4UBau28=
-SIZE (tint2-16.7.tar.gz) = 551146
+SHA256 (tint2-17.0.2.tar.gz) = +H8UfhdtMvMfEvwXN/dfVMTG93lhxqJhXvnWTLKc4kw=
+SIZE (tint2-17.0.2.tar.gz) = 553697
Index: x11/tint2/patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-CMakeLists_txt
--- x11/tint2/patches/patch-CMakeLists_txt  11 Mar 2022 20:17:26 -  
1.5
+++ x11/tint2/patches/patch-CMakeLists_txt  4 Nov 2022 19:12:48 -
@@ -1,12 +1,13 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -289,8 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -292,8 +292,8 @@ target_link_libraries(tint2-send ${X11_LIBRARIES})
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
 -install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
 -install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
++install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
 +install( FILES default_icon.png DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
  install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
  install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: x11/tint2/patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -r1.5 patch-themes_CMakeLists_txt
--- x11/tint2/patches/patch-themes_CMakeLists_txt   11 Mar 2022 20:17:26 
-  1.5
+++ x11/tint2/patches/patch-themes_CMakeLists_txt   4 Nov 2022 19:12:48 
-
@@ -4,5 +4,5 @@ Index: themes/CMakeLists.txt
 @@ -1,2 +1,2 @@
 -file( GLOB EXTRATHEMEFILES *.tint2rc )
 -install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
-+file( GLOB EXTRATHEMEFILES tint2rc *.tint2rc )
++file( GLOB EXTRATHEMEFILES tintrc *.tint2rc )
 +install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
Index: x11/tint2/pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -r1.8 PLIST
--- x11/tint2/pkg/PLIST 11 Mar 2022 20:17:26 -  1.8
+++ x11/tint2/pkg/PLIST 4 Nov 2022 19:12:48 -
@@ -1,4 +1,3 @@
-@pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
 @man man/man1/tint2.1
@@ -44,6 +43,6 @@ share/locale/pl/LC_MESSAGES/tint2conf.mo
 share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
 share/mime/packages/tint2conf.xml
-@tag update-desktop-database
 

x11/openbox diff for py3-xdg

[Heppler, J. Scott]

Attached is a diff that upgrades py-xdg to py3-xdg in openbox.
Tested on amd64.

Thanks to Stuart Henderson for the python 2to3 magic.


--
J. Scott Heppler
Index: x11/openbox/Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -u -r1.88 Makefile
--- x11/openbox/Makefile1 Apr 2022 19:09:43 -   1.88
+++ x11/openbox/Makefile4 Nov 2022 19:11:05 -
@@ -1,7 +1,7 @@
 COMMENT =  small, fast & usable window manager
 
 V =3.6.1
-REVISION = 9
+REVISION = 10
 DISTNAME = openbox-${V}
 SHARED_LIBS += obrender12.0# 32.0
 SHARED_LIBS += obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
 MASTER_SITES = ${HOMEPAGE}dist/openbox/
 
 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
 LIB_DEPENDS += devel/gettext,-runtime \
devel/pango \
@@ -50,10 +49,11 @@ MODPY_ADJ_FILES =data/autostart/openbox-
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = --docdir=${PREFIX}/share/examples/openbox
-CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}"
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart 
 
 .include 
Index: x11/openbox/pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -u -r1.31 PLIST
--- x11/openbox/pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ x11/openbox/pkg/PLIST   4 Nov 2022 19:11:05 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
 include/openbox/${API_V}/obt/version.h
 include/openbox/${API_V}/obt/xml.h
 include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
 lib/libobrender.la
 @lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
 lib/libobt.la
 @lib lib/libobt.so.${LIBobt_VERSION}
 lib/pkgconfig/obrender-3.5.pc

Re: Openbox py-xdg -> py3-xdg

[Heppler, J. Scott]

I ended up building rust, llvm and cmake but with one exception, your
patches below worked.

I added the closing quote in
@@ -55,5 +54,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
and deleted the \ and following line.  I'm guessing your copy mouse-over
was one character short?

No issues building, pkg_info does not contain any Python2 packages and
~/.xsession-errors empty on first start.

Another guess is that you pretty much have the patch.  If you prefer, I
can also generate and send in a f/u email.

Thanks


On Nov 03, 2022: 14:29, Stuart Henderson wrote:

On 2022/11/03 06:43, Heppler, J. Scott wrote:

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler



Does this work?

Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile3 Nov 2022 14:29:19 -
@@ -1,7 +1,7 @@
COMMENT =   small, fast & usable window manager

V = 3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME =  openbox-${V}
SHARED_LIBS +=  obrender12.0# 32.0
SHARED_LIBS +=  obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES =  ${HOMEPAGE}dist/openbox/

MODULES =   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS +=  devel/gettext,-runtime \
devel/pango \
@@ -41,7 +40,7 @@ LIB_DEPENDS +=devel/gettext,-runtime \
FAKE_FLAGS =sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox"

-API_V =${V:R}
+API_V =${V:R}
SUBST_VARS =API_V

USE_GMAKE = Yes
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}

pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart

.include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   3 Nov 2022 14:29:19 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: Openbox py-xdg -> py3-xdg

[Heppler, J. Scott]

Thanks.  I updated my ports tree and will be starting from scratch.
Could I get away with preloading cmake, rust and llvm binaries?


On Nov 03, 2022: 14:29, Stuart Henderson wrote:

On 2022/11/03 06:43, Heppler, J. Scott wrote:

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler



Does this work?

Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile3 Nov 2022 14:29:19 -
@@ -1,7 +1,7 @@
COMMENT =   small, fast & usable window manager

V = 3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME =  openbox-${V}
SHARED_LIBS +=  obrender12.0# 32.0
SHARED_LIBS +=  obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES =  ${HOMEPAGE}dist/openbox/

MODULES =   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS +=  devel/gettext,-runtime \
devel/pango \
@@ -41,7 +40,7 @@ LIB_DEPENDS +=devel/gettext,-runtime \
FAKE_FLAGS =sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox"

-API_V =${V:R}
+API_V =${V:R}
SUBST_VARS =API_V

USE_GMAKE = Yes
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}

pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart

.include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   3 Nov 2022 14:29:19 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Openbox py-xdg -> py3-xdg

[Heppler, J. Scott]

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler

gtk2 -> gtk3 updates for tint2 and tray volume control

[Heppler, J. Scott]

My desktop setup now provides warnings about gtk2 not receiving security
updates.

I believe the warnings are from x11/tint2 and sysutils/tray-app.
I submitted the last update to tint2 a while ago, and am willing to
update to v17.0.2 
https://gitlab.com/o9000/tint2/-/releases


Any thing I need to read up on for the update?  Pledge/Unveil
specifically?

The remaining gtk2 relic is tray-app.
http://www.bsdua.org/tray-app.html
This has not seen an update since 15Mar2016.

Upstream is a war zone but the Author is still active.
https://marc.info/?l=openbsd-bugs=166316075114404=2

I'll send Alexey an email to see if gtk3 migration is doable for the 7.3
release.  There are some alternative system tray volume sliders but most
would shim pulseaudio.
https://wiki.archlinux.org/title/List_of_applications#Volume_control

Regards


--
J. Scott Heppler

Iridium/Ungoogled Chromium as 7.2 Stable Updates?

[Heppler, J. Scott]

There was a significant update to www/Iridium that occurred just after
the ports freeze.  www/ungoogled-chromium was also added.  Is there any
consideration for providing Iridium as an update?  www/googled-chromium
is a newly added package but blurs the criteria for updates as it
patches www/chromium.

"My life is my own" (Not Googles) - Patrick McGoohan in the Prisoner

--
J. Scott Heppler

www/ungoogled-chromium

[Heppler, J. Scott]

On current, ungoogled-chromium errors out - unable to access
/dev/drm/card0.  I replaced with www/iridium and it ran fine.
I suspect pledge/unveil was not fully implemented in ungoogled-chromium.

A second issue is that it likely cannot be installed with www/chromium
as both use ~/.config/chromium.


--
J. Scott Heppler

Re: www/vimb Makefile cleanup and update 3.5 -> 3.6

[Heppler, J. Scott]

Bump.  I've been using this in amd64-current for over a month and it has
rebuilt cleanly through several pkg_add -u's.


--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/www/vimb/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile	18 Oct 2019 20:22:49 -	1.20
+++ Makefile	7 Jan 2020 03:38:07 -
@@ -4,7 +4,7 @@ COMMENT =	modal webkit-based browser ins
 
 GH_ACCOUNT =	fanglingsu
 GH_PROJECT =	vimb
-GH_TAGNAME =	3.5.0
+GH_TAGNAME =	3.6.0
 
 CATEGORIES =	www x11
 
@@ -25,10 +25,6 @@ USE_GMAKE =	Yes
 
 CFLAGS +=	-D_BSD_SOURCE
 MAKE_ENV =	V=1
-
-# .git/index needed to generate version.h
-post-extract:
-		mkdir -p ${WRKSRC}/.git/index
 
 FAKE_FLAGS =	PREFIX="${TRUEPREFIX}" \
 		MANPREFIX="${WRKINST}/${PREFIX}/man"
Index: distinfo
===
RCS file: /cvs/ports/www/vimb/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	18 Oct 2019 20:22:49 -	1.11
+++ distinfo	7 Jan 2020 03:38:07 -
@@ -1,2 +1,2 @@
-SHA256 (vimb-3.5.0.tar.gz) = uzUWy7z0FyxRMnJYWsOxAMD/bvtflszgoDudfMlRMVs=
-SIZE (vimb-3.5.0.tar.gz) = 141269
+SHA256 (vimb-3.6.0.tar.gz) = qNto35iEHwfL+bKqAm5RBaq4P4CdodFmPe//gSUNkh4=
+SIZE (vimb-3.6.0.tar.gz) = 144750
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/vimb/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	27 Jun 2018 21:04:06 -	1.5
+++ pkg/PLIST	7 Jan 2020 03:38:07 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/06/27 21:04:06 espie Exp $
 @bin bin/vimb
 lib/vimb/
-lib/vimb/webext_main.so
+@so lib/vimb/webext_main.so
 @man man/man1/vimb.1
 share/applications/vimb.desktop
 @tag update-desktop-database

[update]x11/jgmenu 2.1 -> 4.0.1. New C coded menu

[Heppler, J. Scott]

This update provides a new C coded menu generator - apps.
Apps is fast, needs minimal dependencies and support icons.
The previous menu generators, lx (menu-cache and gnome-menus),
pmenu (python3 text parsing) and ob (openbox menu.xml) are included

https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/4.0.1.txt

All 4 menu generators run in amd64-current.  Testing on additional
platforms, port reviews and consideration for commit appreciated.

--
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 -	1.6
+++ Makefile	19 Jan 2020 23:10:59 -
@@ -5,8 +5,7 @@ CATEGORIES =	x11
 
 GH_ACCOUNT =	johanmalm
 GH_PROJECT =	jgmenu
-GH_TAGNAME =	v2.1
-REVISION =	1
+GH_TAGNAME =	v4.0.1
 
 # GPLv2 only
 PERMIT_PACKAGE =	Yes
@@ -19,6 +18,7 @@ WANTLIB += pangocairo-1.0 png pthread rs
 COMPILER =	base-clang ports-gcc
 
 MODULES =		lang/python
+
 MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
 MODPY_BUILDDEP =	No
 MODPY_SETUPTOOLS =	No
@@ -29,7 +29,9 @@ LIB_DEPENDS =	x11/gnome/librsvg \
 RUN_DEPENDS =	devel/desktop-file-utils \
 x11/gtk+3,-guic
 
-CONFIGURE_STYLE =	none
+CONFIGURE_STYLE =	gnu
+
+CONFIGURE_ARGS =	--with-lx --with-pmenu
 
 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 -p -r1.2 distinfo
--- distinfo	26 Feb 2019 16:16:05 -	1.2
+++ distinfo	19 Jan 2020 23:10:59 -
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-4.0.1.tar.gz) = AAk+hTjtkgXOfiED8iGqmgt1dPp+IJKXsHZ1Tb/FxMc=
+SIZE (jgmenu-4.0.1.tar.gz) = 371988
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 -	1.1
+++ patches/patch-Makefile	19 Jan 2020 23:10:59 -
@@ -1,21 +1,12 @@
-$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
- 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: ;
+@@ -76,17 +76,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)
@@ -26,6 +17,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 +28,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-Makefile_inc
===
RCS file: patches/patch-Makefile_inc
diff -N patches/patch-Makefile_inc
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_inc	19 Jan 2020 23:10:59 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile.inc
+--- Makefile.inc.orig
 Makefile.inc
+@@ -10,7 +10,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 -p -r1.1.1.1 patch-docs_manual_Makefile
--- 

www/vimb Makefile cleanup and update 3.5 -> 3.6

[Heppler, J. Scott]

Upstream no longer needs to generate a version.h and the post-extract
content can be removed.  Minor update 3.5 -> 3.6
https://github.com/fanglingsu/vimb/releases

Builds, runs amd64-current. Additional testing, comments appreciated.

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/www/vimb/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile	18 Oct 2019 20:22:49 -	1.20
+++ Makefile	7 Jan 2020 03:38:07 -
@@ -4,7 +4,7 @@ COMMENT =	modal webkit-based browser ins
 
 GH_ACCOUNT =	fanglingsu
 GH_PROJECT =	vimb
-GH_TAGNAME =	3.5.0
+GH_TAGNAME =	3.6.0
 
 CATEGORIES =	www x11
 
@@ -25,10 +25,6 @@ USE_GMAKE =	Yes
 
 CFLAGS +=	-D_BSD_SOURCE
 MAKE_ENV =	V=1
-
-# .git/index needed to generate version.h
-post-extract:
-		mkdir -p ${WRKSRC}/.git/index
 
 FAKE_FLAGS =	PREFIX="${TRUEPREFIX}" \
 		MANPREFIX="${WRKINST}/${PREFIX}/man"
Index: distinfo
===
RCS file: /cvs/ports/www/vimb/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	18 Oct 2019 20:22:49 -	1.11
+++ distinfo	7 Jan 2020 03:38:07 -
@@ -1,2 +1,2 @@
-SHA256 (vimb-3.5.0.tar.gz) = uzUWy7z0FyxRMnJYWsOxAMD/bvtflszgoDudfMlRMVs=
-SIZE (vimb-3.5.0.tar.gz) = 141269
+SHA256 (vimb-3.6.0.tar.gz) = qNto35iEHwfL+bKqAm5RBaq4P4CdodFmPe//gSUNkh4=
+SIZE (vimb-3.6.0.tar.gz) = 144750
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/vimb/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST	27 Jun 2018 21:04:06 -	1.5
+++ pkg/PLIST	7 Jan 2020 03:38:07 -
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/06/27 21:04:06 espie Exp $
 @bin bin/vimb
 lib/vimb/
-lib/vimb/webext_main.so
+@so lib/vimb/webext_main.so
 @man man/man1/vimb.1
 share/applications/vimb.desktop
 @tag update-desktop-database

Re: New x11/jgmenu release with new menu module - raises question

[Heppler, J. Scott]

On Jan 06, 2020: 12:10, Stuart Henderson wrote:

On 2020/01/05 09:56, Heppler, J. Scott wrote:

of flavors
Reply-To: Organization:

jgmenu has a new release with a major feature bump - it's own C-coded
menu generator that relegates python3+pmenu and lx+menu-cache to
options.  The new "apps" modules will also reference xfce4 garcon menus.

Since version 2.1 a third build option will generate an xfce4-panel menu
plugin.

For more details, see
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/4.0.txt

From the porters's handbook
"You won't care about some options. It makes no sense to disable some
stuff if it always works, and if the dependencies are quite small."

My questions revolve around "small" and how to to provide for community
testing.  I suspect cwm users would be very interested in a jgmenu-apps
flavor and if it tests well in cwm and other lightweight WM's drop the
python3, menu-cache, libfm dependencies.  pmenu always works, is slower
and python3 is not "quite small" although python2 will loose support
later this year and python3 tends to get installed by other ports.
menu-cache, libfm and gnome/mate-menus are smaller and have always
worked and may be helpful to porters who run lightweight desktops but
need to test ports with freedesktop *.desktop entries.

I'm leaning towards 2 flavors initially:
jgmenu-apps
and
jgmenu-lx.

Comments?  Suggestions?

--
J. Scott Heppler



These are all separate programs aren't they? That would indicate using
"multi-packages" - enabling everything in the port build, but split
the various executables into separate packages which can each have their
own dependencies. See FLAVORS AND MULTI_PACKAGES in bsd.port.mk(5)
and see x11/xkbset for the simplest example I could find of a port using
this.



./configure --help
Produce a config.mk file to be sourced by Makefile
--with-xfce4-panel-applet  Include xfce4-panel-applet. This has quite different
  runtime dependencies, so consider building
  separately.
--with-gtkthemeInclude gtktheme module
--with-lx  Include lx module
--with-pmenu   Include pmenu module
--all, -a  Include all contrib/ packages above
--enable-asan  Enable address sanitizer (only during development)
--prefix= Install architecture-independent files in $prefix
  (e.g. --prefix=$HOME')

Dependencies


## src/ programs

- jgmenu

 * libx11, libxrandr, cairo, pango, librsvg, glib-2.0

- apps

 * Nothing - not even a menu package :)

- ob

 * libxml2

## contrib/ programs

- lx

 * glib-2.0, libmenu-cache (>=1.1.0)
 * A `menu package` such as lxmenu-data or gnome-menus. Xfce's libgarcon-common 
does not yet work with lx.

- pmenu

 * python3
 * A `menu package` is optional. If none is installed, all applications will be 
shown in the menu's root directory.

- xfce-panel

 * xfce4-panel

Upstreams position:

"contrib/ software

The tools and helpers in this directory:

are stand-alone, hopefully interesting and sometimes experimental;

are included in the git-repo to give users easier access to them;

have sometimes been entirely contributed by others;

are not installed by default, but can optionally be added to make &&
make install (those that are considered mature enough, can be given as
options to the configure script - e.g. --with-lx)

may have completely different dependencies to the core jgmenu
application (e.g. ff-bookmarks depends on sqlite3 and arguably also
firefox/iceweasel);

do not always adhere to the jgmenu coding guidelines.

Although I will try to maintain this code, my main focus will remain on
the jgmenu app itself (the code in the src/ directory)."

Reference Porters Handbook:
"In the ideal case, build options will simply create new files, with new
dependencies, and not affect other stuff. This is a fairly common
scenario for plugin frameworks: you add one library, you end up with a
new plugin. This also happens fairly often for core applications with a
graphics front-end: the console application is built every time, and the
x11 interface shows up as a separate binary."

My read of this is that the Core program is jgmenu/apps/ob
and the potential subpackages lx, pmenu and xfce4-panel.

I'll dismiss xfce4-panel due to the runtime dependencies.
PKGNAME-main=jgmenu
PKGNAME-lx=jgmenu-lx
PKGNAME-pmenu=jgmenu-pmenu

I'm testing the apps module now and will hopefully have a modified port
by the end of the week.

Thanks


--
J. Scott Heppler

New x11/jgmenu release with new menu module - raises question

[Heppler, J. Scott]

of flavors
Reply-To: 
Organization:


jgmenu has a new release with a major feature bump - it's own C-coded
menu generator that relegates python3+pmenu and lx+menu-cache to
options.  The new "apps" modules will also reference xfce4 garcon menus.

Since version 2.1 a third build option will generate an xfce4-panel menu
plugin.

For more details, see
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/4.0.txt


From the porters's handbook

"You won't care about some options. It makes no sense to disable some
stuff if it always works, and if the dependencies are quite small."

My questions revolve around "small" and how to to provide for community
testing.  I suspect cwm users would be very interested in a jgmenu-apps
flavor and if it tests well in cwm and other lightweight WM's drop the
python3, menu-cache, libfm dependencies.  pmenu always works, is slower
and python3 is not "quite small" although python2 will loose support
later this year and python3 tends to get installed by other ports.
menu-cache, libfm and gnome/mate-menus are smaller and have always
worked and may be helpful to porters who run lightweight desktops but
need to test ports with freedesktop *.desktop entries.

I'm leaning towards 2 flavors initially:
jgmenu-apps
and
jgmenu-lx. 


Comments?  Suggestions?

--
J. Scott Heppler

Re: [update]x11/yad 0.40 -> 5.0

[Heppler, J. Scott]

I found a  recent ports-cvs opensmtpd-extras thread regarding libtoolize
and applied it to the yad patch.  It was pertinent and worked.  Only
remaining issue is whether to configure for --html.  Webkitgtk2-4.0
security has improved but I am not in the best position to judge.  This
attached patch maintains the 0.40 configuration option.
Constructive comments, testing on other architectures and consideration
for submission appreciated.

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/yad/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile	12 Jul 2019 21:02:30 -	1.19
+++ Makefile	26 Dec 2019 18:09:08 -
@@ -2,34 +2,46 @@
 
 COMMENT=		display graphical dialogs from shell scripts or command line
 
-DISTNAME=		yad-0.40.0
-CATEGORIES=		x11
-REVISION=		1
+V=			5.0
+CATEGORIES= x11
+DISTNAME=		yad-${V}
+EXTRACT_SUFX=   .tar.xz
 
-HOMEPAGE=		http://sourceforge.net/projects/yad-dialog/
+HOMEPAGE=		https://github.com/v1cont/yad
+
+MASTER_SITES=		https://github.com/v1cont/yad/releases/download/v$V/
 
 # GPLv3
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE=		Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yad-dialog/}
-EXTRACT_SUFX=		.tar.xz
 
 WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0 pangocairo-1.0
-WANTLIB += pthread fribidi
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
+WANTLIB += pangocairo-1.0 pthread
 
-MODULES=		textproc/intltool
+MODULES=		devel/dconf \
+			textproc/intltool
 
+CONFIGURE_STYLE=	autoreconf
 USE_GMAKE=		Yes
 
+AUTOCONF_VERSION=   2.69
+AUTOMAKE_VERSION=   1.14
+
+BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPEND} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
 LIB_DEPENDS=		devel/gettext,-runtime \
 			x11/gtk+3
 RUN_DEPENDS=		x11/gtk+3,-guic
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--with-gtk=gtk3 \
+CONFIGURE_ARGS=		--localstatedir=/var/run \
+			--mandir=${LOCALBASE} \
+			--with-gtk=gtk3 \
 			--disable-html \
-			--with-rgb=${X11BASE}/share/X11/rgb.txt
+			--with-rgb=${X11BASE}/share/X11/rgb.txt \
+			--disable-schemas-compile
+
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
Index: distinfo
===
RCS file: /cvs/ports/x11/yad/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo	28 Apr 2018 13:18:18 -	1.11
+++ distinfo	26 Dec 2019 18:09:08 -
@@ -1,2 +1,2 @@
-SHA256 (yad-0.40.0.tar.xz) = wtC30bbToIdymfqgDbddWMl0+B/OctUgo6hOZ9HWDvQ=
-SIZE (yad-0.40.0.tar.xz) = 263332
+SHA256 (yad-5.0.tar.xz) = bXAI9ywrmx+3HNrkOZ8+avYXuxsq6xN2ryPhp6IZl7c=
+SIZE (yad-5.0.tar.xz) = 274632
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/yad/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST	29 Jun 2018 22:16:37 -	1.6
+++ pkg/PLIST	26 Dec 2019 18:09:08 -
@@ -1,7 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.6 2018/06/29 22:16:37 espie Exp $
+@bin bin/pfd
 @bin bin/yad
+@man man/man1/pfd.1
 @man man/man1/yad.1
 share/aclocal/yad.m4
+share/glib-2.0/schemas/yad.gschema.xml
 share/icons/hicolor/128x128/apps/yad.png
 share/icons/hicolor/16x16/apps/yad.png
 share/icons/hicolor/24x24/apps/yad.png
@@ -9,6 +12,7 @@ share/icons/hicolor/32x32/apps/yad.png
 share/icons/hicolor/48x48/apps/yad.png
 share/icons/hicolor/96x96/apps/yad.png
 share/locale/de/LC_MESSAGES/yad.mo
+share/locale/es/LC_MESSAGES/yad.mo
 share/locale/fr/LC_MESSAGES/yad.mo
 share/locale/it/LC_MESSAGES/yad.mo
 share/locale/pt_BR/LC_MESSAGES/yad.mo
@@ -17,3 +21,4 @@ share/locale/sk/LC_MESSAGES/yad.mo
 share/locale/uk/LC_MESSAGES/yad.mo
 share/locale/zh_TW/LC_MESSAGES/yad.mo
 @tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag glib-compile-schemas

[update]x11/yad 0.40 -> 5.0

[Heppler, J. Scott]

Yad migrated to github
https://github.com/v1cont/yad/releases

The attached *.diff updates to the latest release.  It builds and runs
on amd64 and I tested my existing scripts.  Webkitgtk has also been
updated but I did not configure -html.  I personally do not use the
--html feature but am open to adding it.  As it stands, the update
offers the same functionality as the current port only with the current
code base.

I tried to use CONFIGURE_STYLE = autoreconf
but it would not build.  See:

https://marc.info/?l=openbsd-ports=157715985013387=2

Comments, testing and consideration for submission appreciated.
--
J. Scott Heppler
Index: yad/Makefile
===
RCS file: /cvs/ports/x11/yad/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- yad/Makefile	12 Jul 2019 21:02:30 -	1.19
+++ yad/Makefile	24 Dec 2019 21:19:49 -
@@ -2,34 +2,51 @@
 
 COMMENT=		display graphical dialogs from shell scripts or command line
 
-DISTNAME=		yad-0.40.0
-CATEGORIES=		x11
-REVISION=		1
+V=			5.0
+CATEGORIES= x11
+DISTNAME=		yad-${V}
+EXTRACT_SUFX=   .tar.xz
 
-HOMEPAGE=		http://sourceforge.net/projects/yad-dialog/
+HOMEPAGE=		https://github.com/v1cont/yad
+
+MASTER_SITES=		https://github.com/v1cont/yad/releases/download/v$V/
 
 # GPLv3
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE=		Yes
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yad-dialog/}
-EXTRACT_SUFX=		.tar.xz
 
 WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0 pangocairo-1.0
-WANTLIB += pthread fribidi
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz intl pango-1.0
+WANTLIB += pangocairo-1.0 pthread
 
-MODULES=		textproc/intltool
+MODULES=		devel/dconf \
+			textproc/intltool
 
+CONFIGURE_STYLE=	gnu
 USE_GMAKE=		Yes
 
+
 LIB_DEPENDS=		devel/gettext,-runtime \
 			x11/gtk+3
 RUN_DEPENDS=		x11/gtk+3,-guic
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--with-gtk=gtk3 \
+AUTOCONF_VERSION=	2.69
+AUTOMAKE_VERSION=	1.14
+
+do-gen:
+			cd ${WRKSRC} && \
+${SETENV} \
+AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+autoreconf -ivf && libtoolize
+
+CONFIGURE_ARGS=		--localstatedir=/var/run \
+			--mandir=${LOCALBASE} \
+			--with-gtk=gtk3 \
 			--disable-html \
-			--with-rgb=${X11BASE}/share/X11/rgb.txt
+			--with-rgb=${X11BASE}/share/X11/rgb.txt \
+			--disable-schemas-compile
+
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
Index: yad/distinfo
===
RCS file: /cvs/ports/x11/yad/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- yad/distinfo	28 Apr 2018 13:18:18 -	1.11
+++ yad/distinfo	24 Dec 2019 21:19:49 -
@@ -1,2 +1,2 @@
-SHA256 (yad-0.40.0.tar.xz) = wtC30bbToIdymfqgDbddWMl0+B/OctUgo6hOZ9HWDvQ=
-SIZE (yad-0.40.0.tar.xz) = 263332
+SHA256 (yad-5.0.tar.xz) = bXAI9ywrmx+3HNrkOZ8+avYXuxsq6xN2ryPhp6IZl7c=
+SIZE (yad-5.0.tar.xz) = 274632
Index: yad/pkg/PLIST
===
RCS file: /cvs/ports/x11/yad/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- yad/pkg/PLIST	29 Jun 2018 22:16:37 -	1.6
+++ yad/pkg/PLIST	24 Dec 2019 21:19:49 -
@@ -1,7 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.6 2018/06/29 22:16:37 espie Exp $
+@bin bin/pfd
 @bin bin/yad
+@man man/man1/pfd.1
 @man man/man1/yad.1
 share/aclocal/yad.m4
+share/glib-2.0/schemas/yad.gschema.xml
 share/icons/hicolor/128x128/apps/yad.png
 share/icons/hicolor/16x16/apps/yad.png
 share/icons/hicolor/24x24/apps/yad.png
@@ -9,6 +12,7 @@ share/icons/hicolor/32x32/apps/yad.png
 share/icons/hicolor/48x48/apps/yad.png
 share/icons/hicolor/96x96/apps/yad.png
 share/locale/de/LC_MESSAGES/yad.mo
+share/locale/es/LC_MESSAGES/yad.mo
 share/locale/fr/LC_MESSAGES/yad.mo
 share/locale/it/LC_MESSAGES/yad.mo
 share/locale/pt_BR/LC_MESSAGES/yad.mo
@@ -17,3 +21,4 @@ share/locale/sk/LC_MESSAGES/yad.mo
 share/locale/uk/LC_MESSAGES/yad.mo
 share/locale/zh_TW/LC_MESSAGES/yad.mo
 @tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag glib-compile-schemas

updating x11/yad - autoreconf -ivf && intltoolize

[Heppler, J. Scott]

I'm looking at updating x11/yad and it now uses
autoreconf -ivf && intltoolize.

https://github.com/v1cont/yad

With this /usr/ports/x11/yad/Makefile

# $OpenBSD: Makefile,v 1.19 2019/07/12 21:02:30 sthen Exp $

COMMENT=display graphical dialogs from shell scripts or command
line

GH_ACCOUNT= v1cont
GH_PROJECT= yad
GH_TAGNAME= v5.0
CATEGORIES= x11

HOMEPAGE=   https://github.com/v1cont/yad

# GPLv3
PERMIT_PACKAGE= Yes


WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0 pangocairo-1.0
WANTLIB += pthread fribidi

MODULES=textproc/intltool

USE_GMAKE=  Yes

LIB_DEPENDS=devel/gettext,-runtime \
   x11/gtk+3
RUN_DEPENDS=x11/gtk
HOMEPAGE=   https://github.com/v1cont/yad

# GPLv3
PERMIT_PACKAGE= Yes


WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 intl pango-1.0 pangocairo-1.0
WANTLIB += pthread fribidi

MODULES=textproc/intltool

USE_GMAKE=  Yes

LIB_DEPENDS=devel/gettext,-runtime \
   x11/gtk+3
RUN_DEPENDS=x11/gtk+3,-guic

CONFIGURE_STYLE=autoreconf libtoolize
AUTOCONF_VERSION=   2.69
AUTOMAKE_VERSION=   1.14
USE_LIBTOOL=Yes
CONFIGURE_ARGS= --with-gtk=gtk3 \
   --disable-html \
   --with-rgb=${X11BASE}/share/X11/rgb.txt
CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
   LDFLAGS="-L${LOCALBASE}/lib"



I get this make build error

config.status: creating Makefile
config.status: error: cannot find input file: `po/Makefile.in.in'
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2851 'do-configure')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2871 
'/usr/ports/pobj/yad-5.0/.configure_done')
*** Error 1 in /usr/ports/x11/yad 
(/usr/ports/infrastructure/mk/bsd.port.mk:2556 'build')

autoreconf does generate a ~/pobj/yad-5.0/po/Makefile.in but no
~po/Makefile.in.in
Am I implementing autoreconf -ivf && intltoolize correctly?

Is there a cleaner way to do this?

The code also runs glib-compile-schemas which I plan to disable and @tag
in PLIST.

Last question.  Present code can use webkitgtk2-4.0 which has had some
security updates.  I was planning on continuing --disable-html unless
convinced otherwise.

Thanks
--
J. Scott Heppler

6.6release - sysutils/xorriso-tcltk misses tk as install dependency

[Heppler, J. Scott]

Per subject line, xorriso-tcltk will not start without tk85.

--
J. Scott Heppler

[update]www/vimb 3.3 -> 3.5

[Heppler, J. Scott]

Hi ports;

The attached diff updates vimb to the latest stable version.
https://github.com/fanglingsu/vimb/releases

Upstream has a hard dependency on .git/indox to generate the header
file.
https://github.com/fanglingsu/vimb/commit/0eda3ec2ac78577a08ace4c18cd9e912a56609e6

I used a post-extract command similar to the FreeBSD Makefile
https://svnweb.freebsd.org/ports/head/www/vimb/Makefile?view=log

Builds with many warnings and runs on amd64-current.

Testing, feedback and consideration for commit appreciated.
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/www/vimb/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:51:06 -  1.19
+++ Makefile5 Oct 2019 22:39:09 -
@@ -4,7 +4,7 @@ COMMENT =   modal webkit-based browser ins
 
 GH_ACCOUNT =   fanglingsu
 GH_PROJECT =   vimb
-GH_TAGNAME =   3.3.0
+GH_TAGNAME =   3.5.0
 
 CATEGORIES =   www x11
 
@@ -25,6 +25,10 @@ USE_GMAKE =  Yes
 
 CFLAGS +=  -D_BSD_SOURCE
 MAKE_ENV = V=1
+
+# .git/index needed to generate version.h
+post-extract:
+   mkdir -p ${WRKSRC}/.git/index
 
 FAKE_FLAGS =   PREFIX="${TRUEPREFIX}" \
MANPREFIX="${WRKINST}/${PREFIX}/man"
Index: distinfo
===
RCS file: /cvs/ports/www/vimb/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo8 Dec 2018 15:08:23 -   1.10
+++ distinfo5 Oct 2019 22:39:09 -
@@ -1,2 +1,2 @@
-SHA256 (vimb-3.3.0.tar.gz) = XG/jmxssoYo0K7ZoP3/VsTnq1TkD9X3Z7s1aEHRXbWw=
-SIZE (vimb-3.3.0.tar.gz) = 136151
+SHA256 (vimb-3.5.0.tar.gz) = uzUWy7z0FyxRMnJYWsOxAMD/bvtflszgoDudfMlRMVs=
+SIZE (vimb-3.5.0.tar.gz) = 141269

[update] jgmenu 2.1 -> 3.4 and community question on Xfce4

[Heppler, J. Scott]

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
--- Makefile12 Jul 2019 20:51:14 -  1.6
+++ Makefile5 Oct 2019 13:27:50 -
@@ -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
--- distinfo26 Feb 2019 16:16:05 -  1.2
+++ distinfo5 Oct 2019 13:27:50 -
@@ -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 -  1.1
+++ patches/patch-Makefile  5 Oct 2019 13:27:50 -
@@ -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 -   1.1.1.1
+++ patches/patch-docs_manual_Makefile  5 Oct 2019 13:27:50 -
@@ -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 

[update] x11/tint2 16.6.1 -> 16.7

[Heppler, J. Scott]

Hi ports;

The attached *diff is a minor update for x11/tint2.  I've been running
it for about 2 months on an amd64 system and had previously submitted.
The prior submission diff was not cleaned up - I'd left some *.orig
files in patches and pkg.


Changelog

2019-07-14 16.7
- Fixes:
 - Fix spacing around icons in executor without text in vertical panels (issue 
#716)
 - Fix Bug: Clock Only Updates Every Minute With Format %s (issue #724)
 - Fix markup drawing when font shadow enabled (issue #709)
 - Struts pivoting: workaround for panel positioning between monitors in mutter 
(Chris Billington)
- Enhancements:
 - Blink battery when discharging and low (issue #723)
 - Add support for battery percentage without % sign (issue #730)
 - Expand leading ~ in icon paths
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile12 Jul 2019 21:05:06 -  1.13
+++ Makefile4 Oct 2019 15:42:21 -
@@ -2,7 +2,7 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.6.1
+V= 16.7
 CATEGORIES=x11
 DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo16 Sep 2018 17:01:37 -  1.4
+++ distinfo4 Oct 2019 15:42:21 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
-SIZE (tint2-16.6.1.tar.gz) = 546488
+SHA256 (tint2-16.7.tar.gz) = K34MBCW/H3f4l0jnKVqb3ABvGM4LWBSAIv4p4UBau28=
+SIZE (tint2-16.7.tar.gz) = 551146
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-CMakeLists_txt4 Oct 2019 15:42:21 -
@@ -1,14 +1,15 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -289,8 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
 -install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
-+install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
- install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+-install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
++install( FILES default_icon.png DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
  install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
  install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
+ install( DIRECTORY doc/images DESTINATION ${htmldir} )
Index: patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-themes_CMakeLists_txt 4 Oct 2019 15:42:21 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: themes/CMakeLists.txt
 --- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-themes_tint2rc
--- patches/patch-themes_tint2rc16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-themes_tint2rc4 Oct 2019 15:42:21 -
@@ -1,15 +1,17 @@
-$OpenBSD: patch-themes_tint2rc,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: themes/tint2rc
 --- themes/tint2rc.orig
 +++ themes/tint2rc
-@@ -150,9 +150,7 @@ startup_notifications = 1
+@@ -150,9 +150,9 @@ startup_notifications = 1
  launcher_tooltip = 1
  launcher_item_app = tint2conf.desktop
  launcher_item_app = firefox.desktop
 -launcher_item_app = iceweasel.desktop
++launcher_item_app = firefox-esr.desktop
  launcher_item_app = chromium-browser.desktop
 -launcher_item_app = google-chrome.desktop
++launcher_item_app = iridium-browser.desktop
  
  #-
  # Clock
Index: pkg/PLIST

Re: geeqie [Re: graphics/exiv2 0.27.* breakage]

[Heppler, J. Scott]

Thanks for the patch.  This weekend, I could not get the patch to apply
cleanly so I tried to regenerate them locally.  The build generated an
error message on ffmpeg/thunbnailer which was disabled in the prior
build.

This raised the question, which of the new plugins are most attractive
to the project and how much effort should be made toward getting them to
build/function?  Another option is to patch geeqie 1.4 for exiv2 0.27.

The gphoto plugin is less attractive since it would mainly be beneficial
in WM's.  I'm not aware that Openbox/Fluxbox are moving toward gtk3.
DE's can use gvfs in their file manager.

Other plugins are

lirc - remote control support
clutter - map display
lua - scripting
libwmf - windows images
poppler - pdf
TimeZone detection
raw images
ImageMagick

All the above could get messy while patching 1.4 should be easy.

Any objections to just patching 1.4?


On Aug 01, 2019: 17:28, Stuart Henderson wrote:

On 2019/08/01 07:52, Heppler, J. Scott wrote:

Hi,

exiv2 0.26 -> 0.27 broke many ports earlier in the year.  My ports
search shows it was used by KDE4 and Gnome3 graphics ports.

I'm interested in graphics/geeqie which had a 1.5 release that addressed
the exiv2 upgrade.


Updating geeqie is independent of the exiv2 update, so I've changed the
Subject line of this as that seems the main aim of the mail.


The newer geeqie supports gtk2/3 and has a
libgphoto2 plugin that obviates graphics/gtkam.


I haven't looked at the gphoto2 plugin (btw it just uses the CLI tool not
the library), but the other plugin scripts are of variable quality and are
obviously only really tested on linux.


My sense is that an exiv2 upgrade will depend on the KDE4 packages which
will likely require maintainer patches.  Gnome3/KDE5 upstream will have
patched/released for exiv2 0.27.*

Geeqie 1.5 should build against the older exiv2 and I'm willing to
attempt if it fits into the overall plan for KDE4/exiv2.  Is exiv2
slated for an upgrade in the near future?  Any reason not to use the
gtk3 toolkit for geeqie?


The geeqie port already uses Gtk+3 (DESCR is outdated).

Here's a start at updating it, though those plugins need a careful look
and properly figuring out what works OK, what can be fixed, and what
should just be @comment'ed out in PLIST (watch out for gnu-specific flags
to commands like find, amongst other things).

Careful testing plugins as I have seen them do things such as calling rm
with bad parameters.

For the other things that were broken by the previous attempt at updating
exiv2, they really just want a test build and see what's involved. I think
many of us are not all that interested in touching the kde things too much
as they have a tendency to break whenever they're touched (and sometimes
even when they're not touched ...)



Index: Makefile
===
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile12 Jul 2019 20:46:59 -  1.22
+++ Makefile1 Aug 2019 16:16:37 -
@@ -2,20 +2,19 @@

COMMENT=lightweight Gtk+3 based image viewer

-DISTNAME=  geeqie-1.4
+DISTNAME=  geeqie-1.5
EXTRACT_SUFX=   .tar.xz
CATEGORIES= graphics
EPOCH=  0
-REVISION=  1

HOMEPAGE=   http://geeqie.org/

# GPLv2+
PERMIT_PACKAGE= Yes

-WANTLIB += atk-1.0 c cairo cairo-gobject exiv2 gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl
-WANTLIB += jpeg lcms2 m pango-1.0 pangocairo-1.0 pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject exiv2
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-3 intl jpeg lcms2 m pango-1.0 pangocairo-1.0 poppler-glib
WANTLIB += tiff

COMPILER =  base-clang ports-gcc base-gcc
@@ -29,15 +28,19 @@ BUILD_DEPENDS=  x11/gnome/doc-utils
RUN_DEPENDS=devel/desktop-file-utils \
devel/xdg-utils \
graphics/ImageMagick \
-   graphics/exiftran
+   graphics/exiftran \
+   graphics/p5-Image-ExifTool \
+   shells/bash \
+   x11/gnome/zenity

LIB_DEPENDS=graphics/exiv2 \
graphics/lcms2 \
+   print/poppler,-main \
x11/gtk+3

USE_GMAKE=  Yes

-CONFIGURE_STYLE=   autoreconf
+CONFIGURE_STYLE=   gnu
CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-doxygen-doc \
@@ -49,9 +52,9 @@ CONFIGURE_ARGS=   --disable-doxygen-doc \
--with-htmldir=${PREFIX}/share/doc/geeqie \
--with-readmedir=${P

[update] jgmenu 2.1 -> 3.3

[Heppler, J. Scott]

The attached *.diff updates jgmenu to the latest tagged release.
Builds/runs on and64-current.  Testing, feedback and consideration for
commit 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
--- Makefile17 May 2019 16:45:28 -  1.5
+++ Makefile3 Aug 2019 21:26:33 -
@@ -5,11 +5,10 @@ CATEGORIES =  x11
 
 GH_ACCOUNT =   johanmalm
 GH_PROJECT =   jgmenu
-GH_TAGNAME =   v2.1
-REVISION = 1
+GH_TAGNAME =   v3.3
 
 # GPLv2 only
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE=Yes
 
 WANTLIB += X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gobject-2.0 iconv intl lzma m menu-cache pango-1.0
Index: distinfo
===
RCS file: /cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo26 Feb 2019 16:16:05 -  1.2
+++ distinfo3 Aug 2019 21:26:33 -
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
-SIZE (jgmenu-2.1.tar.gz) = 330256
+SHA256 (jgmenu-3.3.tar.gz) = Za4zirYE5t6t/Pz+8C9utU2cJerGxHfssRCEryWwpFM=
+SIZE (jgmenu-3.3.tar.gz) = 341484
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 -  1.1
+++ patches/patch-Makefile  3 Aug 2019 21:26:33 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.1 2019/02/26 16:16:05 sthen Exp $
+$OpenBSD$
 
 Index: Makefile
 --- Makefile.orig
@@ -8,11 +8,11 @@ Index: Makefile
  endif
  
 -CFLAGS  += -g -Wall -Os -std=gnu89
-+CFLAGS  += -Wall -std=gnu89
++CFLAGS  += -Wall -Os -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: ;
+@@ -110,16 +110,16 @@ $(DEPDIR)/%.d: ;
  .PRECIOUS: $(DEPDIR)/%.d
  
  install: checkdeps $(PROGS)
@@ -36,9 +36,6 @@ 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:
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 -   1.1.1.1
+++ patches/patch-docs_manual_Makefile  3 Aug 2019 21:26:33 -
@@ -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
+@@ -3,7 +3,7 @@ man7pages  = jgmenututorial.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 -  1.2
+++ pkg/PLIST   3 Aug 2019 21:26:33 -
@@ -1,17 +1,20 @@
-@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
+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-lx.1
 @man man/man1/jgmenu-ob.1
 @man man/man1/jgmenu-pmenu.1

[update] tint2 16.61. -> 16.7

[Heppler, J. Scott]

The attached *.diff updates tint2 16.6.1 -> 16.7
Builds, runs amd64-current.  Testing, feedback and consideration for
updating appreciated

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile20 May 2019 22:15:30 -  1.12
+++ Makefile3 Aug 2019 21:25:18 -
@@ -2,13 +2,13 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.6.1
+V= 16.7
 CATEGORIES=x11
 DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
-PERMIT_PACKAGE_CDROM= YES
+PERMIT_PACKAGE= YES
 
 MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo16 Sep 2018 17:01:37 -  1.4
+++ distinfo3 Aug 2019 21:25:18 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
-SIZE (tint2-16.6.1.tar.gz) = 546488
+SHA256 (tint2-16.7.tar.gz) = K34MBCW/H3f4l0jnKVqb3ABvGM4LWBSAIv4p4UBau28=
+SIZE (tint2-16.7.tar.gz) = 551146
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-CMakeLists_txt3 Aug 2019 21:25:18 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
Index: patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-themes_CMakeLists_txt 3 Aug 2019 21:25:18 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: themes/CMakeLists.txt
 --- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-themes_tint2rc
--- patches/patch-themes_tint2rc16 Sep 2018 17:01:37 -  1.3
+++ patches/patch-themes_tint2rc3 Aug 2019 21:25:18 -
@@ -1,15 +1,17 @@
-$OpenBSD: patch-themes_tint2rc,v 1.3 2018/09/16 17:01:37 bcallah Exp $
+$OpenBSD$
 
 Index: themes/tint2rc
 --- themes/tint2rc.orig
 +++ themes/tint2rc
-@@ -150,9 +150,7 @@ startup_notifications = 1
+@@ -150,9 +150,9 @@ startup_notifications = 1
  launcher_tooltip = 1
  launcher_item_app = tint2conf.desktop
  launcher_item_app = firefox.desktop
 -launcher_item_app = iceweasel.desktop
++launcher_item_app = firefox-esr.desktop
  launcher_item_app = chromium-browser.desktop
 -launcher_item_app = google-chrome.desktop
++launcher_item_app = iridium-browser.desktop
  
  #-
  # Clock
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   1 Jul 2018 18:33:39 -   1.6
+++ pkg/PLIST   3 Aug 2019 21:25:18 -
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/07/01 18:33:39 espie Exp $
-@pkgpath x11/tint
+@comment $OpenBSD: PLIST,v$
+@pkgpath /x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
 @man man/man1/tint2.1

graphics/exiv2 0.27.* breakage

[Heppler, J. Scott]

Hi,

exiv2 0.26 -> 0.27 broke many ports earlier in the year.  My ports
search shows it was used by KDE4 and Gnome3 graphics ports.

I'm interested in graphics/geeqie which had a 1.5 release that addressed
the exiv2 upgrade.  The newer geeqie supports gtk2/3 and has a
libgphoto2 plugin that obviates graphics/gtkam.

My sense is that an exiv2 upgrade will depend on the KDE4 packages which
will likely require maintainer patches.  Gnome3/KDE5 upstream will have
patched/released for exiv2 0.27.*

Geeqie 1.5 should build against the older exiv2 and I'm willing to
attempt if it fits into the overall plan for KDE4/exiv2.  Is exiv2
slated for an upgrade in the near future?  Any reason not to use the
gtk3 toolkit for geeqie?

Thanks

--
J. Scott Heppler

[update] jgmenu 2.1 -> 3.0

[Heppler, J. Scott]

Hi Ports;

The attached diff updates jgmenu to the latest stable version.  The
changes to the port itself are relatively minor.

Interim changes:
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/3.0.txt
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/2.2.1.txt
https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/2.2.txt

Upstream's roadmap indicates that the port will need larger changes if
it is to include dmenu support.  One option I'm considering is splitting
into -pmenu, -lx and -dmenu flavors.  This is likely to occur after
6.6release.

Seeking testing and comments. 


Thanks

--
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
--- Makefile17 May 2019 16:45:28 -  1.5
+++ Makefile1 Jul 2019 15:16:16 -
@@ -5,11 +5,10 @@ CATEGORIES =  x11
 
 GH_ACCOUNT =   johanmalm
 GH_PROJECT =   jgmenu
-GH_TAGNAME =   v2.1
-REVISION = 1
+GH_TAGNAME =   v3.0
 
 # GPLv2 only
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE =   Yes
 
 WANTLIB += X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gobject-2.0 iconv intl lzma m menu-cache pango-1.0
Index: distinfo
===
RCS file: /cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo26 Feb 2019 16:16:05 -  1.2
+++ distinfo1 Jul 2019 15:16:16 -
@@ -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 -  1.1
+++ patches/patch-Makefile  1 Jul 2019 15:16:16 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.1 2019/02/26 16:16:05 sthen Exp $
+$OpenBSD$
 
 Index: Makefile
 --- Makefile.orig
@@ -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,31 @@ 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:
+@@ -161,19 +161,19 @@ check:
+ 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 '$*=$($*)'
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 -   1.1.1.1
+++ patches/patch-docs_manual_Makefile  1 Jul 2019 15:16:16 -
@@ -1,4 +1,4 @@
-$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
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/jgmenu/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p 

[UPDATE] x11/jgmenu 2.1 -> 3.0

[Heppler, J. Scott]

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
--- Makefile17 May 2019 16:45:28 -  1.5
+++ Makefile25 May 2019 20:27:03 -
@@ -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
--- distinfo26 Feb 2019 16:16:05 -  1.2
+++ distinfo25 May 2019 20:27:03 -
@@ -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 -  1.1
+++ patches/patch-Makefile  25 May 2019 20:27:03 -
@@ -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 

[UPDATE] jgmenu 2.0 -> 2.1

[Heppler, J. Scott]

The attached update entails some code cleaning evident in the PLIST.

Details here:

https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/0.2.1.txt

It also provides a "greeneye" menu with search capability demonstrated
here"

https://www.youtube.com/watch?v=XDmNO_83EnM

Tested openbox current/amd64 with lx
and CWM with jgmenu init --theme=greeneye
with both lx/menu-cache/gnome-menus and pmenu.

Further testing, feedback on problems and commit consideration
appreciated.



--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/jgmenu/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile3 Feb 2019 15:47:09 -   1.1.1.1
+++ Makefile23 Feb 2019 20:20:47 -
@@ -5,7 +5,7 @@ CATEGORIES =x11
 
 GH_ACCOUNT =   johanmalm
 GH_PROJECT =   jgmenu
-GH_TAGNAME =   v2.0
+GH_TAGNAME =   v2.1
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/jgmenu/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Feb 2019 15:47:09 -   1.1.1.1
+++ distinfo23 Feb 2019 20:20:47 -
@@ -1,2 +1,2 @@
-SHA256 (jgmenu-2.0.tar.gz) = dB5usIv3Qjg+iIQmHkFZ+3fQSLTImBVWEbMXn0p6r88=
-SIZE (jgmenu-2.0.tar.gz) = 324635
+SHA256 (jgmenu-2.1.tar.gz) = rtB7PRVsAn4uS2Kvv5b4+RstWRRvT22Hc8SNMV81rz8=
+SIZE (jgmenu-2.1.tar.gz) = 330256
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile  23 Feb 2019 20:20:47 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -24,7 +24,7 @@ else
+ datarootdir= $(prefix)/share
+ endif
+ 
+-CFLAGS  += -g -Wall -Os -std=gnu89
++CFLAGS  += -Wall -Os -std=gnu89
+ CFLAGS  += -Wextra -Wdeclaration-after-statement -Wno-format-zero-length \
+  -Wold-style-definition -Woverflow -Wpointer-arith \
+  -Wstrict-prototypes -Wunused -Wvla -Wunused-result
Index: patches/patch-Makefile_inc
===
RCS file: patches/patch-Makefile_inc
diff -N patches/patch-Makefile_inc
--- patches/patch-Makefile_inc  3 Feb 2019 15:47:09 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_inc,v 1.1.1.1 2019/02/03 15:47:09 bcallah Exp $
-
-Index: Makefile.inc
 Makefile.inc.orig
-+++ Makefile.inc
-@@ -11,7 +11,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
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 -   1.1.1.1
+++ patches/patch-docs_manual_Makefile  23 Feb 2019 20:20:47 -
@@ -1,4 +1,4 @@
-$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
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/jgmenu/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   3 Feb 2019 15:47:09 -   1.1.1.1
+++ pkg/PLIST   23 Feb 2019 20:20:47 -
@@ -2,26 +2,15 @@
 @bin bin/jgmenu
 bin/jgmenu_run
 lib/jgmenu/
-@bin lib/jgmenu/jgmenu
 lib/jgmenu/jgmenu-config.py
 @bin lib/jgmenu/jgmenu-greeneye
 @bin lib/jgmenu/jgmenu-i18n
-lib/jgmenu/jgmenu-init--append.sh
-lib/jgmenu/jgmenu-init--bunsenlabs.sh
-lib/jgmenu/jgmenu-init--neon.sh
-lib/jgmenu/jgmenu-init--prepend.sh
 lib/jgmenu/jgmenu-init.sh
 @bin lib/jgmenu/jgmenu-lx
 @bin lib/jgmenu/jgmenu-ob
 lib/jgmenu/jgmenu-pmenu.py
 @bin lib/jgmenu/jgmenu-socket
 lib/jgmenu/jgmenu-unity-hack.py
-lib/jgmenu/jgmenu_run
-lib/jgmenu/jgmenurc
-lib/jgmenu/jgmenurc.archlabs_1803
-lib/jgmenu/jgmenurc.bunsenlabs_helium
-lib/jgmenu/jgmenurc.bunsenlabs_hydrogen
-lib/jgmenu/jgmenurc.neon
 @man man/man1/jgmenu-config.1
 @man man/man1/jgmenu-lx.1
 @man man/man1/jgmenu-ob.1

Re: [NEW] x11/jgmenu -> V2.0

[Heppler, J. Scott]

Suggested README edits incorporated.  Syntax altered to be consistent
with actual invocation:

+  1) lx using additional packages menu-cache and gnome(mate)-menus

becomes
   1) 'jgmenu_run lx' using additional packages menu-cache and ...

Additionally added that python3 implementation has four times the
latency.

Updated tarball attached.


-Scott

~Brian



+This jgmenu build can generate an X11 application menu 3 different ways:

slightly nitpicking, but it doesn't feel quite right to me using number
3 in text followed by a numbered list, I think it would read better with
"s/3 different/three different/".

+  1) lx using additional packages menu-cache and gnome(mate)-menus
+  2) ob from an existing openbox menu.xml file
+  3) pmenu with python3 text parsing




On Feb 02, 2019: 20:44, Stuart Henderson wrote:

On 2019/02/02 11:20, Brian Callahan wrote:



On 2/2/19 10:27 AM, Heppler, J. Scott wrote:
> Hi ports,
>
> Attached is a port that builds the latest release of jgmenu. Upstream
> has made a large number of commits since 1.6.  Some of these commits
> targeted OpenBSD issues.
>
> Menu generation using XDG and firefox bookmarks has been deactivated and
> the gtar dependency removed.
>
> More details here:
>
> https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/2.0.txt

Fixed up and tightened version attached.
Additionally, portcheck -N says:
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-config.py
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-pmenu.py
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-unity-hack.py

This may or may not be relevant to you.


Not required. pyc files are only used when a module is imported not
run directly.


~Brian



+This jgmenu build can generate an X11 application menu 3 different ways:

slightly nitpicking, but it doesn't feel quite right to me using number
3 in text followed by a numbered list, I think it would read better with
"s/3 different/three different/".

+  1) lx using additional packages menu-cache and gnome(mate)-menus
+  2) ob from an existing openbox menu.xml file
+  3) pmenu with python3 text parsing

I would write "jgmenu-lx" or "jgmenu-lx(1)" instead of just "lx"
(and same for ob/pmenu).

Otherwise OK


--
J. Scott Heppler


jgmenu.tgz
Description: application/tar-gz

Re: [NEW] x11/jgmenu -> V2.0

[Heppler, J. Scott]

Sorry for the mangled pmenu vs lx table.  Here is a link to the same
table that should be easier to read:

https://github.com/johanmalm/jgmenu/blob/master/docs/manual/jgmenututorial.7.md#comparison-of-application-menu-modules

Scott H.

Re: [NEW] x11/jgmenu -> V2.0

[Heppler, J. Scott]

I believe most users will setup lx/menu-cache/gnome-menus.
Upstream testing shows this to be faster (C vs python)

Comparison of application menu modules
This table summarise the key features of each module:

╔═══╤═╤═╗
║   │ pmenu   │ lx  ║ 
║ ──│─│─║

║ speed (my machine)│ 400 ms  │ 99 ms   ║
║ language  │ python  │ C   ║
║ dependencies  │ python3 │ glib, libmenu-cache ║
║ XDG compliance│ not intended│ yes ║
║ localisation support  │ yes │ yes ║
║ ──│─│─║ 
║ {ap,pre}pend support  │ yes │ yes ║

║ 'no-dirs' support │ yes │ yes ║
║ single window support │ yes │ no  ║
║ formatting│ no  │ yes ║
║ generic name support  │ no  │ yes ║
╚═══╧═╧═╝

When Stuart H. reviewed v1.6, I was under the impression that the
Makefile entry 
MODPY_VERSION=  ${MODPY_DEFAULT_VERSION_3}

addressed the Python version and rendered the portcheck warnings
innocuous.  If this is not the case, let me know and point me to the
fix.

Scott


On Feb 02, 2019: 11:20, Brian Callahan wrote:



On 2/2/19 10:27 AM, Heppler, J. Scott wrote:

Hi ports,

Attached is a port that builds the latest release of jgmenu. Upstream
has made a large number of commits since 1.6.  Some of these commits
targeted OpenBSD issues.

Menu generation using XDG and firefox bookmarks has been deactivated and
the gtar dependency removed.

More details here:

https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/2.0.txt


Fixed up and tightened version attached.
Additionally, portcheck -N says:
Python module without compiled version, consider using ${MODPY_BIN} 
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-config.py
Python module without compiled version, consider using ${MODPY_BIN} 
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-pmenu.py
Python module without compiled version, consider using ${MODPY_BIN} 
${MODPY_LIBDIR}/compileall.py: lib/jgmenu/jgmenu-unity-hack.py


This may or may not be relevant to you.

~Brian





--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

[NEW] x11/jgmenu -> V2.0

[Heppler, J. Scott]

Hi ports,

Attached is a port that builds the latest release of jgmenu.  Upstream
has made a large number of commits since 1.6.  Some of these commits
targeted OpenBSD issues.

Menu generation using XDG and firefox bookmarks has been deactivated and
the gtar dependency removed.

More details here:

https://github.com/johanmalm/jgmenu/blob/master/docs/relnotes/2.0.txt
--
J. Scott Heppler


jgmenu.tgz
Description: application/tar-gz

Re: -current Iridium does not have $HOME write permissions for Downloads

[Heppler, J. Scott]

It would not read $HOME/Downloads/ 


I replaced the newly generated ~/.config/iridium directory with one
generated pre Nov/2018 and could then read and save to $HOME/Downlaods.

A thought that others could test by renaming ~/.config/iridium and
generating a new configuration.



On Jan 08, 2019: 17:54, tfrohw...@fastmail.com wrote:

On January 8, 2019 3:13:08 PM UTC, "Heppler, J. Scott" 
 wrote:

I suspect browsers are not the primary means of downloading for
seasoned
OpenBSD users and this new bug may go under the radar.  Anyone else
seeing this on iridium?  On chromium?


Have you tried downloading to $HOME/Downloads/ ? If you use -current, it's 
advisable that you follow changes to ports and src. $HOME is now blocked by 
unveil(2) by default (since November 20th). Mailing list archives contain 
plenty of notices and documentation about it, including how to disable this.


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: -current Iridium does not have $HOME write permissions for Downloads

[Heppler, J. Scott]

I updated and still had the message that iridium could not read the
/home/user.  This was on a newer install and I went ahead and deleted my
~/.config/iridium and replaced it with the iridium directory from my
stable box.  That worked

I have a second -current/amd64 box which also had the same inability to
read my home directory.  I suspect the problem arises on first run.


On Jan 08, 2019: 16:58, Karel Gardas wrote:

On Tue, 8 Jan 2019 07:13:08 -0800
"Heppler, J. Scott"  wrote:


I suspect browsers are not the primary means of downloading for seasoned
OpenBSD users and this new bug may go under the radar.  Anyone else
seeing this on iridium?  On chromium?


Tested on yesterday OpenBSD snapshot with updated iridium package and 
everything goes well. E.g. iridium is able to download and save into Downloads 
directory fine...



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

-current Iridium does not have $HOME write permissions for Downloads

[Heppler, J. Scott]

I suspect browsers are not the primary means of downloading for seasoned
OpenBSD users and this new bug may go under the radar.  Anyone else
seeing this on iridium?  On chromium?


--
J. Scott Heppler

Re: [NEW] x11/jgmenu with fixes

[Heppler, J. Scott]

I forwarded the xsettingsd bug to upstream and this commit resulted

https://github.com/johanmalm/jgmenu/commit/38e4e11a15fc2f2ac24ce2bae0f19754a175cd66

When upstream releases, I'll update the cleaned up version.



On Jan 02, 2019: 14:26, Stuart Henderson wrote:

On 2019/01/01 13:29, Heppler, J. Scott wrote:

Attached is the latest release of jgmenu.  Upstream addressed multiple issues
that Stuart Henderson brought up and now tests on their own install of
OpenBSD.

https://marc.info/?l=openbsd-ports=154275564823284=2

I started a new thread as the port version and pkg/README were updated.

In x11/openbox, I've tested lx and ob menu generation.  pmenu, lx and xdg work
in the base fvwm, cwm and twm.  ff-bookmarks also worked but may be removed
upstream in the future.

Additional testing, comments and consideration for adding to ports appreciated.
--
J. Scott Heppler


Cleaned up version attached. "jgmenu init" uses gnu-specific tar
things so I've added it as a dependency. This one is OK sthen@
if somebody would like to import it.

There is still a coredump if I have xsettingsd running with my
usual config:

$ cat .xsettingsd
Net/ThemeName "Adwaita"

but that's probably uncommon enough that I don't think it should
block import.





--
J. Scott Heppler

[NEW] x11/jgmenu with fixes

[Heppler, J. Scott]

Attached is the latest release of jgmenu.  Upstream addressed multiple issues
that Stuart Henderson brought up and now tests on their own install of
OpenBSD.

https://marc.info/?l=openbsd-ports=154275564823284=2

I started a new thread as the port version and pkg/README were updated.

In x11/openbox, I've tested lx and ob menu generation.  pmenu, lx and xdg work
in the base fvwm, cwm and twm.  ff-bookmarks also worked but may be removed
upstream in the future.

Additional testing, comments and consideration for adding to ports appreciated.
--
J. Scott Heppler


jgmenu-1.6.tar.gz
Description: application/tar-gz

New Submission: x11/jgmenu

[Heppler, J. Scott]

Stuart Henderson observed:

- I can't see how to get it to do much of use. --simple with
a list I generate myself does work, but pmenu dies with
"KeyError: 'Name_markup'", xdg segfaults, ...



Using jgmenu, x11/menu-cache and x11/gnome-menus, I am able to
generate this freedesktop spec menu in openbox:

http://daemonforums.org/showpost.php?p=65468=1

I specified csv-command = lx in ~/.config/jgmenu/jgmenurc and invoke
jgmenu_run via keyboard/mouse entries in ~/.config/openbox/rc.xml.  I
essentially replaced  with .

I agree that it has little value with manually generated menus.  I think
its value is with automatic menu generation.


--
J. Scott Heppler

New Submission: x11/jgmenu

[Heppler, J. Scott]

Attached is the 3rd iteration of jgmenu, a small, freedesktop spec menu
for lightweight WM's.  


https://github.com/johanmalm/jgmenu

Added was a package readme to deal with the choice of gnome-menu vs
mate-menu vs openbox/menu.xml.

Tested on amd64-current w/ openbox/tint2, cwm and twm.

Thanks for looking
--
J. Scott Heppler


jgmenu-1_4_1.tar.gz
Description: application/tar-gz

/usr/local/share/applications/*.desktop entries for base/legacy apps

[Heppler, J. Scott]

Apologies if this has been asked.

Has there been any discussion as to providing *.desktop entries for
xterm, xcalc and terminal based apps like mutt, ncmpc, abook?  The
value is most evident with xterm.  The VTE based terminals, with
*.desktop files that I have tested are not particularly stable while
xterm is rock solid.  An xterm.desktop for Gnome, KDE4, XFCE4, LXQt
would be convenient.

Include in base or provide pkg?  Package could pull entries/icons from
other projects.  


There is also a go based tool:

https://wiki.archlinux.org/index.php/Desktop_entries#Tools

that could be ported

--
J. Scott Heppler

Question: x11/jgmenu optional run dependency

[Heppler, J. Scott]

jgmenu can pull menu data via 4 methods:

1)  ob - openbox menu.xml file
2)  pmenu - python3 based
3)  lx - uses OpenBSD x11/menu-cache.  Build disables this
   option if menu-cache not found.  To run, needs a menu
   file. In OpenBSD, file be provided by x11/gnome/menu or
   x11/mate/menu.  The LXDE project's lxmenu-data also
   provides a menu. A menu file is a freedesktop requirement
   and should also be somewhere in LXQT, KDE4/Plasma and XFCE4.
4)  xdg - also reads a menu file.

https://github.com/johanmalm/jgmenu

For a fully capable build, I made x11/menu-cache a
LIB_DEPENDS.

With that background the question:

Make x11/gnome/menu or x11/mate/menu a RUN_DEPENDS?
or
Provide an install message that a menu file is needed
for full freedesktop functionality?
or
Provide the info in a pkg-readme?
or
Trust that the user can read the extensive man pages?

So far, running jgmenu w/ x11/gnome/menu has been stable
and relatively lightweight.  With openbox-session, 2 tint2
panels, xenodm, messagebus, idle memory is 97M.  On an
Atom 510DU/4GB ram, there is a slight latency (~1 second)
not as evident on more capable systems.

Regards
--
J. Scott Heppler

Re: [NEW] x11/jgmenu

[Heppler, J. Scott]

Upstream had a problem with the tags and released a new version with a
minor correction.

For those who are interested in testing

https://github.com/johanmalm/jgmenu/blob/master/docs/manual/jgmenututorial.7.md

Update attached.

--
J. Scott Heppler


jgmenu-1_4_1.tar.gz
Description: application/tar-gz

[NEW] x11/jgmenu

[Heppler, J. Scott]

Thanks to Stuart Henderson for walking me through this.

jgmenu is a lightweight, highly configurable menu application that was
originally developed for openbox and tint2.  


https://github.com/johanmalm/jgmenu

I've tested for several weeks using x11/menu-cache, openbox, tint2 and
did a quick test in cwm  (started jgmenu_run from .xsession). 


Soliciting critique and testing on other WM's.

See attached
--
J. Scott Heppler


jgmenu.tar.gz
Description: application/tar-gz

Re: Question on Python3 runtime option for jgmenu/pmenu

[Heppler, J. Scott]

CONFIGURE_STYLE=  none solved the main problem.  It should be ready to
test once lib_depends/WANTLIBS are resolved.

I'm getting mixed messages on the WANTLIBs
Tigger# make port-lib-depends-check

jgmenu-1.4(x11/jgmenu): Bogus WANTLIB: cairo.13
(/usr/local/lib/jgmenu/jgmenu) (NOT REACHABLE) Bogus WANTLIB:
pango-1.0.3800 (/usr/local/lib/jgmenu/jgmenu) (NOT REACHABLE) Bogus
WANTLIB: pangocairo-1.0.3800 (/usr/local/lib/jgmenu/jgmenu) (NOT
REACHABLE) Bogus WANTLIB: rsvg-2.39 (/usr/local/lib/jgmenu/jgmenu) (NOT
REACHABLE) *** Error 1 in target 'port-lib-depends-check' (ignored)
Tigger# make print-package-args -P
devel/desktop-file-utils:desktop-file-utils-*:desktop-file-utils-0.23p9
-P
x11/gtk+3,-guic:gtk-update-icon-cache-*:gtk-update-icon-cache-3.22.30p1
-P x11/menu-cache:menu-cache-*:menu-cache-1.1.0p0 -P
lang/python/3.6,-main:python->=3.6,<3.7:python-3.6.6p1 Missing library
for cairo>=0.0 Missing library for pango-1.0>=0.0 Missing library for
pangocairo-1.0>=0.0 Missing library for rsvg-2>=0.0 *** Error 1 in
/usr/ports/x11/jgmenu (/usr/ports/infrastructure/mk/bsd.port.mk:3286
'port-wantlib-args')

Which one to believe and which is fake-news?

Makefile for reference:

# $OpenBSD: Makefile.template,v 1.78 2018/07/09 15:00:06 jca Exp $

COMMENT=freedesktop-compliant menu for openbox and tint2

V=  1.4
CATEGORIES= x11
DISTNAME=   jgmenu-${V}
GH_ACCOUNT= johanmalm
GH_PROJECT= jgmenu
GH_TAGNAME= v${V}

# GPLv2 only
PERMIT_PACKAGE_CDROM=  Yes

MODULES=lang/python
MODPY_VERSION=  ${MODPY_DEFAULT_VERSION_3}
MODPY_SETUPTOOLS= No
MODPY_BUILDDEP= No

WANTLIB+=   X11 Xrandr c cairo gdk_pixbuf-2.0 gio-2.0
WANTLIB+=   glib-2.0 gobject-2.0 iconv intl lzma m
WANTLIB+=   menu-cache pango-1.0 pangocairo-1.0 png
WANTLIB+=   pthread rsvg-2 xml2 z

BUILD_DEPENDS=  x11/menu-cache

USE_GMAKE=  Yes

CONFIGURE_STYLE= None

RUN_DEPENDS=devel/desktop-file-utils \
   x11/gtk+3,-guic \
   x11/menu-cache

.include 

Scott H.

On Oct 25, 2018: 20:28, Stuart Henderson wrote:

On 2018/10/25 20:33, Klemens Nanni wrote:

On Thu, Oct 25, 2018 at 09:43:02AM -0700, Heppler, J. Scott wrote:
> Upstream tagged 1.4 and I'm still struggling with the python3 rdep.
>
> MODULES=   lang/python
> MODPY_VERSION=  ${MODPY_DEFAULT_VERSION_3}
>
> stops "make build" with the error: can't find ./setup.py
>
> No setup.py exists in the upstream code.
See port-modules(5) where MODPY_SETUPTOOLS is documented.

> python3 is not a build dependency and is only needed if
> "jgmenurc pmenu" is invoked.
> https://github.com/johanmalm/jgmenu/blob/master/INSTALL.md#dependencies
MODPY_BUILDDEP

> Johan Malm tells me that python3 is just used to produce text output.
>
> My understanding is that "MODULES" appends to BUILD_DEPENDS,
> RUN_DEPENDS, LIB_DEPENDS and WANTLIB but for this port only RUN_DEPENDS
> is needed.  Would the most concise way to deal with the RUN_DEPENDS be
> to fully specify lang/python3 in RUN_DEPENDS.  I've looked at other
> recent, python based ports and have not found a similar, python3
> RUN_DEPENDS. The closest seems to be productivity/calcurse.
>
> Or use MODULES and disable the appending of BUILD_DEPENDS, LIB_DEPENDS
> and WANTLIB?
>
> What I have currently:
>
> # $OpenBSD: Makefile.template,v 1.78 2018/07/09 15:00:06 jca Exp $
>
> COMMENT=freedesktop-complaint menu for openbox and tint2
>
> V=  1.4
> CATEGORIES= x11
> DISTNAME=   jgmenu-${V}
> HOMEPAGE=   https://github.com/johanmalm/jgmenu
> GH_ACCOUNT= johanmalm
> GH_PROJECT= jgmenu
Just set GH_TAG=v1.4 instead of V, HOMEPAGE and MASTER_SITES.



Oh yes I missed that. It's GH_TAGNAME though, and here it will also replace 
DISTNAME.

Re: Question on Python3 runtime option for jgmenu/pmenu

[Heppler, J. Scott]

Upstream tagged 1.4 and I'm still struggling with the python3 rdep.

MODULES=lang/python
MODPY_VERSION=  ${MODPY_DEFAULT_VERSION_3}

stops "make build" with the error: can't find ./setup.py

No setup.py exists in the upstream code.

python3 is not a build dependency and is only needed if
"jgmenurc pmenu" is invoked. 
https://github.com/johanmalm/jgmenu/blob/master/INSTALL.md#dependencies


Johan Malm tells me that python3 is just used to produce text output.

My understanding is that "MODULES" appends to BUILD_DEPENDS,
RUN_DEPENDS, LIB_DEPENDS and WANTLIB but for this port only RUN_DEPENDS
is needed.  Would the most concise way to deal with the RUN_DEPENDS be
to fully specify lang/python3 in RUN_DEPENDS.  I've looked at other
recent, python based ports and have not found a similar, python3
RUN_DEPENDS. The closest seems to be productivity/calcurse.

Or use MODULES and disable the appending of BUILD_DEPENDS, LIB_DEPENDS
and WANTLIB?

What I have currently:

# $OpenBSD: Makefile.template,v 1.78 2018/07/09 15:00:06 jca Exp $

COMMENT=freedesktop-complaint menu for openbox and tint2

V=  1.4
CATEGORIES= x11
DISTNAME=   jgmenu-${V}
HOMEPAGE=   https://github.com/johanmalm/jgmenu
GH_ACCOUNT= johanmalm
GH_PROJECT= jgmenu

# GPLv2 only
PERMIT_PACKAGE_CDROM=  Yes

MASTER_SITES =  https://github.com/johanmalm/jgmenu/archive/v${V}/

WANTLIB+=   X11 Xrandr c m pthread z
WANTLIB+=   cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 iconv
WANTLIB+=   intl lzma menu-cache pango-1.0 pangocairo-1.0 png
WANTLIB+=   rsvg-2 xml2

BUILD_DEPENDS= x11/menu-cache

USE_GMAKE=  Yes

RUN_DEPENDS=devel/desktop-file-utils \
   x11/gtk+3,-guic \
   x11/menu-cache

.include 

Thanks

--
J. Scott Heppler

Question on Python3 runtime option for jgmenu/pmenu

[Heppler, J. Scott]

I have been working on porting jgmenu which provides menu generation
for openbox, i3, dwm and other WM's.  Jgmenu can source menu generation
from 4 different sources:
  1)  Openbox menu.xml
  2)  x11/menu-cache
  3)  xdg
  4)  pmenu

The pmenu option is python3 code that has been embedded in the upstream
source.  Upstream notes on python:
https://github.com/johanmalm/jgmenu/blob/master/docs/notes_on_python

Upstream has been helpful and since the 1.3 tag has changed the code
base to accommodate openbsd (use setitimer() instead of timer_*).

I am running a jgmenu -master pull spoofed as v1.4 in amd64_current
using x11/menu-cache in openbox.  I had both python2(default) and
python3 when I built the port without any reference to python in the
Makefile.  As long as the pmenu option is not used, it runs fine without
python.

My question is specifying python3 in WANT_LIBS, BUILD_DEPENDS,
RUN_DEPENDS.  Only when using pmenu is python3 needed for any of these.
Still the port should be fully functional.  Does it need to be specified
in WANT_, BUILD_ and RUN_? 


What I have so far:

# $OpenBSD: Makefile.template,v 1.78 2018/07/09 15:00:06 jca Exp $

COMMENT =   freedesktop-complaint menu for openbox and tint2

V = master
CATEGORIES =x11
DISTNAME =  jgmenu-${V}
PKGNAME =   jgmenu-1.4
HOMEPAGE =  https://github.com/johanmalm/jgmenu
GH_ACCOUNT =johanmalm
GH_PROJECT =jgmenu
GH_COMMIT = 5ee0b7e21715ba36690606db27f6dd85cd3ee0fc
WRKDIST =   ${WRKDIR}/jgmenu-5ee0b7e21715ba36690606db27f6dd85cd3ee0fc

# GPLv2 only
PERMIT_PACKAGE_CDROM =  Yes

#MASTER_SITES =  https://github.com/johanmalm/jgmenu/archive/v${V}/

WANTLIB +=  X11 Xrandr c m pthread z
WANTLIB +=  cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 iconv
WANTLIB +=  intl lzma menu-cache pango-1.0 pangocairo-1.0 png
WANTLIB +=  python${MODPY_DEFAULT_VERSION_3} rsvg-2 xml2

BUILD_DEPENDS = x11/menu-cache

LIB_DEPENDS =   devel/pango \
   x11/gnome/librsvg \
   x11/menu-cache

MODULES =   lang/python \
   x11/gnome
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODGNOME_TOOLS = desktop-file-utils \
   gtk-update-icon-cache

USE_GMAKE = Yes

RUN_DEPENDS =   lang/python/${MODPY_DEFAULT_VERSION_3}

.include 




--
J. Scott Heppler

Interest in x11/jgmenu port?

[Heppler, J. Scott]

Just found an menu application that is designed to work with x11/tint2
and x11/menu-cache.  I think an x11/jgmenu port would add flexibility
for those use lightweight WMs.

https://github.com/johanmalm/jgmenu

It is active and has been adapted by BunsenLabs (continuation
of CrunchBang).  Upstream mentions he has built in OpenBSD.

With x11/menu-cache, and x11/openbox pipe menus, it would provide
freedesktop menu integration and do away with manual edits.

I submitted a howto on DaemonForums that results in a lightweight
desktop.  A bare framework of applications is provided in part to
provide placeholders in the menu structure.  Use of jgmenu would allow a
user to start with a largely empty menus and easily customize their
build by adding xdg compliant ports.  It also could provide a "start"
tint2 button to launch a menu, LXDE/MATE/KDE/LXQt style.



--
J. Scott Heppler

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

In the interim there has been one minor patch that addresses icon
spacing for executors in vertical panels.  FreeBSD bugzilla has no
reports for code base 16.6.  16.6.1 just addressed a regression in the
Debian Build code.  There may be a newer release tag in the upcoming
weeks.  


From an OpenBSD standpoint, the port is cleaner and more intuitive -

should be easier to maintain going forward.  I also think it is likely
that the next release will be very close to the upcoming ports freeze.
My intent would be to update the next release tag in 6.5

-Scott H.


On Sep 16, 2018: 09:58, Brian Callahan wrote:


On 09/05/18 00:56, Heppler, J. Scott wrote:

Prior posts had two mistakes with the patchs.  The line count was off
and the first correction had a typo exampls now corrected to examples.
On top of that, I was doing something wrong with cvs diff - the
corrected patches were not showing up in the *diff.

Runs on my current amd64 openbox wm.

Anyway this should be good.  Sorry for the noise



Works for me too. OK for me if someone wants to commit (or let me know 
and I'll commit).


~Brian



On Aug 30, 2018: 18:46, Brian Callahan wrote:


On 08/30/18 00:23, Heppler, J. Scott wrote:


After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.

The attached diff removes PKGNAME.  Builds/Runs -current/amd64 openbox.

Scott


I think this is right. Though when I ran `make update-patches` one 
of the patches got regen'd so it'll get committed with that little 
tweak.


Anyone want to give an ok?

~Brian






--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

Prior posts had two mistakes with the patchs.  The line count was off
and the first correction had a typo exampls now corrected to examples.
On top of that, I was doing something wrong with cvs diff - the
corrected patches were not showing up in the *diff.

Runs on my current amd64 openbox wm.

Anyway this should be good.  Sorry for the noise


On Aug 30, 2018: 18:46, Brian Callahan wrote:


On 08/30/18 00:23, Heppler, J. Scott wrote:


After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.

The attached diff removes PKGNAME.  Builds/Runs -current/amd64 openbox.

Scott


I think this is right. Though when I ran `make update-patches` one of 
the patches got regen'd so it'll get committed with that little tweak.


Anyone want to give an ok?

~Brian


--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile5 Sep 2018 04:37:39 -
@@ -2,19 +2,15 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
-
+DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
 
-MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
 WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo5 Sep 2018 04:37:39 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-CMakeLists_txt5 Sep 2018 04:37:39 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
Index: patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_CMakeLists_txt 5 Sep 2018 04:37:39 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/CMakeLists.txt
 --- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_tint2rc
--- patches/patch-themes_tint2rc12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_tint2rc5 Sep 2018 04:37:39 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_tint2rc,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/tint2rc
 --- themes/tint2rc.orig
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   1 Jul 2018 18:33:39 -   1.6
+++ pkg/PLIST   5 Sep 2018 04:37:39 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/07/01 18:33:39 espie Exp $
+@comment $OpenBSD: PLIST,v$
 @pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

Typo in the last diff corrected: exmapls -> examples
Build/runs on my openbox system.  Feedback/testing appreciated

Scott

On Aug 30, 2018: 18:46, Brian Callahan wrote:


On 08/30/18 00:23, Heppler, J. Scott wrote:


After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.

The attached diff removes PKGNAME.  Builds/Runs -current/amd64 openbox.

Scott


I think this is right. Though when I ran `make update-patches` one of 
the patches got regen'd so it'll get committed with that little tweak.


Anyone want to give an ok?

~Brian


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile5 Sep 2018 03:20:04 -
@@ -2,19 +2,15 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
-
+DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
 
-MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
 WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo5 Sep 2018 03:20:04 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-CMakeLists_txt5 Sep 2018 03:20:04 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
Index: patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_CMakeLists_txt 5 Sep 2018 03:20:04 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/CMakeLists.txt
 --- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_tint2rc
--- patches/patch-themes_tint2rc12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_tint2rc5 Sep 2018 03:20:04 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_tint2rc,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/tint2rc
 --- themes/tint2rc.orig
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   1 Jul 2018 18:33:39 -   1.6
+++ 

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

My mistake on the patches - upstream added a additional line to
CMakeLists.txt and themes/CMakeLists.txt.  Odd that it built and if it
generated any warnings about the patches, I missed them.

The attached diff has patches generated from scratch and make
update-plist.  Testing feedback appreciated.

Scott H

On Aug 30, 2018: 18:46, Brian Callahan wrote:


On 08/30/18 00:23, Heppler, J. Scott wrote:


After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.

The attached diff removes PKGNAME.  Builds/Runs -current/amd64 openbox.

Scott


I think this is right. Though when I ran `make update-patches` one of 
the patches got regen'd so it'll get committed with that little tweak.


Anyone want to give an ok?

~Brian


--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile5 Sep 2018 02:35:56 -
@@ -2,19 +2,15 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
-
+DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
 
-MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
 WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo5 Sep 2018 02:35:56 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-CMakeLists_txt5 Sep 2018 02:35:56 -
@@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
Index: patches/patch-themes_CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_CMakeLists_txt 5 Sep 2018 02:35:56 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/CMakeLists.txt
 --- themes/CMakeLists.txt.orig
@@ -7,4 +7,4 @@ Index: themes/CMakeLists.txt
 -file( GLOB EXTRATHEMEFILES *.tint2rc )
 -install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
 +file( GLOB EXTRATHEMEFILES tint2rc *.tint2rc )
-+install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
++install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/exampls/tint2 )
Index: patches/patch-themes_tint2rc
===
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-themes_tint2rc
--- patches/patch-themes_tint2rc12 Mar 2018 22:49:54 -  1.2
+++ patches/patch-themes_tint2rc5 Sep 2018 02:35:56 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_tint2rc,v 1.2 2018/03/12 22:49:54 sthen Exp $
+$OpenBSD$
 
 Index: themes/tint2rc
 --- themes/tint2rc.orig
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   1 Jul 2018 18:33:39 -   1.6
+++ pkg/PLIST   5 Sep 2018 02:35:56 -
@@ -21,19 +21,22 @@

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

After I uploaded the v2 diff, it occurred to me that PKGNAME would not
be needed if I used the 16.6.1 tag.

The attached diff removes PKGNAME.  Builds/Runs -current/amd64 openbox.

Scott
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile30 Aug 2018 04:17:26 -
@@ -2,19 +2,15 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
-
+DISTNAME=  tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
 
-MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
 WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo30 Aug 2018 04:17:26 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

https://gitlab.com/o9000/tint2/tags offers both
v16.6.1 and 16.6.1 tags

I choose the "non-v" tag to simplify the Makefile.  I can alter if the
v-tag is preferred

I think I have the suggested changes incorporated into the attached
diff.  Builds/Runs on my -current/amd64 x11/openbox wm.

Scott

On Aug 29, 2018: 19:54, Brian Callahan wrote:



On 8/29/2018 6:42 PM, Heppler, J. Scott wrote:

If it would be helpful, this particular project is mirrored on GitHub

https://github.com/o9000/tint2.

Could you point me to the github policy?



For the archives and the curious, it's in
PORTSDIR/infrastructure/templates/Makefile.template right above where
the GH_* variables are.

~Brian


Scott H.
On Aug 29, 2018: 17:46, Brian Callahan wrote:


On 08/26/18 22:01, Heppler, J. Scott wrote:

The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog.

The update fixes some regressions, adds the ability to sort the task
bar
and turn off logging of script executors.

Builds and runs on my -current/amd64.  Additional testing and critique
appreciated.


I realize that we don't have an official policy for GitLab stuff like
we do GitHub stuff, and we're stuck with autogen'd tarballs for this
one (unless I'm missing something obvious).

For MASTER_SITES, we could try something like
MASTER_SITES=https//gitlab.com/o9000/tint2/-/archive/v${V}/

And change DISTNAME to
DISTNAME=tint2-v${V}

and change PKGNAME to
PKGNAME=tint2-${V}

And then not have to do that DISTFILES dance. And we could also get
rid of WRKDIST.

That seems more maintainable to me? What do others think?

The rest looks fine, save for the RCS ID change in PLIST (and was the
reordering there automagic or did you change it yourself?)

~Brian




Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile30 Aug 2018 03:45:48 -
@@ -2,19 +2,16 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
-
+DISTNAME=  tint2-${V}
+PKGNAME=   tint2-${V}
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
 
-MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+MASTER_SITES=  https://gitlab.com/o9000/tint2/-/archive/${V}/
 
 WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo30 Aug 2018 03:45:48 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = 2S51My6+rDcPAntKCx6KCGUPxW4/KrxB9ROGNM9r180=
+SIZE (tint2-16.6.1.tar.gz) = 546488

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

Spoke too soon.  The GitHub mirror has not been sync'd since the
Microsoft purchase.

Will incorporate the suggestions below and update this thread.

Thanks

Scott.

On Aug 29, 2018: 17:46, Brian Callahan wrote:


On 08/26/18 22:01, Heppler, J. Scott wrote:

The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog.

The update fixes some regressions, adds the ability to sort the task bar
and turn off logging of script executors.

Builds and runs on my -current/amd64.  Additional testing and critique
appreciated.


I realize that we don't have an official policy for GitLab stuff like 
we do GitHub stuff, and we're stuck with autogen'd tarballs for this 
one (unless I'm missing something obvious).


For MASTER_SITES, we could try something like
MASTER_SITES=https//gitlab.com/o9000/tint2/-/archive/v${V}/

And change DISTNAME to
DISTNAME=tint2-v${V}

and change PKGNAME to
PKGNAME=tint2-${V}

And then not have to do that DISTFILES dance. And we could also get 
rid of WRKDIST.


That seems more maintainable to me? What do others think?

The rest looks fine, save for the RCS ID change in PLIST (and was the 
reordering there automagic or did you change it yourself?)


~Brian


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: [UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

If it would be helpful, this particular project is mirrored on GitHub

https://github.com/o9000/tint2.

Could you point me to the github policy?

Scott H.
On Aug 29, 2018: 17:46, Brian Callahan wrote:


On 08/26/18 22:01, Heppler, J. Scott wrote:

The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog.

The update fixes some regressions, adds the ability to sort the task bar
and turn off logging of script executors.

Builds and runs on my -current/amd64.  Additional testing and critique
appreciated.


I realize that we don't have an official policy for GitLab stuff like 
we do GitHub stuff, and we're stuck with autogen'd tarballs for this 
one (unless I'm missing something obvious).


For MASTER_SITES, we could try something like
MASTER_SITES=https//gitlab.com/o9000/tint2/-/archive/v${V}/

And change DISTNAME to
DISTNAME=tint2-v${V}

and change PKGNAME to
PKGNAME=tint2-${V}

And then not have to do that DISTFILES dance. And we could also get 
rid of WRKDIST.


That seems more maintainable to me? What do others think?

The rest looks fine, save for the RCS ID change in PLIST (and was the 
reordering there automagic or did you change it yourself?)


~Brian


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

[UPDATE] x11/tint2 16.2 -> 16.6.1

[Heppler, J. Scott]

The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.6.1/ChangeLog.

The update fixes some regressions, adds the ability to sort the task bar
and turn off logging of script executors.

Builds and runs on my -current/amd64.  Additional testing and critique
appreciated.
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile1 Jul 2018 18:33:39 -   1.10
+++ Makefile25 Aug 2018 20:06:26 -
@@ -2,12 +2,11 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 16.2
+V= 16.6.1
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
-REVISION=  2
+WRKDIST=   ${WRKDIR}/tint2-v$V-a82b9a1d7f4ad835183ca17ec38273556cc4b1ff
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo12 Mar 2018 22:49:54 -  1.3
+++ distinfo25 Aug 2018 20:06:26 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
-SIZE (tint2-16.2.tar.gz) = 537236
+SHA256 (tint2-16.6.1.tar.gz) = /cIGoBqV+PsSm0Nveb1ensXi5EwiMYmD5S/PgQHPyb8=
+SIZE (tint2-16.6.1.tar.gz) = 546590
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   1 Jul 2018 18:33:39 -   1.6
+++ pkg/PLIST   25 Aug 2018 20:06:26 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2018/07/01 18:33:39 espie Exp $
+@comment $OpenBSD: PLIST,v$
 @pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
@@ -46,6 +46,6 @@ share/locale/sr/LC_MESSAGES/tint2conf.mo
 share/mime/packages/tint2conf.xml
 share/tint2/
 share/tint2/default_icon.png
-@tag update-desktop-database
-@tag gtk-update-icon-cache %D/share/icons/hicolor
 @tag update-mime-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database

Chromium/Iridium Buildbot for -stable?

[Heppler, J. Scott]

landry@ provides a buildbot for mozill-firefox but core development is
focused on privilege separation: pledge(2), unveil(2),  Chromium/Iridium
are able to utilize privilege separation while mozilla-firefox does not.

This raises questions about a buildbot for Chromium and/or Iridium.
 Would it be worth while?
 What resources would be needed?
 Working w/ upstream Iridium to use their buildbot or keep it in-house?


--
J. Scott Heppler

[UPDATE] x11/tint2 0.14.6 -> 16.2

[Heppler, J. Scott]

The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.2/ChangeLog

Upstream incorporated 2 OpenBSD patch in 16.1 and dropped "0" from the
release numbering system in 15.0.

Runs on my -current/amd64, additional testing and critique appreciated.

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile1 Sep 2017 10:37:44 -   1.6
+++ Makefile11 Mar 2018 16:28:47 -
@@ -2,11 +2,11 @@
 
 COMMENT=   freedesktop-compliant panel
 
-V= 0.14.6
+V= 16.2
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
+WRKDIST=   ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
@@ -38,9 +38,5 @@ MODGNOME_TOOLS+= desktop-file-utils \
shared-mime-info
 
 NO_TEST=   Yes
-
-post-install:
-   sed -i 's,/usr/share,${LOCALBASE}/share,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo1 Sep 2017 10:37:44 -   1.2
+++ distinfo11 Mar 2018 16:28:47 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
-SIZE (tint2-0.14.6.tar.gz) = 466533
+SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
+SIZE (tint2-16.2.tar.gz) = 537236
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt1 Sep 2017 10:37:44 -   1.1
+++ patches/patch-CMakeLists_txt11 Mar 2018 16:28:47 -
@@ -1,13 +1,14 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/09/01 10:37:44 sthen Exp $
+$OpenBSD$
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
--install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+-install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
++install( FILES themes/tint2rc DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )
  install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
  install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
  install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_main_c
===
RCS file: patches/patch-src_tint2conf_main_c
diff -N patches/patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c  1 Sep 2017 10:37:44 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.2 2017/09/01 10:37:44 sthen Exp $
-
-Index: src/tint2conf/main.c
 src/tint2conf/main.c.orig
-+++ src/tint2conf/main.c
-@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)
- 
- void make_backup(const char *filepath)
- {
--gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
-+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long 
long)time(NULL));
- copy_file(filepath, backup_path);
- g_free(backup_path);
- }
Index: patches/patch-src_tint2conf_properties_c
===
RCS file: patches/patch-src_tint2conf_properties_c
diff -N patches/patch-src_tint2conf_properties_c
--- patches/patch-src_tint2conf_properties_c1 Sep 2017 10:37:44 -   
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tint2conf_properties_c,v 1.2 2017/09/01 10:37:44 sthen Exp 
$
-
-Index: src/tint2conf/properties.c
 src/tint2conf/properties.c.orig
-+++ src/tint2conf/properties.c
-@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
- gchar *filepath = get_current_theme_path();
- if (filepath) {
- if (config_is_manual(filepath)) {
--gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
-+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, 
(long long)time(NULL));
- 

6.2i386 netsurf-gtk/netsurf-fb use after free

[Heppler, J. Scott]

Hi ports and Bcc'd maintainer.

First thanks for 6.2 and netsurf.

After upgrading 6.1 -> 6.2 my amd64 system w/ netsurf works w/o issues.
The i386 Via C7-D 2GBram system reliably core dumps with a use after
free with both --gtk and --fb.  netsurf-gtk worked without issues in
6.1.

If I can run and debugging or provide additional information I would be
glad to do so.

I have submitted the following upstream:
Puffy$ netsurf-gtk -v 
(0.03) utils/log.c:101 nserror nslog_init(nslog_ensure_t *, int *, char **): NetSurf version '3.6 (19th November 2016)'

(0.011419) utils/log.c:110 nserror nslog_init(nslog_ensure_t *, int *, char **): NetSurf on , 
node , release <6.2>, version , machine 
(0.031586) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/netsurf.gtk2.ui
(0.047316) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/tabcontents.gtk2.ui
(0.061710) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/password.gtk2.ui
(0.077625) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/login.gtk2.ui
(0.091811) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/ssl.gtk2.ui
(0.106110) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/toolbar.gtk2.ui
(0.121828) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/downloads.gtk2.ui
(0.136616) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/history.gtk2.ui
(0.151364) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/options.gtk2.ui
(0.166494) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/hotlist.gtk2.ui
(0.181145) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/cookies.gtk2.ui
(0.195257) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/viewdata.gtk2.ui
(0.210668) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/warning.gtk2.ui
(0.225030) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/favicon.png
(0.240022) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/netsurf.xpm
(0.254914) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/menu_cursor.png
(0.269293) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/arrow_down_8x32.png
(0.283427) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber0.png
(0.298624) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber1.png
(0.304242) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber2.png
(0.314025) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber3.png
(0.321882) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber4.png
(0.329762) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber5.png
(0.341674) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber6.png
(0.348572) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber7.png
(0.357932) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/throbber/throbber8.png
(0.367084) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path /org/netsurf/welcome.html
(0.377202) frontends/gtk/resources.c:223 nserror init_resource(char **, struct 
nsgtk_resource_s *): Found gresource path 

Re: [UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

[Heppler, J. Scott]

New cvs diff -uNP generated:

1) Updated 0.12.2 -> 0.14.6
2) sed applied to example rc files per @sthen
3) Patched default tint2rc with OpenBSD path and apps
4) Searched tint2conf/main.c tint2conf/properties.c for incorrect
  declaration and patched to print_t %lld (long long)
5) New tint2conf no longer needs python - removed
6) Incorporated Valère_Monseur modifications
7) Removed RUN_DEPENDS
8) Changed to ${LOCALBASE} per @sthen

Builds/Runs amd64
--
J. Scott Heppler

Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile1 Sep 2017 05:29:31 -
@@ -2,13 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
@@ -25,30 +23,23 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
-   devel/pango \
+
+LIB_DEPENDS=   devel/pango \
devel/startup-notification \
-   x11/gnome/librsvg \
+   graphics/imlib2 \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
+   sed -i 's,/usr/share,${LOCALBASE}/share,g' \
${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo1 Sep 2017 05:29:31 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt1 Sep 2017 05:29:31 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt  11 Sep 2015 14:14:07 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 
sthen Exp $
 src/tint2conf/CMakeLists.txt.orig  Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt   Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION 
${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t 
${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
Index: patches/patch-src_tint2conf_main_c
===
RCS file: 

Re: [UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

[Heppler, J. Scott]

The list seems to be mis-behaving lately, I did not get your last reply
and my initial response did not ask for posting confirmation.

I think I was generating the cvs diff incorrectly, I used the example in
the OpenBSD anoncvs web page: cvs diff -u > /tmp/my.diff.  Should be
cvs diff -uNp > /tmp/my.diff?

The two patches for the variable declaration follow:

patch-src_tint2conf_main_c
---
$OpenBSD$

Index: src/tint2conf/main.c
--- src/tint2conf/main.c.orig
+++ src/tint2conf/main.c
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)

void make_backup(const char *filepath)
{
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long 
long)time(NULL));
copy_file(filepath, backup_path);
g_free(backup_path);
}


patch-src_tint2conf_properties_c

$OpenBSD$

Index: src/tint2conf/properties.c
--- src/tint2conf/properties.c.orig
+++ src/tint2conf/properties.c
@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
gchar *filepath = get_current_theme_path();
if (filepath) {
if (config_is_manual(filepath)) {
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, 
(long long)time(NULL));
copy_file(filepath, backup_path);
g_free(backup_path);
}



On Aug 30, 2017: 13:18, Stuart Henderson wrote:

On 2017/08/28 10:23, Heppler, J. Scott wrote:

Summary so far:

1) Updated 0.12.2 - 0.14.6
2) Removed example rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path.
4) Added pkg/README describing how to obtain the example *.tint2rc files
5) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
6) New tint2conf no longer needs python - removed
7) Added x11/gtk+2 as RUN_DEPENDS
8) Incorporated Valère_Monseur modifications





clip-clip-clip-clip



Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile30 Aug 2017 12:18:06 -
@@ -1,22 +1,20 @@
# $OpenBSD: Makefile,v 1.5 2016/11/26 02:06:16 jca Exp $

-COMMENT=freedesktop-compliant panel
+COMMENT=   freedesktop-compliant panel

-V= 0.12.2
-REVISION=  2
+V= 0.14.6
CATEGORIES= x11
DISTNAME=   tint2-$V
DISTFILES=  ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec

HOMEPAGE=   https://gitlab.com/o9000/tint2/

+MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+
# GPLv2 only
PERMIT_PACKAGE_CDROM= YES

-MASTER_SITES=   https://gitlab.com/o9000/tint2/repository/
-
WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
@@ -25,30 +23,23 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
WANTLIB += z

BUILD_DEPENDS=  devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
-   devel/pango \
+
+LIB_DEPENDS=   devel/pango \
devel/startup-notification \
-   x11/gnome/librsvg \
+   graphics/imlib2 \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils

MODULES=devel/cmake \
-   lang/python \
x11/gnome

-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info

NO_TEST=Yes

-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
+   sed -i 's,/usr/local/share,${LOCALBASE}/share,g' \
${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc

.include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo30 Aug 2017 12:18:06 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33I

Re: [UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

[Heppler, J. Scott]

On Aug 30, 2017: 13:18, Stuart Henderson wrote:

On 2017/08/28 10:23, Heppler, J. Scott wrote:

Summary so far:

1) Updated 0.12.2 - 0.14.6
2) Removed example rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path.
4) Added pkg/README describing how to obtain the example *.tint2rc files
5) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
6) New tint2conf no longer needs python - removed
7) Added x11/gtk+2 as RUN_DEPENDS
8) Incorporated Valère_Monseur modifications


It should use ${LOCALBASE} rather than hardcoded /usr/local/share.
I don't really see it as an improvement to have a readme telling people
to fetch more examples from the git repo (which aren't going to be
any more usable than the ones in the distfile, and might be too new
if changes are made upstream) - this doesn't seem like something
where a readme is really needed, and people looking in the examples
directory should understand that they're examples.

Here's an alternative diff which:

- subst's LOCALBASE
- removes rather than comments the linux-only lines from the
"main" @sample'd tint2rc file (which is the only one of the sample
files that really matters)
- gets rid of the bogus gtk+2 RUN_DEPENDS
- cleans up LIB_DEPENDS
- fixes whitespace in Makefile

It keeps commenting-out chrome/firefox, though I'm wondering if it
would be better to keep them enabled, many users will have them
installed anyway and tint2 is already fairly noisy on stderr so
it might be better to keep them as a "working-in-most-cases" example?


Concerns:
The code that incorporated the variable declarations in #4, above, was
moved several hundred lines when upstream re-wrote the tint2conf code
(python -> c).  I do not see the new @@ lines in the diff. Am I not
reading it right or missing a step for cvs'ing a modified patch?


It's always confusing when reading diffs of diffs :)

Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile30 Aug 2017 12:18:06 -
@@ -1,22 +1,20 @@
# $OpenBSD: Makefile,v 1.5 2016/11/26 02:06:16 jca Exp $

-COMMENT=freedesktop-compliant panel
+COMMENT=   freedesktop-compliant panel

-V= 0.12.2
-REVISION=  2
+V= 0.14.6
CATEGORIES= x11
DISTNAME=   tint2-$V
DISTFILES=  ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec

HOMEPAGE=   https://gitlab.com/o9000/tint2/

+MASTER_SITES=  https://gitlab.com/o9000/tint2/repository/
+
# GPLv2 only
PERMIT_PACKAGE_CDROM= YES

-MASTER_SITES=   https://gitlab.com/o9000/tint2/repository/
-
WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
@@ -25,30 +23,23 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
WANTLIB += z

BUILD_DEPENDS=  devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
-   devel/pango \
+
+LIB_DEPENDS=   devel/pango \
devel/startup-notification \
-   x11/gnome/librsvg \
+   graphics/imlib2 \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils

MODULES=devel/cmake \
-   lang/python \
x11/gnome

-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info

NO_TEST=Yes

-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
+   sed -i 's,/usr/local/share,${LOCALBASE}/share,g' \
${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc

.include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo30 Aug 2017 12:18:06 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: pat

[UPDATE] x11/tint2 0.12.2 -> 0.14.6 passes portcheck

[Heppler, J. Scott]

Summary so far:

1) Updated 0.12.2 - 0.14.6
2) Removed example rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path.
4) Added pkg/README describing how to obtain the example *.tint2rc files
5) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
6) New tint2conf no longer needs python - removed
7) Added x11/gtk+2 as RUN_DEPENDS
8) Incorporated Valère_Monseur modifications

Concerns:
The code that incorporated the variable declarations in #4, above, was
moved several hundred lines when upstream re-wrote the tint2conf code
(python -> c).  I do not see the new @@ lines in the diff. Am I not
reading it right or missing a step for cvs'ing a modified patch?

Modified patches:
1) patch-src_tint2conf_main_c:

$OpenBSD$

Index: src/tint2conf/main.c
--- src/tint2conf/main.c.orig
+++ src/tint2conf/main.c
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)

void make_backup(const char *filepath)
{
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long 
long)time(NULL));
   copy_file(filepath, backup_path);
   g_free(backup_path);
}

2) patch-src_tint2conf_properties_c:

$OpenBSD$

Index: src/tint2conf/properties.c
--- src/tint2conf/properties.c.orig
+++ src/tint2conf/properties.c
@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
   gchar *filepath = get_current_theme_path();
   if (filepath) {
   if (config_is_manual(filepath)) {
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, 
(long long)time(NULL));
   copy_file(filepath, backup_path);
   g_free(backup_path);
   }

Runs on amd64.  Soliciting accurate comments/feedback with the goal of
commiting in time for 6.2

J. Scott Heppler

Attached diff:
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile28 Aug 2017 16:37:12 -
@@ -2,13 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
@@ -25,30 +23,26 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
+RUN_DEPENDS=   x11/gtk+2
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo28 Aug 2017 16:37:12 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt28 Aug 2017 16:37:12 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin 

Re: Revised x11/tint2 0.12.2 -> 0.14.6 update

[Heppler, J. Scott]

Forgot the diff

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile27 Aug 2017 19:31:47 -
@@ -2,13 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
 
@@ -25,30 +23,24 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo27 Aug 2017 19:31:47 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt27 Aug 2017 19:31:47 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
++#install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt  11 Sep 2015 14:14:07 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 
sthen Exp $
 src/tint2conf/CMakeLists.txt.orig  Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt   Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION 
${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t 
${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
Index: patches/patch-src_tint2conf_main_c
===
RCS file: patches/patch-src_tint2conf_main_c
diff -N patches/patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c  26 Nov 2016 02:06:16 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.1 2016/11/26 02:06:16 jca Exp $
 src/tint2conf/main.c.orig  Tue Nov 22 21:42:54 2016
-+++ src/tint2conf/main.c   

Re: Revised x11/tint2 0.12.2 -> 0.14.6 update

[Heppler, J. Scott]

Summary so far:

1) Updated 0.12.2 - 0.14.6
2) Removed rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path
4) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)

Current Issues:

1) diff with 2 additional patchs to correct print_t %lld (long long)
seems incomplete - missing new line numbers.  How to get the new @@ line
numbers to show in the diff?
2) I'm still also getting the portcheck message regarding WANTLIB look
liked masked RUN_DEPENDS and did not understand the previous guidance to
add back x11/gtk+2 to LIB_DEPENDS - I had moved it but it is in
LIB_DEPENDS currently
3) Port Module x11/gnome - If x11/gnome is used should I specify Configure Style
= cmake?

patch-src_tint2conf_main_c:

$OpenBSD$

Index: src/tint2conf/main.c
--- src/tint2conf/main.c.orig
+++ src/tint2conf/main.c
@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)

void make_backup(const char *filepath)
{
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long 
long)time(NULL));
copy_file(filepath, backup_path);
g_free(backup_path);
}

and

patch-src_tint2conf_properties_c:

$OpenBSD$

Index: src/tint2conf/properties.c
--- src/tint2conf/properties.c.orig
+++ src/tint2conf/properties.c
@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
gchar *filepath = get_current_theme_path();
if (filepath) {
if (config_is_manual(filepath)) {
-gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath, 
time(NULL));
+gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, 
(long long)time(NULL));
copy_file(filepath, backup_path);
g_free(backup_path);
}



--
J. Scott Heppler

Re: Revised x11/tint2 0.12.2 -> 0.14.6 update

[Heppler, J. Scott]

On Aug 24, 2017: 15:37, Brian Callahan wrote:

Hi Scott --

On 8/24/2017 12:43 AM, Heppler, J. Scott wrote:

There have been a large number of upstream commits to this port listed
at https://gitlab.com/o9000/tint2/blob/master/ChangeLog

After further consideration, I removed 11 *.tint2rc examples and just
retained the default.  In 0.12.2, sed was used to edit the path to
/usr/share/applications/*.desktop files to
/usr/local/share/applications/*.desktop.  The desktop files included
google-chrome, iceweasel, firefox, chromium-browser and tint2conf.
Outside of tint2conf, none of the other desktop files are certain to be
present.  Missing *desktop files generate not found-errors in
.xsession-errors although tint2conf will still function.

I added a pkg README that describes the issue with the example.tint2rc
files and gave the user the url to download the additional examples.

FreeBSD is at 0.14.5 and NetBSD is 0.14.6.  Neither addressed the issues
with desktop files in the example *.tint2rc's.

Although the Makefile WANTLIBs were unchanged portcheck now generates the
following:

Tigger# /usr/ports/infrastructure/bin/portcheck  the following libraries
in WANTLIB look like masked by RUN_DEPENDS: Imlib2 atk-1.0 cairo
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 rsvg-2
startup-notification-1 x11/tint2.

Although I'd like portcheck to run cleanly, I'm not sure what to make of
"look like".



It means you need to add x11/gtk+2 back to LIB_DEPENDS. It sees that
it's a dependency of RUN_DEPENDS, but WANTLIB requires its inclusion in
LIB_DEPENDS.


I had moved x11/gtk+2 to the last entry in LIB_DEPENDS but it is there
in the *.diff.  I reverted the order and still get the same portcheck
error.  /usr/ports/infrastructure/bin/check-lib-depends does not
generate any errors.

Is there something being pulled in? gtk+3 by update-icon-cache.  I saw
ninja flash by in the build.  New PLIST entries to update-mime-database?

Thanks for mentoring

~Scott H.



~Brian


Do I need to re-arrange WANTLIB/RUN_DEPENDS?  Constructive comments
appreciated.





--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Revised x11/tint2 0.12.2 -> 0.14.6 update

[Heppler, J. Scott]

There have been a large number of upstream commits to this port listed
at https://gitlab.com/o9000/tint2/blob/master/ChangeLog

After further consideration, I removed 11 *.tint2rc examples and just
retained the default.  In 0.12.2, sed was used to edit the path to
/usr/share/applications/*.desktop files to
/usr/local/share/applications/*.desktop.  The desktop files included
google-chrome, iceweasel, firefox, chromium-browser and tint2conf.
Outside of tint2conf, none of the other desktop files are certain to be
present.  Missing *desktop files generate not found-errors in
.xsession-errors although tint2conf will still function.

I added a pkg README that describes the issue with the example.tint2rc
files and gave the user the url to download the additional examples.

FreeBSD is at 0.14.5 and NetBSD is 0.14.6.  Neither addressed the issues
with desktop files in the example *.tint2rc's.

Although the Makefile WANTLIBs were unchanged portcheck now generates the
following:

Tigger# /usr/ports/infrastructure/bin/portcheck  the following libraries
in WANTLIB look like masked by RUN_DEPENDS: Imlib2 atk-1.0 cairo
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 rsvg-2
startup-notification-1 x11/tint2.

Although I'd like portcheck to run cleanly, I'm not sure what to make of
"look like".

Do I need to re-arrange WANTLIB/RUN_DEPENDS?  Constructive comments
appreciated.

--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile24 Aug 2017 04:26:24 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -25,30 +24,26 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
-   x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+   x11/gtk+2 \
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo24 Aug 2017 04:26:24 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt24 Aug 2017 04:26:24 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
++#install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: 

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

IMHO, it would otherwise be a regression not to tweak.

Attached is the 4th revision to update tint2.  This patch restores the
post-install sed command that edits Launcher paths in
/etc/xdg/tint2/tint2rc and /usr/local/share/examples/tint2/*.tint2rc:
/usr/share/applicatons -> /usr/local/share/applications.  Builds/runs on
amd64.


On Aug 13, 2017: 13:16, Brian Callahan wrote:

Hi Scott --

On 08/10/17 21:03, Heppler, J. Scott wrote:


Jggimi reviewed the port and found an extra tab and line in the
Makefile.

Version 3 of the attached diff corrects.



This mostly looks good. There's some whitespace/newline tweaks that I 
can fix on commit.

Question though: I get a lot of errors that look like this:
Could not open file /usr/share/applications/tint2conf.desktop

Should these be tweaked?

It worked just fine here, was even smart enough to preserve my fluxbox 
bar settings as it took over which was a nice touch.


Also, do you want to be MAINTAINER?

~Brian


Thanks

Scott
On Aug 10, 2017: 10:23, Brian Callahan wrote:

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.









--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile20 Aug 2017 01:31:48 -
@@ -2,15 +2,14 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
-CATEGORIES=x11
-DISTNAME=  tint2-$V
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
-INSTDIR=   ${PREFIX}/tint2
+V=  0.14.6
+CATEGORIES= x11
+DISTNAME=   tint2-$V
+DISTFILES=  ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
+WRKDIST=${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
+INSTDIR=${PREFIX}/tint2
 
-HOMEPAGE=  https://gitlab.com/o9000/tint2/
+HOMEPAGE=   https://gitlab.com/o9000/tint2/
 
 # GPLv2 only
 PERMIT_PACKAGE_CDROM= YES
@@ -24,31 +23,36 @@ WANTLIB += gobject-2.0 gthread-2.0 gtk-x
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2 startup-notification-1
 WANTLIB += z
 
-BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
-   devel/pango \
-   devel/startup-notification \
-   x11/gnome/librsvg \
-   x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
-
-MODULES=   devel/cmake \
-   lang/python \
-   x11/gnome
+BUILD_DEPENDS=  devel/gettext-tools
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+LIB_DEPENDS=devel/gettext \
+devel/pango \
+devel/startup-notification \
+graphics/imlib2 \
+x11/gnome/librsvg \
+x11/gtk+2
 
-NO_TEST=   Yes
+
+MODULES=devel/cmake \
+x11/gnome
+
+MODGNOME_TOOLS+= desktop-file-utils \
+gtk-update-icon-cache \
+shared-mime-info
+
+NO_TEST=Yes
 
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+cp -R ${WRKSRC}/themes/ ${PREFIX}/share/examples/tint2/
+sed -i -e '/\/usr\/local\/share\/applications/d' -e \
+'s,/usr/share/applications,${LOCALBASE}/share/applications,g' \
+${PREFIX}/share/examples/tint2/*tint2rc
+rm ${PREFIX}/share/tint2/tint2rc
+rm ${PREFIX}/share/tint2/*.tint2rc
+rm ${PREFIX}/share/examples/tint2/CMakeLists*
 
 .include 
+
+
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo20 Aug 2017 01:31:48 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
In

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

On Aug 13, 2017: 13:16, Brian Callahan wrote:

Hi Scott --

On 08/10/17 21:03, Heppler, J. Scott wrote:


Jggimi reviewed the port and found an extra tab and line in the
Makefile.

Version 3 of the attached diff corrects.



This mostly looks good. There's some whitespace/newline tweaks that I 
can fix on commit.

Question though: I get a lot of errors that look like this:
Could not open file /usr/share/applications/tint2conf.desktop

Should these be tweaked?


I think I have narrowed down this issue.  Upstream provided multiple
examples of configuration files using the linux path;
/usr/share/applications.  In the 12.2 code, these were in the sample
directory.  In the interim, the sample directory was renamed themes.
The 0.12.2 port had a post-install sed entry that edited
/usr/share/applications -> /usr/local/share/applications.

I'm not facile with sed.  Conceptually, I can see several  ways.  1)
Run sed post-install ? will the edit be carried to
/etc/xdg/tint2/tint2rc by the PLIST @sample?  2) sed/Patch the tint2rc
*.tint2rc source 3) Run sed pre-install on the work directory on
themes/*.  Upstream is starting to provide packaging options but does
not presently haveany BSD build options.  The FreeBSD 0.14.5 ports does
not address this issue. Any preferences regarding the 3 options?

Thanks

Scott



It worked just fine here, was even smart enough to preserve my fluxbox 
bar settings as it took over which was a nice touch.


Also, do you want to be MAINTAINER?

~Brian


Thanks

Scott
On Aug 10, 2017: 10:23, Brian Callahan wrote:

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.









--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

I am not getting those errors in OpenBox either with a
~/.config/tint2/tint2rc or with a simulated first run that uses
/etc/xdg/tint2/tint2rc.  OpenBox requires py-xdg.  I also have xdg-utils
installed so I suspect the lack one of these packages may be the issue.

I'm still confused on whether or not to implement the /etc/xdg
specification for a default configuration.  I perused existing ports and
OpenBox has a PLIST entry for the specification; FluxBox does not.
OpenBox's Makefile uses FAKE_FLAGS to specify

sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox" \

which would be an option

I also think I could add
MODULES =   lang/python

and

RUN_DEPENDS =   devel/py-xdg \

or

As far as being Maintainer,  I'm semi-game but my perception is that I'm
in way over my head.

Scott


On Aug 13, 2017: 13:16, Brian Callahan wrote:

Hi Scott --

On 08/10/17 21:03, Heppler, J. Scott wrote:


Jggimi reviewed the port and found an extra tab and line in the
Makefile.

Version 3 of the attached diff corrects.



This mostly looks good. There's some whitespace/newline tweaks that I 
can fix on commit.

Question though: I get a lot of errors that look like this:
Could not open file /usr/share/applications/tint2conf.desktop

Should these be tweaked?

It worked just fine here, was even smart enough to preserve my fluxbox 
bar settings as it took over which was a nice touch.


Also, do you want to be MAINTAINER?

~Brian


Thanks

Scott
On Aug 10, 2017: 10:23, Brian Callahan wrote:

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.









--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

Jggimi reviewed the port and found an extra tab and line in the
Makefile.

Version 3 of the attached diff corrects.

Thanks

Scott
On Aug 10, 2017: 10:23, Brian Callahan wrote:

Hi Scott --

I'll take a look at this later today.

~Brian

On 08/09/17 20:01, Heppler, J. Scott wrote:

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.





--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile11 Aug 2017 01:00:07 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -25,30 +24,24 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
-post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo11 Aug 2017 01:00:07 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt11 Aug 2017 01:00:07 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt  11 Sep 2015 14:14:07 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 
sthen Exp $
 src/tint2conf/CMakeLists.txt.orig  Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt   Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION 
${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t 
${

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

A revised diff to update x11/tint2 is attached.  Upstream has added 2
new features:  1)  Configurable "Buttons" that attach an icon to a
command.  2) Shell script "Executors" with examples for Network
monitoring and disk usage.

Changelog here:
https://github.com/o9000/tint2

I cvs add'd/rm;d the revised patches and portchecked.

Testers and feedback appreciated.

--
J. Scott Heppler

Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile9 Aug 2017 23:41:53 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -24,31 +23,26 @@ WANTLIB += gobject-2.0 gthread-2.0 gtk-x
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2 startup-notification-1
 WANTLIB += z
 
+
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
 
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
-post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
-
+   
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo9 Aug 2017 23:41:53 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt9 Aug 2017 23:41:53 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
Index: patches/patch-src_tint2conf_CMakeLists_txt
===
RCS file: patches/patch-src_tint2conf_CMakeLists_txt
diff -N patches/patch-src_tint2conf_CMakeLists_txt
--- patches/patch-src_tint2conf_CMakeLists_txt  11 Sep 2015 14:14:07 -  
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,8 +0,0 @@
-$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 
sthen Exp $
 src/tint2conf/CMakeLists.txt.orig  Tue Aug 11 09:26:49 2015
-+++ src/tint2conf/CMakeLists.txt   Fri Sep 11 15:30:10 2015
-@@ -71,4 +71,3 @@ add_subdirectory(po)
- install( TARGETS tint2conf DESTINATION bin )
- install( FILES tint2conf.svg DESTINATION 
${DATADIR}/icons/hicolor/scalable/apps )
- install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
--install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t 
${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
Index: patches/patch-src_tint2conf_main_c
===
RCS file: patches/patch-src_tint2conf_main_c
diff -N 

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

Revised patch attached.

Added update-mime-databases
Patched Main CMakeLists.txt to not install /etc/xdg/tint2/tintrc
Patched themes CMakeLists.txt to install all tint conf files
   to /usr/local/share/examples/tint2
@sampled /etc/xdg/tint2/tint2rc


On Aug 04, 2017: 15:53, Brian Callahan wrote:



On 8/4/2017 3:50 PM, Heppler, J. Scott wrote:

I think I have this ready but I'm having difficulty generating a diff -
the two new patches are not showing up in the diff.

I installed a snapshot ports.tar.gz and used cvs to update it.
Then I copied the Makefile, distinfo, PLIST and the two patches into the
ports tree.

I used the following syntax for the patches
patch-CMakeLists_txt
patch-themes_CMakeLists_txt

Then in /usr/ports/x11/tint2
cvs diff -u > /tmp/tint2.diff

What am I missing?



cvs add
Also, make update-patches creates diffs for you, don't manually make diffs.

~Brian


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile4 Aug 2017 20:25:42 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -24,31 +23,24 @@ WANTLIB += gobject-2.0 gthread-2.0 gtk-x
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread rsvg-2 startup-notification-1
 WANTLIB += z
 
+
 BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS=   graphics/imlib2 \
-   devel/gettext \
+
+LIB_DEPENDS=   devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
 
 MODULES=   devel/cmake \
-   lang/python \
x11/gnome
 
-MODGNOME_TOOLS+= gtk-update-icon-cache
+MODGNOME_TOOLS+= desktop-file-utils \
+   gtk-update-icon-cache \
+   shared-mime-info
 
 NO_TEST=   Yes
-
-CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
-
-post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo4 Aug 2017 20:25:42 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt4 Aug 2017 20:25:42 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+ install( TARGETS tint2 DESTINATION bin )
+ install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
+ install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )
+-install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+ install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+ install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} 
)
+ install( FILES doc/manual.html doc/readme.html DES

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

I think I have this ready but I'm having difficulty generating a diff -
the two new patches are not showing up in the diff.

I installed a snapshot ports.tar.gz and used cvs to update it.
Then I copied the Makefile, distinfo, PLIST and the two patches into the
ports tree.

I used the following syntax for the patches
patch-CMakeLists_txt
patch-themes_CMakeLists_txt

Then in /usr/ports/x11/tint2
cvs diff -u > /tmp/tint2.diff

What am I missing?

--
J. Scott Heppler

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

On Aug 04, 2017: 00:21, Brian Callahan wrote:

Hi Scott --

On 08/03/17 21:07, Heppler, J. Scott wrote:

Sorry, my first reply I forget to change the To: entry - it went to
devio.us.


Thanks Brian,

The current 12.2 port did have @sample entries for
/etc/xdg/tint2/tint2rc.  I cannot use the old entries because the newer
code follows Freedesktop specs by generating a default
/etc/xdg/tint2/tint2rc configuration file.  My problem is why this does
not show in PLIST.



I'm not totally sure what you're asking. If you're thinking that your 
update will somehow use the tint2rc file from before the update, 
that's not what's happening. It would use the tint2rc file from the 
update. The @sample lines take files from the package that exist in 
installable locations (usually /usr/local/share/examples/ or 
the like) and installs them in places that are otherwise forbidden 
from having files directly installed to (such as /etc).


If you're saying that tint2 generates a tint2rc file upon first run, 
then maybe we'll need to think of some workaround, perhaps 
pre-generating a sane tint2rc that gets installed with the package.


Yes, upstream generates an /etc/xdg/tint2/tint2rc file.  It may be just
me, but it seems like an ugly hack to patch out upstreams' installation
of /etc/xdg/tint2/tint2rc and then add it back via @sample.  I also
think that removing and adding back will become a common occurrence
given the Freedesktop specs.




I did find a second themes/CMakeLists.txt file that GLOB'd the *tint2rc
files and placed the files in ${CMAKE_INSTALL_DATADIR}/tint2.
I patched it to ${CMAKE_INSTALL_DATADIR}/examples/tint2 and was able to
avoid the post-intall entry.

$OpenBSD$

Index: themes/CMakeLists.txt
--- themes/CMakeLists.txt.orig
+++ themes/CMakeLists.txt
@@ -1,2 +1,2 @@
file( GLOB EXTRATHEMEFILES *.tint2rc )
-install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/tint2 )
+install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )



If the bogus elements are ignored, it actually installs
/etc/xdg/tint2/tint2rc per FreeDesktop Specifications - verified in
pobj/tint2./fake-amd64/etc/xdg/tint2/tint2rc.



But it won't get installed when you install the package. Try it. 
Delete /etc/xdg/tint2/tint2rc and then pkg_add your new package. You 
won't get a new /etc/xdg/tint2/tint2rc.



https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
"Specifications may reference this specification by specifying the
location of a configuration file as $XDG_CONFIG_DIRS/subdir/filename.
This implies that:

Default configuration files should be installed to
$sysconfdir/xdg/subdir/filename with $sysconfdir defaulting to /etc."

My understanding is the we do need the PLIST entries in the event a port
is updated.  I am at a loss why make-plist does not detect
/etc/xdg/tint2/tint2rc per the top-most CMakeLists.txt file.



Because it's forbidden to install things directly to /etc. You should 
install it to share/examples/tint2 and then @sample it. This is in 
fact exactly what the port currently does.

Will do tomorrow.  The evenings political news cycle was both righteous
and exhausting.

I'm thinking I'll patch out the xdg install line in the
upper level CMakeLists.txt. Then use the lower level
themes/CMakeLists.txt to file(GLOB THEMEFILES * to install all in
/usr/local/share/examples/tint2.  Then @sample to reconstruct
/etc/xdg/tint2/tint2rc.



I read about FAKE_FLAGS but this is made difficult in that themes has
tint2rc and a fair number of *.tintrc files.



I think my comment from my previous email is all you need. Change that 
line I said to change and add back all the @sample lines from the 
current PLIST.


~Brian


Thanks

Scott

On Aug 03, 2017: 18:14, Brian Callahan wrote:

Hi Scott --

On 08/03/17 16:32, Heppler, J. Scott wrote:

I ran 'make update-plist' and the following bogus elements showed up

Scanning destdir
Getting old lists
1st pass identifying files
Attaching annotations
Sorting out destdir files
make-plist: Bogus element outside of every prefix: /etc/xdg
make-plist: Bogus element outside of every prefix: /etc/xdg/tint2
make-plist: Bogus element outside of every prefix: 
/etc/xdg/tint2/tint2rc


These elements exist in the fake build and are based on a 
CMakeLists.txt

entry:

install( TARGETS tint2 DESTINATION bin )
install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )

install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )


Make a patch to change this line. Tell CMake to install this file 
to share/examples/tint2 (this is where it was previously installed 
to before your diff).

Then go back and re-add @sample to all the places you diff removed them.

Also, don't edit the @comment line with the RCS ID.

~Brian

install( FILES default_icon.png DESTINATION 
${CMAKE_INSTALL_DATADIR}/tint2 )


/usr/ports/pobj/ti

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

Sorry, my first reply I forget to change the To: entry - it went to
devio.us.


Thanks Brian,

The current 12.2 port did have @sample entries for
/etc/xdg/tint2/tint2rc.  I cannot use the old entries because the newer
code follows Freedesktop specs by generating a default
/etc/xdg/tint2/tint2rc configuration file.  My problem is why this does
not show in PLIST.

I did find a second themes/CMakeLists.txt file that GLOB'd the *tint2rc
files and placed the files in ${CMAKE_INSTALL_DATADIR}/tint2.
I patched it to ${CMAKE_INSTALL_DATADIR}/examples/tint2 and was able to
avoid the post-intall entry.

$OpenBSD$

Index: themes/CMakeLists.txt
--- themes/CMakeLists.txt.orig
+++ themes/CMakeLists.txt
@@ -1,2 +1,2 @@
file( GLOB EXTRATHEMEFILES *.tint2rc )
-install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
+install( FILES ${EXTRATHEMEFILES} DESTINATION 
${CMAKE_INSTALL_DATADIR}/examples/tint2 )


If the bogus elements are ignored, it actually installs
/etc/xdg/tint2/tint2rc per FreeDesktop Specifications - verified in
pobj/tint2./fake-amd64/etc/xdg/tint2/tint2rc.

https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
"Specifications may reference this specification by specifying the
location of a configuration file as $XDG_CONFIG_DIRS/subdir/filename.
This implies that:

Default configuration files should be installed to
$sysconfdir/xdg/subdir/filename with $sysconfdir defaulting to /etc."

My understanding is the we do need the PLIST entries in the event a port
is updated.  I am at a loss why make-plist does not detect
/etc/xdg/tint2/tint2rc per the top-most CMakeLists.txt file.

I read about FAKE_FLAGS but this is made difficult in that themes has
tint2rc and a fair number of *.tintrc files.

Thanks

Scott

On Aug 03, 2017: 18:14, Brian Callahan wrote:

Hi Scott --

On 08/03/17 16:32, Heppler, J. Scott wrote:

I ran 'make update-plist' and the following bogus elements showed up

Scanning destdir
Getting old lists
1st pass identifying files
Attaching annotations
Sorting out destdir files
make-plist: Bogus element outside of every prefix: /etc/xdg
make-plist: Bogus element outside of every prefix: /etc/xdg/tint2
make-plist: Bogus element outside of every prefix: /etc/xdg/tint2/tint2rc

These elements exist in the fake build and are based on a CMakeLists.txt
entry:

install( TARGETS tint2 DESTINATION bin )
install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
install( FILES tint2.desktop DESTINATION 
${CMAKE_INSTALL_DATADIR}/applications )

install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )


Make a patch to change this line. Tell CMake to install this file to 
share/examples/tint2 (this is where it was previously installed to 
before your diff).

Then go back and re-add @sample to all the places you diff removed them.

Also, don't edit the @comment line with the RCS ID.

~Brian

install( FILES default_icon.png DESTINATION 
${CMAKE_INSTALL_DATADIR}/tint2 )


/usr/ports/pobj/tint2../fake-amd64/etc/xdg/tint2/tint2rc

The porters handbook/special topics says to add the @sample entry
immediately after the entry, but for some reason the
../xdg/tint2/tint2rc entry is missing ?Stripped? from the PLIST.

So I'm confused about where to add the @sample PLIST entries






--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

I ran 'make update-plist' and the following bogus elements showed up

Scanning destdir
Getting old lists
1st pass identifying files
Attaching annotations
Sorting out destdir files
make-plist: Bogus element outside of every prefix: /etc/xdg
make-plist: Bogus element outside of every prefix: /etc/xdg/tint2
make-plist: Bogus element outside of every prefix: /etc/xdg/tint2/tint2rc

These elements exist in the fake build and are based on a CMakeLists.txt
entry:

install( TARGETS tint2 DESTINATION bin )
install( FILES tint2.svg DESTINATION 
${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )

/usr/ports/pobj/tint2../fake-amd64/etc/xdg/tint2/tint2rc

The porters handbook/special topics says to add the @sample entry
immediately after the entry, but for some reason the
../xdg/tint2/tint2rc entry is missing ?Stripped? from the PLIST.

So I'm confused about where to add the @sample PLIST entries


--
J. Scott Heppler

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

***clip***

One thing I noticed looking at your diff is you're removing the @sample lines.
Does tint2 no longer have configuration file? What happens if you run 'make
update-plist' again? Does it complain about bogus elements? If so, you'll have
to put the @sample lines back in, and return the configuration file to
share/examples/tint2

***end clip***

Upstream renamed the sample directory themes.

--
J. Scott Heppler

Re: UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

I reviewed the OpenBSD/Faq for anoncvs and think I was able to generate
a consistent patch.  From /usr/ports/x11/tint2 I ran
cvs diff -u > /tmp/tint2-0.14.6.diff

On review of the patch, it does not have any content to remove
x11/tint2/patches.  Upstream had revised all areas patched in 12.2 and
14.6 built and runs without any BSD specific patches.  There were some
warnings during the build regarding an Area declaration.  The initial
warning said something about autocorrection.  I review the FreeBSD tint2
port patches.  One toggles NLS, the other moves install targets.  The
install targets in this submission were moved post-install.

If there are any additional flags I can pass to the cvs diff command to
remove the patches directory, let me know.  I'll be glad to regenerate
and re-submit.

Thanks
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile3 Aug 2017 15:23:26 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -45,10 +44,8 @@ NO_TEST= Yes
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   cp -R ${PREFIX}/share/tint2/ ${PREFIX}/share/examples/tint2/
+   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.png
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo3 Aug 2017 15:23:26 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST   11 Sep 2015 14:14:07 -  1.1.1.1
+++ pkg/PLIST   3 Aug 2017 15:23:26 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
+@comment $OpenBSD$
 @pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
@@ -9,8 +9,16 @@ share/doc/tint2/
 share/doc/tint2/AUTHORS
 share/doc/tint2/ChangeLog
 share/doc/tint2/README.md
+share/doc/tint2/html/
+share/doc/tint2/html/images/
+share/doc/tint2/html/images/panel_padding.jpg
+share/doc/tint2/html/images/panel_size_margin.jpg
+share/doc/tint2/html/images/task_padding.jpg
+share/doc/tint2/html/images/taskbar_padding.jpg
+share/doc/tint2/html/manual.html
+share/doc/tint2/html/readme.html
+share/doc/tint2/tint2.md
 share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg/
 share/examples/tint2/horizontal-dark-opaque.tint2rc
 share/examples/tint2/horizontal-dark-transparent.tint2rc
 share/examples/tint2/horizontal-light-opaque.tint2rc
@@ -31,20 +39,20 @@ share/examples/tint2/text_only_3.tint2rc
 share/examples/tint2/text_only_4.tint2rc
 share/examples/tint2/text_only_5.tint2rc
 share/examples/tint2/text_only_6.tint2rc
-share/examples/tint2/tint2rc
-@sample ${SYSCONFDIR}/xdg/tint2/
-@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
 share/examples/tint2/vertical-dark-opaque.tint2rc
 share/examples/tint2/vertical-dark-transparent.tint2rc
 share/examples/tint2/vertical-light-opaque.tint2rc
 share/examples/tint2/vertical-light-transparent.tint2rc
+share/examples/tint2/vertical-neutral-icons.tint2rc
 share/icons/hicolor/scalable/apps/tint2.svg
 share/icons/hicolor/scalable/apps/tint2conf.svg
 share/locale/bs/LC_MESSAGES/tint2conf.mo
 share/locale/fr/LC_MESSAGES/tint2conf.mo
 share/locale/hr/LC_MESSAGES/tint2conf.mo
 share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
 share/tint2/
 share/tint2/default_icon.png
 @exec %D/bin/update-desktop-database

UPDATE x11/tint2-0.12.2 -> 0.14.6

[Heppler, J. Scott]

The attached diff and tarball update tint2 to the latest stable version.
Using clang4.0, it compiled without patches or errors.

Passed portcheck and tested on amd64 with several example config files.  
--

J. Scott Heppler
? 0
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile2 Aug 2017 23:59:34 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.6
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -45,10 +44,8 @@ NO_TEST= Yes
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   cp -R ${PREFIX}/share/tint2/ ${PREFIX}/share/examples/tint2/
+   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.png
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo2 Aug 2017 23:59:34 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
+SIZE (tint2-0.14.6.tar.gz) = 466533
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   11 Sep 2015 14:14:07 -  1.1.1.1
+++ pkg/PLIST   2 Aug 2017 23:59:34 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
+@comment $OpenBSD$
 @pkgpath x11/tint
 @bin bin/tint2
 @bin bin/tint2conf
@@ -9,8 +9,16 @@ share/doc/tint2/
 share/doc/tint2/AUTHORS
 share/doc/tint2/ChangeLog
 share/doc/tint2/README.md
+share/doc/tint2/html/
+share/doc/tint2/html/images/
+share/doc/tint2/html/images/panel_padding.jpg
+share/doc/tint2/html/images/panel_size_margin.jpg
+share/doc/tint2/html/images/task_padding.jpg
+share/doc/tint2/html/images/taskbar_padding.jpg
+share/doc/tint2/html/manual.html
+share/doc/tint2/html/readme.html
+share/doc/tint2/tint2.md
 share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg/
 share/examples/tint2/horizontal-dark-opaque.tint2rc
 share/examples/tint2/horizontal-dark-transparent.tint2rc
 share/examples/tint2/horizontal-light-opaque.tint2rc
@@ -31,20 +39,20 @@ share/examples/tint2/text_only_3.tint2rc
 share/examples/tint2/text_only_4.tint2rc
 share/examples/tint2/text_only_5.tint2rc
 share/examples/tint2/text_only_6.tint2rc
-share/examples/tint2/tint2rc
-@sample ${SYSCONFDIR}/xdg/tint2/
-@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
 share/examples/tint2/vertical-dark-opaque.tint2rc
 share/examples/tint2/vertical-dark-transparent.tint2rc
 share/examples/tint2/vertical-light-opaque.tint2rc
 share/examples/tint2/vertical-light-transparent.tint2rc
+share/examples/tint2/vertical-neutral-icons.tint2rc
 share/icons/hicolor/scalable/apps/tint2.svg
 share/icons/hicolor/scalable/apps/tint2conf.svg
 share/locale/bs/LC_MESSAGES/tint2conf.mo
 share/locale/fr/LC_MESSAGES/tint2conf.mo
 share/locale/hr/LC_MESSAGES/tint2conf.mo
 share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
 share/tint2/
 share/tint2/default_icon.png
 @exec %D/bin/update-desktop-database


tint2-0.14.6.tar.gz
Description: application/tar-gz

Re: ?Remove x11/fbpanel

[Heppler, J. Scott]

You can use the launcher function in tint2
https://wiki.archlinux.org/index.php/Tint2

The launcher function uses *.desktop entries in
/usr/local/share/applications/.  You need to create your own
/usr/local/share/applications/xterm.desktop and within that entry you
can specify whatever icon you want.

This is cleaner than having two panels.

In daemonforums I put together an approximation of an LXDE desktop - it
includes the xterm.desktop launcher I described above.
http://daemonforums.org/showthread.php?t=10230



I'm using fbpanel to have tint2 show a cooler icon for Xterm than the
default one. Before until I discovered this -- eh, feature? -- I used to
compile xterm from sources whenever I updated with a new snapshot.

Probably stupid beyond belief, but seriously: I never found a way to
change the icon. Try not to think too bad of me..


--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.

Re: ?Remove x11/fbpanel

[Heppler, J. Scott]

I did look at updating this port and submitted a patch regarding
duplicated menu items

" 2009-05-30 15:34:16 by Landry Breuil | Files touched by this commit (2)
Log message:
Fix issue where all desktop files were duplicated in menus, due to
g_get_system_data_dirs() reporting usr/local/share twice, cf
http://sourceforge.net/tracker/?func=detail=1872819_id=66031=513125
Reported & fix found by "J. Scott Heppler" shepper at earthlink.net,
thanks!
While here, drop maintainership. I don't want to be responsible for
an app with such a crappy code."

Because of this I migrated to tint2 when trying to put together a
lightweight desktop.


Huh? This had a release in December 2015...
$ cd /usr/ports/x11/fbpanel && firefox `make show=HOMEPAGE`
See the nice big banner at the top? Click on it, and you'll see a 7.0
release dated December 2015.

Perhaps you'd like to submit an update.

On 7/10/2017 3:21 PM, li...@wrant.com wrote:

Mon, 10 Jul 2017 07:04:00 -0700 "Heppler, J. Scott"
<shep...@centurylink.net>

x11/fbpanel is an abandoned project with no updates since 2010.

Hi J. Scott,

Objection to remove this port, still works and useful in some scenarios.

Kind regards,
Anton Lazarov


The panels plugins for networking/audio volume were linux specific.
OpenBSD functionality for these features is available in x11/tint2
which is actively maintained.  If anyone has concerns, I can point to
tint2 configuratons with menu buttons, battery, networking,
clock/calendar and audio volume systray icons.


.

J. Scott Heppler



--
J. Scott Heppler

?Remove x11/fbpanel

[Heppler, J. Scott]

x11/fbpanel is an abandoned project with no updates since 2010.  The
panels plugins for networking/audio volume were linux specific.  OpenBSD
functionality for these features is available in x11/tint2 which is
actively maintained.  If anyone has concerns, I can point to tint2
configuratons with menu buttons, battery, networking, clock/calendar and
audio volume systray icons.


.

J. Scott Heppler

--

Bump: x11/tint2 update

[Heppler, J. Scott]

There have been several submissions regarding updating x11/tint2 12.2 ->
14.5.  The threads die after the submission of a corrected diff.
http://marc.info/?l=openbsd-ports=149696759228602=2
http://marc.info/?l=openbsd-ports=149584008802666=2

I've tested the lasted update from Valère_Monseur (2017-06-08) on
amd64.  My older configuration file functioned without errors.  Test of
the new button and executors features also worked.

If there are problems with patching, please let us know.

--
J. Scott Heppler

Re: UPDATE: x11/tint2 memory leak fixed by attached patch

[Heppler, J. Scott]

On May 26, 2017: 22:34, Stuart Henderson wrote:

On 2017/05/26 12:49, Heppler, J. Scott wrote:

On May 21, 2017: 18:00, Daniel Jakots wrote:
> On Sun, 21 May 2017 14:27:09 -0700, "Heppler, J. Scott"
> <shep...@centurylink.net> wrote:
>
> > ? ports/x11/tint2/patches
>
> It looks like something is missing :)


yes. "make patch" fails with the diff as sent.

assuming patches/ has the correct patches in, i would:

mv patches patches-
cvs up -PdA patches
rsync -avC --delete patches-/ patches/
cd patches
cvs add / cvs rm as necessary
cd ..
cvs di -uNp


> > ===
> > RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -r1.1.1.1 PLIST
> > --- ports/x11/tint2/pkg/PLIST 11 Sep 2015 14:14:07
> > - 1.1.1.1 +++ ports/x11/tint2/pkg/PLIST   21 May 2017
> > 21:12:38 - @@ -1,5 +1,4 @@
> > -@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
> > -@pkgpath x11/tint
> > +@comment $OpenBSD$
>
> I think the @pkgpath must stay.

I'm glad to update this but I want to confirm the change.  I submitted
the last x11/tint2 update and my memory is that the @pkgpath entry was
to provide seamless upgrades due to the name change tint -> tint2.  My
understanding previously was that the @pkgpath entry would only be
necessary for 2 release cycles - the last upgrade was 20 months ago.

--
J. Scott Heppler



I don't see a reason to remove the @pkgpath marker in this case.
We don't *support* upgrades that skip over versions but there's no
reason to actively break them unless it's hurting something..



The unpatched source generated warning regarding variable type
declaration that the previous maintainer had patched to long long.

Updated diff attached
--
J. Scott Heppler

? patches-
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 -  1.5
+++ Makefile26 May 2017 22:51:00 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.5
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-d10a505aa951c8c3589f5c5f3a2fb0c2f0dd93b4
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -25,14 +24,17 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
+
 LIB_DEPENDS=   graphics/imlib2 \
devel/gettext \
devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
+RUN_DEPENDS=   devel/desktop-file-utils \
+   misc/shared-mime-info \
+   x11/py-gtk2
 
 MODULES=   devel/cmake \
lang/python \
@@ -45,10 +47,8 @@ NO_TEST= Yes
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   cp -R ${PREFIX}/share/tint2/ ${PREFIX}/share/examples/tint2/
+   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.png
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ distinfo26 May 2017 22:51:00 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.5.tar.gz) = OGhFdgAAfD9OK/yhTQ+iFp4BMwlF5o+S5yeg7U1rZjk=
+SIZE (tint2-0.14.5.tar.gz) = 465986
Index: patches/patch-src_tint2conf_main_c
===
RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_main_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c  26 Nov 2016 02:06:16 -  1.1
+++ patches/patch-src_tint2conf_main_c  26 May 2017 22:51:00 -
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.1 2016/11/26 02:06:16 jca Exp $
 src/tint2conf/main.c.orig  Tue Nov 22 21:42:54 2016
-+++ src/tint2conf/main.c   Tue Nov 22 21:43:58 2016
-@@ -503,7 +503,7 

Re: UPDATE: x11/tint2 memory leak fixed by attached patch

[Heppler, J. Scott]

On May 21, 2017: 18:00, Daniel Jakots wrote:

On Sun, 21 May 2017 14:27:09 -0700, "Heppler, J. Scott"
<shep...@centurylink.net> wrote:


? ports/x11/tint2/patches


It looks like something is missing :)


===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- ports/x11/tint2/pkg/PLIST   11 Sep 2015 14:14:07
-   1.1.1.1 +++ ports/x11/tint2/pkg/PLIST   21 May 2017
21:12:38 - @@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
-@pkgpath x11/tint
+@comment $OpenBSD$


I think the @pkgpath must stay.


I'm glad to update this but I want to confirm the change.  I submitted
the last x11/tint2 update and my memory is that the @pkgpath entry was
to provide seamless upgrades due to the name change tint -> tint2.  My
understanding previously was that the @pkgpath entry would only be
necessary for 2 release cycles - the last upgrade was 20 months ago.

--
J. Scott Heppler

UPDATE: x11/tint2 memory leak fixed by attached patch

[Heppler, J. Scott]

Please find attached a patch to update tint2 0.12.2 ->
0.14.5.

This patch corrects a memory leak.

The changelog has more details
https://gitlab.com/o9000/tint2/blob/master/ChangeLog


--
J. Scott Heppler

? ports/x11/tint2/patches
Index: ports/x11/tint2/Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- ports/x11/tint2/Makefile26 Nov 2016 02:06:16 -  1.5
+++ ports/x11/tint2/Makefile21 May 2017 21:12:38 -
@@ -2,12 +2,11 @@
 
 COMMENT=freedesktop-compliant panel
 
-V= 0.12.2
-REVISION=  2
+V= 0.14.5
 CATEGORIES=x11
 DISTNAME=  tint2-$V
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST=   ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae
+WRKDIST=   ${WRKDIR}/tint2-v$V-d10a505aa951c8c3589f5c5f3a2fb0c2f0dd93b4
 INSTDIR=   ${PREFIX}/tint2
 
 HOMEPAGE=  https://gitlab.com/o9000/tint2/
@@ -25,14 +24,17 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
 WANTLIB += z
 
 BUILD_DEPENDS= devel/gettext-tools
+
 LIB_DEPENDS=   graphics/imlib2 \
devel/gettext \
devel/pango \
devel/startup-notification \
x11/gnome/librsvg \
x11/gtk+2
-RUN_DEPENDS=   x11/py-gtk2 \
-   devel/desktop-file-utils
+
+RUN_DEPENDS=   devel/desktop-file-utils \
+   misc/shared-mime-info \
+   x11/py-gtk2
 
 MODULES=   devel/cmake \
lang/python \
@@ -45,10 +47,8 @@ NO_TEST= Yes
 CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man"
 
 post-install:
-   cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/
-   sed -i -e '/\/usr\/local\/share\/applications/d' -e \
-   's,/usr/share/applications,${LOCALBASE}/share/applications,g' \
-   ${PREFIX}/share/examples/tint2/*tint2rc
-   rm ${PREFIX}/share/tint2/*.tint2rc
+   cp -R ${PREFIX}/share/tint2/ ${PREFIX}/share/examples/tint2/
+   rm ${PREFIX}/share/tint2/*.tint2rc
+   rm ${PREFIX}/share/examples/tint2/*.png
 
 .include 
Index: ports/x11/tint2/distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- ports/x11/tint2/distinfo11 Sep 2015 14:14:07 -  1.1.1.1
+++ ports/x11/tint2/distinfo21 May 2017 21:12:38 -
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U=
-SIZE (tint2-0.12.2.tar.gz) = 229320
+SHA256 (tint2-0.14.5.tar.gz) = OGhFdgAAfD9OK/yhTQ+iFp4BMwlF5o+S5yeg7U1rZjk=
+SIZE (tint2-0.14.5.tar.gz) = 465986
Index: ports/x11/tint2/pkg/PLIST
===
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- ports/x11/tint2/pkg/PLIST   11 Sep 2015 14:14:07 -  1.1.1.1
+++ ports/x11/tint2/pkg/PLIST   21 May 2017 21:12:38 -
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $
-@pkgpath x11/tint
+@comment $OpenBSD$
 @bin bin/tint2
 @bin bin/tint2conf
 @man man/man1/tint2.1
@@ -9,8 +8,16 @@ share/doc/tint2/
 share/doc/tint2/AUTHORS
 share/doc/tint2/ChangeLog
 share/doc/tint2/README.md
+share/doc/tint2/html/
+share/doc/tint2/html/images/
+share/doc/tint2/html/images/panel_padding.jpg
+share/doc/tint2/html/images/panel_size_margin.jpg
+share/doc/tint2/html/images/task_padding.jpg
+share/doc/tint2/html/images/taskbar_padding.jpg
+share/doc/tint2/html/manual.html
+share/doc/tint2/html/readme.html
+share/doc/tint2/tint2.md
 share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg/
 share/examples/tint2/horizontal-dark-opaque.tint2rc
 share/examples/tint2/horizontal-dark-transparent.tint2rc
 share/examples/tint2/horizontal-light-opaque.tint2rc
@@ -31,22 +38,24 @@ share/examples/tint2/text_only_3.tint2rc
 share/examples/tint2/text_only_4.tint2rc
 share/examples/tint2/text_only_5.tint2rc
 share/examples/tint2/text_only_6.tint2rc
-share/examples/tint2/tint2rc
-@sample ${SYSCONFDIR}/xdg/tint2/
-@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
 share/examples/tint2/vertical-dark-opaque.tint2rc
 share/examples/tint2/vertical-dark-transparent.tint2rc
 share/examples/tint2/vertical-light-opaque.tint2rc
 share/examples/tint2/vertical-light-transparent.tint2rc
+share/examples/tint2/vertical-neutral-icons.tint2rc
 share/icons/hicolor/scalable/apps/tint2.svg
 share/icons/hicolor/scalable/apps/tint2conf.svg
 share/locale/bs/LC_MESSAGES/tint2conf.mo
 share/locale/fr/LC_MESSAGES/tint2conf.mo
 share/locale/hr/LC_MESSAGES/tint2conf.mo
 share/locale/pl/LC_MESSAGES/tint2conf.mo
+share/locale/ru/LC_MESSAGES/tint2conf.mo
 share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
 share/tint2/
 share/tint2/default_icon.png
+@exec %D/bin/update-mime-database %D/share/mime