Re: [update] dunst-1.3.1

2018-02-23 Thread Stuart Henderson 
On 2018/02/23 17:06, Theo Buehler wrote:
> On Fri, Feb 23, 2018 at 09:48:25AM +, Stuart Henderson wrote:
> > On 2018/02/23 09:45, Klemens Nanni wrote:
> > > > > -+if (pledge("stdio rpath proc exec", NULL) == -1)
> > > > > -+err(1, "pledge");
> > > > > ++
> > > > > ++/* allow prot_exec if icons are used */
> > > > > ++if (settings.icon_position != icons_off) {
> > > > > ++if (pledge("stdio rpath proc exec prot_exec", NULL) 
> > > > > == -1)
> > > > > ++   err(1, "pledge");
> > > > > ++} else {
> > > > > ++if (pledge("stdio rpath proc exec", NULL) == -1)
> > > > > ++   err(1, "pledge");
> > > > > ++}
> > 
> > Generally OK with the update but regarding the pledge change:
> > 
> > Honestly I'd keep it simple. It's not like there's a super-tight pledge
> > already - it has unrestricted exec. Rather than adding a conditional to
> > the pledge I think you might as well just have the single check and add
> > prot_exec to the pledge. CC'ing tb@ for a second opinion though :)
> > 
> > I'd probably commit as 2-part so the commit history is clear. 1, fix
> > pledge in the existing port (since the problem is not new), 2, do the
> > update.
> > 
> 
> I'm not convinced about the correctness of this apart from some people
> assuring that it "seems to work". As far as I know, allowing icons
> results in calls out to GdkPixbuf that in turn dlopen some library I
> don't know at all. Has anyone audited this to make sure that the list
> of of pledges is complete? I've not seen such an analysis.
> 
> Lacking this, I would suggest to be conservative and pledge only
> condititonally on "settings.icon_position == icons.off" and run
> unpledged otherwise.

Thanks for looking - OK yes, that makes sense to me.

Re: [update] dunst-1.3.1

2018-02-23 Thread Theo Buehler 
On Fri, Feb 23, 2018 at 09:48:25AM +, Stuart Henderson wrote:
> On 2018/02/23 09:45, Klemens Nanni wrote:
> > > > -+if (pledge("stdio rpath proc exec", NULL) == -1)
> > > > -+err(1, "pledge");
> > > > ++
> > > > ++/* allow prot_exec if icons are used */
> > > > ++if (settings.icon_position != icons_off) {
> > > > ++if (pledge("stdio rpath proc exec prot_exec", NULL) 
> > > > == -1)
> > > > ++   err(1, "pledge");
> > > > ++} else {
> > > > ++if (pledge("stdio rpath proc exec", NULL) == -1)
> > > > ++   err(1, "pledge");
> > > > ++}
> 
> Generally OK with the update but regarding the pledge change:
> 
> Honestly I'd keep it simple. It's not like there's a super-tight pledge
> already - it has unrestricted exec. Rather than adding a conditional to
> the pledge I think you might as well just have the single check and add
> prot_exec to the pledge. CC'ing tb@ for a second opinion though :)
> 
> I'd probably commit as 2-part so the commit history is clear. 1, fix
> pledge in the existing port (since the problem is not new), 2, do the
> update.
> 

I'm not convinced about the correctness of this apart from some people
assuring that it "seems to work". As far as I know, allowing icons
results in calls out to GdkPixbuf that in turn dlopen some library I
don't know at all. Has anyone audited this to make sure that the list
of of pledges is complete? I've not seen such an analysis.

Lacking this, I would suggest to be conservative and pledge only
condititonally on "settings.icon_position == icons.off" and run
unpledged otherwise.

Re: [update] dunst-1.3.1

2018-02-23 Thread Stuart Henderson 
On 2018/02/23 09:45, Klemens Nanni wrote:
> > > -+if (pledge("stdio rpath proc exec", NULL) == -1)
> > > -+err(1, "pledge");
> > > ++
> > > ++/* allow prot_exec if icons are used */
> > > ++if (settings.icon_position != icons_off) {
> > > ++if (pledge("stdio rpath proc exec prot_exec", NULL) == 
> > > -1)
> > > ++   err(1, "pledge");
> > > ++} else {
> > > ++if (pledge("stdio rpath proc exec", NULL) == -1)
> > > ++   err(1, "pledge");
> > > ++}

Generally OK with the update but regarding the pledge change:

Honestly I'd keep it simple. It's not like there's a super-tight pledge
already - it has unrestricted exec. Rather than adding a conditional to
the pledge I think you might as well just have the single check and add
prot_exec to the pledge. CC'ing tb@ for a second opinion though :)

I'd probably commit as 2-part so the commit history is clear. 1, fix
pledge in the existing port (since the problem is not new), 2, do the
update.

Re: [update] dunst-1.3.1

2018-02-23 Thread Klemens Nanni 
On Fri, Feb 16, 2018 at 07:15:43PM +0100, Klemens Nanni wrote:
> On Fri, Feb 09, 2018 at 05:57:17PM +0100, Klemens Nanni wrote:
> > On Sat, Jan 27, 2018 at 08:51:58AM +0200, Timo Myyrä wrote:
> > > Klemens Nanni  writes:
> > > 
> > > > On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:
> > > >> > Klemens Nanni  writes:
> > > >> >> Paths in the example dunst.rc need to be adjusted so copying it over
> > > >> >> will work without manually fixing them.
> > > > Yuck, I forgot to include those in my earlier diff, sorry.
> > > >
> > > >> Here is an updated diff to include patching the dunstrc file and pod 
> > > >> doc.
> > > > Except for a few nits below this diff looks good to me.
> > > >
> > > >> Index: Makefile
> > > >> ===
> > > >> RCS file: /cvs/ports/x11/dunst/Makefile,v
> > > >> retrieving revision 1.3
> > > >> diff -u -p -r1.3 Makefile
> > > >> --- Makefile   31 Aug 2017 20:57:00 -  1.3
> > > >> +++ Makefile   26 Jan 2018 07:11:14 -
> > > >> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> > > > There are two spaces after += instead of a tab.
> > > >
> > > >>devel/pango \
> > > >>graphics/cairo \
> > > >>graphics/gdk-pixbuf2 \
> > > >> -  x11/gtk+2 \
> > > >>x11/libxdg-basedir \
> > > >>x11/dbus
> > > > I'd still move dbus up to sort them alphabetically as done in my earlier
> > > > diff.
> > > >
> > > >>  MAKE_FLAGS =  V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> > > > Not a big fan of those squashed ones, they're better readable across
> > > > multiple lines as done for *_DEPENDS (also makes future diffs easier).
> > > 
> > > Ok, here's revised diff:
> > Updated below for 1.3.1 from 30.01.2018:
> > 
> > Version 1.3.1 addresses a race condition that can cause the
> > service file to be empty upon installation.
> > It contains no other changes, [...]
> > 
> > Feedback? Any takers?
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/dunst/Makefile,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 Makefile
> > --- Makefile31 Aug 2017 20:57:00 -  1.3
> > +++ Makefile9 Feb 2018 16:54:29 -
> > @@ -4,36 +4,38 @@ COMMENT=  customizable and lightweight no
> >  
> >  GH_ACCOUNT =   dunst-project
> >  GH_PROJECT =   dunst
> > -GH_TAGNAME =   v1.2.0
> > +GH_TAGNAME =   v1.3.1
> >  
> >  CATEGORIES =   x11
> >  
> >  HOMEPAGE=  https://dunst-project.org/
> >  
> > -MAINTAINER =   Timo Myyra 
> > +MAINTAINER =   Timo Myyra 
> >  
> >  # BSD
> >  PERMIT_PACKAGE_CDROM=  Yes
> >  
> >  # uses pledge()
> > -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> > -WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
> > -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> > -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
> > -WANTLIB += z
> > +WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> > +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
> > +WANTLIB += pthread xdg-basedir
> >  
> >  USE_GMAKE =Yes
> >  
> > -LIB_DEPENDS +=  devel/gettext \
> > +LIB_DEPENDS += devel/gettext \
> > devel/glib2 \
> > devel/pango \
> > graphics/cairo \
> > graphics/gdk-pixbuf2 \
> > -   x11/gtk+2 \
> > -   x11/libxdg-basedir \
> > -   x11/dbus
> > +   x11/dbus \
> > +   x11/libxdg-basedir
> >  
> > -MAKE_FLAGS =   V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> > +MAKE_FLAGS =   V=1 \
> > +   PREFIX="${PREFIX}" \
> > +   MANPREFIX="${PREFIX}/man"
> > +
> > +pre-configure:
> > +   ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
> >  
> >  post-install:
> > mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/x11/dunst/distinfo,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 distinfo
> > --- distinfo31 Aug 2017 20:57:00 -  1.2
> > +++ distinfo9 Feb 2018 16:54:29 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
> > -SIZE (dunst-1.2.0.tar.gz) = 110628
> > +SHA256 (dunst-1.3.1.tar.gz) = 6iluHTJEZBmGyFlsiKRIL2AJDki6VE4Z+uYMhne4bdY=
> > +SIZE (dunst-1.3.1.tar.gz) = 121539
> > Index: patches/patch-config_mk
> > ===
> > RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 patch-config_mk
> > --- patches/patch-config_mk 31 Aug 2017 20:57:00 -  1.2
> > +++ patches/patch-config_mk 9 Feb 2018 16:54:29 -
> > @@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 201

Re: [update] dunst-1.3.1

2018-02-17 Thread Thierry 


Hi,

on 16 Feb 18 at 06:15:43 PM +, Klemens Nanni  
wrote:

On Fri, Feb 09, 2018 at 05:57:17PM +0100, Klemens Nanni wrote:

On Sat, Jan 27, 2018 at 08:51:58AM +0200, Timo Myyrä wrote:
> Klemens Nanni  writes:
> 
> > On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:

> >> > Klemens Nanni  writes:
> >> >> Paths in the example dunst.rc need to be adjusted so 
> >> >> copying it over

> >> >> will work without manually fixing them.
> > Yuck, I forgot to include those in my earlier diff, sorry.
> >
> >> Here is an updated diff to include patching the dunstrc 
> >> file and pod doc.

> > Except for a few nits below this diff looks good to me.
> >
> >> Index: Makefile
> >> ===
> >> RCS file: /cvs/ports/x11/dunst/Makefile,v
> >> retrieving revision 1.3
> >> diff -u -p -r1.3 Makefile
> >> --- Makefile  31 Aug 2017 20:57:00 -  1.3
> >> +++ Makefile  26 Jan 2018 07:11:14 -
> >> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> > There are two spaces after += instead of a tab.
> >
> >>   devel/pango \
> >>   graphics/cairo \
> >>   graphics/gdk-pixbuf2 \
> >> - x11/gtk+2 \
> >>   x11/libxdg-basedir \
> >>   x11/dbus
> > I'd still move dbus up to sort them alphabetically as done 
> > in my earlier

> > diff.
> >
> >>  MAKE_FLAGS =	V=1 PREFIX="${PREFIX}" 
> >>  MANPREFIX="${PREFIX}/man"
> > Not a big fan of those squashed ones, they're better 
> > readable across
> > multiple lines as done for *_DEPENDS (also makes future 
> > diffs easier).
> 
> Ok, here's revised diff:

Updated below for 1.3.1 from 30.01.2018:

Version 1.3.1 addresses a race condition that can cause the
service file to be empty upon installation.
It contains no other changes, [...]

Feedback? Any takers?

Index: Makefile
===
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile31 Aug 2017 20:57:00 -  1.3
+++ Makefile9 Feb 2018 16:54:29 -
@@ -4,36 +4,38 @@ COMMENT=  customizable and lightweight no
 
 GH_ACCOUNT =	dunst-project

 GH_PROJECT =   dunst
-GH_TAGNAME =   v1.2.0
+GH_TAGNAME =   v1.3.1
 
 CATEGORIES =	x11
 
 HOMEPAGE=	https://dunst-project.org/
 
-MAINTAINER =	Timo Myyra 

+MAINTAINER =   Timo Myyra 
 
 # BSD

 PERMIT_PACKAGE_CDROM=  Yes
 
 # uses pledge()
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi 
Xinerama
-WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig 
freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 
gobject-2.0

-WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
-WANTLIB += z
+WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 
gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 
pangocairo-1.0

+WANTLIB += pthread xdg-basedir
 
 USE_GMAKE =	Yes
 
-LIB_DEPENDS +=  devel/gettext \

+LIB_DEPENDS += devel/gettext \
devel/glib2 \
devel/pango \
graphics/cairo \
graphics/gdk-pixbuf2 \
-   x11/gtk+2 \
-   x11/libxdg-basedir \
-   x11/dbus
+   x11/dbus \
+   x11/libxdg-basedir
 
-MAKE_FLAGS =	V=1 PREFIX="${PREFIX}" 
MANPREFIX="${PREFIX}/man"

+MAKE_FLAGS =   V=1 \
+   PREFIX="${PREFIX}" \
+   MANPREFIX="${PREFIX}/man"
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
 
 post-install:

mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
Index: distinfo
===
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 Aug 2017 20:57:00 -  1.2
+++ distinfo9 Feb 2018 16:54:29 -
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.2.0.tar.gz) = 
o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=

-SIZE (dunst-1.2.0.tar.gz) = 110628
+SHA256 (dunst-1.3.1.tar.gz) = 
6iluHTJEZBmGyFlsiKRIL2AJDki6VE4Z+uYMhne4bdY=

+SIZE (dunst-1.3.1.tar.gz) = 121539
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_mk
--- patches/patch-config_mk 31 Aug 2017 20:57:00 -  1.2
+++ patches/patch-config_mk 9 Feb 2018 16:54:29 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -28,7 +28,7 @@ endif
+@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
  
  # flags

  CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
 -CFLAGS   += -g --std=gnu99 -pedantic -Wall 
 -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS}
 +CFLAGS   += -g --std=gnu99 -pedantic -Wall 
 -Wno-overlength-strings ${STATIC} ${CPPFLAGS}

+ LDFLAGS  += -lm -L${X11LIB}
  
- pkg_config_packs := dbus-1 x1

Re: [update] dunst-1.3.1

2018-02-16 Thread Klemens Nanni 
On Fri, Feb 09, 2018 at 05:57:17PM +0100, Klemens Nanni wrote:
> On Sat, Jan 27, 2018 at 08:51:58AM +0200, Timo Myyrä wrote:
> > Klemens Nanni  writes:
> > 
> > > On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:
> > >> > Klemens Nanni  writes:
> > >> >> Paths in the example dunst.rc need to be adjusted so copying it over
> > >> >> will work without manually fixing them.
> > > Yuck, I forgot to include those in my earlier diff, sorry.
> > >
> > >> Here is an updated diff to include patching the dunstrc file and pod doc.
> > > Except for a few nits below this diff looks good to me.
> > >
> > >> Index: Makefile
> > >> ===
> > >> RCS file: /cvs/ports/x11/dunst/Makefile,v
> > >> retrieving revision 1.3
> > >> diff -u -p -r1.3 Makefile
> > >> --- Makefile 31 Aug 2017 20:57:00 -  1.3
> > >> +++ Makefile 26 Jan 2018 07:11:14 -
> > >> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> > > There are two spaces after += instead of a tab.
> > >
> > >>  devel/pango \
> > >>  graphics/cairo \
> > >>  graphics/gdk-pixbuf2 \
> > >> -x11/gtk+2 \
> > >>  x11/libxdg-basedir \
> > >>  x11/dbus
> > > I'd still move dbus up to sort them alphabetically as done in my earlier
> > > diff.
> > >
> > >>  MAKE_FLAGS =V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> > > Not a big fan of those squashed ones, they're better readable across
> > > multiple lines as done for *_DEPENDS (also makes future diffs easier).
> > 
> > Ok, here's revised diff:
> Updated below for 1.3.1 from 30.01.2018:
> 
>   Version 1.3.1 addresses a race condition that can cause the
>   service file to be empty upon installation.
>   It contains no other changes, [...]
> 
> Feedback? Any takers?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/dunst/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  31 Aug 2017 20:57:00 -  1.3
> +++ Makefile  9 Feb 2018 16:54:29 -
> @@ -4,36 +4,38 @@ COMMENT=customizable and lightweight no
>  
>  GH_ACCOUNT = dunst-project
>  GH_PROJECT = dunst
> -GH_TAGNAME = v1.2.0
> +GH_TAGNAME = v1.3.1
>  
>  CATEGORIES = x11
>  
>  HOMEPAGE=https://dunst-project.org/
>  
> -MAINTAINER = Timo Myyra 
> +MAINTAINER = Timo Myyra 
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  # uses pledge()
> -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
> -WANTLIB += z
> +WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pthread xdg-basedir
>  
>  USE_GMAKE =  Yes
>  
> -LIB_DEPENDS +=  devel/gettext \
> +LIB_DEPENDS +=   devel/gettext \
>   devel/glib2 \
>   devel/pango \
>   graphics/cairo \
>   graphics/gdk-pixbuf2 \
> - x11/gtk+2 \
> - x11/libxdg-basedir \
> - x11/dbus
> + x11/dbus \
> + x11/libxdg-basedir
>  
> -MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> +MAKE_FLAGS = V=1 \
> + PREFIX="${PREFIX}" \
> + MANPREFIX="${PREFIX}/man"
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
>  
>  post-install:
>   mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/dunst/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  31 Aug 2017 20:57:00 -  1.2
> +++ distinfo  9 Feb 2018 16:54:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
> -SIZE (dunst-1.2.0.tar.gz) = 110628
> +SHA256 (dunst-1.3.1.tar.gz) = 6iluHTJEZBmGyFlsiKRIL2AJDki6VE4Z+uYMhne4bdY=
> +SIZE (dunst-1.3.1.tar.gz) = 121539
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-config_mk
> --- patches/patch-config_mk   31 Aug 2017 20:57:00 -  1.2
> +++ patches/patch-config_mk   9 Feb 2018 16:54:29 -
> @@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/
>  Index: config.mk
>  --- config.mk.orig
>  +++ config.mk
> -@@ -28,7 +28,7 @@ endif
> +@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
>   
>   # flags
>   CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
>  -CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os 
> ${STATIC} ${CPPFLAGS}
>  +CFLAGS   += -g -

Re: [update] dunst-1.3.1

2018-02-09 Thread Klemens Nanni 
On Sat, Jan 27, 2018 at 08:51:58AM +0200, Timo Myyrä wrote:
> Klemens Nanni  writes:
> 
> > On Fri, Jan 26, 2018 at 09:13:17AM +0200, Timo Myyrä wrote:
> >> > Klemens Nanni  writes:
> >> >> Paths in the example dunst.rc need to be adjusted so copying it over
> >> >> will work without manually fixing them.
> > Yuck, I forgot to include those in my earlier diff, sorry.
> >
> >> Here is an updated diff to include patching the dunstrc file and pod doc.
> > Except for a few nits below this diff looks good to me.
> >
> >> Index: Makefile
> >> ===
> >> RCS file: /cvs/ports/x11/dunst/Makefile,v
> >> retrieving revision 1.3
> >> diff -u -p -r1.3 Makefile
> >> --- Makefile   31 Aug 2017 20:57:00 -  1.3
> >> +++ Makefile   26 Jan 2018 07:11:14 -
> >> @@ -29,11 +27,13 @@ LIB_DEPENDS +=  devel/gettext \
> > There are two spaces after += instead of a tab.
> >
> >>devel/pango \
> >>graphics/cairo \
> >>graphics/gdk-pixbuf2 \
> >> -  x11/gtk+2 \
> >>x11/libxdg-basedir \
> >>x11/dbus
> > I'd still move dbus up to sort them alphabetically as done in my earlier
> > diff.
> >
> >>  MAKE_FLAGS =  V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
> > Not a big fan of those squashed ones, they're better readable across
> > multiple lines as done for *_DEPENDS (also makes future diffs easier).
> 
> Ok, here's revised diff:
Updated below for 1.3.1 from 30.01.2018:

Version 1.3.1 addresses a race condition that can cause the
service file to be empty upon installation.
It contains no other changes, [...]

Feedback? Any takers?

Index: Makefile
===
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile31 Aug 2017 20:57:00 -  1.3
+++ Makefile9 Feb 2018 16:54:29 -
@@ -4,36 +4,38 @@ COMMENT=  customizable and lightweight no
 
 GH_ACCOUNT =   dunst-project
 GH_PROJECT =   dunst
-GH_TAGNAME =   v1.2.0
+GH_TAGNAME =   v1.3.1
 
 CATEGORIES =   x11
 
 HOMEPAGE=  https://dunst-project.org/
 
-MAINTAINER =   Timo Myyra 
+MAINTAINER =   Timo Myyra 
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
 # uses pledge()
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
-WANTLIB += z
+WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0 pangocairo-1.0
+WANTLIB += pthread xdg-basedir
 
 USE_GMAKE =Yes
 
-LIB_DEPENDS +=  devel/gettext \
+LIB_DEPENDS += devel/gettext \
devel/glib2 \
devel/pango \
graphics/cairo \
graphics/gdk-pixbuf2 \
-   x11/gtk+2 \
-   x11/libxdg-basedir \
-   x11/dbus
+   x11/dbus \
+   x11/libxdg-basedir
 
-MAKE_FLAGS =   V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
+MAKE_FLAGS =   V=1 \
+   PREFIX="${PREFIX}" \
+   MANPREFIX="${PREFIX}/man"
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod ${WRKSRC}/dunstrc
 
 post-install:
mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
Index: distinfo
===
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo31 Aug 2017 20:57:00 -  1.2
+++ distinfo9 Feb 2018 16:54:29 -
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
-SIZE (dunst-1.2.0.tar.gz) = 110628
+SHA256 (dunst-1.3.1.tar.gz) = 6iluHTJEZBmGyFlsiKRIL2AJDki6VE4Z+uYMhne4bdY=
+SIZE (dunst-1.3.1.tar.gz) = 121539
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_mk
--- patches/patch-config_mk 31 Aug 2017 20:57:00 -  1.2
+++ patches/patch-config_mk 9 Feb 2018 16:54:29 -
@@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -28,7 +28,7 @@ endif
+@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
  
  # flags
  CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
 -CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os 
${STATIC} ${CPPFLAGS}
 +CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} 
${CPPFLAGS}
+ LDFLAGS  += -lm -L${X11LIB}
  
- pkg_config_packs := dbus-1 x11 xscrnsaver \
- "glib-2.0 >= 2.36" gio-2.0 \
+ CPPFLAGS_DEBUG := -DDEBUG_BUILD
Index: patches/patch-docs_dunst_pod
=