summaryrefslogtreecommitdiffstats
path: root/net-im/empathy
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-11-19 02:04:55 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2010-11-19 02:04:55 +0800
commitce25d269ebf8253ccae311c4aa10b966d60282aa (patch)
tree5d384336c123b1538b1ede9994f28c0fa5350e75 /net-im/empathy
parent1e7c4ea2230c98074f9a671462433d70a5de0972 (diff)
downloadmarcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar.gz
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar.bz2
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar.lz
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar.xz
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.tar.zst
marcuscom-ports-ce25d269ebf8253ccae311c4aa10b966d60282aa.zip
Update to 2.32.2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14911 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net-im/empathy')
-rw-r--r--net-im/empathy/Makefile13
-rw-r--r--net-im/empathy/distinfo4
-rw-r--r--net-im/empathy/files/patch-configure21
3 files changed, 26 insertions, 12 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index 733052c8f..ce2b9eb09 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/empathy/Makefile,v 1.74 2010/10/26 08:50:10 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.75 2010/11/15 14:07:53 kwm Exp $
PORTNAME= empathy
-PORTVERSION= 2.32.1
+PORTVERSION= 2.32.2
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
@@ -14,6 +14,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME IM client based around telepathy
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
telepathy.2:${PORTSDIR}/net-im/libtelepathy \
@@ -24,6 +25,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
USE_GMAKE= yes
@@ -39,7 +41,8 @@ USE_PYTHON= yes
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-tpl=no --enable-gtk3=no
+CONFIGURE_ARGS= --disable-Werror \
+ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml
@@ -104,8 +107,4 @@ CONFIGURE_ARGS+=--disable-map
PLIST_SUB+= MAP="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|g ; \
- s|-Werror||g' ${WRKSRC}/configure
-
.include <bsd.port.post.mk>
diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo
index 41427c6a1..aef3ef0e3 100644
--- a/net-im/empathy/distinfo
+++ b/net-im/empathy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (empathy-2.32.1.tar.bz2) = 72b226244707b0bb50c74025463bdf2e1e847a8f0cefcbb187afd899103d419c
-SIZE (empathy-2.32.1.tar.bz2) = 2935652
+SHA256 (empathy-2.32.2.tar.bz2) = f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
+SIZE (empathy-2.32.2.tar.bz2) = 2936340
diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure
index 4b18eac3f..054f1a3e5 100644
--- a/net-im/empathy/files/patch-configure
+++ b/net-im/empathy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2010-11-15 14:52:20.000000000 +0100
-+++ configure 2010-11-15 14:52:21.000000000 +0100
-@@ -13388,8 +13388,8 @@
+--- configure.orig 2010-11-18 17:41:43.000000000 +0100
++++ configure 2010-11-18 17:41:43.000000000 +0100
+@@ -13390,8 +13390,8 @@
.SECONDARY: $(gsettings_SCHEMAS)
gsettings__base_list = \
@@ -11,3 +11,18 @@
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
@$(NORMAL_INSTALL)
+@@ -15049,11 +15049,11 @@
+ fi
+
+ # Enable GSEAL checks if needed
+-if test $USE_MAINTAINER_MODE = yes; then
++#if test $USE_MAINTAINER_MODE = yes; then
+
+-$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
++#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
+
+-fi
++#fi
+
+ # -----------------------------------------------------------
+ # Enable debug