From 9f07c1ab0d095c7db2ff0228111b790ad6cd5535 Mon Sep 17 00:00:00 2001 From: couderc Date: Tue, 12 Apr 2005 18:07:47 +0000 Subject: [PATCH] fix gnome vfs dependency. --- x11/rox-filer/Makefile | 4 +- .../patches/patch-ROX-Filer_src_configure | 54 +++++++++++++++---- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/x11/rox-filer/Makefile b/x11/rox-filer/Makefile index 604b4fb10b8..2528687339e 100644 --- a/x11/rox-filer/Makefile +++ b/x11/rox-filer/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.24 2005/01/31 19:01:47 couderc Exp $ +# $OpenBSD: Makefile,v 1.25 2005/04/12 18:07:47 couderc Exp $ COMMENT= "gtk file manager with desktop features" VERSION= 2.2.0 DISTNAME= rox-${VERSION} -PKGNAME= rox-filer-${VERSION} +PKGNAME= rox-filer-${VERSION}p0 CATEGORIES= x11 HOMEPAGE= http://rox.sourceforge.net/ diff --git a/x11/rox-filer/patches/patch-ROX-Filer_src_configure b/x11/rox-filer/patches/patch-ROX-Filer_src_configure index 958f936a4ec..7b84694a8df 100644 --- a/x11/rox-filer/patches/patch-ROX-Filer_src_configure +++ b/x11/rox-filer/patches/patch-ROX-Filer_src_configure @@ -1,10 +1,46 @@ -$OpenBSD: patch-ROX-Filer_src_configure,v 1.3 2005/01/31 19:01:47 couderc Exp $ ---- ROX-Filer/src/configure.orig Mon Jan 31 19:01:27 2005 -+++ ROX-Filer/src/configure Mon Jan 31 19:01:57 2005 -@@ -2382,42 +2382,6 @@ fi +$OpenBSD: patch-ROX-Filer_src_configure,v 1.4 2005/04/12 18:07:47 couderc Exp $ +--- ROX-Filer/src/configure.orig Sat Jan 29 13:52:43 2005 ++++ ROX-Filer/src/configure Wed Mar 16 20:58:45 2005 +@@ -831,20 +831,20 @@ else + fi + + +-echo $ac_n "checking for GNOME VFS 2.8 or later""... $ac_c" 1>&6 +-echo "configure:836: checking for GNOME VFS 2.8 or later" >&5 +-if "$PKG_CONFIG" --atleast-version=2.8.0 "gnome-vfs-2.0" ; then +- LIBS="$LIBS `$PKG_CONFIG --libs gnome-vfs-2.0`" +- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gnome-vfs-2.0`" +- cat >> confdefs.h <<\EOF +-#define HAVE_GNOME_VFS 1 +-EOF ++#echo $ac_n "checking for GNOME VFS 2.8 or later""... $ac_c" 1>&6 ++#echo "configure:836: checking for GNOME VFS 2.8 or later" >&5 ++#if "$PKG_CONFIG" --atleast-version=2.8.0 "gnome-vfs-2.0" ; then ++# LIBS="$LIBS `$PKG_CONFIG --libs gnome-vfs-2.0`" ++# CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gnome-vfs-2.0`" ++# cat >> confdefs.h <<\EOF ++##define HAVE_GNOME_VFS 1 ++#EOF ++# ++# echo "$ac_t""yes" 1>&6 ++#else ++# echo "$ac_t""no" 1>&6 ++#fi + +- echo "$ac_t""yes" 1>&6 +-else +- echo "$ac_t""no" 1>&6 +-fi +- + GTK_VERSION=`"$PKG_CONFIG" --modversion gtk+-2.0` + cat >> confdefs.h <&6 + fi done - - +- +- -ac_safe=`echo "X11/SM/SMlib.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for X11/SM/SMlib.h""... $ac_c" 1>&6 -echo "configure:2388: checking for X11/SM/SMlib.h" >&5 @@ -39,8 +75,6 @@ $OpenBSD: patch-ROX-Filer_src_configure,v 1.3 2005/01/31 19:01:47 couderc Exp $ -{ echo "configure: error: Session management library (libsm) missing. It is part of the X server distribution. Try installing the libsm-dev package." 1>&2; exit 1; } - -fi -- -- + + echo $ac_n "checking for working const""... $ac_c" 1>&6 - echo "configure:2423: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then