CVS commit: pkgsrc/chat/profanity

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jan 14 12:50:25 UTC 2021

Modified Files:
        pkgsrc/chat/profanity: Makefile distinfo
        pkgsrc/chat/profanity/patches: patch-configure.ac
Added Files:
        pkgsrc/chat/profanity: options.mk

Log Message:
profanity: add some optional (off-by-default) GUI features.

Patch provided by snow flurry in PR pkg/55673


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/profanity/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/profanity/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/profanity/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/profanity/patches/patch-configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/profanity/Makefile
diff -u pkgsrc/chat/profanity/Makefile:1.5 pkgsrc/chat/profanity/Makefile:1.6
--- pkgsrc/chat/profanity/Makefile:1.5  Fri Dec  4 20:45:01 2020
+++ pkgsrc/chat/profanity/Makefile      Thu Jan 14 12:50:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/12/04 20:45:01 nia Exp $
+# $NetBSD: Makefile,v 1.6 2021/01/14 12:50:25 nia Exp $
 
 DISTNAME=      profanity-0.9.5
 PKGREVISION=   2
@@ -31,6 +31,8 @@ CONFIGURE_ARGS+=      --enable-c-plugins
 CONFIGURE_ARGS+=       --enable-python-plugins
 CONFIGURE_ARGS+=       --enable-omemo
 
+.include "options.mk"
+
 pre-configure:
        cd ${WRKSRC} && autoconf
 

Index: pkgsrc/chat/profanity/distinfo
diff -u pkgsrc/chat/profanity/distinfo:1.2 pkgsrc/chat/profanity/distinfo:1.3
--- pkgsrc/chat/profanity/distinfo:1.2  Fri Sep 11 20:44:17 2020
+++ pkgsrc/chat/profanity/distinfo      Thu Jan 14 12:50:25 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2020/09/11 20:44:17 js Exp $
+$NetBSD: distinfo,v 1.3 2021/01/14 12:50:25 nia Exp $
 
 SHA1 (profanity-0.9.5.tar.gz) = 88f3bcb483f25710cb35ab3e3f227f11b5d1225a
 RMD160 (profanity-0.9.5.tar.gz) = 39c0a1b7f50e5000bfc649a0461d7f2d45230b16
 SHA512 (profanity-0.9.5.tar.gz) = 79305ee488d3a9b87bb422d6525bfaae62c4969d466b968c86941ed5bf0c0080e349758f2e1ead144693513b5d19a635372e73aa1fe9e362836b9245e1d2b898
 Size (profanity-0.9.5.tar.gz) = 830966 bytes
-SHA1 (patch-configure.ac) = 7f3ec4182d82cb6836d4e0ecb0b023e56ce3b91d
+SHA1 (patch-configure.ac) = d7d07f7c62755bc46e318df216932d7273a0c34c
 SHA1 (patch-src_ui_inputwin.c) = ccdfc1b1fe932ba09eafaf54ed10af453b1a6c80
 SHA1 (patch-src_ui_rosterwin.c) = 1e31cbd7dc0bdaebe9e3fcddbecceeb60b70faf2
 SHA1 (patch-src_ui_window.c) = 5844f276517260beb2ea767523f44c46d6b562d2

Index: pkgsrc/chat/profanity/patches/patch-configure.ac
diff -u pkgsrc/chat/profanity/patches/patch-configure.ac:1.2 pkgsrc/chat/profanity/patches/patch-configure.ac:1.3
--- pkgsrc/chat/profanity/patches/patch-configure.ac:1.2        Fri Sep 11 20:44:17 2020
+++ pkgsrc/chat/profanity/patches/patch-configure.ac    Thu Jan 14 12:50:25 2021
@@ -1,10 +1,11 @@
-$NetBSD: patch-configure.ac,v 1.2 2020/09/11 20:44:17 js Exp $
+$NetBSD: patch-configure.ac,v 1.3 2021/01/14 12:50:25 nia Exp $
 
 - Add NetBSD as a non-libdl platform.
 - Fix == usage.
 - Remove hardcoded homebrew path on macOS.
+- Add NetBSD as a libnotify platform.
 
---- configure.ac.orig  2020-07-01 16:49:19.000000000 +0000
+--- configure.ac.orig  2020-09-19 01:06:20.595094431 +0000
 +++ configure.ac
 @@ -22,6 +22,7 @@ AC_CANONICAL_HOST
  PLATFORM="unknown"
@@ -49,3 +50,12 @@ $NetBSD: patch-configure.ac,v 1.2 2020/0
        [AC_CHECK_FILE([/usr/local/include/ereadline],
            [LIBS="-lereadline $LIBS"
                AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"
+@@ -246,7 +239,7 @@ AS_IF([test "x$PLATFORM" = xosx],
+                     [AC_MSG_ERROR([terminal-notifier not found, required for desktop notifications.])],
+                     [AC_MSG_NOTICE([Desktop notifications not supported.])])],
+                 [AC_DEFINE([HAVE_OSXNOTIFY], [1], [terminal notifier])])])],
+-    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd],
++    [test "x$PLATFORM" = xnix -o "x$PLATFORM" = xfreebsd -o "x$PLATFORM" = xnetbsd],
+         [AS_IF([test "x$enable_notifications" != xno],
+             [PKG_CHECK_MODULES([libnotify], [libnotify],
+                 [AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify module])],

Added files:

Index: pkgsrc/chat/profanity/options.mk
diff -u /dev/null pkgsrc/chat/profanity/options.mk:1.1
--- /dev/null   Thu Jan 14 12:50:25 2021
+++ pkgsrc/chat/profanity/options.mk    Thu Jan 14 12:50:25 2021
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2021/01/14 12:50:25 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.profanity
+PKG_SUPPORTED_OPTIONS= libnotify gtk2 xscrnsaver
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+# gtk2
+.if !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+# libnotify
+.if !empty(PKG_OPTIONS:Mlibnotify)
+.include "../../sysutils/libnotify/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-notifications
+.endif
+
+# xscrnsaver
+.if !empty(PKG_OPTIONS:Mxscrnsaver)
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.endif