CVS commit: pkgsrc/chat/mcabber

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Nov 18 12:06:23 UTC 2018

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

Log Message:
Port mcabber to enchant2, bump revision.


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

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

Modified files:

Index: pkgsrc/chat/mcabber/Makefile
diff -u pkgsrc/chat/mcabber/Makefile:1.10 pkgsrc/chat/mcabber/Makefile:1.11
--- pkgsrc/chat/mcabber/Makefile:1.10   Sat Sep  9 14:19:25 2017
+++ pkgsrc/chat/mcabber/Makefile        Sun Nov 18 12:06:23 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/09/09 14:19:25 leot Exp $
+# $NetBSD: Makefile,v 1.11 2018/11/18 12:06:23 bsiegert Exp $
 
 DISTNAME=      mcabber-1.1.0
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  http://www.lilotux.net/~mikael/mcabber/files/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/chat/mcabber/distinfo
diff -u pkgsrc/chat/mcabber/distinfo:1.5 pkgsrc/chat/mcabber/distinfo:1.6
--- pkgsrc/chat/mcabber/distinfo:1.5    Sat Sep  9 14:19:25 2017
+++ pkgsrc/chat/mcabber/distinfo        Sun Nov 18 12:06:23 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2017/09/09 14:19:25 leot Exp $
+$NetBSD: distinfo,v 1.6 2018/11/18 12:06:23 bsiegert Exp $
 
 SHA1 (mcabber-1.1.0.tar.bz2) = 3530831e99007356142325e0e5cdffe4d4885c15
 RMD160 (mcabber-1.1.0.tar.bz2) = ba23cf7541b62f4d8b913416c2a7fabf3406a0b8
 SHA512 (mcabber-1.1.0.tar.bz2) = d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
 Size (mcabber-1.1.0.tar.bz2) = 608975 bytes
 SHA1 (patch-aa) = 2abb198ee8433d2e7552236242f8fdc92e72979d
+SHA1 (patch-configure) = 7c328a067243e881aeb8eea445a8400c479349a5

Index: pkgsrc/chat/mcabber/options.mk
diff -u pkgsrc/chat/mcabber/options.mk:1.1 pkgsrc/chat/mcabber/options.mk:1.2
--- pkgsrc/chat/mcabber/options.mk:1.1  Fri Jan 10 09:50:42 2014
+++ pkgsrc/chat/mcabber/options.mk      Sun Nov 18 12:06:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/01/10 09:50:42 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2018/11/18 12:06:23 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mcabber
 PKG_SUPPORTED_OPTIONS= aspell enchant gpgme otr ssl
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=      --enable-aspell
 .endif
 
 .if !empty(PKG_OPTIONS:Menchant)
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-enchant
 .endif
 

Added files:

Index: pkgsrc/chat/mcabber/patches/patch-configure
diff -u /dev/null pkgsrc/chat/mcabber/patches/patch-configure:1.3
--- /dev/null   Sun Nov 18 12:06:23 2018
+++ pkgsrc/chat/mcabber/patches/patch-configure Sun Nov 18 12:06:23 2018
@@ -0,0 +1,50 @@
+$NetBSD: patch-configure,v 1.3 2018/11/18 12:06:23 bsiegert Exp $
+
+Enchant2 support.
+
+--- configure.orig     2017-06-04 21:13:23.000000000 +0000
++++ configure
+@@ -16361,12 +16361,12 @@ if test -n "$ENCHANT_CFLAGS"; then
+     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant" 2>/dev/null`
++  pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16378,12 +16378,12 @@ if test -n "$ENCHANT_LIBS"; then
+     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "enchant") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant" 2>/dev/null`
++  pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16404,9 +16404,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-              ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant" 2>&1`
++              ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "enchant-2" 2>&1`
+         else
+-              ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant" 2>&1`
++              ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "enchant-2" 2>&1`
+         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$ENCHANT_PKG_ERRORS" >&5