summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/screem-devel/Makefile16
-rw-r--r--www/screem-devel/distinfo2
-rw-r--r--www/screem-devel/files/patch-ab10
-rw-r--r--www/screem-devel/files/patch-ltmain.sh51
-rw-r--r--www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in11
-rw-r--r--www/screem-devel/files/patch-po::Makefile.in.in11
-rw-r--r--www/screem-devel/files/patch-src_screem-markup.c22
-rw-r--r--www/screem-devel/pkg-plist147
-rw-r--r--www/screem/Makefile16
-rw-r--r--www/screem/distinfo2
-rw-r--r--www/screem/files/patch-ab10
-rw-r--r--www/screem/files/patch-ltmain.sh51
-rw-r--r--www/screem/files/patch-plugins_uploadWizard_Makefile.in11
-rw-r--r--www/screem/files/patch-po::Makefile.in.in11
-rw-r--r--www/screem/files/patch-src_screem-markup.c22
-rw-r--r--www/screem/pkg-plist147
16 files changed, 344 insertions, 196 deletions
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 0a9a9975ac2d..6b1f21f7cfac 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= screem
-PORTVERSION= 0.6.2
+PORTVERSION= 0.8.2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,16 +14,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= coop9211@uidaho.edu
COMMENT= Nice GNOME/GTK-based HTML editor
+# www/neon needs to be updated to 0.24.3
+#LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon
+
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml
+USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
+ gtksourceview
USE_LIBTOOL= yes
+INSTALLS_SHLIB= yes
+
+.ifndef WITHOUT_OPENSSL
USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-ssl
+.endif
+
USE_PERL5= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-ssl
+#CONFIGURE_ARGS+= --with-neon="${LOCALBASE}/bin"
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo
index 93aa9e8489c2..9e6a96d331b4 100644
--- a/www/screem-devel/distinfo
+++ b/www/screem-devel/distinfo
@@ -1 +1 @@
-MD5 (screem-0.6.2.tar.gz) = 015360e3d61b69c097e4412a168e7b31
+MD5 (screem-0.8.2.tar.gz) = fd1c6f8c2867a43028621cbdd944b9df
diff --git a/www/screem-devel/files/patch-ab b/www/screem-devel/files/patch-ab
deleted file mode 100644
index 68a30859a705..000000000000
--- a/www/screem-devel/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-ltmain.sh b/www/screem-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1d5a5c7b87e1
--- /dev/null
+++ b/www/screem-devel/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Fri Sep 12 14:51:51 2003
++++ ltmain.sh Sun Sep 21 17:49:07 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in b/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in
deleted file mode 100644
index db8be8753a7b..000000000000
--- a/www/screem-devel/files/patch-plugins_uploadWizard_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-po::Makefile.in.in b/www/screem-devel/files/patch-po::Makefile.in.in
deleted file mode 100644
index af9aed221d8f..000000000000
--- a/www/screem-devel/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in 2001/08/03 10:53:37 1.1
-+++ po/Makefile.in.in 2001/08/03 10:53:57
-@@ -106,7 +106,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff --git a/www/screem-devel/files/patch-src_screem-markup.c b/www/screem-devel/files/patch-src_screem-markup.c
deleted file mode 100644
index 9afe058c8c15..000000000000
--- a/www/screem-devel/files/patch-src_screem-markup.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/screem-markup.c.orig Wed Nov 13 08:19:22 2002
-+++ src/screem-markup.c Sun Dec 1 21:57:23 2002
-@@ -778,7 +778,7 @@
-
- GSList *screem_markup_get_links( ScreemDTD *dtd, const gchar *text )
- {
-- GSList *ret;
-+ GSList *ret, *attr, *tmp;
- gchar *next;
- gint pos;
- gint end;
-@@ -792,8 +792,8 @@
- NULL, &end, &name ) ) ) {
- pos = end;
- /* get tag attributes */
-- GSList *attr;
-- GSList *tmp;
-+ /* GSList *attr; */
-+ /* GSList *tmp; */
-
- attr = screem_markup_build_attributes_list( next, NULL );
-
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index 0d598ee611d3..d3c64ed951f3 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -1,4 +1,6 @@
bin/screem
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
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
@@ -6,6 +8,8 @@ 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/apps/screem/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%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
@@ -27,6 +31,7 @@ share/gnome/applications/screem.desktop
share/gnome/help/screem/C/figures/dummy.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/gnome/omf/screem/screem-C.omf
share/gnome/pixmaps/screem.png
@@ -35,15 +40,17 @@ share/gnome/screem/dtd/HTMLlat1.ent
share/gnome/screem/dtd/HTMLspecial.ent
share/gnome/screem/dtd/HTMLsymbols.ent
share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/frameset.dtd
-share/gnome/screem/dtd/loose.dtd
-share/gnome/screem/dtd/strict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/gnome/screem/dtd/screem-tagtree.dtd
share/gnome/screem/dtd/xhtml-lat1.ent
share/gnome/screem/dtd/xhtml-special.ent
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/features.xml
share/gnome/screem/glade/css.glade
share/gnome/screem/glade/entityWizard.glade
share/gnome/screem/glade/imageWizard.glade
@@ -56,40 +63,43 @@ 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/php/php3_functions
-share/gnome/screem/php/php4_functions
share/gnome/screem/resources/Images/made.jpg
+share/gnome/screem/resources/Javascript/linktitle.js
+share/gnome/screem/resources/Javascript/preload.js
+share/gnome/screem/resources/Javascript/rollover.js
share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/screem.tagtree
-share/gnome/screem/syntax/asp.screem.syntax
-share/gnome/screem/syntax/html.screem.syntax
-share/gnome/screem/syntax/javascript.screem.syntax
-share/gnome/screem/syntax/perl.screem.syntax
-share/gnome/screem/syntax/php.screem.syntax
-share/gnome/screem/syntax/xml.screem.syntax
+share/gnome/screem/tagtrees/apache.tagtree
+share/gnome/screem/tagtrees/css.tagtree
+share/gnome/screem/tagtrees/funcref_php.tagtree
+share/gnome/screem/tagtrees/html.tagtree
+share/gnome/screem/tagtrees/javascript.tagtree
+share/gnome/screem/ui/layout
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/cs/LC_MESSAGES/screem.mo
-share/locale/da/LC_MESSAGES/screem.mo
-share/locale/de/LC_MESSAGES/screem.mo
-share/locale/el/LC_MESSAGES/screem.mo
-share/locale/es/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/ko/LC_MESSAGES/screem.mo
-share/locale/nb/LC_MESSAGES/screem.mo
-share/locale/no/LC_MESSAGES/screem.mo
-share/locale/pl/LC_MESSAGES/screem.mo
-share/locale/pt_BR/LC_MESSAGES/screem.mo
-share/locale/ru/LC_MESSAGES/screem.mo
-share/locale/sk/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
-share/locale/vi/LC_MESSAGES/screem.mo
-share/locale/zh_CN/LC_MESSAGES/screem.mo
+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
+share/gnome/screem/ui/screem-window-toolbar.xml
+share/locale/az.mo/LC_MESSAGES/screem.mo
+share/locale/cs.mo/LC_MESSAGES/screem.mo
+share/locale/da.mo/LC_MESSAGES/screem.mo
+share/locale/de.mo/LC_MESSAGES/screem.mo
+share/locale/el.mo/LC_MESSAGES/screem.mo
+share/locale/es.mo/LC_MESSAGES/screem.mo
+share/locale/fr.mo/LC_MESSAGES/screem.mo
+share/locale/it.mo/LC_MESSAGES/screem.mo
+share/locale/ja.mo/LC_MESSAGES/screem.mo
+share/locale/ko.mo/LC_MESSAGES/screem.mo
+share/locale/nb.mo/LC_MESSAGES/screem.mo
+share/locale/no.mo/LC_MESSAGES/screem.mo
+share/locale/pl.mo/LC_MESSAGES/screem.mo
+share/locale/pt_BR.mo/LC_MESSAGES/screem.mo
+share/locale/ru.mo/LC_MESSAGES/screem.mo
+share/locale/sk.mo/LC_MESSAGES/screem.mo
+share/locale/sv.mo/LC_MESSAGES/screem.mo
+share/locale/tr.mo/LC_MESSAGES/screem.mo
+share/locale/uk.mo/LC_MESSAGES/screem.mo
+share/locale/vi.mo/LC_MESSAGES/screem.mo
+share/locale/zh_CN.mo/LC_MESSAGES/screem.mo
share/screem/pixmaps/add-link-16.png
share/screem/pixmaps/add-link-24.png
share/screem/pixmaps/add_column-16.png
@@ -144,8 +154,51 @@ share/screem/pixmaps/todo.png
share/screem/pixmaps/tr.xpm
@dirrm share/screem/pixmaps
@dirrm share/screem
+@dirrm share/locale/zh_CN.mo/LC_MESSAGES
+@dirrm share/locale/zh_CN.mo
+@dirrm share/locale/vi.mo/LC_MESSAGES
+@dirrm share/locale/vi.mo
+@dirrm share/locale/uk.mo/LC_MESSAGES
+@dirrm share/locale/uk.mo
+@dirrm share/locale/tr.mo/LC_MESSAGES
+@dirrm share/locale/tr.mo
+@dirrm share/locale/sv.mo/LC_MESSAGES
+@dirrm share/locale/sv.mo
+@dirrm share/locale/sk.mo/LC_MESSAGES
+@dirrm share/locale/sk.mo
+@dirrm share/locale/ru.mo/LC_MESSAGES
+@dirrm share/locale/ru.mo
+@dirrm share/locale/pt_BR.mo/LC_MESSAGES
+@dirrm share/locale/pt_BR.mo
+@dirrm share/locale/pl.mo/LC_MESSAGES
+@dirrm share/locale/pl.mo
+@dirrm share/locale/no.mo/LC_MESSAGES
+@dirrm share/locale/no.mo
+@dirrm share/locale/nb.mo/LC_MESSAGES
+@dirrm share/locale/nb.mo
+@dirrm share/locale/ko.mo/LC_MESSAGES
+@dirrm share/locale/ko.mo
+@dirrm share/locale/ja.mo/LC_MESSAGES
+@dirrm share/locale/ja.mo
+@dirrm share/locale/it.mo/LC_MESSAGES
+@dirrm share/locale/it.mo
+@dirrm share/locale/fr.mo/LC_MESSAGES
+@dirrm share/locale/fr.mo
+@dirrm share/locale/es.mo/LC_MESSAGES
+@dirrm share/locale/es.mo
+@dirrm share/locale/el.mo/LC_MESSAGES
+@dirrm share/locale/el.mo
+@dirrm share/locale/de.mo/LC_MESSAGES
+@dirrm share/locale/de.mo
+@dirrm share/locale/da.mo/LC_MESSAGES
+@dirrm share/locale/da.mo
+@dirrm share/locale/cs.mo/LC_MESSAGES
+@dirrm share/locale/cs.mo
+@dirrm share/locale/az.mo/LC_MESSAGES
+@dirrm share/locale/az.mo
+@dirrm share/locale
@dirrm share/gnome/screem/ui
-@dirrm share/gnome/screem/syntax
+@dirrm share/gnome/screem/tagtrees
@dirrm share/gnome/screem/resources/Templates
@dirrm share/gnome/screem/resources/PHP3
@dirrm share/gnome/screem/resources/Javascript
@@ -153,25 +206,34 @@ share/screem/pixmaps/tr.xpm
@dirrm share/gnome/screem/resources/HTML
@dirrm share/gnome/screem/resources/Applets
@dirrm share/gnome/screem/resources
-@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/omf/screem
@dirrm share/gnome/pixmaps/screem/splash
@dirrm share/gnome/pixmaps/screem
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/omf/screem
+@dirrm share/gnome/omf
+@dirrm share/gnome/mime-info
@dirrm share/gnome/help/screem/C/figures
@dirrm share/gnome/help/screem/C
@dirrm share/gnome/help/screem
+@dirrm share/gnome/help
+@dirrm share/gnome/applications
+@dirrm share/gnome/application-registry
+@dirrm share/gnome
@dirrm lib/screem/plugins
@dirrm lib/screem
+@dirrm etc/gconf/schemas
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui
@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/schemas/apps
+@dirrm etc/gconf/gconf.xml.defaults/schemas
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/ui
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
@@ -179,3 +241,8 @@ share/screem/pixmaps/tr.xpm
@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
+@dirrm etc/gconf/gconf.xml.defaults/apps
+@dirrm etc/gconf/gconf.xml.defaults
+@dirrm etc/gconf
+@exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 0a9a9975ac2d..6b1f21f7cfac 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= screem
-PORTVERSION= 0.6.2
+PORTVERSION= 0.8.2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,16 +14,26 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= coop9211@uidaho.edu
COMMENT= Nice GNOME/GTK-based HTML editor
+# www/neon needs to be updated to 0.24.3
+#LIB_DEPENDS= neon.24:${PORTSDIR}/www/neon
+
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_XPM= yes
-USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml
+USE_GNOME= gnomeprefix gnomehack libgnomeui libgnomeprintui libgtkhtml \
+ gtksourceview
USE_LIBTOOL= yes
+INSTALLS_SHLIB= yes
+
+.ifndef WITHOUT_OPENSSL
USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-ssl
+.endif
+
USE_PERL5= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-ssl
+#CONFIGURE_ARGS+= --with-neon="${LOCALBASE}/bin"
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/screem/distinfo b/www/screem/distinfo
index 93aa9e8489c2..9e6a96d331b4 100644
--- a/www/screem/distinfo
+++ b/www/screem/distinfo
@@ -1 +1 @@
-MD5 (screem-0.6.2.tar.gz) = 015360e3d61b69c097e4412a168e7b31
+MD5 (screem-0.8.2.tar.gz) = fd1c6f8c2867a43028621cbdd944b9df
diff --git a/www/screem/files/patch-ab b/www/screem/files/patch-ab
deleted file mode 100644
index 68a30859a705..000000000000
--- a/www/screem/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-ltmain.sh b/www/screem/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1d5a5c7b87e1
--- /dev/null
+++ b/www/screem/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Fri Sep 12 14:51:51 2003
++++ ltmain.sh Sun Sep 21 17:49:07 2003
+@@ -1280,7 +1280,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1290,8 +1290,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -3000,6 +3008,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5428,10 +5439,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/screem/files/patch-plugins_uploadWizard_Makefile.in b/www/screem/files/patch-plugins_uploadWizard_Makefile.in
deleted file mode 100644
index db8be8753a7b..000000000000
--- a/www/screem/files/patch-plugins_uploadWizard_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-po::Makefile.in.in b/www/screem/files/patch-po::Makefile.in.in
deleted file mode 100644
index af9aed221d8f..000000000000
--- a/www/screem/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in 2001/08/03 10:53:37 1.1
-+++ po/Makefile.in.in 2001/08/03 10:53:57
-@@ -106,7 +106,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff --git a/www/screem/files/patch-src_screem-markup.c b/www/screem/files/patch-src_screem-markup.c
deleted file mode 100644
index 9afe058c8c15..000000000000
--- a/www/screem/files/patch-src_screem-markup.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/screem-markup.c.orig Wed Nov 13 08:19:22 2002
-+++ src/screem-markup.c Sun Dec 1 21:57:23 2002
-@@ -778,7 +778,7 @@
-
- GSList *screem_markup_get_links( ScreemDTD *dtd, const gchar *text )
- {
-- GSList *ret;
-+ GSList *ret, *attr, *tmp;
- gchar *next;
- gint pos;
- gint end;
-@@ -792,8 +792,8 @@
- NULL, &end, &name ) ) ) {
- pos = end;
- /* get tag attributes */
-- GSList *attr;
-- GSList *tmp;
-+ /* GSList *attr; */
-+ /* GSList *tmp; */
-
- attr = screem_markup_build_attributes_list( next, NULL );
-
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 0d598ee611d3..d3c64ed951f3 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -1,4 +1,6 @@
bin/screem
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
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
@@ -6,6 +8,8 @@ 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/apps/screem/ui/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%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
@@ -27,6 +31,7 @@ share/gnome/applications/screem.desktop
share/gnome/help/screem/C/figures/dummy.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/gnome/omf/screem/screem-C.omf
share/gnome/pixmaps/screem.png
@@ -35,15 +40,17 @@ share/gnome/screem/dtd/HTMLlat1.ent
share/gnome/screem/dtd/HTMLspecial.ent
share/gnome/screem/dtd/HTMLsymbols.ent
share/gnome/screem/dtd/catalog
-share/gnome/screem/dtd/frameset.dtd
-share/gnome/screem/dtd/loose.dtd
-share/gnome/screem/dtd/strict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fframeset.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Floose.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fhtml4%2Fstrict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-frameset.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-strict.dtd
+share/gnome/screem/dtd/http:%2F%2Fwww.w3.org%2FTR%2Fxhtml1%2FDTD%2Fxhtml1-transitional.dtd
+share/gnome/screem/dtd/screem-tagtree.dtd
share/gnome/screem/dtd/xhtml-lat1.ent
share/gnome/screem/dtd/xhtml-special.ent
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/features.xml
share/gnome/screem/glade/css.glade
share/gnome/screem/glade/entityWizard.glade
share/gnome/screem/glade/imageWizard.glade
@@ -56,40 +63,43 @@ 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/php/php3_functions
-share/gnome/screem/php/php4_functions
share/gnome/screem/resources/Images/made.jpg
+share/gnome/screem/resources/Javascript/linktitle.js
+share/gnome/screem/resources/Javascript/preload.js
+share/gnome/screem/resources/Javascript/rollover.js
share/gnome/screem/resources/Templates/template.html
-share/gnome/screem/screem.tagtree
-share/gnome/screem/syntax/asp.screem.syntax
-share/gnome/screem/syntax/html.screem.syntax
-share/gnome/screem/syntax/javascript.screem.syntax
-share/gnome/screem/syntax/perl.screem.syntax
-share/gnome/screem/syntax/php.screem.syntax
-share/gnome/screem/syntax/xml.screem.syntax
+share/gnome/screem/tagtrees/apache.tagtree
+share/gnome/screem/tagtrees/css.tagtree
+share/gnome/screem/tagtrees/funcref_php.tagtree
+share/gnome/screem/tagtrees/html.tagtree
+share/gnome/screem/tagtrees/javascript.tagtree
+share/gnome/screem/ui/layout
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/cs/LC_MESSAGES/screem.mo
-share/locale/da/LC_MESSAGES/screem.mo
-share/locale/de/LC_MESSAGES/screem.mo
-share/locale/el/LC_MESSAGES/screem.mo
-share/locale/es/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/ko/LC_MESSAGES/screem.mo
-share/locale/nb/LC_MESSAGES/screem.mo
-share/locale/no/LC_MESSAGES/screem.mo
-share/locale/pl/LC_MESSAGES/screem.mo
-share/locale/pt_BR/LC_MESSAGES/screem.mo
-share/locale/ru/LC_MESSAGES/screem.mo
-share/locale/sk/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
-share/locale/vi/LC_MESSAGES/screem.mo
-share/locale/zh_CN/LC_MESSAGES/screem.mo
+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
+share/gnome/screem/ui/screem-window-toolbar.xml
+share/locale/az.mo/LC_MESSAGES/screem.mo
+share/locale/cs.mo/LC_MESSAGES/screem.mo
+share/locale/da.mo/LC_MESSAGES/screem.mo
+share/locale/de.mo/LC_MESSAGES/screem.mo
+share/locale/el.mo/LC_MESSAGES/screem.mo
+share/locale/es.mo/LC_MESSAGES/screem.mo
+share/locale/fr.mo/LC_MESSAGES/screem.mo
+share/locale/it.mo/LC_MESSAGES/screem.mo
+share/locale/ja.mo/LC_MESSAGES/screem.mo
+share/locale/ko.mo/LC_MESSAGES/screem.mo
+share/locale/nb.mo/LC_MESSAGES/screem.mo
+share/locale/no.mo/LC_MESSAGES/screem.mo
+share/locale/pl.mo/LC_MESSAGES/screem.mo
+share/locale/pt_BR.mo/LC_MESSAGES/screem.mo
+share/locale/ru.mo/LC_MESSAGES/screem.mo
+share/locale/sk.mo/LC_MESSAGES/screem.mo
+share/locale/sv.mo/LC_MESSAGES/screem.mo
+share/locale/tr.mo/LC_MESSAGES/screem.mo
+share/locale/uk.mo/LC_MESSAGES/screem.mo
+share/locale/vi.mo/LC_MESSAGES/screem.mo
+share/locale/zh_CN.mo/LC_MESSAGES/screem.mo
share/screem/pixmaps/add-link-16.png
share/screem/pixmaps/add-link-24.png
share/screem/pixmaps/add_column-16.png
@@ -144,8 +154,51 @@ share/screem/pixmaps/todo.png
share/screem/pixmaps/tr.xpm
@dirrm share/screem/pixmaps
@dirrm share/screem
+@dirrm share/locale/zh_CN.mo/LC_MESSAGES
+@dirrm share/locale/zh_CN.mo
+@dirrm share/locale/vi.mo/LC_MESSAGES
+@dirrm share/locale/vi.mo
+@dirrm share/locale/uk.mo/LC_MESSAGES
+@dirrm share/locale/uk.mo
+@dirrm share/locale/tr.mo/LC_MESSAGES
+@dirrm share/locale/tr.mo
+@dirrm share/locale/sv.mo/LC_MESSAGES
+@dirrm share/locale/sv.mo
+@dirrm share/locale/sk.mo/LC_MESSAGES
+@dirrm share/locale/sk.mo
+@dirrm share/locale/ru.mo/LC_MESSAGES
+@dirrm share/locale/ru.mo
+@dirrm share/locale/pt_BR.mo/LC_MESSAGES
+@dirrm share/locale/pt_BR.mo
+@dirrm share/locale/pl.mo/LC_MESSAGES
+@dirrm share/locale/pl.mo
+@dirrm share/locale/no.mo/LC_MESSAGES
+@dirrm share/locale/no.mo
+@dirrm share/locale/nb.mo/LC_MESSAGES
+@dirrm share/locale/nb.mo
+@dirrm share/locale/ko.mo/LC_MESSAGES
+@dirrm share/locale/ko.mo
+@dirrm share/locale/ja.mo/LC_MESSAGES
+@dirrm share/locale/ja.mo
+@dirrm share/locale/it.mo/LC_MESSAGES
+@dirrm share/locale/it.mo
+@dirrm share/locale/fr.mo/LC_MESSAGES
+@dirrm share/locale/fr.mo
+@dirrm share/locale/es.mo/LC_MESSAGES
+@dirrm share/locale/es.mo
+@dirrm share/locale/el.mo/LC_MESSAGES
+@dirrm share/locale/el.mo
+@dirrm share/locale/de.mo/LC_MESSAGES
+@dirrm share/locale/de.mo
+@dirrm share/locale/da.mo/LC_MESSAGES
+@dirrm share/locale/da.mo
+@dirrm share/locale/cs.mo/LC_MESSAGES
+@dirrm share/locale/cs.mo
+@dirrm share/locale/az.mo/LC_MESSAGES
+@dirrm share/locale/az.mo
+@dirrm share/locale
@dirrm share/gnome/screem/ui
-@dirrm share/gnome/screem/syntax
+@dirrm share/gnome/screem/tagtrees
@dirrm share/gnome/screem/resources/Templates
@dirrm share/gnome/screem/resources/PHP3
@dirrm share/gnome/screem/resources/Javascript
@@ -153,25 +206,34 @@ share/screem/pixmaps/tr.xpm
@dirrm share/gnome/screem/resources/HTML
@dirrm share/gnome/screem/resources/Applets
@dirrm share/gnome/screem/resources
-@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/omf/screem
@dirrm share/gnome/pixmaps/screem/splash
@dirrm share/gnome/pixmaps/screem
+@dirrm share/gnome/pixmaps
+@dirrm share/gnome/omf/screem
+@dirrm share/gnome/omf
+@dirrm share/gnome/mime-info
@dirrm share/gnome/help/screem/C/figures
@dirrm share/gnome/help/screem/C
@dirrm share/gnome/help/screem
+@dirrm share/gnome/help
+@dirrm share/gnome/applications
+@dirrm share/gnome/application-registry
+@dirrm share/gnome
@dirrm lib/screem/plugins
@dirrm lib/screem
+@dirrm etc/gconf/schemas
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/screem/ui
@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/schemas/apps
+@dirrm etc/gconf/gconf.xml.defaults/schemas
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/ui
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/linkview
@dirrm etc/gconf/gconf.xml.defaults/apps/screem/hint
@@ -179,3 +241,8 @@ share/screem/pixmaps/tr.xpm
@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
+@dirrm etc/gconf/gconf.xml.defaults/apps
+@dirrm etc/gconf/gconf.xml.defaults
+@dirrm etc/gconf
+@exec scrollkeeper-install -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true