From 94280c000c7d0a7fa486ec20ac4cd12320606d50 Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Thu, 2 Jul 2009 19:25:47 +0000
Subject: use libgnutls-config.mk

---
 sysutils/gnome-vfs/Makefile.common        | 10 ++--------
 sysutils/gnome-vfs/files/libgnutls-config | 10 ----------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 sysutils/gnome-vfs/files/libgnutls-config

(limited to 'sysutils')

diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index e3a08dfdaae..7d2355d73fb 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2009/06/25 17:37:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/07/02 19:25:47 tnn Exp $
 #
 # used by audio/gnome-vfs-cdda/Makefile
 # used by net/gnome-vfs-dns-sd/Makefile
@@ -31,8 +31,6 @@ CONFIGURE_ARGS+=	--disable-openssl
 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}\""
@@ -60,11 +58,6 @@ post-wrapper:
 	${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.
@@ -110,5 +103,6 @@ do-install:
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../security/gnutls/libgnutls-config.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/files/libgnutls-config b/sysutils/gnome-vfs/files/libgnutls-config
deleted file mode 100644
index d5fd2877350..00000000000
--- a/sysutils/gnome-vfs/files/libgnutls-config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!@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
-- 
cgit v1.2.3