8 files changed, 170 insertions, 40 deletions

diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 7049b66ab546..8772f951fca3 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	SCREEM
-# Version required:	0.1.92
+# Version required:	0.2.1
 # Date created:		05 Nov 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	screem-0.1.92
+DISTNAME=	screem-0.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.screem.org/src/
+MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/screem/ \
+		http://www.screem.org/src/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	glade.3:${PORTSDIR}/devel/libglade \
-		pthread.13:${PORTSDIR}/devel/pth-devel
+LIB_DEPENDS=	glade.3:${PORTSDIR}/devel/libglade
 
 LIBGLADE_CONFIG?=	${LOCALBASE}/bin/libglade-config
 GNU_CONFIGURE=	yes
diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo
index dff38f50df69..9f4b75f98cc3 100644
--- a/www/screem-devel/distinfo
+++ b/www/screem-devel/distinfo
@@ -1 +1 @@
-MD5 (screem-0.1.92.tar.gz) = a453d71ddb2cb751cad3dbb0948514e2
+MD5 (screem-0.2.1.tar.gz) = 37a39c59e34399a13455b759e03e8eeb
diff --git a/www/screem-devel/files/patch-ab b/www/screem-devel/files/patch-ab
index ced38c2cfb75..dbaa9196f0dd 100644
--- a/www/screem-devel/files/patch-ab
+++ b/www/screem-devel/files/patch-ab
@@ -1,6 +1,74 @@
---- configure	Thu Oct 28 15:09:16 1999
-+++ configure.new	Sat Nov 13 15:01:06 1999
-@@ -5686,7 +5686,7 @@
+--- configure	Mon Jan  3 09:33:01 2000
++++ configure.new	Sat Mar 18 16:23:46 2000
+@@ -1922,8 +1922,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1937,7 +1937,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2405,6 +2405,7 @@
+   fi
+ 
+ 
++if false; then
+ 	PTHREAD_LIB=""
+ 	echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+ echo "configure:2411: checking for pthread_create in -lpthread" >&5
+@@ -2482,6 +2483,9 @@
+   PTHREAD_LIB="-lpthreads"
+ else
+   echo "$ac_t""no" 1>&6
++fi
++fi
++fi
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+ echo "configure:2487: checking for pthread_create in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+@@ -2489,7 +2493,7 @@
+   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 2495 "configure"
+ #include "confdefs.h"
+@@ -2517,7 +2521,7 @@
+ 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"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -2571,11 +2575,6 @@
+ 		    
+ fi
+ 
+-		
+-fi
+-
+-	
+-fi
+ 
+ 	
+ 	
+@@ -5882,7 +5881,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index 6c1058901f86..9f846acfece6 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -6,6 +6,7 @@ share/gnome/pixmaps/screem.png
 share/locale/de/LC_MESSAGES/screem.mo
 share/locale/fr/LC_MESSAGES/screem.mo
 share/locale/pl/LC_MESSAGES/screem.mo
+share/screem/glade/css.glade
 share/screem/glade/extern_browsers.glade
 share/screem/glade/imageWizard.glade
 share/screem/glade/linkWizard.glade
@@ -16,25 +17,16 @@ share/screem/glade/sitedruid.glade
 share/screem/glade/sitetemplate.glade
 share/screem/glade/todo.glade
 share/screem/plugins/colourWizard.a
-share/screem/plugins/colourWizard.la
+share/screem/plugins/cssWizard.a
 share/screem/plugins/entityWizard.a
-share/screem/plugins/entityWizard.la
 share/screem/plugins/externBrowsers.a
-share/screem/plugins/externBrowsers.la
 share/screem/plugins/galleryWizard.a
-share/screem/plugins/galleryWizard.la
 share/screem/plugins/imageWizard.a
-share/screem/plugins/imageWizard.la
 share/screem/plugins/linkWizard.a
-share/screem/plugins/linkWizard.la
 share/screem/plugins/mailWizard.a
-share/screem/plugins/mailWizard.la
 share/screem/plugins/ssiWizard.a
-share/screem/plugins/ssiWizard.la
 share/screem/plugins/tableWizard.a
-share/screem/plugins/tableWizard.la
 share/screem/plugins/uploadWizard.a
-share/screem/plugins/uploadWizard.la
 share/screem/screem.tagtree
 share/screem/splash/1.png
 share/screem/splash/2.png
@@ -42,5 +34,10 @@ share/screem/splash/3.png
 share/screem/splash/4.png
 @dirrm share/screem/glade
 @dirrm share/screem/plugins
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources
 @dirrm share/screem/splash
 @dirrm share/screem
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 7049b66ab546..8772f951fca3 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	SCREEM
-# Version required:	0.1.92
+# Version required:	0.2.1
 # Date created:		05 Nov 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	screem-0.1.92
+DISTNAME=	screem-0.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.screem.org/src/
+MASTER_SITES=	ftp://download.sourceforge.net/pub/sourceforge/screem/ \
+		http://www.screem.org/src/
 
-MAINTAINER=	andrews@technologist.com
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	glade.3:${PORTSDIR}/devel/libglade \
-		pthread.13:${PORTSDIR}/devel/pth-devel
+LIB_DEPENDS=	glade.3:${PORTSDIR}/devel/libglade
 
 LIBGLADE_CONFIG?=	${LOCALBASE}/bin/libglade-config
 GNU_CONFIGURE=	yes
diff --git a/www/screem/distinfo b/www/screem/distinfo
index dff38f50df69..9f4b75f98cc3 100644
--- a/www/screem/distinfo
+++ b/www/screem/distinfo
@@ -1 +1 @@
-MD5 (screem-0.1.92.tar.gz) = a453d71ddb2cb751cad3dbb0948514e2
+MD5 (screem-0.2.1.tar.gz) = 37a39c59e34399a13455b759e03e8eeb
diff --git a/www/screem/files/patch-ab b/www/screem/files/patch-ab
index ced38c2cfb75..dbaa9196f0dd 100644
--- a/www/screem/files/patch-ab
+++ b/www/screem/files/patch-ab
@@ -1,6 +1,74 @@
---- configure	Thu Oct 28 15:09:16 1999
-+++ configure.new	Sat Nov 13 15:01:06 1999
-@@ -5686,7 +5686,7 @@
+--- configure	Mon Jan  3 09:33:01 2000
++++ configure.new	Sat Mar 18 16:23:46 2000
+@@ -1922,8 +1922,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1937,7 +1937,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2405,6 +2405,7 @@
+   fi
+ 
+ 
++if false; then
+ 	PTHREAD_LIB=""
+ 	echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+ echo "configure:2411: checking for pthread_create in -lpthread" >&5
+@@ -2482,6 +2483,9 @@
+   PTHREAD_LIB="-lpthreads"
+ else
+   echo "$ac_t""no" 1>&6
++fi
++fi
++fi
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+ echo "configure:2487: checking for pthread_create in -lc_r" >&5
+ ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+@@ -2489,7 +2493,7 @@
+   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 2495 "configure"
+ #include "confdefs.h"
+@@ -2517,7 +2521,7 @@
+ 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"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -2571,11 +2575,6 @@
+ 		    
+ fi
+ 
+-		
+-fi
+-
+-	
+-fi
+ 
+ 	
+ 	
+@@ -5882,7 +5881,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 6c1058901f86..9f846acfece6 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -6,6 +6,7 @@ share/gnome/pixmaps/screem.png
 share/locale/de/LC_MESSAGES/screem.mo
 share/locale/fr/LC_MESSAGES/screem.mo
 share/locale/pl/LC_MESSAGES/screem.mo
+share/screem/glade/css.glade
 share/screem/glade/extern_browsers.glade
 share/screem/glade/imageWizard.glade
 share/screem/glade/linkWizard.glade
@@ -16,25 +17,16 @@ share/screem/glade/sitedruid.glade
 share/screem/glade/sitetemplate.glade
 share/screem/glade/todo.glade
 share/screem/plugins/colourWizard.a
-share/screem/plugins/colourWizard.la
+share/screem/plugins/cssWizard.a
 share/screem/plugins/entityWizard.a
-share/screem/plugins/entityWizard.la
 share/screem/plugins/externBrowsers.a
-share/screem/plugins/externBrowsers.la
 share/screem/plugins/galleryWizard.a
-share/screem/plugins/galleryWizard.la
 share/screem/plugins/imageWizard.a
-share/screem/plugins/imageWizard.la
 share/screem/plugins/linkWizard.a
-share/screem/plugins/linkWizard.la
 share/screem/plugins/mailWizard.a
-share/screem/plugins/mailWizard.la
 share/screem/plugins/ssiWizard.a
-share/screem/plugins/ssiWizard.la
 share/screem/plugins/tableWizard.a
-share/screem/plugins/tableWizard.la
 share/screem/plugins/uploadWizard.a
-share/screem/plugins/uploadWizard.la
 share/screem/screem.tagtree
 share/screem/splash/1.png
 share/screem/splash/2.png
@@ -42,5 +34,10 @@ share/screem/splash/3.png
 share/screem/splash/4.png
 @dirrm share/screem/glade
 @dirrm share/screem/plugins
+@dirrm share/screem/resources/Applets
+@dirrm share/screem/resources/Images
+@dirrm share/screem/resources/Javascript
+@dirrm share/screem/resources/PHP3
+@dirrm share/screem/resources
 @dirrm share/screem/splash
 @dirrm share/screem