aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-08-20 07:29:24 +0800
committerdelphij <delphij@FreeBSD.org>2009-08-20 07:29:24 +0800
commit964b445cec43773259d9ee0fc804d3df48408f84 (patch)
treef023fa280af631578635a63d314b6ba792edf0ca /mail
parenteca6316d0f7aaf4bc62d39dfe82b192d410b138d (diff)
downloadfreebsd-ports-gnome-964b445cec43773259d9ee0fc804d3df48408f84.tar.gz
freebsd-ports-gnome-964b445cec43773259d9ee0fc804d3df48408f84.tar.zst
freebsd-ports-gnome-964b445cec43773259d9ee0fc804d3df48408f84.zip
Chase for latest GNUtls's removal of libgnutls-config.
Diffstat (limited to 'mail')
-rw-r--r--mail/libvmime/Makefile5
-rw-r--r--mail/libvmime/files/patch-configure21
2 files changed, 18 insertions, 8 deletions
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index 403d358a1a05..e2b39930d15a 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libvmime
PORTVERSION= 0.9.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= SF
MASTER_SITE_SUBDIR= vmime
@@ -33,7 +33,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-debug
.endif
-CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= EXTRA_CFLAGS="${CFLAGS}" EXTRA_CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+ LIBGNUTLS_CONFIG="${LOCALBASE}/bin/pkg-config" libgnutls_config_args="gnutls"
DOCSDIR= ${PREFIX}/share/doc/vmime
diff --git a/mail/libvmime/files/patch-configure b/mail/libvmime/files/patch-configure
index 44ccd5bc6a3d..3135a5c57a20 100644
--- a/mail/libvmime/files/patch-configure
+++ b/mail/libvmime/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2006-12-20 11:27:52.000000000 -0800
-+++ configure 2008-02-17 15:53:22.664811475 -0800
-@@ -3455,13 +3455,13 @@
+--- ./configure.orig 2008-10-19 05:36:19.000000000 -0700
++++ ./configure 2009-08-19 16:22:34.333460257 -0700
+@@ -3486,13 +3486,13 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
@@ -16,7 +16,7 @@
else
CFLAGS=
fi
-@@ -4108,13 +4108,13 @@
+@@ -4135,13 +4135,13 @@
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
@@ -32,7 +32,7 @@
else
CXXFLAGS=
fi
-@@ -7107,13 +7107,13 @@
+@@ -7156,13 +7156,13 @@
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
if test "x$ac_cv_f77_compiler_gnu" = xyes; then
@@ -48,7 +48,16 @@
else
FFLAGS=
fi
-@@ -24916,7 +24916,7 @@
+@@ -30797,7 +30797,7 @@
+ else
+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
++ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --modversion`
+
+
+ ac_save_CFLAGS="$CFLAGS"
+@@ -32278,7 +32278,7 @@
else
# -O2
OLD_CXXFLAGS="$CXXFLAGS"