* Re-enable howl support

* Fix FAM detection
* Add basic Kerberos detection mainly for 4.X systems
* Use the new libtool scheme
* Fix the build on 4.X


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

6 files changed, 60 insertions, 114 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 00ca678fa..01dce7a28 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
 		libbonobo
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-openssl \
 		--disable-gnutls \
@@ -40,10 +40,8 @@ OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
-.if ${ARCH} == "i386"
 .undef WITHOUT_MDNS
-#WITH_MDNS=		yes
-.endif
+WITH_MDNS=		yes
 WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
@@ -74,10 +72,14 @@ PLIST_SUB+=	CDPARANOIA=""
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM)
+.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if exists(${LOCALBASE}/lib/libkrb5.so)
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+.endif
+
 .if defined(WITH_SAMBA)
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
@@ -86,7 +88,7 @@ PLIST_SUB+=	SAMBA="@comment "
 .endif
 
 .if defined(WITH_MDNS)
-#LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
 .endif
 
 post-patch:
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
deleted file mode 100644
index 58384ee38..000000000
--- a/devel/gnome-vfs/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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/files/patch-modules_http-neon-method.c b/devel/gnome-vfs/files/patch-modules_http-neon-method.c
new file mode 100644
index 000000000..f0b3d5f96
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_http-neon-method.c
@@ -0,0 +1,22 @@
+--- modules/http-neon-method.c.orig	Thu Jul 22 16:05:32 2004
++++ modules/http-neon-method.c	Thu Jul 22 16:05:52 2004
+@@ -497,8 +497,8 @@
+ static gboolean
+ http_auth_cache_cleanup (gpointer *data)
+ {
+-	DEBUG_HTTP ("[AuthCache] Cleanup!");
+ 	gboolean restart_timeout;
++	DEBUG_HTTP ("[AuthCache] Cleanup!");
+ 
+ 	restart_timeout = FALSE;
+ 
+@@ -1324,8 +1324,8 @@
+ static gboolean
+ neon_session_pool_cleanup (gpointer *data)
+ {
+-	DEBUG_HTTP ("[Session Pool] Cleanup!");
+ 	gboolean restart_timeout;
++	DEBUG_HTTP ("[Session Pool] Cleanup!");
+ 
+ 	restart_timeout = FALSE;
+ 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 00ca678fa..01dce7a28 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
 		libbonobo
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-openssl \
 		--disable-gnutls \
@@ -40,10 +40,8 @@ OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_CDPARANOIA
 .undef WITHOUT_SAMBA
-.if ${ARCH} == "i386"
 .undef WITHOUT_MDNS
-#WITH_MDNS=		yes
-.endif
+WITH_MDNS=		yes
 WITH_CDPARANOIA=	yes
 WITH_SAMBA=		yes
 .endif
@@ -74,10 +72,14 @@ PLIST_SUB+=	CDPARANOIA=""
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 
-.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM)
+.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if exists(${LOCALBASE}/lib/libkrb5.so)
+LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
+.endif
+
 .if defined(WITH_SAMBA)
 LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
@@ -86,7 +88,7 @@ PLIST_SUB+=	SAMBA="@comment "
 .endif
 
 .if defined(WITH_MDNS)
-#LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
+LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
 .endif
 
 post-patch:
diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh
deleted file mode 100644
index 58384ee38..000000000
--- a/devel/gnomevfs2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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/files/patch-modules_http-neon-method.c b/devel/gnomevfs2/files/patch-modules_http-neon-method.c
new file mode 100644
index 000000000..f0b3d5f96
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_http-neon-method.c
@@ -0,0 +1,22 @@
+--- modules/http-neon-method.c.orig	Thu Jul 22 16:05:32 2004
++++ modules/http-neon-method.c	Thu Jul 22 16:05:52 2004
+@@ -497,8 +497,8 @@
+ static gboolean
+ http_auth_cache_cleanup (gpointer *data)
+ {
+-	DEBUG_HTTP ("[AuthCache] Cleanup!");
+ 	gboolean restart_timeout;
++	DEBUG_HTTP ("[AuthCache] Cleanup!");
+ 
+ 	restart_timeout = FALSE;
+ 
+@@ -1324,8 +1324,8 @@
+ static gboolean
+ neon_session_pool_cleanup (gpointer *data)
+ {
+-	DEBUG_HTTP ("[Session Pool] Cleanup!");
+ 	gboolean restart_timeout;
++	DEBUG_HTTP ("[Session Pool] Cleanup!");
+ 
+ 	restart_timeout = FALSE;
+