Update to 2.3.6.

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

4 files changed, 65 insertions, 8 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 0aa2527f5..1d6a34915 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.3
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index c78a43c8f..f3a50c549 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-2.3.4.tar.bz2) = 45221f8861337c460d17ad30ac2ed041
+MD5 (gnome2/yelp-2.3.6.tar.bz2) = aab67ada710389166f6df121bab57881
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index a6e8fbc28..20702046e 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue May 28 02:02:29 2002
-+++ configure	Tue May 28 02:03:10 2002
-@@ -7381,6 +7381,7 @@
+--- configure.orig	Tue Aug 12 03:36:10 2003
++++ configure	Tue Aug 12 10:30:37 2003
+@@ -18129,6 +18129,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9979,7 +9980,7 @@
+@@ -20408,12 +20409,12 @@
  
  YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
  
 -YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
 +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
  
- echo "$as_me:9984: checking for bzread in -lbz2" >&5
- echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
+ 
+ 
+   case $host in
+-  *-linux-gnu | *-irix6*)
++  *-linux-gnu | *-irix6* | *-freebsd*)
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MAN_WHEREIS 1
+ _ACEOF
diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c
new file mode 100644
index 000000000..93b99da55
--- /dev/null
+++ b/x11/yelp/files/patch-src_man2html_yelp-man2html.c
@@ -0,0 +1,51 @@
+--- src/man2html/yelp-man2html.c.orig	Thu Jul 24 14:06:36 2003
++++ src/man2html/yelp-man2html.c	Thu Jul 24 14:06:06 2003
+@@ -129,6 +129,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <time.h>
+ #include <sys/time.h>
+@@ -3727,6 +3728,9 @@
+ main(int argc, char **argv)
+ {
+ 	char *t=NULL;
++#ifdef __FreeBSD__
++	char *source=NULL;
++#endif
+ 	int i,len;
+ 	char *buf;
+ 	char *h = '\0';
+@@ -3845,6 +3849,20 @@
+ 		 * right.
+ 		 */
+ 		
++#ifdef __FreeBSD__
++		if ((source =  strstr(output, "source: ")) != NULL)
++		{
++		    	int j;
++		    	for(i = 8, j = 0; i < strlen(source); i++)
++			{
++			    	if (!g_ascii_isspace((unsigned char)source[i]) && source[i] != ')')
++				{
++				    	output[j++] = source[i];
++				}
++			}
++			output[j] = '\0';
++		}
++#else
+ 		len = strlen(output);
+ 		for(i = 0; i < len; i++)
+ 		{
+@@ -3855,8 +3873,7 @@
+ 		i = strlen(output) - 1;
+ 		while (g_ascii_isspace((unsigned char)output[i])) 
+ 			output[i--] = '\0';
+-
+-		
++#endif
+ 		if (output[0]) {
+ #ifdef HAVE_LIBBZ2
+ 		  if(strstr(output,".bz2"))