diff options
| author | drochner <drochner@pkgsrc.org> | 2009-06-25 17:37:11 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-06-25 17:37:11 +0000 |
| commit | 9da19547507dfcd896f1bbc09a397402510e0cca (patch) | |
| tree | 8ec17b267e6cbe7fd32b8da3a17b906eee22bae3 /sysutils | |
| parent | 8ff3da2d21a3695b6144d85c494d972d73dd4532 (diff) | |
| download | pkgsrc-9da19547507dfcd896f1bbc09a397402510e0cca.tar.gz | |
work around nonexistant config script in gnutls-1.8 the same way
as in wireshark
this restores eg "https" functionality
bump PKGREVISION
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 10 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/files/libgnutls-config | 10 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index d554e603dda..3d567c962ba 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -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 --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index db17184a43f..e3a08dfdaae 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -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 @@ COMMENT= GNOME Virtual File System (v2) 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-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}\"" @@ -57,6 +60,11 @@ 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. diff --git a/sysutils/gnome-vfs/files/libgnutls-config b/sysutils/gnome-vfs/files/libgnutls-config new file mode 100644 index 00000000000..d5fd2877350 --- /dev/null +++ b/sysutils/gnome-vfs/files/libgnutls-config @@ -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 |