From 85f882a768a468f3abf0f8c7df3446aa1dd56e89 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 7 Feb 2004 04:54:02 +0000 Subject: * Roll in the gnomevfs-extras Samba support (auto-detected or enabled via WITH_SAMBA) * Add OPTIONS support for non-auto-detected options * Correct a problem with the KDE menus patch * [Re-]Add [controversial] SSL support. This may cause apps such as Galeon, Epiphany, and Evolution to lock-up when doing SSL opterations. Feedback is greatly appreciated * Enable Samba and CDParanoia support when package building git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1786 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 30 +++++++++++-- ..._vfolder_applications-all-users.vfolder-info.in | 2 +- devel/gnome-vfs/files/patch-aa | 40 +++++------------ devel/gnome-vfs/files/patch-ltmain.sh | 51 ++++++++++++++++++++++ devel/gnome-vfs/pkg-plist | 3 ++ devel/gnomevfs2/Makefile | 30 +++++++++++-- ..._vfolder_applications-all-users.vfolder-info.in | 2 +- devel/gnomevfs2/files/patch-aa | 40 +++++------------ devel/gnomevfs2/files/patch-ltmain.sh | 51 ++++++++++++++++++++++ devel/gnomevfs2/pkg-plist | 3 ++ 10 files changed, 182 insertions(+), 70 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-ltmain.sh create mode 100644 devel/gnomevfs2/files/patch-ltmain.sh (limited to 'devel') diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 5280ca7b3..4af5ab77f 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -25,32 +25,54 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on \ + FAM "Dynamic file system updates" on + +.include + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_CDPARANOIA +.undef WITHOUT_SAMBA +WITH_CDPARANOIA= yes +WITH_SAMBA= yes +.endif + .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in .endif -.include - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif +.if exists(${LOCALBASE}/lib/libsmbclient.so) +WITH_SAMBA= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" .else PLIST_SUB+= CDPARANOIA="@comment " .endif + .if !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if defined(WITH_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SAMBA="" +.else +PLIST_SUB+= SAMBA="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in index 13ce78387..e12976533 100644 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -5,7 +5,7 @@ - /etc/X11/applnk/ -+ %%LOCALBASE%%/share/applnk/ ++ /usr/local/share/applnk/ diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index 8c07fab8e..055572c2f 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,14 +1,6 @@ ---- configure.orig Fri Jan 30 06:09:41 2004 -+++ configure Fri Jan 30 15:33:43 2004 -@@ -20062,6 +20062,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' -@@ -22816,6 +22817,8 @@ +--- configure.orig Fri Feb 6 21:34:33 2004 ++++ configure Fri Feb 6 21:35:22 2004 +@@ -22816,6 +22816,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22898,6 +22901,7 @@ +@@ -22898,6 +22900,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -25,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -22905,6 +22909,7 @@ +@@ -22905,6 +22908,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -33,7 +25,7 @@ have_ngettext=yes fi done -@@ -26396,8 +26401,8 @@ +@@ -26396,8 +26400,8 @@ done fi @@ -44,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -26416,11 +26421,11 @@ +@@ -26416,11 +26420,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -58,28 +50,16 @@ ; return 0; } -@@ -27547,7 +27552,7 @@ +@@ -27547,7 +27551,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27613,9 +27618,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - -@@ -30543,6 +30548,7 @@ +@@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh new file mode 100644 index 000000000..58384ee38 --- /dev/null +++ b/devel/gnome-vfs/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 1f03b61ff..be6d96641 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -48,6 +48,8 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gconf/schemas/system_smb.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf +%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -109,6 +111,7 @@ lib/gnome-vfs-2.0/modules/libhttp.so lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so +%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 5280ca7b3..4af5ab77f 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomevfs2 PORTVERSION= 2.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-vfs/2.5 @@ -25,32 +25,54 @@ USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +OPTIONS= KDE_MENUS "Integrated KDE menu picks" on \ + FAM "Dynamic file system updates" on + +.include + +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_CDPARANOIA +.undef WITHOUT_SAMBA +WITH_CDPARANOIA= yes +WITH_SAMBA= yes +.endif + .if !defined(WITHOUT_KDE_MENUS) EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in .endif -.include - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif +.if exists(${LOCALBASE}/lib/libsmbclient.so) +WITH_SAMBA= yes +.endif + .if defined(WITH_CDPARANOIA) LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia PLIST_SUB+= CDPARANOIA="" .else PLIST_SUB+= CDPARANOIA="@comment " .endif + .if !defined(WITHOUT_FAM) LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam .endif +.if defined(WITH_SAMBA) +LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient +PLIST_SUB+= SAMBA="" +.else +PLIST_SUB+= SAMBA="@comment " +.endif + post-patch: @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in index 13ce78387..e12976533 100644 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in @@ -5,7 +5,7 @@ - /etc/X11/applnk/ -+ %%LOCALBASE%%/share/applnk/ ++ /usr/local/share/applnk/ diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index 8c07fab8e..055572c2f 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,14 +1,6 @@ ---- configure.orig Fri Jan 30 06:09:41 2004 -+++ configure Fri Jan 30 15:33:43 2004 -@@ -20062,6 +20062,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' -@@ -22816,6 +22817,8 @@ +--- configure.orig Fri Feb 6 21:34:33 2004 ++++ configure Fri Feb 6 21:35:22 2004 +@@ -22816,6 +22816,8 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17,7 +9,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22898,6 +22901,7 @@ +@@ -22898,6 +22900,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -25,7 +17,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -22905,6 +22909,7 @@ +@@ -22905,6 +22908,7 @@ cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -33,7 +25,7 @@ have_ngettext=yes fi done -@@ -26396,8 +26401,8 @@ +@@ -26396,8 +26400,8 @@ done fi @@ -44,7 +36,7 @@ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -@@ -26416,11 +26421,11 @@ +@@ -26416,11 +26420,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -58,28 +50,16 @@ ; return 0; } -@@ -27547,7 +27552,7 @@ +@@ -27547,7 +27551,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" -+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27613,9 +27618,9 @@ - - msg_openssl="yes" - if test x$with_openssl_libs != x/usr/lib; then -- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto" -+ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo" - else -- OPENSSL_LIBS="-lssl -lcrypto" -+ OPENSSL_LIBS="-lssl -lcryptofoo" - fi - - -@@ -30543,6 +30548,7 @@ +@@ -30543,6 +30547,7 @@ s,@ORBIT_IDL@,$ORBIT_IDL,;t t s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh new file mode 100644 index 000000000..58384ee38 --- /dev/null +++ b/devel/gnomevfs2/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Sat Dec 6 14:47:45 2003 ++++ ltmain.sh Tue Dec 9 14:09:01 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 1f03b61ff..be6d96641 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -48,6 +48,8 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gconf/schemas/system_smb.schemas %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf +%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf +etc/gnome-vfs-2.0/modules/ssl-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info etc/gnome-vfs-2.0/vfolders/network.vfolder-info @@ -109,6 +111,7 @@ lib/gnome-vfs-2.0/modules/libhttp.so lib/gnome-vfs-2.0/modules/libnetwork.so lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so +%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libssh.so lib/gnome-vfs-2.0/modules/libtar.so lib/gnome-vfs-2.0/modules/libvfolder-desktop.so -- cgit v1.2.3