Fix profanity

[Jonathan Schleifer <js%heap.zone@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Schleifer <js%heap.zone@localhost>
Pushed By:	js
Date:		Mon Jan 23 02:08:41 2017 +0100
Changeset:	caa252eb1f687e29a3ff171a91fcd17a078314db

Modified Files:
	profanity/Makefile
	profanity/distinfo
Added Files:
	profanity/patches/patch-configure.ac
Removed Files:
	profanity/patches/patch-configure

Log Message:
Fix profanity

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=caa252eb1f687e29a3ff171a91fcd17a078314db

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

diffstat:
 profanity/Makefile                   |  7 ++++++-
 profanity/distinfo                   |  2 +-
 profanity/patches/patch-configure    | 15 ---------------
 profanity/patches/patch-configure.ac | 22 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 17 deletions(-)

diffs:
diff --git a/profanity/Makefile b/profanity/Makefile
index c470b45..fa12a4a 100644
--- a/profanity/Makefile
+++ b/profanity/Makefile
@@ -9,10 +9,14 @@ HOMEPAGE=	http://www.profanity.im/
 COMMENT=	Console based XMPP client inspired by irssi
 LICENSE=	gnu-gpl-v3
 
+USE_TOOLS+=	autoconf
+
+AUTOCONF_REQD=	2.69
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-CONFIGURE_ARGS+=	--with-libxml2
+pre-configure:
+		cd ${WRKSRC} && autoconf
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
@@ -22,5 +26,6 @@ BUILDLINK_API_DEPENDS.libstrophe+=	libstrophe>=0.9.1
 .include "../../wip/libstrophe/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/profanity/distinfo b/profanity/distinfo
index 859e79a..ef91b14 100644
--- a/profanity/distinfo
+++ b/profanity/distinfo
@@ -4,4 +4,4 @@ SHA1 (profanity-0.5.0.tar.gz) = 139215837907331290a03f3d764afe188a1fd65d
 RMD160 (profanity-0.5.0.tar.gz) = 1b30dcdaafbcc7ee5813c5047faf5d360aa2c72f
 SHA512 (profanity-0.5.0.tar.gz) = 65625f0ed0b1e87c6cd4ec9dc85076a971b899b9b39d5707d32d1977a450b910ff760e339bfacd0d0906740bd299c018877b6720071d92c805fca095631e7163
 Size (profanity-0.5.0.tar.gz) = 687169 bytes
-SHA1 (patch-configure) = 6ed6b3354492c5bf4c34695d8e3890ab560200c2
+SHA1 (patch-configure.ac) = d5921da1fa9b2b04ad7a36e08ce6b0682df53f44
diff --git a/profanity/patches/patch-configure b/profanity/patches/patch-configure
deleted file mode 100644
index 2bc5ff9..0000000
--- a/profanity/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix unportable test(1) operator.
-
---- configure.orig	2016-09-14 21:13:42.000000000 +0000
-+++ configure
-@@ -11970,7 +11970,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--    if test "$PYTHON_CONFIG_EXISTS" == "yes"; then
-+    if test "$PYTHON_CONFIG_EXISTS" = "yes"; then
- 
- 	#
- 	# Allow the use of a (user set) custom python version
diff --git a/profanity/patches/patch-configure.ac b/profanity/patches/patch-configure.ac
new file mode 100644
index 0000000..bcf712e
--- /dev/null
+++ b/profanity/patches/patch-configure.ac
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- configure.ac.orig	2016-09-14 20:52:04.000000000 +0000
++++ configure.ac
+@@ -172,15 +172,8 @@ AS_IF([test "x$enable_icons" != xno],
+             [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])],
+             [AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])])])
+ 
+-AS_IF([test "x$PLATFORM" != xosx],
+-    [AC_CHECK_LIB([readline], [main], [],
+-        [AC_MSG_ERROR([libreadline is required for profanity])])],
+-    [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])])])
++AC_CHECK_LIB([readline], [main], [],
++    [AC_MSG_ERROR([libreadline is required for profanity])])
+ 
+ ### Check for desktop notification support
+ ### Linux/FreeBSD require libnotify