CVS commit: pkgsrc/chat/profanity

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Fri Sep 11 20:44:17 UTC 2020

Modified Files:
        pkgsrc/chat/profanity: distinfo
        pkgsrc/chat/profanity/patches: patch-configure.ac

Log Message:
profanity: Remove hardcoded homebrew paths to fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/profanity/distinfo
cvs rdiff -u -r1.1 -r1.2 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/distinfo
diff -u pkgsrc/chat/profanity/distinfo:1.1 pkgsrc/chat/profanity/distinfo:1.2
--- pkgsrc/chat/profanity/distinfo:1.1  Fri Sep  4 10:15:17 2020
+++ pkgsrc/chat/profanity/distinfo      Fri Sep 11 20:44:17 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2020/09/04 10:15:17 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/09/11 20:44:17 js 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) = b01d512700e204306e2ebeebdd7d8d4164a57c5f
+SHA1 (patch-configure.ac) = 7f3ec4182d82cb6836d4e0ecb0b023e56ce3b91d
 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.1 pkgsrc/chat/profanity/patches/patch-configure.ac:1.2
--- pkgsrc/chat/profanity/patches/patch-configure.ac:1.1        Fri Sep  4 10:15:17 2020
+++ pkgsrc/chat/profanity/patches/patch-configure.ac    Fri Sep 11 20:44:17 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.1 2020/09/04 10:15:17 nia Exp $
+$NetBSD: patch-configure.ac,v 1.2 2020/09/11 20:44:17 js Exp $
 
 - Add NetBSD as a non-libdl platform.
 - Fix == usage.
+- Remove hardcoded homebrew path on macOS.
 
 --- configure.ac.orig  2020-07-01 16:49:19.000000000 +0000
 +++ configure.ac
@@ -31,3 +32,20 @@ $NetBSD: patch-configure.ac,v 1.1 2020/0
              [AM_CONDITIONAL([BUILD_C_API], [true]) AC_DEFINE([HAVE_C], [1], [C support])],
              [AC_CHECK_LIB([dl], [main],
                  [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
+@@ -214,15 +215,7 @@ AS_IF([test "x$enable_icons_and_clipboar
+             [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
+             [AC_MSG_NOTICE([gtk+-2.0 not found, icons and clipboard not enabled])])])])
+ 
+-AS_IF([test "x$PLATFORM" = xosx],
+-    [AC_CHECK_FILE([/usr/local/opt/readline/lib],
+-        [LIBS="-lreadline $LIBS"
+-            AM_CPPFLAGS="-I/usr/local/opt/readline/include $AM_CPPFLAGS"
+-            AM_LDFLAGS="-L/usr/local/opt/readline/lib $AM_LDFLAGS"
+-            AC_SUBST(AM_LDFLAGS)],
+-        [AC_MSG_ERROR([libreadline is required for profanity])])],
+-
+-      [test "x$PLATFORM" = xopenbsd],
++AS_IF([test "x$PLATFORM" = xopenbsd],
+       [AC_CHECK_FILE([/usr/local/include/ereadline],
+           [LIBS="-lereadline $LIBS"
+               AM_CPPFLAGS="-I/usr/local/include/ereadline $AM_CPPFLAGS"