summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-07-02 19:25:47 +0000
committertnn <tnn@pkgsrc.org>2009-07-02 19:25:47 +0000
commit94280c000c7d0a7fa486ec20ac4cd12320606d50 (patch)
tree8506d53f8f39dd165e7b124456c5f68f8f70c87e /sysutils
parent65581dbf52858f7cd6015158b91b00486f87737c (diff)
downloadpkgsrc-94280c000c7d0a7fa486ec20ac4cd12320606d50.tar.gz
use libgnutls-config.mk
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gnome-vfs/Makefile.common10
-rw-r--r--sysutils/gnome-vfs/files/libgnutls-config10
2 files changed, 2 insertions, 18 deletions
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