Update to 0.2.10. Replace couple of patches with perl regex.

8 files changed, 368 insertions, 432 deletions

diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 0cd483431eb0..6be554f25f68 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	screem
-PORTVERSION= 	0.2.8
+PORTVERSION= 	0.2.10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
@@ -36,7 +36,14 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share \
-		--libdir=${PREFIX}/share
+		--datadir=${PREFIX}/share/gnome \
+		--libdir=${PREFIX}/share/gnome
+
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo
index e43c2356e166..023d761f1cc1 100644
--- a/www/screem-devel/distinfo
+++ b/www/screem-devel/distinfo
@@ -1 +1 @@
-MD5 (screem-0.2.8.tar.gz) = f8445beb528a6a4dbec033bf917be8f5
+MD5 (screem-0.2.10.tar.gz) = 90caaa58898fdfc66d70f5a99f1f720b
diff --git a/www/screem-devel/files/patch-ab b/www/screem-devel/files/patch-ab
deleted file mode 100644
index 7482922efb60..000000000000
--- a/www/screem-devel/files/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	Mon Jul 17 21:51:46 2000
-+++ configure	Fri Jul 21 12:13:37 2000
-@@ -2763,14 +2763,14 @@
-   PTHREAD_LIB="-lpthreads"
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:2768: checking for pthread_create in -lc_r" >&5
-+echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
-+echo "configure:2768: checking for pthread_create in -pthread" >&5
- ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lc_r  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2776 "configure"
- #include "confdefs.h"
-@@ -2798,7 +2798,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB="-pthread"
-+  CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -6296,7 +6297,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index f15e8af18151..aa7b95b69c25 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -25,184 +25,184 @@ 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/text.xpm
+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/uploadwizard.glade
+share/gnome/screem/hints/screem_hints.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/plugins/colourWizard.so
+share/gnome/screem/plugins/cssWizard.so
+share/gnome/screem/plugins/entityWizard.so
+share/gnome/screem/plugins/formWizard.so
+share/gnome/screem/plugins/frameWizard.so
+share/gnome/screem/plugins/galleryWizard.so
+share/gnome/screem/plugins/imageWizard.so
+share/gnome/screem/plugins/linkWizard.so
+share/gnome/screem/plugins/mailWizard.so
+share/gnome/screem/plugins/script.scm
+share/gnome/screem/plugins/ssiWizard.so
+share/gnome/screem/plugins/tableWizard.so
+share/gnome/screem/plugins/uploadWizard.so
+share/gnome/screem/resources/Images/made.jpg
+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/locale/de/LC_MESSAGES/screem.mo
 share/locale/fr/LC_MESSAGES/screem.mo
 share/locale/it/LC_MESSAGES/screem.mo
 share/locale/ja/LC_MESSAGES/screem.mo
 share/locale/pl/LC_MESSAGES/screem.mo
 share/locale/ru/LC_MESSAGES/screem.mo
-share/screem/frames/style1.html
-share/screem/glade/css.glade
-share/screem/glade/entityWizard.glade
-share/screem/glade/formWizard.glade
-share/screem/glade/frameWizard.glade
-share/screem/glade/imageWizard.glade
-share/screem/glade/linkWizard.glade
-share/screem/glade/screem.glade
-share/screem/glade/uploadwizard.glade
-share/screem/hints/screem_hints.txt
-share/screem/htmlhelp/alist.html
-share/screem/htmlhelp/attrs.html
-share/screem/htmlhelp/aural.css
-share/screem/htmlhelp/block.html
-share/screem/htmlhelp/block/address.html
-share/screem/htmlhelp/block/blockquote.html
-share/screem/htmlhelp/block/center.html
-share/screem/htmlhelp/block/div.html
-share/screem/htmlhelp/block/h1.html
-share/screem/htmlhelp/block/h2.html
-share/screem/htmlhelp/block/h3.html
-share/screem/htmlhelp/block/h4.html
-share/screem/htmlhelp/block/h5.html
-share/screem/htmlhelp/block/h6.html
-share/screem/htmlhelp/block/hr.html
-share/screem/htmlhelp/block/index.html
-share/screem/htmlhelp/block/isindex.html
-share/screem/htmlhelp/block/noscript.html
-share/screem/htmlhelp/block/p.html
-share/screem/htmlhelp/block/pre.html
-share/screem/htmlhelp/deprecated.html
-share/screem/htmlhelp/entities/index.html
-share/screem/htmlhelp/entities/latin1.html
-share/screem/htmlhelp/entities/special.html
-share/screem/htmlhelp/entities/symbols.html
-share/screem/htmlhelp/fontstyle/b.html
-share/screem/htmlhelp/fontstyle/big.html
-share/screem/htmlhelp/fontstyle/i.html
-share/screem/htmlhelp/fontstyle/index.html
-share/screem/htmlhelp/fontstyle/s.html
-share/screem/htmlhelp/fontstyle/small.html
-share/screem/htmlhelp/fontstyle/strike.html
-share/screem/htmlhelp/fontstyle/tt.html
-share/screem/htmlhelp/fontstyle/u.html
-share/screem/htmlhelp/forms/button.html
-share/screem/htmlhelp/forms/fieldset.html
-share/screem/htmlhelp/forms/form.html
-share/screem/htmlhelp/forms/index.html
-share/screem/htmlhelp/forms/input.html
-share/screem/htmlhelp/forms/label.html
-share/screem/htmlhelp/forms/legend.html
-share/screem/htmlhelp/forms/optgroup.html
-share/screem/htmlhelp/forms/option.html
-share/screem/htmlhelp/forms/select.html
-share/screem/htmlhelp/forms/textarea.html
-share/screem/htmlhelp/frames/frame.html
-share/screem/htmlhelp/frames/frameset.html
-share/screem/htmlhelp/frames/index.html
-share/screem/htmlhelp/frames/noframes.html
-share/screem/htmlhelp/head/base.html
-share/screem/htmlhelp/head/head.html
-share/screem/htmlhelp/head/index.html
-share/screem/htmlhelp/head/link.html
-share/screem/htmlhelp/head/meta.html
-share/screem/htmlhelp/head/style.html
-share/screem/htmlhelp/head/title.html
-share/screem/htmlhelp/html/body.html
-share/screem/htmlhelp/html/doctype.html
-share/screem/htmlhelp/html/html.html
-share/screem/htmlhelp/html/index.html
-share/screem/htmlhelp/index.html
-share/screem/htmlhelp/inline.html
-share/screem/htmlhelp/lists/dd.html
-share/screem/htmlhelp/lists/dir.html
-share/screem/htmlhelp/lists/dl.html
-share/screem/htmlhelp/lists/dt.html
-share/screem/htmlhelp/lists/index.html
-share/screem/htmlhelp/lists/li.html
-share/screem/htmlhelp/lists/menu.html
-share/screem/htmlhelp/lists/ol.html
-share/screem/htmlhelp/lists/ul.html
-share/screem/htmlhelp/new.html
-share/screem/htmlhelp/olist.html
-share/screem/htmlhelp/phrase/abbr.html
-share/screem/htmlhelp/phrase/acronym.html
-share/screem/htmlhelp/phrase/cite.html
-share/screem/htmlhelp/phrase/code.html
-share/screem/htmlhelp/phrase/del.html
-share/screem/htmlhelp/phrase/dfn.html
-share/screem/htmlhelp/phrase/em.html
-share/screem/htmlhelp/phrase/index.html
-share/screem/htmlhelp/phrase/ins.html
-share/screem/htmlhelp/phrase/kbd.html
-share/screem/htmlhelp/phrase/samp.html
-share/screem/htmlhelp/phrase/strong.html
-share/screem/htmlhelp/phrase/var.html
-share/screem/htmlhelp/special/a.html
-share/screem/htmlhelp/special/applet.html
-share/screem/htmlhelp/special/area.html
-share/screem/htmlhelp/special/basefont.html
-share/screem/htmlhelp/special/bdo.html
-share/screem/htmlhelp/special/br.html
-share/screem/htmlhelp/special/font.html
-share/screem/htmlhelp/special/iframe.html
-share/screem/htmlhelp/special/img.html
-share/screem/htmlhelp/special/index.html
-share/screem/htmlhelp/special/map.html
-share/screem/htmlhelp/special/object.html
-share/screem/htmlhelp/special/param.html
-share/screem/htmlhelp/special/q.html
-share/screem/htmlhelp/special/script.html
-share/screem/htmlhelp/special/span.html
-share/screem/htmlhelp/special/sub.html
-share/screem/htmlhelp/special/sup.html
-share/screem/htmlhelp/structure.html
-share/screem/htmlhelp/style.css
-share/screem/htmlhelp/tables/caption.html
-share/screem/htmlhelp/tables/col.html
-share/screem/htmlhelp/tables/colgroup.html
-share/screem/htmlhelp/tables/index.html
-share/screem/htmlhelp/tables/table.html
-share/screem/htmlhelp/tables/tbody.html
-share/screem/htmlhelp/tables/td.html
-share/screem/htmlhelp/tables/tfoot.html
-share/screem/htmlhelp/tables/th.html
-share/screem/htmlhelp/tables/thead.html
-share/screem/htmlhelp/tables/tr.html
-share/screem/htmlhelp/values.html
-share/screem/htmlhelp/wdglogo-small.gif
-share/screem/htmlhelp/wdglogo1.gif
-share/screem/plugins/colourWizard.so
-share/screem/plugins/cssWizard.so
-share/screem/plugins/entityWizard.so
-share/screem/plugins/formWizard.so
-share/screem/plugins/frameWizard.so
-share/screem/plugins/galleryWizard.so
-share/screem/plugins/imageWizard.so
-share/screem/plugins/linkWizard.so
-share/screem/plugins/mailWizard.so
-share/screem/plugins/script.scm
-share/screem/plugins/ssiWizard.so
-share/screem/plugins/tableWizard.so
-share/screem/plugins/uploadWizard.so
-share/screem/resources/Images/made.jpg
-share/screem/screem.tagtree
-share/screem/syntax/html.screem.syntax
-share/screem/syntax/perl.screem.syntax
-share/screem/syntax/php3_functions
-share/screem/syntax/screemsyntax.screem.syntax
-@dirrm share/screem/syntax
-@dirrm share/screem/resources/PHP3
-@dirrm share/screem/resources/Javascript
-@dirrm share/screem/resources/Images
-@dirrm share/screem/resources/HTML
-@dirrm share/screem/resources/Applets
-@dirrm share/screem/resources
-@dirrm share/screem/plugins
-@dirrm share/screem/htmlhelp/tables
-@dirrm share/screem/htmlhelp/special
-@dirrm share/screem/htmlhelp/phrase
-@dirrm share/screem/htmlhelp/lists
-@dirrm share/screem/htmlhelp/html
-@dirrm share/screem/htmlhelp/head
-@dirrm share/screem/htmlhelp/frames
-@dirrm share/screem/htmlhelp/forms
-@dirrm share/screem/htmlhelp/fontstyle
-@dirrm share/screem/htmlhelp/entities
-@dirrm share/screem/htmlhelp/block
-@dirrm share/screem/htmlhelp
-@dirrm share/screem/hints
-@dirrm share/screem/glade
-@dirrm share/screem/frames
-@dirrm share/screem
+@dirrm share/gnome/screem/syntax
+@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/plugins
+@dirrm share/gnome/screem/htmlhelp/tables
+@dirrm share/gnome/screem/htmlhelp/special
+@dirrm share/gnome/screem/htmlhelp/phrase
+@dirrm share/gnome/screem/htmlhelp/lists
+@dirrm share/gnome/screem/htmlhelp/html
+@dirrm share/gnome/screem/htmlhelp/head
+@dirrm share/gnome/screem/htmlhelp/frames
+@dirrm share/gnome/screem/htmlhelp/forms
+@dirrm share/gnome/screem/htmlhelp/fontstyle
+@dirrm share/gnome/screem/htmlhelp/entities
+@dirrm share/gnome/screem/htmlhelp/block
+@dirrm share/gnome/screem/htmlhelp
+@dirrm share/gnome/screem/hints
+@dirrm share/gnome/screem/glade
+@dirrm share/gnome/screem/frames
+@dirrm share/gnome/screem
 @dirrm share/gnome/pixmaps/screem/splash
 @dirrm share/gnome/pixmaps/screem
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 0cd483431eb0..6be554f25f68 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	screem
-PORTVERSION= 	0.2.8
+PORTVERSION= 	0.2.10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.screem.org/src/
@@ -36,7 +36,14 @@ CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share \
-		--libdir=${PREFIX}/share
+		--datadir=${PREFIX}/share/gnome \
+		--libdir=${PREFIX}/share/gnome
+
+post-extract:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\@GNOME_DATA_PREFIX\@/gnome|\@GNOME_DATA_PREFIX\@|g ; \
+		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/screem/distinfo b/www/screem/distinfo
index e43c2356e166..023d761f1cc1 100644
--- a/www/screem/distinfo
+++ b/www/screem/distinfo
@@ -1 +1 @@
-MD5 (screem-0.2.8.tar.gz) = f8445beb528a6a4dbec033bf917be8f5
+MD5 (screem-0.2.10.tar.gz) = 90caaa58898fdfc66d70f5a99f1f720b
diff --git a/www/screem/files/patch-ab b/www/screem/files/patch-ab
deleted file mode 100644
index 7482922efb60..000000000000
--- a/www/screem/files/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
---- configure.orig	Mon Jul 17 21:51:46 2000
-+++ configure	Fri Jul 21 12:13:37 2000
-@@ -2763,14 +2763,14 @@
-   PTHREAD_LIB="-lpthreads"
- else
-   echo "$ac_t""no" 1>&6
--echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
--echo "configure:2768: checking for pthread_create in -lc_r" >&5
-+echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
-+echo "configure:2768: checking for pthread_create in -pthread" >&5
- ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lc_r  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2776 "configure"
- #include "confdefs.h"
-@@ -2798,7 +2798,8 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIB="-lc_r"
-+  PTHREAD_LIB="-pthread"
-+  CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
-@@ -6296,7 +6297,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index f15e8af18151..aa7b95b69c25 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -25,184 +25,184 @@ 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/text.xpm
+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/uploadwizard.glade
+share/gnome/screem/hints/screem_hints.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/plugins/colourWizard.so
+share/gnome/screem/plugins/cssWizard.so
+share/gnome/screem/plugins/entityWizard.so
+share/gnome/screem/plugins/formWizard.so
+share/gnome/screem/plugins/frameWizard.so
+share/gnome/screem/plugins/galleryWizard.so
+share/gnome/screem/plugins/imageWizard.so
+share/gnome/screem/plugins/linkWizard.so
+share/gnome/screem/plugins/mailWizard.so
+share/gnome/screem/plugins/script.scm
+share/gnome/screem/plugins/ssiWizard.so
+share/gnome/screem/plugins/tableWizard.so
+share/gnome/screem/plugins/uploadWizard.so
+share/gnome/screem/resources/Images/made.jpg
+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/locale/de/LC_MESSAGES/screem.mo
 share/locale/fr/LC_MESSAGES/screem.mo
 share/locale/it/LC_MESSAGES/screem.mo
 share/locale/ja/LC_MESSAGES/screem.mo
 share/locale/pl/LC_MESSAGES/screem.mo
 share/locale/ru/LC_MESSAGES/screem.mo
-share/screem/frames/style1.html
-share/screem/glade/css.glade
-share/screem/glade/entityWizard.glade
-share/screem/glade/formWizard.glade
-share/screem/glade/frameWizard.glade
-share/screem/glade/imageWizard.glade
-share/screem/glade/linkWizard.glade
-share/screem/glade/screem.glade
-share/screem/glade/uploadwizard.glade
-share/screem/hints/screem_hints.txt
-share/screem/htmlhelp/alist.html
-share/screem/htmlhelp/attrs.html
-share/screem/htmlhelp/aural.css
-share/screem/htmlhelp/block.html
-share/screem/htmlhelp/block/address.html
-share/screem/htmlhelp/block/blockquote.html
-share/screem/htmlhelp/block/center.html
-share/screem/htmlhelp/block/div.html
-share/screem/htmlhelp/block/h1.html
-share/screem/htmlhelp/block/h2.html
-share/screem/htmlhelp/block/h3.html
-share/screem/htmlhelp/block/h4.html
-share/screem/htmlhelp/block/h5.html
-share/screem/htmlhelp/block/h6.html
-share/screem/htmlhelp/block/hr.html
-share/screem/htmlhelp/block/index.html
-share/screem/htmlhelp/block/isindex.html
-share/screem/htmlhelp/block/noscript.html
-share/screem/htmlhelp/block/p.html
-share/screem/htmlhelp/block/pre.html
-share/screem/htmlhelp/deprecated.html
-share/screem/htmlhelp/entities/index.html
-share/screem/htmlhelp/entities/latin1.html
-share/screem/htmlhelp/entities/special.html
-share/screem/htmlhelp/entities/symbols.html
-share/screem/htmlhelp/fontstyle/b.html
-share/screem/htmlhelp/fontstyle/big.html
-share/screem/htmlhelp/fontstyle/i.html
-share/screem/htmlhelp/fontstyle/index.html
-share/screem/htmlhelp/fontstyle/s.html
-share/screem/htmlhelp/fontstyle/small.html
-share/screem/htmlhelp/fontstyle/strike.html
-share/screem/htmlhelp/fontstyle/tt.html
-share/screem/htmlhelp/fontstyle/u.html
-share/screem/htmlhelp/forms/button.html
-share/screem/htmlhelp/forms/fieldset.html
-share/screem/htmlhelp/forms/form.html
-share/screem/htmlhelp/forms/index.html
-share/screem/htmlhelp/forms/input.html
-share/screem/htmlhelp/forms/label.html
-share/screem/htmlhelp/forms/legend.html
-share/screem/htmlhelp/forms/optgroup.html
-share/screem/htmlhelp/forms/option.html
-share/screem/htmlhelp/forms/select.html
-share/screem/htmlhelp/forms/textarea.html
-share/screem/htmlhelp/frames/frame.html
-share/screem/htmlhelp/frames/frameset.html
-share/screem/htmlhelp/frames/index.html
-share/screem/htmlhelp/frames/noframes.html
-share/screem/htmlhelp/head/base.html
-share/screem/htmlhelp/head/head.html
-share/screem/htmlhelp/head/index.html
-share/screem/htmlhelp/head/link.html
-share/screem/htmlhelp/head/meta.html
-share/screem/htmlhelp/head/style.html
-share/screem/htmlhelp/head/title.html
-share/screem/htmlhelp/html/body.html
-share/screem/htmlhelp/html/doctype.html
-share/screem/htmlhelp/html/html.html
-share/screem/htmlhelp/html/index.html
-share/screem/htmlhelp/index.html
-share/screem/htmlhelp/inline.html
-share/screem/htmlhelp/lists/dd.html
-share/screem/htmlhelp/lists/dir.html
-share/screem/htmlhelp/lists/dl.html
-share/screem/htmlhelp/lists/dt.html
-share/screem/htmlhelp/lists/index.html
-share/screem/htmlhelp/lists/li.html
-share/screem/htmlhelp/lists/menu.html
-share/screem/htmlhelp/lists/ol.html
-share/screem/htmlhelp/lists/ul.html
-share/screem/htmlhelp/new.html
-share/screem/htmlhelp/olist.html
-share/screem/htmlhelp/phrase/abbr.html
-share/screem/htmlhelp/phrase/acronym.html
-share/screem/htmlhelp/phrase/cite.html
-share/screem/htmlhelp/phrase/code.html
-share/screem/htmlhelp/phrase/del.html
-share/screem/htmlhelp/phrase/dfn.html
-share/screem/htmlhelp/phrase/em.html
-share/screem/htmlhelp/phrase/index.html
-share/screem/htmlhelp/phrase/ins.html
-share/screem/htmlhelp/phrase/kbd.html
-share/screem/htmlhelp/phrase/samp.html
-share/screem/htmlhelp/phrase/strong.html
-share/screem/htmlhelp/phrase/var.html
-share/screem/htmlhelp/special/a.html
-share/screem/htmlhelp/special/applet.html
-share/screem/htmlhelp/special/area.html
-share/screem/htmlhelp/special/basefont.html
-share/screem/htmlhelp/special/bdo.html
-share/screem/htmlhelp/special/br.html
-share/screem/htmlhelp/special/font.html
-share/screem/htmlhelp/special/iframe.html
-share/screem/htmlhelp/special/img.html
-share/screem/htmlhelp/special/index.html
-share/screem/htmlhelp/special/map.html
-share/screem/htmlhelp/special/object.html
-share/screem/htmlhelp/special/param.html
-share/screem/htmlhelp/special/q.html
-share/screem/htmlhelp/special/script.html
-share/screem/htmlhelp/special/span.html
-share/screem/htmlhelp/special/sub.html
-share/screem/htmlhelp/special/sup.html
-share/screem/htmlhelp/structure.html
-share/screem/htmlhelp/style.css
-share/screem/htmlhelp/tables/caption.html
-share/screem/htmlhelp/tables/col.html
-share/screem/htmlhelp/tables/colgroup.html
-share/screem/htmlhelp/tables/index.html
-share/screem/htmlhelp/tables/table.html
-share/screem/htmlhelp/tables/tbody.html
-share/screem/htmlhelp/tables/td.html
-share/screem/htmlhelp/tables/tfoot.html
-share/screem/htmlhelp/tables/th.html
-share/screem/htmlhelp/tables/thead.html
-share/screem/htmlhelp/tables/tr.html
-share/screem/htmlhelp/values.html
-share/screem/htmlhelp/wdglogo-small.gif
-share/screem/htmlhelp/wdglogo1.gif
-share/screem/plugins/colourWizard.so
-share/screem/plugins/cssWizard.so
-share/screem/plugins/entityWizard.so
-share/screem/plugins/formWizard.so
-share/screem/plugins/frameWizard.so
-share/screem/plugins/galleryWizard.so
-share/screem/plugins/imageWizard.so
-share/screem/plugins/linkWizard.so
-share/screem/plugins/mailWizard.so
-share/screem/plugins/script.scm
-share/screem/plugins/ssiWizard.so
-share/screem/plugins/tableWizard.so
-share/screem/plugins/uploadWizard.so
-share/screem/resources/Images/made.jpg
-share/screem/screem.tagtree
-share/screem/syntax/html.screem.syntax
-share/screem/syntax/perl.screem.syntax
-share/screem/syntax/php3_functions
-share/screem/syntax/screemsyntax.screem.syntax
-@dirrm share/screem/syntax
-@dirrm share/screem/resources/PHP3
-@dirrm share/screem/resources/Javascript
-@dirrm share/screem/resources/Images
-@dirrm share/screem/resources/HTML
-@dirrm share/screem/resources/Applets
-@dirrm share/screem/resources
-@dirrm share/screem/plugins
-@dirrm share/screem/htmlhelp/tables
-@dirrm share/screem/htmlhelp/special
-@dirrm share/screem/htmlhelp/phrase
-@dirrm share/screem/htmlhelp/lists
-@dirrm share/screem/htmlhelp/html
-@dirrm share/screem/htmlhelp/head
-@dirrm share/screem/htmlhelp/frames
-@dirrm share/screem/htmlhelp/forms
-@dirrm share/screem/htmlhelp/fontstyle
-@dirrm share/screem/htmlhelp/entities
-@dirrm share/screem/htmlhelp/block
-@dirrm share/screem/htmlhelp
-@dirrm share/screem/hints
-@dirrm share/screem/glade
-@dirrm share/screem/frames
-@dirrm share/screem
+@dirrm share/gnome/screem/syntax
+@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/plugins
+@dirrm share/gnome/screem/htmlhelp/tables
+@dirrm share/gnome/screem/htmlhelp/special
+@dirrm share/gnome/screem/htmlhelp/phrase
+@dirrm share/gnome/screem/htmlhelp/lists
+@dirrm share/gnome/screem/htmlhelp/html
+@dirrm share/gnome/screem/htmlhelp/head
+@dirrm share/gnome/screem/htmlhelp/frames
+@dirrm share/gnome/screem/htmlhelp/forms
+@dirrm share/gnome/screem/htmlhelp/fontstyle
+@dirrm share/gnome/screem/htmlhelp/entities
+@dirrm share/gnome/screem/htmlhelp/block
+@dirrm share/gnome/screem/htmlhelp
+@dirrm share/gnome/screem/hints
+@dirrm share/gnome/screem/glade
+@dirrm share/gnome/screem/frames
+@dirrm share/gnome/screem
 @dirrm share/gnome/pixmaps/screem/splash
 @dirrm share/gnome/pixmaps/screem