2 files changed, 113 insertions, 35 deletions

diff --git a/www/slash/Makefile b/www/slash/Makefile
index 9d9eb35eb1a7..0b65589850fa 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -8,21 +8,37 @@
 PORTNAME=	slash
 PORTVERSION=	2.2.6
 CATEGORIES=	www
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	slashcode
 DISTNAME=	slash-${PORTVERSION}
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	Slash-Like Automatic Storytelling Homepage system
 
-BUILD_DEPENDS=  ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server \
+BUILD_DEPENDS=	${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql40-server \
 		${SITE_PERL}/Bundle/Slash.pm:${PORTSDIR}/www/p5-Bundle-Slash
-RUN_DEPENDS=    ${BUILD_DEPENDS} \
+RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
 DOCS=		README INSTALL
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \
+		Slash::Apache::Log.3 Slash::Apache::User.3 \
+		Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \
+		Slash::DB::Oracle.3 Slash::DB::PostgreSQL.3 \
+		Slash::DB::Static::MySQL.3 Slash::DB::Static::Oracle.3 \
+		Slash::DB::Static::PostgreSQL.3 Slash::DB::Utility.3 \
+		Slash::Display.3 Slash::Display::Plugin.3 \
+		Slash::Display::Provider.3 Slash::Install.3 Slash::Journal.3 \
+		Slash::Messages.3 Slash::Messages::DB::MySQL.3 \
+		Slash::Search.3 Slash::Test.3 Slash::Utility.3 \
+		Slash::Utility::Access.3 Slash::Utility::Anchor.3 \
+		Slash::Utility::Data.3 Slash::Utility::Display.3 \
+		Slash::Utility::Environment.3 Slash::Utility::System.3 \
+		Slash::XML.3 Slash::XML::RSS.3
 
 post-install:
+	@${FIND} ${PREFIX}/slash -name "*.orig" -delete
 	@${SED} s!%%LOCALBASE%%!${LOCALBASE}!g ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
diff --git a/www/slash/pkg-plist b/www/slash/pkg-plist
index 38400b36e77e..99997b937b27 100644
--- a/www/slash/pkg-plist
+++ b/www/slash/pkg-plist
@@ -1,3 +1,47 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/Apache.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/Apache.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/User.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/User.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Journal/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Search/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Messages/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/XML/FZ.pm/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Install.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Test.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/XML.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/XML/RSS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Access.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Anchor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Data.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Display.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/Environment.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility/System.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display/Plugin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display/Provider.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/MySQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Oracle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/PostgreSQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Utility.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/MySQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/Oracle.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static/PostgreSQL.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Custom/Bulkmail.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/Banlist.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/Log.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache/User.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Slash.pm
+%%SITE_PERL%%/Slash/Journal.pm
+%%SITE_PERL%%/Slash/Search.pm
+%%SITE_PERL%%/Slash/Messages.pm
+%%SITE_PERL%%/Slash/Messages/DB/MySQL.pm
+%%SITE_PERL%%/Slash/XML/FZ.pm
 slash/bin/install-theme
 slash/bin/install-plugin
 slash/bin/backup-blocks
@@ -353,48 +397,66 @@ slash/plugins/Makefile
 slash/httpd/slash.conf
 slash/httpd/slash.conf.def
 slash/slash.sites
-@dirrm slash/bin
-@dirrm slash/bin/templates
-@dirrm slash/sbin
-@dirrm slash/sql
-@dirrm slash/sql/mysql
-@dirrm slash/sql/oracle
-@dirrm slash/sql/postgresql
-@dirrm slash/themes
-@dirrm slash/themes/slashcode
-@dirrm slash/themes/slashcode/htdocs
-@dirrm slash/themes/slashcode/htdocs/images
-@dirrm slash/themes/slashcode/htdocs/images/topics
-@dirrm slash/themes/slashcode/sql
-@dirrm slash/themes/slashcode/sql/mysql
-@dirrm slash/themes/slashcode/sql/oracle
-@dirrm slash/themes/slashcode/sql/postgresql
-@dirrm slash/themes/slashcode/backup
-@dirrm slash/themes/slashcode/logs
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/XML/FZ.pm
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/XML/
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Search
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Messages
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Journal
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache/User
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Slash
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/XML
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/Utility
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/Display
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB/Static
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/DB
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/Custom
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Slash
+@dirrm %%SITE_PERL%%/Slash/XML
+@dirrm %%SITE_PERL%%/Slash/Messages/DB
+@dirrm %%SITE_PERL%%/Slash/Messages
+@dirrm %%SITE_PERL%%/Slash
 @dirrm slash/themes/slashcode/templates
 @dirrm slash/themes/slashcode/tasks
+@dirrm slash/themes/slashcode/sql/postgresql
+@dirrm slash/themes/slashcode/sql/oracle
+@dirrm slash/themes/slashcode/sql/mysql
+@dirrm slash/themes/slashcode/sql
 @dirrm slash/themes/slashcode/misc
-@dirrm slash/plugins
-@dirrm slash/plugins/Admin
-@dirrm slash/plugins/Admin/templates
-@dirrm slash/plugins/Search
+@dirrm slash/themes/slashcode/logs
+@dirrm slash/themes/slashcode/htdocs/images/topics
+@dirrm slash/themes/slashcode/htdocs/images
+@dirrm slash/themes/slashcode/htdocs
+@dirrm slash/themes/slashcode/backup
+@dirrm slash/themes/slashcode
+@dirrm slash/themes
+@dirrm slash/sql/postgresql
+@dirrm slash/sql/oracle
+@dirrm slash/sql/mysql
+@dirrm slash/sql
+@dirrm slash/sbin
 @dirrm slash/plugins/Search/templates
-@dirrm slash/plugins/PubKey
+@dirrm slash/plugins/Search
 @dirrm slash/plugins/PubKey/templates
-@dirrm slash/plugins/Messages
+@dirrm slash/plugins/PubKey
 @dirrm slash/plugins/Messages/templates
-@dirrm slash/plugins/Messages/DB
 @dirrm slash/plugins/Messages/DB/MySQL
-@dirrm slash/plugins/BunchaBlocks
-@dirrm slash/plugins/Hof
+@dirrm slash/plugins/Messages/DB
+@dirrm slash/plugins/Messages
+@dirrm slash/plugins/Journal/templates
+@dirrm slash/plugins/Journal
 @dirrm slash/plugins/Hof/templates
-@dirrm slash/plugins/ForumZilla
+@dirrm slash/plugins/Hof
 @dirrm slash/plugins/ForumZilla/templates
-@dirrm slash/plugins/CheesyPortal
+@dirrm slash/plugins/ForumZilla
 @dirrm slash/plugins/CheesyPortal/templates
 @dirrm slash/plugins/CheesyPortal/tasks
-@dirrm slash/plugins/Journal
-@dirrm slash/plugins/Journal/templates
+@dirrm slash/plugins/CheesyPortal
+@dirrm slash/plugins/BunchaBlocks
+@dirrm slash/plugins/Admin/templates
+@dirrm slash/plugins/Admin
+@dirrm slash/plugins
 @dirrm slash/httpd
-@dirrm slash/site
+@dirrm slash/bin
 @unexec rmdir %D/slash 2>/dev/null || true