10 files changed, 38 insertions, 100 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 7ce5a3db6be4..c13b96395d73 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.14
+PORTVERSION=	1.5.17
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,7 +23,7 @@ USE_XPM=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
 		--datadir=${PREFIX}/share/gnome2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,6 +37,6 @@ pre-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
-		 s|\$\(datadir\)/gnome|\$\(datadir\)|g'
+		 s|\$\(datadir\)/gnome/|\$\(datadir\)/|g'
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index a24482ec300b..96d0cc6fe998 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.14.tar.bz2) = 4731bdb0df5178d1a63b8e1c3b65c64c
+MD5 (gnome2/gnome-desktop-1.5.17.tar.bz2) = 74cd91b5841c753edf5cbfa6f60b9575
diff --git a/x11/gnome-desktop/files/patch-configure b/x11/gnome-desktop/files/patch-configure
new file mode 100644
index 000000000000..46f1d528083e
--- /dev/null
+++ b/x11/gnome-desktop/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 14:02:41	1.1
++++ configure	2002/04/26 14:02:56
+@@ -7222,6 +7222,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/x11/gnome-desktop/files/patch-ltmain.sh b/x11/gnome-desktop/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11/gnome-desktop/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,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
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 0fd85ad825fe..1e1db57e093d 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -27,6 +27,7 @@ share/gnome2/vfolders/Settings.order
 share/gnome2/vfolders/System.directory
 share/gnome2/pixmaps/apple-green.png
 share/gnome2/pixmaps/apple-red.png
+share/gnome2/pixmaps/cdeappmenu.png
 share/gnome2/pixmaps/gnome-amusements.png
 share/gnome2/pixmaps/gnome-aorta.png
 share/gnome2/pixmaps/gnome-applets.png
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 7ce5a3db6be4..c13b96395d73 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.14
+PORTVERSION=	1.5.17
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,7 +23,7 @@ USE_XPM=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
 		--datadir=${PREFIX}/share/gnome2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -37,6 +37,6 @@ pre-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
-		 s|\$\(datadir\)/gnome|\$\(datadir\)|g'
+		 s|\$\(datadir\)/gnome/|\$\(datadir\)/|g'
 
 .include <bsd.port.mk>
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index a24482ec300b..96d0cc6fe998 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.14.tar.bz2) = 4731bdb0df5178d1a63b8e1c3b65c64c
+MD5 (gnome2/gnome-desktop-1.5.17.tar.bz2) = 74cd91b5841c753edf5cbfa6f60b9575
diff --git a/x11/gnomedesktop/files/patch-configure b/x11/gnomedesktop/files/patch-configure
new file mode 100644
index 000000000000..46f1d528083e
--- /dev/null
+++ b/x11/gnomedesktop/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 14:02:41	1.1
++++ configure	2002/04/26 14:02:56
+@@ -7222,6 +7222,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/x11/gnomedesktop/files/patch-ltmain.sh b/x11/gnomedesktop/files/patch-ltmain.sh
deleted file mode 100644
index 91713d2306f8..000000000000
--- a/x11/gnomedesktop/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,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
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,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/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index 0fd85ad825fe..1e1db57e093d 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -27,6 +27,7 @@ share/gnome2/vfolders/Settings.order
 share/gnome2/vfolders/System.directory
 share/gnome2/pixmaps/apple-green.png
 share/gnome2/pixmaps/apple-red.png
+share/gnome2/pixmaps/cdeappmenu.png
 share/gnome2/pixmaps/gnome-amusements.png
 share/gnome2/pixmaps/gnome-aorta.png
 share/gnome2/pixmaps/gnome-applets.png