Port empathy to enchant2, bump revision.

3 files changed, 76 insertions, 6 deletions

diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 7d553cd7149..fe399f21e2e 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2018/11/14 22:21:08 kleink Exp $
+# $NetBSD: Makefile,v 1.100 2018/11/18 11:48:56 bsiegert Exp $
 
 DISTNAME=	empathy-2.34.0
-PKGREVISION=	66
+PKGREVISION=	67
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/empathy/2.34/}
 
@@ -49,7 +49,7 @@ BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
diff --git a/chat/empathy/distinfo b/chat/empathy/distinfo
index 74b181731d1..ea6d332928e 100644
--- a/chat/empathy/distinfo
+++ b/chat/empathy/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:20:18 agc Exp $
+$NetBSD: distinfo,v 1.14 2018/11/18 11:48:56 bsiegert Exp $
 
 SHA1 (empathy-2.34.0.tar.gz) = 533be910844e92e24be7232d2d122e9dc8b2267f
 RMD160 (empathy-2.34.0.tar.gz) = dfff9212f8c7f5d1c745a4b6bd3f6dbaf4ef02ab
 SHA512 (empathy-2.34.0.tar.gz) = 9b6539f645357c9f1f9a4ff5fa0e7511d02163c5433f1439388adbeae96138f66aca4af8078e016fd78c147ba91ef88d342da55e4392486d68f065857ca3775e
 Size (empathy-2.34.0.tar.gz) = 5085101 bytes
-SHA1 (patch-ad) = 2f0df78b7ee7ae3f58610894a6899397a4601ba7
+SHA1 (patch-ad) = a63038d8f86b93b235b77804cc35347ccb8f9501
 SHA1 (patch-libempathy_empathy-auth-factory.c) = 4f2e4fe7ad4e15bd075c39791248143a5c0f005f
 SHA1 (patch-src_Makefile.am) = b80be45492abf1a4bf79f4c408f07beb4ee4ed29
 SHA1 (patch-src_Makefile.in) = bf630e12c9517d0bb7b4e0e32ee47d4197ab0d92
diff --git a/chat/empathy/patches/patch-ad b/chat/empathy/patches/patch-ad
index 5348b0213de..1ad690a0bcb 100644
--- a/chat/empathy/patches/patch-ad
+++ b/chat/empathy/patches/patch-ad
@@ -1,7 +1,18 @@
-$NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $
+$NetBSD: patch-ad,v 1.3 2018/11/18 11:48:56 bsiegert Exp $
+
+Enchant2 support.
 
 --- configure.orig	2011-03-24 15:18:52.000000000 +0000
 +++ configure
+@@ -2667,7 +2667,7 @@ UNIQUE_REQUIRED=1.1.2
+ 
+ # Optionnal deps
+ CLUTTER_GTK_REQUIRED=0.10
+-ENCHANT_REQUIRED=1.2.0
++ENCHANT_REQUIRED=2.0.0
+ GEOCLUE_REQUIRED=0.11
+ ISO_CODES_REQUIRED=0.35
+ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
 @@ -13553,8 +13553,8 @@ install-data-am: install-gsettings-schem
  .SECONDARY: $(gsettings_SCHEMAS)
  
@@ -13,3 +24,62 @@ $NetBSD: patch-ad,v 1.2 2013/08/12 10:00:03 obache Exp $
  
  install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
  	@$(NORMAL_INSTALL)
+@@ -16648,18 +16648,18 @@ if test -n "$ENCHANT_CFLAGS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+-      enchant >= \$ENCHANT_REQUIRED,
++      enchant-2 >= \$ENCHANT_REQUIRED,
+       iso-codes >= \$ISO_CODES_REQUIRED
+    \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    ") 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 >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    " 2>/dev/null`
+ else
+@@ -16673,18 +16673,18 @@ if test -n "$ENCHANT_LIBS"; then
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
+-      enchant >= \$ENCHANT_REQUIRED,
++      enchant-2 >= \$ENCHANT_REQUIRED,
+       iso-codes >= \$ISO_CODES_REQUIRED
+    \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    ") 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 >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    " 2>/dev/null`
+ else
+@@ -16707,12 +16707,12 @@ else
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    " 2>&1`
+         else
+ 	        ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+-      enchant >= $ENCHANT_REQUIRED,
++      enchant-2 >= $ENCHANT_REQUIRED,
+       iso-codes >= $ISO_CODES_REQUIRED
+    " 2>&1`
+         fi