Update to 0.5.5 which makes screem a GNOME 2 app. Yay!

PR:	45302
Submitted by:	maintainer

18 files changed, 320 insertions, 630 deletions

diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 994b73b8d87e..f3836d0a7f2c 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	screem
-PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTVERSION=	0.5.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.screem.org/src/ \
-		http://www.borgsdemons.com/distfiles/screem/
+		http://www.screem.org/src/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-docs${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	coop9211@uidaho.edu
 
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
+		zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
+		neon.22:${PORTSDIR}/www/neon
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomevfs gtkhtml
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/gnome-vfs-1.0" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gnomevfs --with-ssl --with-included-neon
+CONFIGURE_ARGS=	--with-gnomevfs --with-ssl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -34,8 +38,4 @@ post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
 		's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g'
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/../${PORTNAME}-docs/* \
-		${PREFIX}/share/gnome/help/screem/C/
-
 .include <bsd.port.mk>
diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo
index efd675914605..cf2e54d9388e 100644
--- a/www/screem-devel/distinfo
+++ b/www/screem-devel/distinfo
@@ -1,2 +1 @@
-MD5 (screem-0.4.1.tar.gz) = 8424eb59a232e976f9dd276320727f5b
-MD5 (screem-docs.tar.gz) = 4afc0446ed4e876ea004d08043751760
+MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06
diff --git a/www/screem-devel/files/patch-ab b/www/screem-devel/files/patch-ab
index 8d824739420a..68a30859a705 100644
--- a/www/screem-devel/files/patch-ab
+++ b/www/screem-devel/files/patch-ab
@@ -1,27 +1,10 @@
-
-$FreeBSD$
-
---- configure.orig	Tue Nov 13 12:46:59 2001
-+++ configure	Tue Nov 13 12:50:04 2001
-@@ -4834,8 +4834,10 @@
- fi
- GNOME_VFS_LIBS=
- if $have_gnome_vfs; then
--	CFLAGS="$CFLAGS `$GNOME_CONFIG vfs vfscorba vfspthread --cflags`"
--	GNOME_VFS_LIBS=`$GNOME_CONFIG vfs vfscorba vfspthread --libs`
-+	CFLAGS="$CFLAGS `$GNOME_CONFIG vfs --cflags`"
-+	CPPFLAGS="$CPPFLAGS `$GNOME_CONFIG gtkhtml print --cflags`"
-+	GNOME_VFS_LIBS=`$GNOME_CONFIG vfs --libs`
-+	LDFLAGS="$LDFLAGS `$GNOME_CONFIG gtkhtml print --libs`"
- fi
- 
- 
-@@ -5029,7 +5031,7 @@
-   HAVE_PTHREADS_FALSE=
- fi
- 
--GTHREAD_LIBS=`glib-config gthread --libs`
-+GTHREAD_LIBS=`${GLIB_CONFIG} gthread --libs`
- 
+--- configure.orig	Thu Nov 14 22:42:00 2002
++++ configure	Thu Nov 14 22:42:26 2002
+@@ -7251,6 +7251,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/www/screem-devel/files/patch-plugins::mailWizard::mailWizard.c b/www/screem-devel/files/patch-plugins::mailWizard::mailWizard.c
deleted file mode 100644
index c50e9c5a2fc1..000000000000
--- a/www/screem-devel/files/patch-plugins::mailWizard::mailWizard.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- plugins/mailWizard/mailWizard.c	2001/12/11 15:18:13	1.1
-+++ plugins/mailWizard/mailWizard.c	2001/12/11 15:18:27
-@@ -1,8 +1,8 @@
- #include <config.h>
- 
-+#include <sys/types.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
--#include <sys/types.h>
- #include <sys/socket.h> 
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in b/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in
deleted file mode 100644
index a843f279434c..000000000000
--- a/www/screem-devel/files/patch-plugins::uploadWizard::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- plugins/uploadWizard/Makefile.in	2001/11/13 11:12:50	1.1
-+++ plugins/uploadWizard/Makefile.in	2001/11/13 11:13:46
-@@ -168,7 +168,7 @@
- 
- 
- uploadWizard_la_LDFLAGS = -avoid-version -module
--uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) 			$(PTHREAD_LIB) $(NEONOBJS)
-+uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) 			$(PTHREAD_LIB) $(NEONOBJS) -lssl -lcrypto
- 
- config_h = $(top_builddir)/config.h
- obj_ext = o
diff --git a/www/screem-devel/files/patch-plugins::uploadWizard::uploadWizard.c b/www/screem-devel/files/patch-plugins::uploadWizard::uploadWizard.c
deleted file mode 100644
index 880eb8443ae7..000000000000
--- a/www/screem-devel/files/patch-plugins::uploadWizard::uploadWizard.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plugins/uploadWizard/uploadWizard.c	2001/12/12 04:27:17	1.1
-+++ plugins/uploadWizard/uploadWizard.c	2001/12/12 04:28:19
-@@ -53,6 +53,7 @@
- 
- /* screem stuff */
- #include "site.h"
-+#include "support.h"
- #include "uploadWizard.h"
- 
- int my_abortable_transfer_wrapper(struct site *site,
diff --git a/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in b/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in
new file mode 100644
index 000000000000..db8be8753a7b
--- /dev/null
+++ b/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/uploadWizard/Makefile.in.orig	Thu Nov 14 23:37:10 2002
++++ plugins/uploadWizard/Makefile.in	Thu Nov 14 23:37:37 2002
+@@ -169,7 +169,7 @@
+ 
+ 
+ uploadWizard_la_LDFLAGS = -avoid-version -module
+-uploadWizard_la_LIBADD = $(NEONOBJS) $(SCREEM_LIBS)	
++uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) $(SCREEM_LIBS)	
+ 
+ config_h = $(top_builddir)/config.h
+ obj_ext = o
diff --git a/www/screem-devel/files/patch-src_fileops.c b/www/screem-devel/files/patch-src_fileops.c
new file mode 100644
index 000000000000..d2db97291400
--- /dev/null
+++ b/www/screem-devel/files/patch-src_fileops.c
@@ -0,0 +1,31 @@
+--- src/fileops.c.orig	Fri Sep 20 11:27:42 2002
++++ src/fileops.c	Fri Nov 15 03:46:00 2002
+@@ -144,6 +144,9 @@
+ 	result = gnome_vfs_get_file_info( dest, vfsinfo, options );
+ 	
+ 	if( result != GNOME_VFS_OK ) {
++	    	gnome_vfs_file_info_unref( vfsinfo );
++		vfsinfo = gnome_vfs_file_info_new();
++		gnome_vfs_get_file_info( source, vfsinfo, options );
+ 		if( ! mkdir_recursive( dest, vfsinfo->permissions ) ) {
+ 			gnome_vfs_file_info_unref( vfsinfo );
+ 			return FALSE;
+@@ -159,7 +162,7 @@
+ 	gnome_vfs_file_info_unref( vfsinfo );
+ 
+ 	handle = NULL;
+-	result = gnome_vfs_directory_open( &handle, dest, options );
++	result = gnome_vfs_directory_open( &handle, source, options );
+ 
+ 	if( result != GNOME_VFS_OK ) {
+ 		return FALSE;
+@@ -298,6 +301,9 @@
+ 					result = GNOME_VFS_OK;
+ 				}
+ 				gnome_vfs_file_info_unref( info );
++			}
++			else if ( result == GNOME_VFS_ERROR_IS_DIRECTORY ) {
++			    result = GNOME_VFS_OK;
+ 			}
+ 			
+ 			ret = ( result == GNOME_VFS_OK );
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index 2b0aa9b7ef72..a8b5a1634b5b 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -1,28 +1,29 @@
 bin/screem
+etc/gconf/gconf.xml.defaults/apps/screem/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/editor/print/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/hint/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/linkview/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint/%gconf.xml
+etc/gconf/schemas/screem.schemas
 lib/screem/plugins/colourWizard.so
 lib/screem/plugins/cssWizard.so
 lib/screem/plugins/entityWizard.so
 lib/screem/plugins/formWizard.so
-lib/screem/plugins/frameWizard.so
-lib/screem/plugins/galleryWizard.so
 lib/screem/plugins/imageWizard.so
 lib/screem/plugins/linkWizard.so
-lib/screem/plugins/mailWizard.so
-lib/screem/plugins/script.scm
 lib/screem/plugins/ssiWizard.so
 lib/screem/plugins/tableWizard.so
 lib/screem/plugins/uploadWizard.so
-share/gnome/apps/Development/screem.desktop
-share/gnome/help/screem/C/authors.html
+share/gnome/application-registry/screem.applications
+share/gnome/applications/screem.desktop
 share/gnome/help/screem/C/authors.sgml
-share/gnome/help/screem/C/bugs.html
 share/gnome/help/screem/C/bugs.sgml
-share/gnome/help/screem/C/cvs.html
-share/gnome/help/screem/C/dnd.html
-share/gnome/help/screem/C/documentstructure.html
-share/gnome/help/screem/C/dtd.html
-share/gnome/help/screem/C/externalbrowsers.html
-share/gnome/help/screem/C/features.html
 share/gnome/help/screem/C/features.sgml
 share/gnome/help/screem/C/figs/color.png
 share/gnome/help/screem/C/figs/copybutton.png
@@ -56,88 +57,23 @@ share/gnome/help/screem/C/figs/tagbutton.png
 share/gnome/help/screem/C/figs/todo.png
 share/gnome/help/screem/C/figs/upload.png
 share/gnome/help/screem/C/figs/wizardbutton.png
-share/gnome/help/screem/C/guilescripting.html
-share/gnome/help/screem/C/highlighting.html
-share/gnome/help/screem/C/index.html
-share/gnome/help/screem/C/inlinetagginginfo.html
-share/gnome/help/screem/C/install-install.html
-share/gnome/help/screem/C/install-uninstall.html
-share/gnome/help/screem/C/install-what.html
-share/gnome/help/screem/C/install.html
 share/gnome/help/screem/C/install.sgml
-share/gnome/help/screem/C/intelliclose.html
-share/gnome/help/screem/C/intellientity.html
-share/gnome/help/screem/C/internationalisation.html
-share/gnome/help/screem/C/intro.html
 share/gnome/help/screem/C/intro.sgml
-share/gnome/help/screem/C/keymacros.html
-share/gnome/help/screem/C/libraryrequirements.html
-share/gnome/help/screem/C/linkfix.html
-share/gnome/help/screem/C/linkview.html
-share/gnome/help/screem/C/multiprojects.html
-share/gnome/help/screem/C/plugins.html
-share/gnome/help/screem/C/previewwindow.html
-share/gnome/help/screem/C/printing.html
-share/gnome/help/screem/C/requirements.html
 share/gnome/help/screem/C/requirements.sgml
 share/gnome/help/screem/C/screem.sgml
 share/gnome/help/screem/C/screemDev.sgml
 share/gnome/help/screem/C/screemGuiRef.sgml
-share/gnome/help/screem/C/searchreplace.html
-share/gnome/help/screem/C/setup-helpers.html
-share/gnome/help/screem/C/setup-import.html
-share/gnome/help/screem/C/setup.html
 share/gnome/help/screem/C/setup.sgml
-share/gnome/help/screem/C/sitewidetemplates.html
-share/gnome/help/screem/C/spellchecking.html
-share/gnome/help/screem/C/started-editing.html
-share/gnome/help/screem/C/started-previewing.html
-share/gnome/help/screem/C/started-uploading.html
-share/gnome/help/screem/C/started.html
 share/gnome/help/screem/C/started.sgml
-share/gnome/help/screem/C/taghelp.html
-share/gnome/help/screem/C/taglist.html
-share/gnome/help/screem/C/tagproperties.html
-share/gnome/help/screem/C/todolist.html
-share/gnome/help/screem/C/tooltips.html
 share/gnome/help/screem/C/topic.dat
 share/gnome/mc/templates/screem.desktop
 share/gnome/mime-info/screem.keys
 share/gnome/mime-info/screem.mime
 share/gnome/pixmaps/screem.png
-share/gnome/pixmaps/screem/broken.xpm
-share/gnome/pixmaps/screem/browser.xpm
-share/gnome/pixmaps/screem/button.xpm
-share/gnome/pixmaps/screem/caption.xpm
-share/gnome/pixmaps/screem/checkbutton.xpm
-share/gnome/pixmaps/screem/dir-close.xpm
-share/gnome/pixmaps/screem/dir-open.xpm
-share/gnome/pixmaps/screem/entry.xpm
-share/gnome/pixmaps/screem/fixed.xpm
-share/gnome/pixmaps/screem/gallery.xpm
-share/gnome/pixmaps/screem/gnome-fileentry.xpm
-share/gnome/pixmaps/screem/image.xpm
-share/gnome/pixmaps/screem/link.xpm
-share/gnome/pixmaps/screem/noicon.xpm
-share/gnome/pixmaps/screem/optionmenu.xpm
-share/gnome/pixmaps/screem/p.xpm
-share/gnome/pixmaps/screem/pre.xpm
-share/gnome/pixmaps/screem/preview.xpm
-share/gnome/pixmaps/screem/radiobutton.xpm
-share/gnome/pixmaps/screem/splash/1.png
-share/gnome/pixmaps/screem/splash/2.png
-share/gnome/pixmaps/screem/splash/3.png
-share/gnome/pixmaps/screem/splash/4.png
-share/gnome/pixmaps/screem/sub.xpm
-share/gnome/pixmaps/screem/sup.xpm
-share/gnome/pixmaps/screem/table.xpm
-share/gnome/pixmaps/screem/td.xpm
-share/gnome/pixmaps/screem/text.xpm
-share/gnome/pixmaps/screem/th.xpm
-share/gnome/pixmaps/screem/tr.xpm
+share/gnome/pixmaps/screem/splash/splash.png
 share/gnome/screem/dtd/HTMLlat1.ent
 share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbol.ent
+share/gnome/screem/dtd/HTMLsymbols.ent
 share/gnome/screem/dtd/catalog
 share/gnome/screem/dtd/frameset.dtd
 share/gnome/screem/dtd/loose.dtd
@@ -148,13 +84,9 @@ share/gnome/screem/dtd/xhtml-symbol.ent
 share/gnome/screem/dtd/xhtml1-frameset.dtd
 share/gnome/screem/dtd/xhtml1-strict.dtd
 share/gnome/screem/dtd/xhtml1-transitional.dtd
-share/gnome/screem/frames/style1.html
 share/gnome/screem/glade/css.glade
 share/gnome/screem/glade/entityWizard.glade
-share/gnome/screem/glade/formWizard.glade
-share/gnome/screem/glade/frameWizard.glade
 share/gnome/screem/glade/imageWizard.glade
-share/gnome/screem/glade/linkWizard.glade
 share/gnome/screem/glade/screem.glade
 share/gnome/screem/glade/tablewizard.glade
 share/gnome/screem/glade/uploadwizard.glade
@@ -162,133 +94,16 @@ share/gnome/screem/hints/screem_hints.txt
 share/gnome/screem/hints/screem_hints_fr.txt
 share/gnome/screem/hints/screem_hints_pt_BR.txt
 share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/htmlhelp/alist.html
-share/gnome/screem/htmlhelp/attrs.html
-share/gnome/screem/htmlhelp/aural.css
-share/gnome/screem/htmlhelp/block.html
-share/gnome/screem/htmlhelp/block/address.html
-share/gnome/screem/htmlhelp/block/blockquote.html
-share/gnome/screem/htmlhelp/block/center.html
-share/gnome/screem/htmlhelp/block/div.html
-share/gnome/screem/htmlhelp/block/h1.html
-share/gnome/screem/htmlhelp/block/h2.html
-share/gnome/screem/htmlhelp/block/h3.html
-share/gnome/screem/htmlhelp/block/h4.html
-share/gnome/screem/htmlhelp/block/h5.html
-share/gnome/screem/htmlhelp/block/h6.html
-share/gnome/screem/htmlhelp/block/hr.html
-share/gnome/screem/htmlhelp/block/index.html
-share/gnome/screem/htmlhelp/block/isindex.html
-share/gnome/screem/htmlhelp/block/noscript.html
-share/gnome/screem/htmlhelp/block/p.html
-share/gnome/screem/htmlhelp/block/pre.html
-share/gnome/screem/htmlhelp/deprecated.html
-share/gnome/screem/htmlhelp/entities/index.html
-share/gnome/screem/htmlhelp/entities/latin1.html
-share/gnome/screem/htmlhelp/entities/special.html
-share/gnome/screem/htmlhelp/entities/symbols.html
-share/gnome/screem/htmlhelp/fontstyle/b.html
-share/gnome/screem/htmlhelp/fontstyle/big.html
-share/gnome/screem/htmlhelp/fontstyle/i.html
-share/gnome/screem/htmlhelp/fontstyle/index.html
-share/gnome/screem/htmlhelp/fontstyle/s.html
-share/gnome/screem/htmlhelp/fontstyle/small.html
-share/gnome/screem/htmlhelp/fontstyle/strike.html
-share/gnome/screem/htmlhelp/fontstyle/tt.html
-share/gnome/screem/htmlhelp/fontstyle/u.html
-share/gnome/screem/htmlhelp/forms/button.html
-share/gnome/screem/htmlhelp/forms/fieldset.html
-share/gnome/screem/htmlhelp/forms/form.html
-share/gnome/screem/htmlhelp/forms/index.html
-share/gnome/screem/htmlhelp/forms/input.html
-share/gnome/screem/htmlhelp/forms/label.html
-share/gnome/screem/htmlhelp/forms/legend.html
-share/gnome/screem/htmlhelp/forms/optgroup.html
-share/gnome/screem/htmlhelp/forms/option.html
-share/gnome/screem/htmlhelp/forms/select.html
-share/gnome/screem/htmlhelp/forms/textarea.html
-share/gnome/screem/htmlhelp/frames/frame.html
-share/gnome/screem/htmlhelp/frames/frameset.html
-share/gnome/screem/htmlhelp/frames/index.html
-share/gnome/screem/htmlhelp/frames/noframes.html
-share/gnome/screem/htmlhelp/head/base.html
-share/gnome/screem/htmlhelp/head/head.html
-share/gnome/screem/htmlhelp/head/index.html
-share/gnome/screem/htmlhelp/head/link.html
-share/gnome/screem/htmlhelp/head/meta.html
-share/gnome/screem/htmlhelp/head/style.html
-share/gnome/screem/htmlhelp/head/title.html
-share/gnome/screem/htmlhelp/html/body.html
-share/gnome/screem/htmlhelp/html/doctype.html
-share/gnome/screem/htmlhelp/html/html.html
-share/gnome/screem/htmlhelp/html/index.html
-share/gnome/screem/htmlhelp/index.html
-share/gnome/screem/htmlhelp/inline.html
-share/gnome/screem/htmlhelp/lists/dd.html
-share/gnome/screem/htmlhelp/lists/dir.html
-share/gnome/screem/htmlhelp/lists/dl.html
-share/gnome/screem/htmlhelp/lists/dt.html
-share/gnome/screem/htmlhelp/lists/index.html
-share/gnome/screem/htmlhelp/lists/li.html
-share/gnome/screem/htmlhelp/lists/menu.html
-share/gnome/screem/htmlhelp/lists/ol.html
-share/gnome/screem/htmlhelp/lists/ul.html
-share/gnome/screem/htmlhelp/new.html
-share/gnome/screem/htmlhelp/olist.html
-share/gnome/screem/htmlhelp/phrase/abbr.html
-share/gnome/screem/htmlhelp/phrase/acronym.html
-share/gnome/screem/htmlhelp/phrase/cite.html
-share/gnome/screem/htmlhelp/phrase/code.html
-share/gnome/screem/htmlhelp/phrase/del.html
-share/gnome/screem/htmlhelp/phrase/dfn.html
-share/gnome/screem/htmlhelp/phrase/em.html
-share/gnome/screem/htmlhelp/phrase/index.html
-share/gnome/screem/htmlhelp/phrase/ins.html
-share/gnome/screem/htmlhelp/phrase/kbd.html
-share/gnome/screem/htmlhelp/phrase/samp.html
-share/gnome/screem/htmlhelp/phrase/strong.html
-share/gnome/screem/htmlhelp/phrase/var.html
-share/gnome/screem/htmlhelp/special/a.html
-share/gnome/screem/htmlhelp/special/applet.html
-share/gnome/screem/htmlhelp/special/area.html
-share/gnome/screem/htmlhelp/special/basefont.html
-share/gnome/screem/htmlhelp/special/bdo.html
-share/gnome/screem/htmlhelp/special/br.html
-share/gnome/screem/htmlhelp/special/font.html
-share/gnome/screem/htmlhelp/special/iframe.html
-share/gnome/screem/htmlhelp/special/img.html
-share/gnome/screem/htmlhelp/special/index.html
-share/gnome/screem/htmlhelp/special/map.html
-share/gnome/screem/htmlhelp/special/object.html
-share/gnome/screem/htmlhelp/special/param.html
-share/gnome/screem/htmlhelp/special/q.html
-share/gnome/screem/htmlhelp/special/script.html
-share/gnome/screem/htmlhelp/special/span.html
-share/gnome/screem/htmlhelp/special/sub.html
-share/gnome/screem/htmlhelp/special/sup.html
-share/gnome/screem/htmlhelp/structure.html
-share/gnome/screem/htmlhelp/style.css
-share/gnome/screem/htmlhelp/tables/caption.html
-share/gnome/screem/htmlhelp/tables/col.html
-share/gnome/screem/htmlhelp/tables/colgroup.html
-share/gnome/screem/htmlhelp/tables/index.html
-share/gnome/screem/htmlhelp/tables/table.html
-share/gnome/screem/htmlhelp/tables/tbody.html
-share/gnome/screem/htmlhelp/tables/td.html
-share/gnome/screem/htmlhelp/tables/tfoot.html
-share/gnome/screem/htmlhelp/tables/th.html
-share/gnome/screem/htmlhelp/tables/thead.html
-share/gnome/screem/htmlhelp/tables/tr.html
-share/gnome/screem/htmlhelp/values.html
-share/gnome/screem/htmlhelp/wdglogo-small.gif
-share/gnome/screem/htmlhelp/wdglogo1.gif
+share/gnome/screem/php/php3_functions
+share/gnome/screem/php/php4_functions
 share/gnome/screem/resources/Images/made.jpg
 share/gnome/screem/resources/Templates/template.html
 share/gnome/screem/screem.tagtree
 share/gnome/screem/syntax/html.screem.syntax
 share/gnome/screem/syntax/perl.screem.syntax
-share/gnome/screem/syntax/php3_functions
 share/gnome/screem/syntax/screemsyntax.screem.syntax
+share/gnome/screem/ui/screem-css-window-ui.xml
+share/gnome/screem/ui/screem-window-ui.xml
 share/locale/az/LC_MESSAGES/screem.mo
 share/locale/da/LC_MESSAGES/screem.mo
 share/locale/de/LC_MESSAGES/screem.mo
@@ -303,35 +118,83 @@ share/locale/ru/LC_MESSAGES/screem.mo
 share/locale/sv/LC_MESSAGES/screem.mo
 share/locale/tr/LC_MESSAGES/screem.mo
 share/locale/uk/LC_MESSAGES/screem.mo
-@dirrm lib/screem/plugins
-@dirrm lib/screem
-@dirrm share/gnome/help/screem/C/figs
-@dirrm share/gnome/help/screem/C
-@dirrm share/gnome/help/screem
-@dirrm share/gnome/pixmaps/screem/splash
-@dirrm share/gnome/pixmaps/screem
-@dirrm share/gnome/screem/dtd
-@dirrm share/gnome/screem/frames
-@dirrm share/gnome/screem/glade
-@dirrm share/gnome/screem/hints
-@dirrm share/gnome/screem/htmlhelp/block
-@dirrm share/gnome/screem/htmlhelp/entities
-@dirrm share/gnome/screem/htmlhelp/fontstyle
-@dirrm share/gnome/screem/htmlhelp/forms
-@dirrm share/gnome/screem/htmlhelp/frames
-@dirrm share/gnome/screem/htmlhelp/head
-@dirrm share/gnome/screem/htmlhelp/html
-@dirrm share/gnome/screem/htmlhelp/lists
-@dirrm share/gnome/screem/htmlhelp/phrase
-@dirrm share/gnome/screem/htmlhelp/special
-@dirrm share/gnome/screem/htmlhelp/tables
-@dirrm share/gnome/screem/htmlhelp
-@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
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/link.xpm
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/p.xpm
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure_48.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/table.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+@dirrm share/screem/pixmaps
+@dirrm share/screem
+@dirrm share/gnome/screem/ui
+@dirrm share/gnome/screem/syntax
 @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/syntax
+@dirrm share/gnome/screem/php
+@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/help/screem/C/figs
+@dirrm share/gnome/help/screem/C
+@dirrm share/gnome/help/screem
+@dirrm lib/screem/plugins
+@dirrm lib/screem
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/general
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/general
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 994b73b8d87e..f3836d0a7f2c 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -6,27 +6,31 @@
 #
 
 PORTNAME=	screem
-PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTVERSION=	0.5.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.screem.org/src/ \
-		http://www.borgsdemons.com/distfiles/screem/
+		http://www.screem.org/src/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-docs${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	coop9211@uidaho.edu
 
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
+		zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \
+		neon.22:${PORTSDIR}/www/neon
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomevfs gtkhtml
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/gnome-vfs-1.0" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gnomevfs --with-ssl --with-included-neon
+CONFIGURE_ARGS=	--with-gnomevfs --with-ssl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -34,8 +38,4 @@ post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
 		's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g'
 
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/../${PORTNAME}-docs/* \
-		${PREFIX}/share/gnome/help/screem/C/
-
 .include <bsd.port.mk>
diff --git a/www/screem/distinfo b/www/screem/distinfo
index efd675914605..cf2e54d9388e 100644
--- a/www/screem/distinfo
+++ b/www/screem/distinfo
@@ -1,2 +1 @@
-MD5 (screem-0.4.1.tar.gz) = 8424eb59a232e976f9dd276320727f5b
-MD5 (screem-docs.tar.gz) = 4afc0446ed4e876ea004d08043751760
+MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06
diff --git a/www/screem/files/patch-ab b/www/screem/files/patch-ab
index 8d824739420a..68a30859a705 100644
--- a/www/screem/files/patch-ab
+++ b/www/screem/files/patch-ab
@@ -1,27 +1,10 @@
-
-$FreeBSD$
-
---- configure.orig	Tue Nov 13 12:46:59 2001
-+++ configure	Tue Nov 13 12:50:04 2001
-@@ -4834,8 +4834,10 @@
- fi
- GNOME_VFS_LIBS=
- if $have_gnome_vfs; then
--	CFLAGS="$CFLAGS `$GNOME_CONFIG vfs vfscorba vfspthread --cflags`"
--	GNOME_VFS_LIBS=`$GNOME_CONFIG vfs vfscorba vfspthread --libs`
-+	CFLAGS="$CFLAGS `$GNOME_CONFIG vfs --cflags`"
-+	CPPFLAGS="$CPPFLAGS `$GNOME_CONFIG gtkhtml print --cflags`"
-+	GNOME_VFS_LIBS=`$GNOME_CONFIG vfs --libs`
-+	LDFLAGS="$LDFLAGS `$GNOME_CONFIG gtkhtml print --libs`"
- fi
- 
- 
-@@ -5029,7 +5031,7 @@
-   HAVE_PTHREADS_FALSE=
- fi
- 
--GTHREAD_LIBS=`glib-config gthread --libs`
-+GTHREAD_LIBS=`${GLIB_CONFIG} gthread --libs`
- 
+--- configure.orig	Thu Nov 14 22:42:00 2002
++++ configure	Thu Nov 14 22:42:26 2002
+@@ -7251,6 +7251,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/www/screem/files/patch-plugins::mailWizard::mailWizard.c b/www/screem/files/patch-plugins::mailWizard::mailWizard.c
deleted file mode 100644
index c50e9c5a2fc1..000000000000
--- a/www/screem/files/patch-plugins::mailWizard::mailWizard.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- plugins/mailWizard/mailWizard.c	2001/12/11 15:18:13	1.1
-+++ plugins/mailWizard/mailWizard.c	2001/12/11 15:18:27
-@@ -1,8 +1,8 @@
- #include <config.h>
- 
-+#include <sys/types.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
--#include <sys/types.h>
- #include <sys/socket.h> 
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/www/screem/files/patch-plugins::uploadWizard::Makefile.in b/www/screem/files/patch-plugins::uploadWizard::Makefile.in
deleted file mode 100644
index a843f279434c..000000000000
--- a/www/screem/files/patch-plugins::uploadWizard::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- plugins/uploadWizard/Makefile.in	2001/11/13 11:12:50	1.1
-+++ plugins/uploadWizard/Makefile.in	2001/11/13 11:13:46
-@@ -168,7 +168,7 @@
- 
- 
- uploadWizard_la_LDFLAGS = -avoid-version -module
--uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) 			$(PTHREAD_LIB) $(NEONOBJS)
-+uploadWizard_la_LIBADD = $(LIBGLADE_LIBS) $(GNOME_LIBDIR) $(GNOMEUI_LIBS) 			$(PTHREAD_LIB) $(NEONOBJS) -lssl -lcrypto
- 
- config_h = $(top_builddir)/config.h
- obj_ext = o
diff --git a/www/screem/files/patch-plugins::uploadWizard::uploadWizard.c b/www/screem/files/patch-plugins::uploadWizard::uploadWizard.c
deleted file mode 100644
index 880eb8443ae7..000000000000
--- a/www/screem/files/patch-plugins::uploadWizard::uploadWizard.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- plugins/uploadWizard/uploadWizard.c	2001/12/12 04:27:17	1.1
-+++ plugins/uploadWizard/uploadWizard.c	2001/12/12 04:28:19
-@@ -53,6 +53,7 @@
- 
- /* screem stuff */
- #include "site.h"
-+#include "support.h"
- #include "uploadWizard.h"
- 
- int my_abortable_transfer_wrapper(struct site *site,
diff --git a/www/screem/files/patch-plugins_uploadWizard_Makefile.in b/www/screem/files/patch-plugins_uploadWizard_Makefile.in
new file mode 100644
index 000000000000..db8be8753a7b
--- /dev/null
+++ b/www/screem/files/patch-plugins_uploadWizard_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/uploadWizard/Makefile.in.orig	Thu Nov 14 23:37:10 2002
++++ plugins/uploadWizard/Makefile.in	Thu Nov 14 23:37:37 2002
+@@ -169,7 +169,7 @@
+ 
+ 
+ uploadWizard_la_LDFLAGS = -avoid-version -module
+-uploadWizard_la_LIBADD = $(NEONOBJS) $(SCREEM_LIBS)	
++uploadWizard_la_LIBADD = $(NEONOBJS) $(NEON_LIBS) $(SCREEM_LIBS)	
+ 
+ config_h = $(top_builddir)/config.h
+ obj_ext = o
diff --git a/www/screem/files/patch-src_fileops.c b/www/screem/files/patch-src_fileops.c
new file mode 100644
index 000000000000..d2db97291400
--- /dev/null
+++ b/www/screem/files/patch-src_fileops.c
@@ -0,0 +1,31 @@
+--- src/fileops.c.orig	Fri Sep 20 11:27:42 2002
++++ src/fileops.c	Fri Nov 15 03:46:00 2002
+@@ -144,6 +144,9 @@
+ 	result = gnome_vfs_get_file_info( dest, vfsinfo, options );
+ 	
+ 	if( result != GNOME_VFS_OK ) {
++	    	gnome_vfs_file_info_unref( vfsinfo );
++		vfsinfo = gnome_vfs_file_info_new();
++		gnome_vfs_get_file_info( source, vfsinfo, options );
+ 		if( ! mkdir_recursive( dest, vfsinfo->permissions ) ) {
+ 			gnome_vfs_file_info_unref( vfsinfo );
+ 			return FALSE;
+@@ -159,7 +162,7 @@
+ 	gnome_vfs_file_info_unref( vfsinfo );
+ 
+ 	handle = NULL;
+-	result = gnome_vfs_directory_open( &handle, dest, options );
++	result = gnome_vfs_directory_open( &handle, source, options );
+ 
+ 	if( result != GNOME_VFS_OK ) {
+ 		return FALSE;
+@@ -298,6 +301,9 @@
+ 					result = GNOME_VFS_OK;
+ 				}
+ 				gnome_vfs_file_info_unref( info );
++			}
++			else if ( result == GNOME_VFS_ERROR_IS_DIRECTORY ) {
++			    result = GNOME_VFS_OK;
+ 			}
+ 			
+ 			ret = ( result == GNOME_VFS_OK );
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 2b0aa9b7ef72..a8b5a1634b5b 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -1,28 +1,29 @@
 bin/screem
+etc/gconf/gconf.xml.defaults/apps/screem/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/editor/print/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/hint/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/screem/linkview/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint/%gconf.xml
+etc/gconf/schemas/screem.schemas
 lib/screem/plugins/colourWizard.so
 lib/screem/plugins/cssWizard.so
 lib/screem/plugins/entityWizard.so
 lib/screem/plugins/formWizard.so
-lib/screem/plugins/frameWizard.so
-lib/screem/plugins/galleryWizard.so
 lib/screem/plugins/imageWizard.so
 lib/screem/plugins/linkWizard.so
-lib/screem/plugins/mailWizard.so
-lib/screem/plugins/script.scm
 lib/screem/plugins/ssiWizard.so
 lib/screem/plugins/tableWizard.so
 lib/screem/plugins/uploadWizard.so
-share/gnome/apps/Development/screem.desktop
-share/gnome/help/screem/C/authors.html
+share/gnome/application-registry/screem.applications
+share/gnome/applications/screem.desktop
 share/gnome/help/screem/C/authors.sgml
-share/gnome/help/screem/C/bugs.html
 share/gnome/help/screem/C/bugs.sgml
-share/gnome/help/screem/C/cvs.html
-share/gnome/help/screem/C/dnd.html
-share/gnome/help/screem/C/documentstructure.html
-share/gnome/help/screem/C/dtd.html
-share/gnome/help/screem/C/externalbrowsers.html
-share/gnome/help/screem/C/features.html
 share/gnome/help/screem/C/features.sgml
 share/gnome/help/screem/C/figs/color.png
 share/gnome/help/screem/C/figs/copybutton.png
@@ -56,88 +57,23 @@ share/gnome/help/screem/C/figs/tagbutton.png
 share/gnome/help/screem/C/figs/todo.png
 share/gnome/help/screem/C/figs/upload.png
 share/gnome/help/screem/C/figs/wizardbutton.png
-share/gnome/help/screem/C/guilescripting.html
-share/gnome/help/screem/C/highlighting.html
-share/gnome/help/screem/C/index.html
-share/gnome/help/screem/C/inlinetagginginfo.html
-share/gnome/help/screem/C/install-install.html
-share/gnome/help/screem/C/install-uninstall.html
-share/gnome/help/screem/C/install-what.html
-share/gnome/help/screem/C/install.html
 share/gnome/help/screem/C/install.sgml
-share/gnome/help/screem/C/intelliclose.html
-share/gnome/help/screem/C/intellientity.html
-share/gnome/help/screem/C/internationalisation.html
-share/gnome/help/screem/C/intro.html
 share/gnome/help/screem/C/intro.sgml
-share/gnome/help/screem/C/keymacros.html
-share/gnome/help/screem/C/libraryrequirements.html
-share/gnome/help/screem/C/linkfix.html
-share/gnome/help/screem/C/linkview.html
-share/gnome/help/screem/C/multiprojects.html
-share/gnome/help/screem/C/plugins.html
-share/gnome/help/screem/C/previewwindow.html
-share/gnome/help/screem/C/printing.html
-share/gnome/help/screem/C/requirements.html
 share/gnome/help/screem/C/requirements.sgml
 share/gnome/help/screem/C/screem.sgml
 share/gnome/help/screem/C/screemDev.sgml
 share/gnome/help/screem/C/screemGuiRef.sgml
-share/gnome/help/screem/C/searchreplace.html
-share/gnome/help/screem/C/setup-helpers.html
-share/gnome/help/screem/C/setup-import.html
-share/gnome/help/screem/C/setup.html
 share/gnome/help/screem/C/setup.sgml
-share/gnome/help/screem/C/sitewidetemplates.html
-share/gnome/help/screem/C/spellchecking.html
-share/gnome/help/screem/C/started-editing.html
-share/gnome/help/screem/C/started-previewing.html
-share/gnome/help/screem/C/started-uploading.html
-share/gnome/help/screem/C/started.html
 share/gnome/help/screem/C/started.sgml
-share/gnome/help/screem/C/taghelp.html
-share/gnome/help/screem/C/taglist.html
-share/gnome/help/screem/C/tagproperties.html
-share/gnome/help/screem/C/todolist.html
-share/gnome/help/screem/C/tooltips.html
 share/gnome/help/screem/C/topic.dat
 share/gnome/mc/templates/screem.desktop
 share/gnome/mime-info/screem.keys
 share/gnome/mime-info/screem.mime
 share/gnome/pixmaps/screem.png
-share/gnome/pixmaps/screem/broken.xpm
-share/gnome/pixmaps/screem/browser.xpm
-share/gnome/pixmaps/screem/button.xpm
-share/gnome/pixmaps/screem/caption.xpm
-share/gnome/pixmaps/screem/checkbutton.xpm
-share/gnome/pixmaps/screem/dir-close.xpm
-share/gnome/pixmaps/screem/dir-open.xpm
-share/gnome/pixmaps/screem/entry.xpm
-share/gnome/pixmaps/screem/fixed.xpm
-share/gnome/pixmaps/screem/gallery.xpm
-share/gnome/pixmaps/screem/gnome-fileentry.xpm
-share/gnome/pixmaps/screem/image.xpm
-share/gnome/pixmaps/screem/link.xpm
-share/gnome/pixmaps/screem/noicon.xpm
-share/gnome/pixmaps/screem/optionmenu.xpm
-share/gnome/pixmaps/screem/p.xpm
-share/gnome/pixmaps/screem/pre.xpm
-share/gnome/pixmaps/screem/preview.xpm
-share/gnome/pixmaps/screem/radiobutton.xpm
-share/gnome/pixmaps/screem/splash/1.png
-share/gnome/pixmaps/screem/splash/2.png
-share/gnome/pixmaps/screem/splash/3.png
-share/gnome/pixmaps/screem/splash/4.png
-share/gnome/pixmaps/screem/sub.xpm
-share/gnome/pixmaps/screem/sup.xpm
-share/gnome/pixmaps/screem/table.xpm
-share/gnome/pixmaps/screem/td.xpm
-share/gnome/pixmaps/screem/text.xpm
-share/gnome/pixmaps/screem/th.xpm
-share/gnome/pixmaps/screem/tr.xpm
+share/gnome/pixmaps/screem/splash/splash.png
 share/gnome/screem/dtd/HTMLlat1.ent
 share/gnome/screem/dtd/HTMLspecial.ent
-share/gnome/screem/dtd/HTMLsymbol.ent
+share/gnome/screem/dtd/HTMLsymbols.ent
 share/gnome/screem/dtd/catalog
 share/gnome/screem/dtd/frameset.dtd
 share/gnome/screem/dtd/loose.dtd
@@ -148,13 +84,9 @@ share/gnome/screem/dtd/xhtml-symbol.ent
 share/gnome/screem/dtd/xhtml1-frameset.dtd
 share/gnome/screem/dtd/xhtml1-strict.dtd
 share/gnome/screem/dtd/xhtml1-transitional.dtd
-share/gnome/screem/frames/style1.html
 share/gnome/screem/glade/css.glade
 share/gnome/screem/glade/entityWizard.glade
-share/gnome/screem/glade/formWizard.glade
-share/gnome/screem/glade/frameWizard.glade
 share/gnome/screem/glade/imageWizard.glade
-share/gnome/screem/glade/linkWizard.glade
 share/gnome/screem/glade/screem.glade
 share/gnome/screem/glade/tablewizard.glade
 share/gnome/screem/glade/uploadwizard.glade
@@ -162,133 +94,16 @@ share/gnome/screem/hints/screem_hints.txt
 share/gnome/screem/hints/screem_hints_fr.txt
 share/gnome/screem/hints/screem_hints_pt_BR.txt
 share/gnome/screem/hints/screem_hints_sv.txt
-share/gnome/screem/htmlhelp/alist.html
-share/gnome/screem/htmlhelp/attrs.html
-share/gnome/screem/htmlhelp/aural.css
-share/gnome/screem/htmlhelp/block.html
-share/gnome/screem/htmlhelp/block/address.html
-share/gnome/screem/htmlhelp/block/blockquote.html
-share/gnome/screem/htmlhelp/block/center.html
-share/gnome/screem/htmlhelp/block/div.html
-share/gnome/screem/htmlhelp/block/h1.html
-share/gnome/screem/htmlhelp/block/h2.html
-share/gnome/screem/htmlhelp/block/h3.html
-share/gnome/screem/htmlhelp/block/h4.html
-share/gnome/screem/htmlhelp/block/h5.html
-share/gnome/screem/htmlhelp/block/h6.html
-share/gnome/screem/htmlhelp/block/hr.html
-share/gnome/screem/htmlhelp/block/index.html
-share/gnome/screem/htmlhelp/block/isindex.html
-share/gnome/screem/htmlhelp/block/noscript.html
-share/gnome/screem/htmlhelp/block/p.html
-share/gnome/screem/htmlhelp/block/pre.html
-share/gnome/screem/htmlhelp/deprecated.html
-share/gnome/screem/htmlhelp/entities/index.html
-share/gnome/screem/htmlhelp/entities/latin1.html
-share/gnome/screem/htmlhelp/entities/special.html
-share/gnome/screem/htmlhelp/entities/symbols.html
-share/gnome/screem/htmlhelp/fontstyle/b.html
-share/gnome/screem/htmlhelp/fontstyle/big.html
-share/gnome/screem/htmlhelp/fontstyle/i.html
-share/gnome/screem/htmlhelp/fontstyle/index.html
-share/gnome/screem/htmlhelp/fontstyle/s.html
-share/gnome/screem/htmlhelp/fontstyle/small.html
-share/gnome/screem/htmlhelp/fontstyle/strike.html
-share/gnome/screem/htmlhelp/fontstyle/tt.html
-share/gnome/screem/htmlhelp/fontstyle/u.html
-share/gnome/screem/htmlhelp/forms/button.html
-share/gnome/screem/htmlhelp/forms/fieldset.html
-share/gnome/screem/htmlhelp/forms/form.html
-share/gnome/screem/htmlhelp/forms/index.html
-share/gnome/screem/htmlhelp/forms/input.html
-share/gnome/screem/htmlhelp/forms/label.html
-share/gnome/screem/htmlhelp/forms/legend.html
-share/gnome/screem/htmlhelp/forms/optgroup.html
-share/gnome/screem/htmlhelp/forms/option.html
-share/gnome/screem/htmlhelp/forms/select.html
-share/gnome/screem/htmlhelp/forms/textarea.html
-share/gnome/screem/htmlhelp/frames/frame.html
-share/gnome/screem/htmlhelp/frames/frameset.html
-share/gnome/screem/htmlhelp/frames/index.html
-share/gnome/screem/htmlhelp/frames/noframes.html
-share/gnome/screem/htmlhelp/head/base.html
-share/gnome/screem/htmlhelp/head/head.html
-share/gnome/screem/htmlhelp/head/index.html
-share/gnome/screem/htmlhelp/head/link.html
-share/gnome/screem/htmlhelp/head/meta.html
-share/gnome/screem/htmlhelp/head/style.html
-share/gnome/screem/htmlhelp/head/title.html
-share/gnome/screem/htmlhelp/html/body.html
-share/gnome/screem/htmlhelp/html/doctype.html
-share/gnome/screem/htmlhelp/html/html.html
-share/gnome/screem/htmlhelp/html/index.html
-share/gnome/screem/htmlhelp/index.html
-share/gnome/screem/htmlhelp/inline.html
-share/gnome/screem/htmlhelp/lists/dd.html
-share/gnome/screem/htmlhelp/lists/dir.html
-share/gnome/screem/htmlhelp/lists/dl.html
-share/gnome/screem/htmlhelp/lists/dt.html
-share/gnome/screem/htmlhelp/lists/index.html
-share/gnome/screem/htmlhelp/lists/li.html
-share/gnome/screem/htmlhelp/lists/menu.html
-share/gnome/screem/htmlhelp/lists/ol.html
-share/gnome/screem/htmlhelp/lists/ul.html
-share/gnome/screem/htmlhelp/new.html
-share/gnome/screem/htmlhelp/olist.html
-share/gnome/screem/htmlhelp/phrase/abbr.html
-share/gnome/screem/htmlhelp/phrase/acronym.html
-share/gnome/screem/htmlhelp/phrase/cite.html
-share/gnome/screem/htmlhelp/phrase/code.html
-share/gnome/screem/htmlhelp/phrase/del.html
-share/gnome/screem/htmlhelp/phrase/dfn.html
-share/gnome/screem/htmlhelp/phrase/em.html
-share/gnome/screem/htmlhelp/phrase/index.html
-share/gnome/screem/htmlhelp/phrase/ins.html
-share/gnome/screem/htmlhelp/phrase/kbd.html
-share/gnome/screem/htmlhelp/phrase/samp.html
-share/gnome/screem/htmlhelp/phrase/strong.html
-share/gnome/screem/htmlhelp/phrase/var.html
-share/gnome/screem/htmlhelp/special/a.html
-share/gnome/screem/htmlhelp/special/applet.html
-share/gnome/screem/htmlhelp/special/area.html
-share/gnome/screem/htmlhelp/special/basefont.html
-share/gnome/screem/htmlhelp/special/bdo.html
-share/gnome/screem/htmlhelp/special/br.html
-share/gnome/screem/htmlhelp/special/font.html
-share/gnome/screem/htmlhelp/special/iframe.html
-share/gnome/screem/htmlhelp/special/img.html
-share/gnome/screem/htmlhelp/special/index.html
-share/gnome/screem/htmlhelp/special/map.html
-share/gnome/screem/htmlhelp/special/object.html
-share/gnome/screem/htmlhelp/special/param.html
-share/gnome/screem/htmlhelp/special/q.html
-share/gnome/screem/htmlhelp/special/script.html
-share/gnome/screem/htmlhelp/special/span.html
-share/gnome/screem/htmlhelp/special/sub.html
-share/gnome/screem/htmlhelp/special/sup.html
-share/gnome/screem/htmlhelp/structure.html
-share/gnome/screem/htmlhelp/style.css
-share/gnome/screem/htmlhelp/tables/caption.html
-share/gnome/screem/htmlhelp/tables/col.html
-share/gnome/screem/htmlhelp/tables/colgroup.html
-share/gnome/screem/htmlhelp/tables/index.html
-share/gnome/screem/htmlhelp/tables/table.html
-share/gnome/screem/htmlhelp/tables/tbody.html
-share/gnome/screem/htmlhelp/tables/td.html
-share/gnome/screem/htmlhelp/tables/tfoot.html
-share/gnome/screem/htmlhelp/tables/th.html
-share/gnome/screem/htmlhelp/tables/thead.html
-share/gnome/screem/htmlhelp/tables/tr.html
-share/gnome/screem/htmlhelp/values.html
-share/gnome/screem/htmlhelp/wdglogo-small.gif
-share/gnome/screem/htmlhelp/wdglogo1.gif
+share/gnome/screem/php/php3_functions
+share/gnome/screem/php/php4_functions
 share/gnome/screem/resources/Images/made.jpg
 share/gnome/screem/resources/Templates/template.html
 share/gnome/screem/screem.tagtree
 share/gnome/screem/syntax/html.screem.syntax
 share/gnome/screem/syntax/perl.screem.syntax
-share/gnome/screem/syntax/php3_functions
 share/gnome/screem/syntax/screemsyntax.screem.syntax
+share/gnome/screem/ui/screem-css-window-ui.xml
+share/gnome/screem/ui/screem-window-ui.xml
 share/locale/az/LC_MESSAGES/screem.mo
 share/locale/da/LC_MESSAGES/screem.mo
 share/locale/de/LC_MESSAGES/screem.mo
@@ -303,35 +118,83 @@ share/locale/ru/LC_MESSAGES/screem.mo
 share/locale/sv/LC_MESSAGES/screem.mo
 share/locale/tr/LC_MESSAGES/screem.mo
 share/locale/uk/LC_MESSAGES/screem.mo
-@dirrm lib/screem/plugins
-@dirrm lib/screem
-@dirrm share/gnome/help/screem/C/figs
-@dirrm share/gnome/help/screem/C
-@dirrm share/gnome/help/screem
-@dirrm share/gnome/pixmaps/screem/splash
-@dirrm share/gnome/pixmaps/screem
-@dirrm share/gnome/screem/dtd
-@dirrm share/gnome/screem/frames
-@dirrm share/gnome/screem/glade
-@dirrm share/gnome/screem/hints
-@dirrm share/gnome/screem/htmlhelp/block
-@dirrm share/gnome/screem/htmlhelp/entities
-@dirrm share/gnome/screem/htmlhelp/fontstyle
-@dirrm share/gnome/screem/htmlhelp/forms
-@dirrm share/gnome/screem/htmlhelp/frames
-@dirrm share/gnome/screem/htmlhelp/head
-@dirrm share/gnome/screem/htmlhelp/html
-@dirrm share/gnome/screem/htmlhelp/lists
-@dirrm share/gnome/screem/htmlhelp/phrase
-@dirrm share/gnome/screem/htmlhelp/special
-@dirrm share/gnome/screem/htmlhelp/tables
-@dirrm share/gnome/screem/htmlhelp
-@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
+share/screem/pixmaps/bookmarks-open.png
+share/screem/pixmaps/bookmarks-preferences.png
+share/screem/pixmaps/browser.xpm
+share/screem/pixmaps/button.xpm
+share/screem/pixmaps/caption.xpm
+share/screem/pixmaps/checkbutton.xpm
+share/screem/pixmaps/cvs-add-16.png
+share/screem/pixmaps/cvs-add-24.png
+share/screem/pixmaps/cvs-add.png
+share/screem/pixmaps/cvs-checkout-16.png
+share/screem/pixmaps/cvs-checkout-24.png
+share/screem/pixmaps/cvs-checkout.png
+share/screem/pixmaps/cvs-commit-16.png
+share/screem/pixmaps/cvs-commit-24.png
+share/screem/pixmaps/cvs-remove-16.png
+share/screem/pixmaps/cvs-remove-24.png
+share/screem/pixmaps/cvs-remove.png
+share/screem/pixmaps/cvs-update-16.png
+share/screem/pixmaps/cvs-update-24.png
+share/screem/pixmaps/cvs-update.png
+share/screem/pixmaps/entry.xpm
+share/screem/pixmaps/fixed.xpm
+share/screem/pixmaps/gallery.xpm
+share/screem/pixmaps/gnome-fileentry.xpm
+share/screem/pixmaps/insert-symbol-16.png
+share/screem/pixmaps/insert-symbol-24.png
+share/screem/pixmaps/link.xpm
+share/screem/pixmaps/optionmenu.xpm
+share/screem/pixmaps/p.xpm
+share/screem/pixmaps/pre.xpm
+share/screem/pixmaps/radiobutton.xpm
+share/screem/pixmaps/screem_site.png
+share/screem/pixmaps/site_preview.png
+share/screem/pixmaps/site_structure_48.png
+share/screem/pixmaps/stock_connect.png
+share/screem/pixmaps/stock_disconnect.png
+share/screem/pixmaps/stock_insert_image-16.png
+share/screem/pixmaps/stock_insert_image.png
+share/screem/pixmaps/sub.xpm
+share/screem/pixmaps/sup.xpm
+share/screem/pixmaps/table.xpm
+share/screem/pixmaps/td.xpm
+share/screem/pixmaps/text.xpm
+share/screem/pixmaps/th.xpm
+share/screem/pixmaps/todo.png
+share/screem/pixmaps/tr.xpm
+@dirrm share/screem/pixmaps
+@dirrm share/screem
+@dirrm share/gnome/screem/ui
+@dirrm share/gnome/screem/syntax
 @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/syntax
+@dirrm share/gnome/screem/php
+@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/help/screem/C/figs
+@dirrm share/gnome/help/screem/C
+@dirrm share/gnome/help/screem
+@dirrm lib/screem/plugins
+@dirrm lib/screem
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/hint
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/general
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/editor
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/general
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem/editor
+@dirrm etc/gconf/gconf.xml.defaults/apps/screem