Hi,
Dunst seems to have gotten new release a while back.
Here's an update to bring the port up to date.
Seems the port includes systemd stuff, should these be removed or just leave
them in?
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/dunst/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 3 Nov 2016 09:46:44 -0000 1.2
+++ Makefile 31 Aug 2017 19:32:56 -0000
@@ -2,35 +2,39 @@
COMMENT= customizable and lightweight notification-daemon
-DISTNAME = dunst-1.1.0
-
-REVISION = 0
+DISTNAME = v${GH_TAGNAME}
+PKGNAME = dunst-${GH_TAGNAME}
CATEGORIES = x11
-HOMEPAGE= http://www.knopwob.org/dunst/
+HOMEPAGE= https://dunst-project.org/
MAINTAINER = Timo Myyra <timo.myyra@wickedbsd.net>
+GH_ACCOUNT = dunst-project
+GH_PROJECT = dunst
+GH_TAGNAME = 1.2.0
+
# BSD
PERMIT_PACKAGE_CDROM= Yes
# uses pledge()
-WANTLIB += X11 Xext Xft Xinerama Xss c freetype m pthread z \
- cairo dbus-1 gio-2.0 glib-2.0 gobject-2.0 intl \
+WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xi Xrandr Xrender \
+ X11 Xinerama Xss c m pthread z \
+ cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0 \
+ gdk-x11-2.0 gio-2.0 glib-2.0 gobject-2.0 intl \
pango-1.0 pangocairo-1.0 xdg-basedir
-MASTER_SITES= http://www.knopwob.org/public/dunst-release/
-EXTRACT_SUFX = .tar.bz2
-
USE_GMAKE = Yes
-LIB_DEPENDS += x11/dbus \
- x11/libxdg-basedir \
- devel/pango \
+LIB_DEPENDS += devel/gettext \
devel/glib2 \
+ devel/pango \
graphics/cairo \
- devel/gettext
+ graphics/gdk-pixbuf2 \
+ x11/gtk+2 \
+ x11/libxdg-basedir \
+ x11/dbus
MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/dunst/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 3 May 2016 18:42:51 -0000 1.1.1.1
+++ distinfo 31 Aug 2017 19:32:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.1.0.tar.bz2) = xyvxZ+qrTkSpjshxAbAj7+4KqJFt9WYwuZpbxT+NcHA=
-SIZE (dunst-1.1.0.tar.bz2) = 79032
+SHA256 (v1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
+SIZE (v1.2.0.tar.gz) = 110628
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/dunst/patches/patch-config_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_mk
--- patches/patch-config_mk 3 May 2016 18:42:51 -0000 1.1.1.1
+++ patches/patch-config_mk 31 Aug 2017 19:32:56 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
---- config.mk.orig Tue Jul 29 22:49:11 2014
-+++ config.mk Sat Apr 30 23:59:21 2016
-@@ -23,7 +23,7 @@ endif
+Index: config.mk
+--- config.mk.orig
++++ config.mk
+@@ -28,7 +28,7 @@ endif
# flags
- CPPFLAGS += -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${INIFLAGS}
--CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
-+CFLAGS += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${CPPFLAGS} ${EXTRACFLAGS}
+ 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}
- pkg_config_packs := dbus-1 x11 freetype2 xext xft xscrnsaver \
+ pkg_config_packs := dbus-1 x11 xscrnsaver \
"glib-2.0 >= 2.36" gio-2.0 \
Index: patches/patch-dunst_c
===================================================================
RCS file: patches/patch-dunst_c
diff -N patches/patch-dunst_c
--- patches/patch-dunst_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-dunst_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
-Pledge rpath for config file, proc/exec for running scripts.
---- dunst.c.orig Tue Jul 29 22:49:11 2014
-+++ dunst.c Sat Apr 30 23:13:54 2016
-@@ -4,6 +4,7 @@
- #define XLIB_ILLEGAL_ACCESS
-
- #include <assert.h>
-+#include <err.h>
- #include <unistd.h>
- #include <time.h>
- #include <stdio.h>
-@@ -361,6 +362,9 @@ int main(int argc, char *argv[])
-
- g_unix_signal_add(SIGUSR1, pause_signal, NULL);
- g_unix_signal_add(SIGUSR2, unpause_signal, NULL);
-+
-+ if (pledge("stdio rpath proc exec", NULL) == -1)
-+ err(1, "pledge");
-
- run(NULL);
- g_main_loop_run(mainloop);
Index: patches/patch-menu_c
===================================================================
RCS file: patches/patch-menu_c
diff -N patches/patch-menu_c
--- patches/patch-menu_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-menu_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
-Refactor to exclude GNU extensions in regex
---- menu.c.orig Tue Jul 29 22:49:11 2014
-+++ menu.c Sat Apr 30 23:27:00 2016
-@@ -27,10 +27,7 @@ char *extract_urls(const char *to_match)
- static regex_t cregex;
-
- if (!is_initialized) {
-- char *regex =
-- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
-- "[[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*"
-- "(\\([[:alnum:]\\-\\@;/?:&=%$.+!*\x27,~#]*\\)|[[:alnum:]\\-\\@;/?:&=%$+*~])+";
-+ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
- int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
- if (ret != 0) {
- printf("failed to compile regex\n");
Index: patches/patch-notification_c
===================================================================
RCS file: patches/patch-notification_c
diff -N patches/patch-notification_c
--- patches/patch-notification_c 3 May 2016 18:42:51 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-notification_c,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
---- notification.c.orig Sat Apr 30 22:47:20 2016
-+++ notification.c Sat Apr 30 23:04:16 2016
-@@ -5,6 +5,7 @@
- #include <time.h>
- #include <glib.h>
- #include <errno.h>
-+#include <libgen.h>
- #include <string.h>
- #include <stdbool.h>
- #include <unistd.h>
Index: patches/patch-src_dunst_c
===================================================================
RCS file: patches/patch-src_dunst_c
diff -N patches/patch-src_dunst_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_dunst_c 31 Aug 2017 19:32:56 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Index: src/dunst.c
+--- src/dunst.c.orig
++++ src/dunst.c
+@@ -14,6 +14,9 @@
+ #include <stdlib.h>
+ #include <time.h>
+
++#include <err.h>
++#include <unistd.h>
++
+ #include "dbus.h"
+ #include "menu.h"
+ #include "notification.h"
+@@ -325,6 +328,9 @@ int dunst_main(int argc, char *argv[])
+ int owner_id = initdbus();
+
+ x_setup();
++
++ if (pledge("stdio rpath proc exec", NULL) == -1)
++ err(1, "pledge");
+
+ if (settings.startup_notification) {
+ notification *n = notification_create();
Index: patches/patch-src_menu_c
===================================================================
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_menu_c 31 Aug 2017 19:32:56 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/menu.c
+--- src/menu.c.orig
++++ src/menu.c
+@@ -27,10 +27,7 @@ static int regex_init(void)
+ if (is_initialized)
+ return 1;
+
+- char *regex =
+- "\\b(https?://|ftps?://|news://|mailto:|file://|www\\.)"
+- "[-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*"
+- "(\\([-[:alnum:]_\\@;/?:&=%$.+!*\x27,~#]*\\)|[-[:alnum:]_\\@;/?:&=%$+*~])+";
++ char *regex = "[[:<:]](https?://|ftps?://|news://|mailto:|file://|www\\.)[0-9a-zA-Z_/.@]+[a-zA-Z/]";
+ int ret = regcomp(&cregex, regex, REG_EXTENDED | REG_ICASE);
+ if (ret != 0) {
+ fputs("failed to compile regex", stderr);
Index: patches/patch-src_notification_c
===================================================================
RCS file: patches/patch-src_notification_c
diff -N patches/patch-src_notification_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_notification_c 31 Aug 2017 19:32:56 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/notification.c
+--- src/notification.c.orig
++++ src/notification.c
+@@ -5,6 +5,7 @@
+
+ #include <assert.h>
+ #include <errno.h>
++#include <libgen.h>
+ #include <glib.h>
+ #include <stdbool.h>
+ #include <stdio.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/dunst/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 3 May 2016 18:42:51 -0000 1.1.1.1
+++ pkg/PLIST 31 Aug 2017 19:32:56 -0000
@@ -1,5 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/03 18:42:51 jca Exp $
@bin bin/dunst
+lib/systemd/
+lib/systemd/user/
+lib/systemd/user/dunst.service
@man man/man1/dunst.1
share/dbus-1/services/org.knopwob.dunst.service
share/examples/dunst/
No comments:
Post a Comment