3 files changed, 204 insertions, 221 deletions

diff --git a/www/simplog/Makefile b/www/simplog/Makefile
index b896c5294c78..94ae3a89862f 100644
--- a/www/simplog/Makefile
+++ b/www/simplog/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	simplog
-PORTVERSION=	0.9.3.1
+PORTVERSION=	0.9.3.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/simplog/distinfo b/www/simplog/distinfo
index 53a6d258f791..d4ee330947d9 100644
--- a/www/simplog/distinfo
+++ b/www/simplog/distinfo
@@ -1,3 +1,3 @@
-MD5 (simplog-0.9.3.1.tar.gz) = 6a6d0cf9a1a67da80e84cb6c231ebd43
-SHA256 (simplog-0.9.3.1.tar.gz) = db4725640f649c088f42f18a0115569b33dbd83a128f7e7fb6c9f5637c0392e4
-SIZE (simplog-0.9.3.1.tar.gz) = 747517
+MD5 (simplog-0.9.3.2.tar.gz) = 9f20cb99e1b193856f296cdf0d37f340
+SHA256 (simplog-0.9.3.2.tar.gz) = 7bdc498acbc6fcd1bcdf65cc9f9a8629f236d23b45f27fef8a3c8815bd020ad5
+SIZE (simplog-0.9.3.2.tar.gz) = 676589
diff --git a/www/simplog/pkg-plist b/www/simplog/pkg-plist
index d1fcbfb633e2..a5921ef83523 100644
--- a/www/simplog/pkg-plist
+++ b/www/simplog/pkg-plist
@@ -1,53 +1,55 @@
-%%DATADIR%%/CHANGES
-%%DATADIR%%/CREDITS
-%%DATADIR%%/LICENSE
-%%DATADIR%%/README
-%%DATADIR%%/add_html.inc
-%%DATADIR%%/add_symbols.inc
-%%DATADIR%%/admin.php
-%%DATADIR%%/adodb/adodb-active-record.inc.php
-%%DATADIR%%/adodb/adodb-csvlib.inc.php
-%%DATADIR%%/adodb/adodb-datadict.inc.php
-%%DATADIR%%/adodb/adodb-error.inc.php
-%%DATADIR%%/adodb/adodb-errorhandler.inc.php
-%%DATADIR%%/adodb/adodb-errorpear.inc.php
-%%DATADIR%%/adodb/adodb-exceptions.inc.php
-%%DATADIR%%/adodb/adodb-iterator.inc.php
-%%DATADIR%%/adodb/adodb-lib.inc.php
-%%DATADIR%%/adodb/adodb-pager.inc.php
-%%DATADIR%%/adodb/adodb-pear.inc.php
-%%DATADIR%%/adodb/adodb-perf.inc.php
-%%DATADIR%%/adodb/adodb-php4.inc.php
-%%DATADIR%%/adodb/adodb-time.inc.php
-%%DATADIR%%/adodb/adodb-xmlschema.inc.php
-%%DATADIR%%/adodb/adodb-xmlschema03.inc.php
-%%DATADIR%%/adodb/adodb.inc.php
-%%DATADIR%%/adodb/contrib/toxmlrpc.inc.php
-%%DATADIR%%/adodb/cute_icons_for_site/adodb.gif
-%%DATADIR%%/adodb/cute_icons_for_site/adodb2.gif
-%%DATADIR%%/adodb/datadict/datadict-access.inc.php
-%%DATADIR%%/adodb/datadict/datadict-db2.inc.php
-%%DATADIR%%/adodb/datadict/datadict-firebird.inc.php
-%%DATADIR%%/adodb/datadict/datadict-generic.inc.php
-%%DATADIR%%/adodb/datadict/datadict-ibase.inc.php
-%%DATADIR%%/adodb/datadict/datadict-informix.inc.php
-%%DATADIR%%/adodb/datadict/datadict-mssql.inc.php
-%%DATADIR%%/adodb/datadict/datadict-mysql.inc.php
-%%DATADIR%%/adodb/datadict/datadict-oci8.inc.php
-%%DATADIR%%/adodb/datadict/datadict-postgres.inc.php
-%%DATADIR%%/adodb/datadict/datadict-sapdb.inc.php
-%%DATADIR%%/adodb/datadict/datadict-sybase.inc.php
-%%DATADIR%%/adodb/docs/docs-active-record.htm
-%%DATADIR%%/adodb/docs/docs-adodb.htm
-%%DATADIR%%/adodb/docs/docs-datadict.htm
-%%DATADIR%%/adodb/docs/docs-oracle.htm
-%%DATADIR%%/adodb/docs/docs-perf.htm
-%%DATADIR%%/adodb/docs/docs-session.htm
-%%DATADIR%%/adodb/docs/old-changelog.htm
-%%DATADIR%%/adodb/docs/readme.htm
-%%DATADIR%%/adodb/docs/tips_portable_sql.htm
-%%DATADIR%%/adodb/docs/tute.htm
-%%DATADIR%%/adodb/drivers/adodb-access.inc.php
+%%DATADIR%%/adodb/tests/xmlschema.xml
+%%DATADIR%%/adodb/tests/client.php
+%%DATADIR%%/adodb/tests/pdo.php
+%%DATADIR%%/adodb/tests/rr.htm
+%%DATADIR%%/adodb/tests/test-active-record.php
+%%DATADIR%%/adodb/tests/test-active-recs2.php
+%%DATADIR%%/adodb/tests/test-datadict.php
+%%DATADIR%%/adodb/tests/test-perf.php
+%%DATADIR%%/adodb/tests/test-pgblob.php
+%%DATADIR%%/adodb/tests/test-php5.php
+%%DATADIR%%/adodb/tests/test-xmlschema.php
+%%DATADIR%%/adodb/tests/test.php
+%%DATADIR%%/adodb/tests/test2.php
+%%DATADIR%%/adodb/tests/test3.php
+%%DATADIR%%/adodb/tests/test4.php
+%%DATADIR%%/adodb/tests/test5.php
+%%DATADIR%%/adodb/tests/test_rs_array.php
+%%DATADIR%%/adodb/tests/testcache.php
+%%DATADIR%%/adodb/tests/testdatabases.inc.php
+%%DATADIR%%/adodb/tests/testgenid.php
+%%DATADIR%%/adodb/tests/testmssql.php
+%%DATADIR%%/adodb/tests/testoci8.php
+%%DATADIR%%/adodb/tests/testoci8cursor.php
+%%DATADIR%%/adodb/tests/testpaging.php
+%%DATADIR%%/adodb/tests/testpear.php
+%%DATADIR%%/adodb/tests/testsessions.php
+%%DATADIR%%/adodb/tests/time.php
+%%DATADIR%%/adodb/tests/tmssql.php
+%%DATADIR%%/adodb/tests/xmlschema-mssql.xml
+%%DATADIR%%/adodb/tests/benchmark.php
+%%DATADIR%%/adodb/session/old/adodb-cryptsession.php
+%%DATADIR%%/adodb/session/old/adodb-session-clob.php
+%%DATADIR%%/adodb/session/old/adodb-session.php
+%%DATADIR%%/adodb/session/old/crypt.inc.php
+%%DATADIR%%/adodb/session/adodb-compress-gzip.php
+%%DATADIR%%/adodb/session/adodb-cryptsession.php
+%%DATADIR%%/adodb/session/adodb-encrypt-mcrypt.php
+%%DATADIR%%/adodb/session/adodb-encrypt-md5.php
+%%DATADIR%%/adodb/session/adodb-encrypt-secret.php
+%%DATADIR%%/adodb/session/adodb-encrypt-sha1.php
+%%DATADIR%%/adodb/session/adodb-sess.txt
+%%DATADIR%%/adodb/session/adodb-compress-bzip2.php
+%%DATADIR%%/adodb/session/adodb-session.php
+%%DATADIR%%/adodb/session/adodb-sessions.mysql.sql
+%%DATADIR%%/adodb/session/adodb-sessions.oracle.clob.sql
+%%DATADIR%%/adodb/session/adodb-sessions.oracle.sql
+%%DATADIR%%/adodb/session/crypt.inc.php
+%%DATADIR%%/adodb/session/session_schema.xml
+%%DATADIR%%/adodb/session/adodb-session-clob.php
+%%DATADIR%%/adodb/pear/Auth/Container/ADOdb.php
+%%DATADIR%%/adodb/pear/readme.Auth.txt
+%%DATADIR%%/adodb/drivers/adodb-vfp.inc.php
 %%DATADIR%%/adodb/drivers/adodb-ado.inc.php
 %%DATADIR%%/adodb/drivers/adodb-ado5.inc.php
 %%DATADIR%%/adodb/drivers/adodb-ado_access.inc.php
@@ -93,8 +95,8 @@
 %%DATADIR%%/adodb/drivers/adodb-sqlitepo.inc.php
 %%DATADIR%%/adodb/drivers/adodb-sybase.inc.php
 %%DATADIR%%/adodb/drivers/adodb-sybase_ase.inc.php
-%%DATADIR%%/adodb/drivers/adodb-vfp.inc.php
-%%DATADIR%%/adodb/lang/adodb-ar.inc.php
+%%DATADIR%%/adodb/drivers/adodb-access.inc.php
+%%DATADIR%%/adodb/lang/adodb-uk1251.inc.php
 %%DATADIR%%/adodb/lang/adodb-bg.inc.php
 %%DATADIR%%/adodb/lang/adodb-bgutf8.inc.php
 %%DATADIR%%/adodb/lang/adodb-ca.inc.php
@@ -114,120 +116,71 @@
 %%DATADIR%%/adodb/lang/adodb-ro.inc.php
 %%DATADIR%%/adodb/lang/adodb-ru1251.inc.php
 %%DATADIR%%/adodb/lang/adodb-sv.inc.php
-%%DATADIR%%/adodb/lang/adodb-uk1251.inc.php
-%%DATADIR%%/adodb/license.txt
-%%DATADIR%%/adodb/pear/Auth/Container/ADOdb.php
-%%DATADIR%%/adodb/pear/readme.Auth.txt
+%%DATADIR%%/adodb/lang/adodb-ar.inc.php
 %%DATADIR%%/adodb/perf/perf-db2.inc.php
 %%DATADIR%%/adodb/perf/perf-informix.inc.php
 %%DATADIR%%/adodb/perf/perf-mssql.inc.php
 %%DATADIR%%/adodb/perf/perf-mysql.inc.php
 %%DATADIR%%/adodb/perf/perf-oci8.inc.php
 %%DATADIR%%/adodb/perf/perf-postgres.inc.php
-%%DATADIR%%/adodb/pivottable.inc.php
+%%DATADIR%%/adodb/cute_icons_for_site/adodb.gif
+%%DATADIR%%/adodb/cute_icons_for_site/adodb2.gif
+%%DATADIR%%/adodb/datadict/datadict-sybase.inc.php
+%%DATADIR%%/adodb/datadict/datadict-db2.inc.php
+%%DATADIR%%/adodb/datadict/datadict-firebird.inc.php
+%%DATADIR%%/adodb/datadict/datadict-generic.inc.php
+%%DATADIR%%/adodb/datadict/datadict-ibase.inc.php
+%%DATADIR%%/adodb/datadict/datadict-informix.inc.php
+%%DATADIR%%/adodb/datadict/datadict-mssql.inc.php
+%%DATADIR%%/adodb/datadict/datadict-mysql.inc.php
+%%DATADIR%%/adodb/datadict/datadict-oci8.inc.php
+%%DATADIR%%/adodb/datadict/datadict-postgres.inc.php
+%%DATADIR%%/adodb/datadict/datadict-sapdb.inc.php
+%%DATADIR%%/adodb/datadict/datadict-access.inc.php
+%%DATADIR%%/adodb/contrib/toxmlrpc.inc.php
+%%DATADIR%%/adodb/xsl/convert-0.1-0.2.xsl
+%%DATADIR%%/adodb/xsl/convert-0.1-0.3.xsl
+%%DATADIR%%/adodb/xsl/convert-0.2-0.1.xsl
+%%DATADIR%%/adodb/xsl/convert-0.2-0.3.xsl
+%%DATADIR%%/adodb/xsl/remove-0.2.xsl
+%%DATADIR%%/adodb/xsl/remove-0.3.xsl
+%%DATADIR%%/adodb/docs/tute.htm
+%%DATADIR%%/adodb/docs/docs-adodb.htm
+%%DATADIR%%/adodb/docs/docs-datadict.htm
+%%DATADIR%%/adodb/docs/docs-oracle.htm
+%%DATADIR%%/adodb/docs/docs-perf.htm
+%%DATADIR%%/adodb/docs/docs-session.htm
+%%DATADIR%%/adodb/docs/old-changelog.htm
+%%DATADIR%%/adodb/docs/readme.htm
+%%DATADIR%%/adodb/docs/tips_portable_sql.htm
+%%DATADIR%%/adodb/docs/docs-active-record.htm
+%%DATADIR%%/adodb/adodb-perf.inc.php
+%%DATADIR%%/adodb/adodb-php4.inc.php
+%%DATADIR%%/adodb/adodb-time.inc.php
+%%DATADIR%%/adodb/adodb-xmlschema.inc.php
+%%DATADIR%%/adodb/adodb-xmlschema03.inc.php
+%%DATADIR%%/adodb/adodb.inc.php
+%%DATADIR%%/adodb/license.txt
+%%DATADIR%%/adodb/adodb-active-record.inc.php
 %%DATADIR%%/adodb/readme.txt
 %%DATADIR%%/adodb/rsfilter.inc.php
 %%DATADIR%%/adodb/server.php
-%%DATADIR%%/adodb/session/adodb-compress-bzip2.php
-%%DATADIR%%/adodb/session/adodb-compress-gzip.php
-%%DATADIR%%/adodb/session/adodb-cryptsession.php
-%%DATADIR%%/adodb/session/adodb-encrypt-mcrypt.php
-%%DATADIR%%/adodb/session/adodb-encrypt-md5.php
-%%DATADIR%%/adodb/session/adodb-encrypt-secret.php
-%%DATADIR%%/adodb/session/adodb-encrypt-sha1.php
-%%DATADIR%%/adodb/session/adodb-sess.txt
-%%DATADIR%%/adodb/session/adodb-session-clob.php
-%%DATADIR%%/adodb/session/adodb-session.php
-%%DATADIR%%/adodb/session/adodb-sessions.mysql.sql
-%%DATADIR%%/adodb/session/adodb-sessions.oracle.clob.sql
-%%DATADIR%%/adodb/session/adodb-sessions.oracle.sql
-%%DATADIR%%/adodb/session/crypt.inc.php
-%%DATADIR%%/adodb/session/old/adodb-cryptsession.php
-%%DATADIR%%/adodb/session/old/adodb-session-clob.php
-%%DATADIR%%/adodb/session/old/adodb-session.php
-%%DATADIR%%/adodb/session/old/crypt.inc.php
-%%DATADIR%%/adodb/session/session_schema.xml
-%%DATADIR%%/adodb/tests/benchmark.php
-%%DATADIR%%/adodb/tests/client.php
-%%DATADIR%%/adodb/tests/pdo.php
-%%DATADIR%%/adodb/tests/rr.htm
-%%DATADIR%%/adodb/tests/test-active-record.php
-%%DATADIR%%/adodb/tests/test-active-recs2.php
-%%DATADIR%%/adodb/tests/test-datadict.php
-%%DATADIR%%/adodb/tests/test-perf.php
-%%DATADIR%%/adodb/tests/test-pgblob.php
-%%DATADIR%%/adodb/tests/test-php5.php
-%%DATADIR%%/adodb/tests/test-xmlschema.php
-%%DATADIR%%/adodb/tests/test.php
-%%DATADIR%%/adodb/tests/test2.php
-%%DATADIR%%/adodb/tests/test3.php
-%%DATADIR%%/adodb/tests/test4.php
-%%DATADIR%%/adodb/tests/test5.php
-%%DATADIR%%/adodb/tests/test_rs_array.php
-%%DATADIR%%/adodb/tests/testcache.php
-%%DATADIR%%/adodb/tests/testdatabases.inc.php
-%%DATADIR%%/adodb/tests/testgenid.php
-%%DATADIR%%/adodb/tests/testmssql.php
-%%DATADIR%%/adodb/tests/testoci8.php
-%%DATADIR%%/adodb/tests/testoci8cursor.php
-%%DATADIR%%/adodb/tests/testpaging.php
-%%DATADIR%%/adodb/tests/testpear.php
-%%DATADIR%%/adodb/tests/testsessions.php
-%%DATADIR%%/adodb/tests/time.php
-%%DATADIR%%/adodb/tests/tmssql.php
-%%DATADIR%%/adodb/tests/xmlschema-mssql.xml
-%%DATADIR%%/adodb/tests/xmlschema.xml
 %%DATADIR%%/adodb/toexport.inc.php
 %%DATADIR%%/adodb/tohtml.inc.php
 %%DATADIR%%/adodb/xmlschema.dtd
 %%DATADIR%%/adodb/xmlschema03.dtd
-%%DATADIR%%/adodb/xsl/convert-0.1-0.2.xsl
-%%DATADIR%%/adodb/xsl/convert-0.1-0.3.xsl
-%%DATADIR%%/adodb/xsl/convert-0.2-0.1.xsl
-%%DATADIR%%/adodb/xsl/convert-0.2-0.3.xsl
-%%DATADIR%%/adodb/xsl/remove-0.2.xsl
-%%DATADIR%%/adodb/xsl/remove-0.3.xsl
-%%DATADIR%%/api.php
-%%DATADIR%%/archive.php
-%%DATADIR%%/atom.php
-%%DATADIR%%/blocks.php
-%%DATADIR%%/blocksadmin.php
-%%DATADIR%%/blog.admin.php
-%%DATADIR%%/blog.php
-%%DATADIR%%/blogadmin.php
-%%DATADIR%%/catadmin.php
-%%DATADIR%%/class.BlogEntry.php
-%%DATADIR%%/class.BlogInfo.php
-%%DATADIR%%/class.BlogServer.php
-%%DATADIR%%/class.BlogUser.php
-%%DATADIR%%/class.HttpClient.php
-%%DATADIR%%/class.RSS.php
-%%DATADIR%%/comments.php
-%%DATADIR%%/config-dist.php
-%%DATADIR%%/do_glyph.php
-%%DATADIR%%/doc/admin.html
-%%DATADIR%%/doc/index.php
-%%DATADIR%%/doc/user.html
-%%DATADIR%%/edit.php
-%%DATADIR%%/footer.php
-%%DATADIR%%/header.php
-%%DATADIR%%/imagelist.php
-%%DATADIR%%/images/admin.gif
-%%DATADIR%%/images/bgbutton.gif
-%%DATADIR%%/images/blog.gif
-%%DATADIR%%/images/button.gif
-%%DATADIR%%/images/delete.gif
-%%DATADIR%%/images/down.gif
-%%DATADIR%%/images/edit.gif
-%%DATADIR%%/images/help.gif
-%%DATADIR%%/images/logo_sm.gif
-%%DATADIR%%/images/logout.gif
-%%DATADIR%%/images/new.gif
-%%DATADIR%%/images/next.gif
-%%DATADIR%%/images/pbmpb.gif
-%%DATADIR%%/images/prev.gif
-%%DATADIR%%/images/request.gif
-%%DATADIR%%/images/smile/icon_arrow.gif
+%%DATADIR%%/adodb/pivottable.inc.php
+%%DATADIR%%/adodb/adodb-csvlib.inc.php
+%%DATADIR%%/adodb/adodb-datadict.inc.php
+%%DATADIR%%/adodb/adodb-error.inc.php
+%%DATADIR%%/adodb/adodb-errorhandler.inc.php
+%%DATADIR%%/adodb/adodb-errorpear.inc.php
+%%DATADIR%%/adodb/adodb-exceptions.inc.php
+%%DATADIR%%/adodb/adodb-iterator.inc.php
+%%DATADIR%%/adodb/adodb-lib.inc.php
+%%DATADIR%%/adodb/adodb-pager.inc.php
+%%DATADIR%%/adodb/adodb-pear.inc.php
+%%DATADIR%%/images/smile/icon_wink.gif
 %%DATADIR%%/images/smile/icon_biggrin.gif
 %%DATADIR%%/images/smile/icon_confused.gif
 %%DATADIR%%/images/smile/icon_cool.gif
@@ -249,16 +202,31 @@
 %%DATADIR%%/images/smile/icon_smile.gif
 %%DATADIR%%/images/smile/icon_surprised.gif
 %%DATADIR%%/images/smile/icon_twisted.gif
-%%DATADIR%%/images/smile/icon_wink.gif
+%%DATADIR%%/images/smile/icon_arrow.gif
+%%DATADIR%%/images/admin.gif
+%%DATADIR%%/images/bgbutton.gif
+%%DATADIR%%/images/blog.gif
+%%DATADIR%%/images/button.gif
+%%DATADIR%%/images/delete.gif
+%%DATADIR%%/images/down.gif
+%%DATADIR%%/images/edit.gif
+%%DATADIR%%/images/help.gif
+%%DATADIR%%/images/logo_sm.gif
+%%DATADIR%%/images/logout.gif
+%%DATADIR%%/images/new.gif
+%%DATADIR%%/images/next.gif
+%%DATADIR%%/images/pbmpb.gif
+%%DATADIR%%/images/prev.gif
+%%DATADIR%%/images/request.gif
 %%DATADIR%%/images/spacer.gif
 %%DATADIR%%/images/up.gif
 %%DATADIR%%/images/userinfo.gif
 %%DATADIR%%/images/view.gif
 %%DATADIR%%/images/xml.gif
-%%DATADIR%%/img.php
-%%DATADIR%%/index.php
-%%DATADIR%%/install.php
-%%DATADIR%%/install/021to03.php
+%%DATADIR%%/doc/admin.html
+%%DATADIR%%/doc/index.php
+%%DATADIR%%/doc/user.html
+%%DATADIR%%/install/upgrade3.php
 %%DATADIR%%/install/03to05.php
 %%DATADIR%%/install/05to06.php
 %%DATADIR%%/install/06to07.php
@@ -276,43 +244,8 @@
 %%DATADIR%%/install/step3.php
 %%DATADIR%%/install/upgrade1.php
 %%DATADIR%%/install/upgrade2.php
-%%DATADIR%%/install/upgrade3.php
-%%DATADIR%%/karma.php
-%%DATADIR%%/lib.php
-%%DATADIR%%/login.php
-%%DATADIR%%/logout.php
-%%DATADIR%%/news.php
-%%DATADIR%%/phpFlickr/ChangeLog.txt
-%%DATADIR%%/phpFlickr/PEAR/DB.php
-%%DATADIR%%/phpFlickr/PEAR/DB/common.php
-%%DATADIR%%/phpFlickr/PEAR/DB/mysql.php
-%%DATADIR%%/phpFlickr/PEAR/DB/pgsql.php
-%%DATADIR%%/phpFlickr/PEAR/DB/storage.php
-%%DATADIR%%/phpFlickr/PEAR/HTTP/Request.php
-%%DATADIR%%/phpFlickr/PEAR/HTTP/Request/Listener.php
-%%DATADIR%%/phpFlickr/PEAR/Net/Socket.php
-%%DATADIR%%/phpFlickr/PEAR/Net/URL.php
-%%DATADIR%%/phpFlickr/PEAR/PEAR.php
-%%DATADIR%%/phpFlickr/README.txt
-%%DATADIR%%/phpFlickr/auth.php
-%%DATADIR%%/phpFlickr/example.php
-%%DATADIR%%/phpFlickr/getToken.php
-%%DATADIR%%/phpFlickr/phpFlickr.php
-%%DATADIR%%/phpFlickr/xml.php
-%%DATADIR%%/preview.php
-%%DATADIR%%/rand_pass.php
-%%DATADIR%%/request.php
-%%DATADIR%%/rss.php
-%%DATADIR%%/rss2.php
-%%DATADIR%%/simplog.css
-%%DATADIR%%/simplog.js
-%%DATADIR%%/spam.admin.php
-%%DATADIR%%/tb.php
-%%DATADIR%%/tb_validate.php
-%%DATADIR%%/tem.admin.php
-%%DATADIR%%/templates/basic.tem
-%%DATADIR%%/templates/blog.tem
-%%DATADIR%%/templates/images/background.gif
+%%DATADIR%%/install/021to03.php
+%%DATADIR%%/templates/images/slc.gif
 %%DATADIR%%/templates/images/black_dot.gif
 %%DATADIR%%/templates/images/cl.gif
 %%DATADIR%%/templates/images/cr.gif
@@ -332,7 +265,9 @@
 %%DATADIR%%/templates/images/menutopright.gif
 %%DATADIR%%/templates/images/pix.gif
 %%DATADIR%%/templates/images/sketch.gif
-%%DATADIR%%/templates/images/slc.gif
+%%DATADIR%%/templates/images/background.gif
+%%DATADIR%%/templates/basic.tem
+%%DATADIR%%/templates/blog.tem
 %%DATADIR%%/templates/kde.tem
 %%DATADIR%%/templates/kuro5hin.tem
 %%DATADIR%%/templates/new.tem
@@ -342,36 +277,84 @@
 %%DATADIR%%/templates/slash.tem
 %%DATADIR%%/templates/slashdot.tem
 %%DATADIR%%/templates/webhack.tem
-%%DATADIR%%/user.admin.php
-%%DATADIR%%/user.php
-%%DATADIR%%/weblogrpc.php
-%%DATADIR%%/xmlrpc.inc
+%%DATADIR%%/phpFlickr/ChangeLog.txt
+%%DATADIR%%/phpFlickr/README.txt
+%%DATADIR%%/phpFlickr/phpFlickr.php
+%%DATADIR%%/phpFlickr/xml.php
+%%DATADIR%%/rss.php
+%%DATADIR%%/request.php
+%%DATADIR%%/rand_pass.php
+%%DATADIR%%/preview.php
+%%DATADIR%%/news.php
+%%DATADIR%%/logout.php
+%%DATADIR%%/login.php
+%%DATADIR%%/lib.php
+%%DATADIR%%/karma.php
+%%DATADIR%%/install.php
+%%DATADIR%%/index.php
+%%DATADIR%%/img.php
+%%DATADIR%%/imagelist.php
+%%DATADIR%%/header.php
+%%DATADIR%%/footer.php
+%%DATADIR%%/edit.php
+%%DATADIR%%/do_glyph.php
+%%DATADIR%%/config-dist.php
+%%DATADIR%%/comments.php
+%%DATADIR%%/class.RSS.php
+%%DATADIR%%/class.HttpClient.php
+%%DATADIR%%/class.BlogUser.php
+%%DATADIR%%/class.BlogServer.php
+%%DATADIR%%/class.BlogInfo.php
+%%DATADIR%%/class.BlogEntry.php
+%%DATADIR%%/catadmin.php
+%%DATADIR%%/blogadmin.php
+%%DATADIR%%/blog.php
+%%DATADIR%%/blog.admin.php
+%%DATADIR%%/blocksadmin.php
+%%DATADIR%%/blocks.php
+%%DATADIR%%/atom.php
+%%DATADIR%%/archive.php
+%%DATADIR%%/api.php
+%%DATADIR%%/admin.php
+%%DATADIR%%/add_symbols.inc
+%%DATADIR%%/add_html.inc
 %%DATADIR%%/xmlrpcs.inc
-@dirrm %%DATADIR%%/templates/images
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/phpFlickr/PEAR/Net
-@dirrm %%DATADIR%%/phpFlickr/PEAR/HTTP/Request
-@dirrm %%DATADIR%%/phpFlickr/PEAR/HTTP
-@dirrm %%DATADIR%%/phpFlickr/PEAR/DB
-@dirrm %%DATADIR%%/phpFlickr/PEAR
-@dirrm %%DATADIR%%/phpFlickr
-@dirrm %%DATADIR%%/install
-@dirrm %%DATADIR%%/images/smile
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/adodb/xsl
+%%DATADIR%%/LICENSE
+%%DATADIR%%/CREDITS
+%%DATADIR%%/CHANGES
+%%DATADIR%%/README
+%%DATADIR%%/xmlrpc.inc
+%%DATADIR%%/weblogrpc.php
+%%DATADIR%%/user.php
+%%DATADIR%%/user.admin.php
+%%DATADIR%%/tem.admin.php
+%%DATADIR%%/tb_validate.php
+%%DATADIR%%/tb.php
+%%DATADIR%%/spam.admin.php
+%%DATADIR%%/simplog.js
+%%DATADIR%%/simplog.css
+%%DATADIR%%/rss2.php
 @dirrm %%DATADIR%%/adodb/tests
 @dirrm %%DATADIR%%/adodb/session/old
 @dirrm %%DATADIR%%/adodb/session
-@dirrm %%DATADIR%%/adodb/perf
 @dirrm %%DATADIR%%/adodb/pear/Auth/Container
 @dirrm %%DATADIR%%/adodb/pear/Auth
 @dirrm %%DATADIR%%/adodb/pear
-@dirrm %%DATADIR%%/adodb/lang
 @dirrm %%DATADIR%%/adodb/drivers
-@dirrm %%DATADIR%%/adodb/docs
-@dirrm %%DATADIR%%/adodb/datadict
+@dirrm %%DATADIR%%/adodb/lang
+@dirrm %%DATADIR%%/adodb/perf
 @dirrm %%DATADIR%%/adodb/cute_icons_for_site
+@dirrm %%DATADIR%%/adodb/datadict
 @dirrm %%DATADIR%%/adodb/contrib
+@dirrm %%DATADIR%%/adodb/xsl
+@dirrm %%DATADIR%%/adodb/docs
 @dirrm %%DATADIR%%/adodb
+@dirrm %%DATADIR%%/images/smile
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%/cache
+@dirrm %%DATADIR%%/install
+@dirrm %%DATADIR%%/templates/images
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/phpFlickr
 @dirrm %%DATADIR%%