[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs work around nonexistant config scri...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7490ce4f64c
branches:  trunk
changeset: 394944:e7490ce4f64c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Jun 25 17:37:11 2009 +0000

description:
work around nonexistant config script in gnutls-1.8 the same way
as in wireshark
this restores eg "https" functionality
bump PKGREVISION

diffstat:

 sysutils/gnome-vfs/Makefile               |   4 +++-
 sysutils/gnome-vfs/Makefile.common        |  10 +++++++++-
 sysutils/gnome-vfs/files/libgnutls-config |  10 ++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diffs (63 lines):

diff -r e3421ec6a2d0 -r e7490ce4f64c sysutils/gnome-vfs/Makefile
--- a/sysutils/gnome-vfs/Makefile       Thu Jun 25 15:33:31 2009 +0000
+++ b/sysutils/gnome-vfs/Makefile       Thu Jun 25 17:37:11 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2009/04/10 22:27:16 asau Exp $
+# $NetBSD: Makefile,v 1.75 2009/06/25 17:37:11 drochner Exp $
+
+PKGREVISION=   1
 
 PKGCONFIG_OVERRIDE=    gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gnome-vfs-module-2.0.pc.in
diff -r e3421ec6a2d0 -r e7490ce4f64c sysutils/gnome-vfs/Makefile.common
--- a/sysutils/gnome-vfs/Makefile.common        Thu Jun 25 15:33:31 2009 +0000
+++ b/sysutils/gnome-vfs/Makefile.common        Thu Jun 25 17:37:11 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2009/06/14 22:58:09 joerg Exp $
+# $NetBSD: Makefile.common,v 1.20 2009/06/25 17:37:11 drochner Exp $
 #
 # used by audio/gnome-vfs-cdda/Makefile
 # used by net/gnome-vfs-dns-sd/Makefile
@@ -18,6 +18,7 @@
 
 DISTINFO_FILE=         ${.CURDIR}/../../sysutils/gnome-vfs/distinfo
 PATCHDIR=              ${.CURDIR}/../../sysutils/gnome-vfs/patches
+FILESDIR=              ${.CURDIR}/../../sysutils/gnome-vfs/files
 
 GNU_CONFIGURE=         YES
 USE_PKGLOCALEDIR=      YES
@@ -30,6 +31,8 @@
 CONFIGURE_ARGS+=       --disable-samba
 CONFIGURE_ARGS+=       --enable-gnutls
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+# XXX work around missing "libgnutls-config" in gnutls-2.8
+CONFIGURE_ENV+=                LIBGNUTLS_CONFIG=${WRKDIR}/libgnutls-config
 
 CPPFLAGS+=             -DPREFIX="\"${PREFIX}\""
 CPPFLAGS+=             -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
@@ -57,6 +60,11 @@
        ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h
 .endif
 
+pre-configure:
+       ${SED} "s|@SH@|${SH}|" <${FILESDIR}/libgnutls-config \
+               >${WRKDIR}/libgnutls-config
+       ${CHMOD} +x ${WRKDIR}/libgnutls-config
+
 #
 # The following stuff is to allow easy building of modules distributed within
 # gnome-vfs as independent packages.
diff -r e3421ec6a2d0 -r e7490ce4f64c sysutils/gnome-vfs/files/libgnutls-config
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gnome-vfs/files/libgnutls-config Thu Jun 25 17:37:11 2009 +0000
@@ -0,0 +1,10 @@
+#!@SH@
+# $NetBSD: libgnutls-config,v 1.1 2009/06/25 17:37:11 drochner Exp $
+
+if [ $1 = "--version" ]; then
+       arg=--modversion
+else
+       arg=$1
+fi
+
+pkg-config $arg gnutls