Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

7 files changed, 123 insertions, 117 deletions

diff --git a/www/screem/Makefile b/www/screem/Makefile
index 6a2989c2e2ee..c6b03ef99d67 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	screem
-PORTVERSION=	0.10.2
-CATEGORIES=	www editors gnome
+PORTVERSION=	0.12.0
+CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -15,18 +15,22 @@ MAINTAINER=	coop9211@uidaho.edu
 COMMENT=	Nice GNOME/GTK-based HTML editor
 
 LIB_DEPENDS+=	neon.24:${PORTSDIR}/www/neon \
-		croco.3:${PORTSDIR}/textproc/libcroco
+		croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco \
+		dbus-1.0:${PORTSDIR}/devel/dbus
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
-		gtksourceview lthack intlhack
-USE_INC_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
+		gtksourceview intlhack
+USE_LIBTOOL_VER=15
 
-.ifndef WITHOUT_OPENSSL
+GCONF_SCHEMAS=	screem.schemas
+
+CROCO_VERSION=	0.6
+
+.if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl
 .endif
@@ -39,8 +43,17 @@ CONFIGURE_ARGS+=	--without-included-neon
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$${DATADIRNAME}/\$${PACKAGE}/pixmaps|\$${DATADIRNAME}/gnome/\$${PACKAGE}/pixmaps|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$(datadir)/mime/|${PREFIX}/share/mime/| ; \
+		s|$$(datadir)/mime$$|${PREFIX}/share/mime|' \
+		${WRKSRC}/data/mime/Makefile.in \
+		${WRKSRC}/data/tagtrees/Makefile.in
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|\/\* #undef HAVE_LIMITS_H \*\/|#define HAVE_LIMITS_H 1|g' ${WRKSRC}/config.h
 
+# HACK:  This allows test builds into a temporary directory, but in the REAL world,
+# gconf would have created this directory.
+pre-install:
+	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults
+
 .include <bsd.port.mk>
diff --git a/www/screem/distinfo b/www/screem/distinfo
index 983b017c2c07..2cd82d29274c 100644
--- a/www/screem/distinfo
+++ b/www/screem/distinfo
@@ -1,2 +1,2 @@
-MD5 (screem-0.10.2.tar.gz) = a58c72555a6cecf34c2e2f6d9fda0288
-SIZE (screem-0.10.2.tar.gz) = 2350572
+MD5 (screem-0.12.0.tar.gz) = 549077fca6a94e7a7051f33fc1d51e4a
+SIZE (screem-0.12.0.tar.gz) = 4172719
diff --git a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c b/www/screem/files/patch-libegg::toolbar::eggtoolbar.c
deleted file mode 100644
index 84d7b815805b..000000000000
--- a/www/screem/files/patch-libegg::toolbar::eggtoolbar.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libegg/toolbar/eggtoolbar.c.orig	Thu Aug 12 10:09:55 2004
-+++ libegg/toolbar/eggtoolbar.c	Thu Aug 12 10:11:54 2004
-@@ -2534,7 +2534,7 @@
- 
- GtkWidget*
- egg_toolbar_append_element (EggToolbar          *toolbar,
--			    GtkToolbarChildType  type,
-+			    EggToolbarChildType  type,
- 			    GtkWidget           *widget,
- 			    const char          *text,
- 			    const char          *tooltip_text,
-@@ -2551,7 +2551,7 @@
- 
- GtkWidget *
- egg_toolbar_prepend_element (EggToolbar          *toolbar,
--			     GtkToolbarChildType  type,
-+			     EggToolbarChildType  type,
- 			     GtkWidget           *widget,
- 			     const char          *text,
- 			     const char          *tooltip_text,
diff --git a/www/screem/files/patch-ltmain.sh b/www/screem/files/patch-ltmain.sh
deleted file mode 100644
index 3bd995ac82f9..000000000000
--- a/www/screem/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Tue Mar 30 22:36:08 2004
-+++ ltmain.sh	Tue Mar 30 22:39:04 2004
-@@ -1360,7 +1360,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
- 	   ;;
-@@ -1370,8 +1370,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
- 	;;
- 
-@@ -3110,6 +3118,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5712,10 +5723,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/www/screem/files/patch-plugins::uploadWizard::Makefile.in b/www/screem/files/patch-plugins::uploadWizard::Makefile.in
index 51b06f5f654b..5ce8e16b5326 100644
--- a/www/screem/files/patch-plugins::uploadWizard::Makefile.in
+++ b/www/screem/files/patch-plugins::uploadWizard::Makefile.in
@@ -1,22 +1,22 @@
---- plugins/uploadWizard/Makefile.in.orig	Tue Mar 30 22:42:31 2004
-+++ plugins/uploadWizard/Makefile.in	Tue Mar 30 22:43:33 2004
-@@ -267,8 +267,8 @@
- 			localdriver.c
+--- plugins/uploadWizard/Makefile.in.orig	Wed Nov  3 03:18:43 2004
++++ plugins/uploadWizard/Makefile.in	Wed Nov  3 03:20:17 2004
+@@ -277,8 +277,8 @@
+ 			vfsdriver.c
  
  
 -uploadWizard_la_LDFLAGS = -avoid-version -module $(NEON_CFLAGS)
 -uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) 
 +uploadWizard_la_LDFLAGS = -avoid-version -module
-+uploadWizard_la_LIBADD =  
++uploadWizard_la_LIBADD =
  
  config_h = $(top_builddir)/config.h
  obj_ext = o
-@@ -279,7 +279,7 @@
+@@ -289,7 +289,7 @@
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(plugins_exec_LTLIBRARIES)
  
 -uploadWizard_la_DEPENDENCIES = $(neon_dir)/*.lo
-+uploadWizard_la_DEPENDENCIES = 
- am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h rpmatch.c \
- 	fnmatch.c fnmatch.h common.c common.h davdriver.c fileset.c \
- 	fileset.h frontend.h ftp.c ftp.h ftpdriver.c i18n.h protocol.h \
++uploadWizard_la_DEPENDENCIES =
+ am__uploadWizard_la_SOURCES_DIST = basename.h netrc.c netrc.h fnmatch.c \
+ 	fnmatch.h common.c common.h fileset.c fileset.h frontend.h \
+ 	ftp.c ftp.h ftpdriver.c i18n.h protocol.h rcfile.c rcfile.h \
diff --git a/www/screem/pkg-descr b/www/screem/pkg-descr
index b586f6d09b23..b601941fa4de 100644
--- a/www/screem/pkg-descr
+++ b/www/screem/pkg-descr
@@ -2,7 +2,7 @@ SCREEM (Site CReating and Editing EnvironMent) is a VERY nice
 GUI-based HTML editor, much like bluefish. It even imports bluefish
 functions from your bluefish installation!
 
-SCREEM makes a rather ideal GUI HTML editor, especially for 
+SCREEM makes a rather ideal GUI HTML editor, especially for
 Unixheads who like using CVS to manage source trees, as SCREEM
 has functional CVS interaction.
 
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 3363683c65d9..ae424d011918 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -1,7 +1,4 @@
 bin/screem
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/screem.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/screem.schemas > /dev/null || /usr/bin/true
 lib/screem/plugins/colourWizard.so
 lib/screem/plugins/cssWizard.so
 lib/screem/plugins/css_wizard.so
@@ -9,16 +6,73 @@ lib/screem/plugins/entityWizard.so
 lib/screem/plugins/formWizard.so
 lib/screem/plugins/imageWizard.so
 lib/screem/plugins/linkWizard.so
+lib/screem/plugins/object_wizard.so
 lib/screem/plugins/ssiWizard.so
 lib/screem/plugins/tableWizard.so
 lib/screem/plugins/uploadWizard.so
 share/gnome/application-registry/screem.applications
+share/gnome/applications/mimeinfo.cache
 share/gnome/applications/screem.desktop
-share/gnome/help/screem/C/figures/dummy.png
+share/gnome/help/screem/C/figures/color-wizard.png
+share/gnome/help/screem/C/figures/css-wizard1.png
+share/gnome/help/screem/C/figures/css-wizard2.png
+share/gnome/help/screem/C/figures/editor-autocomplete1.png
+share/gnome/help/screem/C/figures/editor-context-menu.png
+share/gnome/help/screem/C/figures/editor-error.png
+share/gnome/help/screem/C/figures/editor-inline-tagging.png
+share/gnome/help/screem/C/figures/editor-pasting.png
+share/gnome/help/screem/C/figures/editor-tooltips.png
+share/gnome/help/screem/C/figures/editor.png
+share/gnome/help/screem/C/figures/entity-wizard.png
+share/gnome/help/screem/C/figures/form-wizard.png
+share/gnome/help/screem/C/figures/image-wizard.png
+share/gnome/help/screem/C/figures/link-wizard1.png
+share/gnome/help/screem/C/figures/link-wizard2.png
+share/gnome/help/screem/C/figures/newblankdoc.png
+share/gnome/help/screem/C/figures/newdoc.png
+share/gnome/help/screem/C/figures/newsite1.png
+share/gnome/help/screem/C/figures/newsite2.png
+share/gnome/help/screem/C/figures/object-wizard.png
+share/gnome/help/screem/C/figures/opensite1.png
+share/gnome/help/screem/C/figures/opensite2.png
+share/gnome/help/screem/C/figures/opensitelocation.png
+share/gnome/help/screem/C/figures/prefs-browsers.png
+share/gnome/help/screem/C/figures/prefs-doctypes.png
+share/gnome/help/screem/C/figures/prefs-editor.png
+share/gnome/help/screem/C/figures/prefs-fonts-colors.png
+share/gnome/help/screem/C/figures/prefs-misc.png
+share/gnome/help/screem/C/figures/prefs-tag-trees.png
+share/gnome/help/screem/C/figures/preview.png
+share/gnome/help/screem/C/figures/sidebar-attributes1.png
+share/gnome/help/screem/C/figures/sidebar-attributes2.png
+share/gnome/help/screem/C/figures/sidebar-attributes3.png
+share/gnome/help/screem/C/figures/sidebar-errors.png
+share/gnome/help/screem/C/figures/sidebar-files1.png
+share/gnome/help/screem/C/figures/sidebar-files2.png
+share/gnome/help/screem/C/figures/sidebar-messages.png
+share/gnome/help/screem/C/figures/sidebar-resources1.png
+share/gnome/help/screem/C/figures/sidebar-resources2.png
+share/gnome/help/screem/C/figures/sidebar-resources3.png
+share/gnome/help/screem/C/figures/sidebar-symbols.png
+share/gnome/help/screem/C/figures/sidebar-tree.png
+share/gnome/help/screem/C/figures/ssi-wizard.png
+share/gnome/help/screem/C/figures/table-wizard.png
+share/gnome/help/screem/C/figures/tree.png
 share/gnome/help/screem/C/legal.xml
 share/gnome/help/screem/C/screem.xml
 share/gnome/mime-info/screem.keys
-share/gnome/mime-info/screem.mime
+share/mime/application/vnd.wap.wmlc.xml
+share/mime/application/vnd.wap.wmlscriptc.xml
+share/mime/application/x-screem-tag-tree.xml
+share/mime/application/x-screem.xml
+share/mime/application/xhtml+xml.xml
+share/mime/image/vnd.wap.wbmp.xml
+share/mime/packages/screem.xml
+share/mime/text/html.xml
+share/mime/text/vnd.wap.wml.xml
+share/mime/text/vnd.wap.wmlscript.xml
+share/mime/text/x-component.xml
+share/mime/text/x-javascript.xml
 share/gnome/omf/screem/screem-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/screem.png
@@ -40,10 +94,10 @@ share/gnome/screem/dtd/xhtml-special.ent
 share/gnome/screem/dtd/xhtml-symbol.ent
 share/gnome/screem/features.xml
 share/gnome/screem/glade/css-wizard.glade
-share/gnome/screem/glade/css.glade
 share/gnome/screem/glade/entityWizard.glade
 share/gnome/screem/glade/imageWizard.glade
 share/gnome/screem/glade/linkwizard.glade
+share/gnome/screem/glade/object-wizard.glade
 share/gnome/screem/glade/screem.glade
 share/gnome/screem/glade/ssiwizard.glade
 share/gnome/screem/glade/tablewizard.glade
@@ -82,6 +136,7 @@ share/gnome/screem/pixmaps/entry.xpm
 share/gnome/screem/pixmaps/fixed.xpm
 share/gnome/screem/pixmaps/gallery.xpm
 share/gnome/screem/pixmaps/gnome-fileentry.xpm
+share/gnome/screem/pixmaps/hand-open.png
 share/gnome/screem/pixmaps/insert-symbol-16.png
 share/gnome/screem/pixmaps/insert-symbol-24.png
 share/gnome/screem/pixmaps/optionmenu.xpm
@@ -92,10 +147,15 @@ share/gnome/screem/pixmaps/resources.png
 share/gnome/screem/pixmaps/screem_site.png
 share/gnome/screem/pixmaps/site_preview.png
 share/gnome/screem/pixmaps/site_structure-48.png
+share/gnome/screem/pixmaps/stock-close-12.png
+share/gnome/screem/pixmaps/stock-menu-left-12.png
+share/gnome/screem/pixmaps/stock-menu-right-12.png
 share/gnome/screem/pixmaps/stock_connect.png
 share/gnome/screem/pixmaps/stock_disconnect.png
 share/gnome/screem/pixmaps/stock_insert_image-16.png
 share/gnome/screem/pixmaps/stock_insert_image.png
+share/gnome/screem/pixmaps/stock_insert_object-16.png
+share/gnome/screem/pixmaps/stock_insert_object.png
 share/gnome/screem/pixmaps/stock_insert_table-16.png
 share/gnome/screem/pixmaps/sub.xpm
 share/gnome/screem/pixmaps/sup.xpm
@@ -112,10 +172,12 @@ share/gnome/screem/resources/Templates/template.html
 share/gnome/screem/tagtrees/apache.tagtree
 share/gnome/screem/tagtrees/css.tagtree
 share/gnome/screem/tagtrees/funcref_php.tagtree
+share/gnome/screem/tagtrees/funcref_python.tagtree
 share/gnome/screem/tagtrees/html.tagtree
 share/gnome/screem/tagtrees/javascript.tagtree
+share/gnome/screem/tagtrees/teixlite.tagtree
 share/gnome/screem/ui/layout
-share/gnome/screem/ui/screem-css-window-ui.xml
+share/gnome/screem/ui/screem-editable-toolbars.xml
 share/gnome/screem/ui/screem-tag-tree-bar.xml
 share/gnome/screem/ui/screem-window-menu.xml
 share/gnome/screem/ui/screem-window-popups.xml
@@ -141,26 +203,28 @@ share/locale/tr/LC_MESSAGES/screem.mo
 share/locale/uk/LC_MESSAGES/screem.mo
 share/locale/vi/LC_MESSAGES/screem.mo
 share/locale/zh_CN/LC_MESSAGES/screem.mo
-@dirrm share/gnome/screem/ui
-@dirrm share/gnome/screem/tagtrees
-@dirrm share/gnome/screem/resources/Templates
-@dirrm share/gnome/screem/resources/PHP3
-@dirrm share/gnome/screem/resources/Javascript
-@dirrm share/gnome/screem/resources/Images
-@dirrm share/gnome/screem/resources/HTML
-@dirrm share/gnome/screem/resources/Applets
-@dirrm share/gnome/screem/resources
-@dirrm share/gnome/screem/pixmaps
-@dirrm share/gnome/screem/hints
-@dirrm share/gnome/screem/glade
-@dirrm share/gnome/screem/dtd
-@dirrm share/gnome/screem
-@dirrm share/gnome/pixmaps/screem/splash
-@dirrm share/gnome/pixmaps/screem
-@dirrm share/gnome/omf/screem
+@dirrm lib/screem/plugins
+@dirrm lib/screem
 @dirrm share/gnome/help/screem/C/figures
 @dirrm share/gnome/help/screem/C
 @dirrm share/gnome/help/screem
-@dirrm lib/screem/plugins
-@dirrm lib/screem
+@dirrm share/gnome/omf/screem
+@dirrm share/gnome/pixmaps/screem/splash
+@dirrm share/gnome/pixmaps/screem
+@dirrm share/gnome/screem/dtd
+@dirrm share/gnome/screem/glade
+@dirrm share/gnome/screem/hints
+@dirrm share/gnome/screem/pixmaps
+@dirrm share/gnome/screem/resources/Applets
+@dirrm share/gnome/screem/resources/HTML
+@dirrm share/gnome/screem/resources/Images
+@dirrm share/gnome/screem/resources/Javascript
+@dirrm share/gnome/screem/resources/PHP3
+@dirrm share/gnome/screem/resources/Templates
+@dirrm share/gnome/screem/resources
+@dirrm share/gnome/screem/tagtrees
+@dirrm share/gnome/screem/ui
+@dirrm share/gnome/screem
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime