From 02c43b8d40ea3eaf3fbb292dcf1f869baa6459ed Mon Sep 17 00:00:00 2001 From: sobomax Date: Fri, 26 Apr 2002 09:46:41 +0000 Subject: - Update to 1.9.12 (version found in the GNOME2 beta4); - use USE_LIBTOOL. --- devel/gnome-vfs/Makefile | 7 ++- devel/gnome-vfs/distinfo | 2 +- devel/gnome-vfs/files/patch-aa | 85 +++++++++++++++++++---------------- devel/gnome-vfs/files/patch-ltmain.sh | 45 ------------------- devel/gnome-vfs/pkg-plist | 43 ++++++++++++++++++ 5 files changed, 93 insertions(+), 89 deletions(-) delete mode 100644 devel/gnome-vfs/files/patch-ltmain.sh (limited to 'devel/gnome-vfs') diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 32454ea..a868e48 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 1.9.11 -PORTREVISION= 1 +PORTVERSION= 1.9.12 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3 +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +23,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/mis USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 255faa7..7618a27 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-1.9.11.tar.bz2) = 51ddc69ecaf25366a1aa7eed5f5c8a53 +MD5 (gnome2/gnome-vfs-1.9.12.tar.bz2) = 83bd2b8f31ddb32fe4d81aa8c6038148 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index bd10b13..f4c57af 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,43 +1,50 @@ $FreeBSD$ ---- configure.orig Mon Mar 11 21:42:05 2002 -+++ configure Mon Mar 11 21:42:37 2002 -@@ -11993,8 +11993,8 @@ +--- configure.orig Fri Apr 26 12:27:40 2002 ++++ configure Fri Apr 26 12:30:02 2002 +@@ -5586,6 +5586,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9131,8 +9132,8 @@ done fi --echo "$as_me:11996: checking for bzCompressInit in -lbz2" >&5 --echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 -+echo "$as_me:11996: checking for BZ2_bzCompressInit in -lbz2" >&5 -+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 - if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -12010,11 +12010,11 @@ - #endif +-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 +-echo "configure:9136: checking for bzCompressInit in -lbz2" >&5 ++echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 ++echo "configure:9136: checking for BZ2_bzCompressInit in -lbz2" >&5 + ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -9145,10 +9146,10 @@ + /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit (); -+char BZ2_bzCompressInit (); - int - main () - { --bzCompressInit (); -+BZ2_bzCompressInit (); - ; - return 0; - } -@@ -12326,7 +12326,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else + builtin and then its argument prototype would still apply. */ +-char bzCompressInit(); ++char BZ2_bzCompressInit(); + int main() { +-bzCompressInit() ++BZ2_bzCompressInit() + ; return 0; } + EOF + if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -9421,7 +9422,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" - cat >conftest.$ac_ext <<_ACEOF - #line 12331 "configure" + cat > conftest.$ac_ext <