6 files changed, 65 insertions, 25 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index d5a862a559b2..172ba45a74be 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	devhelp
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	rui@ruilopes.com
@@ -20,9 +19,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgtkhtml libgnomeui
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 234aa68a513a..fce9a7967db8 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/devhelp-0.6.0.tar.bz2) = 550483a3717f8bc58d0f3bfdab57413f
+MD5 (gnome2/devhelp-0.7.tar.bz2) = 7391578353368d9db3ed6a74f4128754
diff --git a/devel/devhelp/files/patch-configure b/devel/devhelp/files/patch-configure
deleted file mode 100644
index 22e7246eea3a..000000000000
--- a/devel/devhelp/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Thu May 29 02:11:26 2003
-+++ configure	Thu May 29 02:12:44 2003
-@@ -7639,6 +7639,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'
diff --git a/devel/devhelp/files/patch-ltmain.sh b/devel/devhelp/files/patch-ltmain.sh
new file mode 100644
index 000000000000..d2334e2a55e7
--- /dev/null
+++ b/devel/devhelp/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sun Jun 29 11:51:47 2003
++++ ltmain.sh	Sun Jun 29 21:02:37 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/devhelp/files/patch-src::dh-base.c b/devel/devhelp/files/patch-src::dh-base.c
index c364d4ff1b99..8e174831a535 100644
--- a/devel/devhelp/files/patch-src::dh-base.c
+++ b/devel/devhelp/files/patch-src::dh-base.c
@@ -1,10 +1,10 @@
---- src/dh-base.c.orig	Tue Jun  3 12:21:34 2003
-+++ src/dh-base.c	Tue Jun  3 12:23:04 2003
-@@ -155,6 +155,7 @@
+--- src/dh-base.c.orig	Sat Jun 28 22:16:34 2003
++++ src/dh-base.c	Sun Jun 29 13:40:23 2003
+@@ -222,6 +222,7 @@
  	
- 	/* Insert the books from default gtk-doc install path */
- 	base_add_books (base, DATADIR"/gtk-doc/html");
-+	base_add_books (base, DATADIR"/../doc"); // FreeBSD default doc path
+ 	/* Insert the books from default gtk-doc install path. */
+ 	base_add_books (base, DATADIR "/gtk-doc/html");
++	base_add_books (base, DATADIR "/../doc"); // FreeBSD default doc path
  	base_add_books (base, "/usr/share/gtk-doc/html");
- 	base_add_books (base, DATADIR"/devhelp/books");
- 	dir = g_strconcat (g_getenv ("HOME"), "/.devhelp/books", NULL);
+ 	base_add_books (base, DATADIR "/devhelp/books");
+ 	dir = g_build_filename (g_get_home_dir (), ".devhelp", "books", NULL);
diff --git a/devel/devhelp/pkg-descr b/devel/devhelp/pkg-descr
index 099a8d859df3..2d617b391b33 100644
--- a/devel/devhelp/pkg-descr
+++ b/devel/devhelp/pkg-descr
@@ -3,6 +3,6 @@ frontend to books about GNOME development, providing cross-referenced,
 easily searchable information.  Many books are available, and can
 be found through the project's website.
 
-WWW: http://devhelp.codefactory.se
+WWW: http://www.imendio.com/projects/devhelp/
 
 -Adam Weinberger <adamw@FreeBSD.org>