[pkgsrc/trunk]: pkgsrc/sysutils/gnome-vfs use libgnutls-config.mk

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/355f30348a2a
branches:  trunk
changeset: 395033:355f30348a2a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jul 02 19:25:47 2009 +0000

description:
use libgnutls-config.mk

diffstat:

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

diffs (51 lines):

diff -r e0e83fc0ccaf -r 355f30348a2a sysutils/gnome-vfs/Makefile.common
--- a/sysutils/gnome-vfs/Makefile.common        Thu Jul 02 19:13:53 2009 +0000
+++ b/sysutils/gnome-vfs/Makefile.common        Thu Jul 02 19:25:47 2009 +0000
@@ -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-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 @@
        ${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 @@
 .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 -r e0e83fc0ccaf -r 355f30348a2a sysutils/gnome-vfs/files/libgnutls-config
--- a/sysutils/gnome-vfs/files/libgnutls-config Thu Jul 02 19:13:53 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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