Looks like SSL is still a bitch with apps like Galeon and Epiphany. Remove

SSL support again.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1801 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 32 insertions, 10 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 98c66d11e..e10ad2ba6 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.5.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.5
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 055572c2f..ba863aab1 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Fri Feb  6 21:34:33 2004
-+++ configure	Fri Feb  6 21:35:22 2004
+--- configure.orig	Sun Feb  8 16:04:02 2004
++++ configure	Sun Feb  8 16:04:36 2004
 @@ -22816,6 +22816,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -55,10 +55,22 @@
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -27613,9 +27617,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 +30547,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index be6d96641..2e189c416 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -49,7 +49,6 @@ 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
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 98c66d11e..e10ad2ba6 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomevfs2
 PORTVERSION=	2.5.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.5
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 055572c2f..ba863aab1 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Fri Feb  6 21:34:33 2004
-+++ configure	Fri Feb  6 21:35:22 2004
+--- configure.orig	Sun Feb  8 16:04:02 2004
++++ configure	Sun Feb  8 16:04:36 2004
 @@ -22816,6 +22816,8 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -55,10 +55,22 @@
  else
  
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
-+		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo"
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -27613,9 +27617,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 +30547,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index be6d96641..2e189c416 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -49,7 +49,6 @@ 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