4 files changed, 29 insertions, 87 deletions

diff --git a/www/p5-Kwiki/Makefile b/www/p5-Kwiki/Makefile
index 9e2d0a8a720e..40cc79d1f472 100644
--- a/www/p5-Kwiki/Makefile
+++ b/www/p5-Kwiki/Makefile
@@ -6,58 +6,29 @@
 #
 
 PORTNAME=	Kwiki
-PORTVERSION=	0.38
+PORTVERSION=	0.39
 CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Kwiki
+MASTER_SITES=	http://www.kwiki.org/downloads/
 PKGNAMEPREFIX=	p5-
+DISTNAME=	kwiki-trunk-20070327
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Kwiki Wiki Building Framework
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
-		${SITE_PERL}/Spoon.pm:${PORTSDIR}/devel/p5-Spoon
-RUN_DEPENDS=	${BUILD_DEPENDS}
+KWIKIDIR?=	kwiki
+NO_BUILD=	yes
 
-PERL_CONFIGURE=	yes
-
-MAN1=		kwiki.1
-MAN3=		Kwiki.3 \
-		Kwiki::Archive.3 \
-		Kwiki::Base.3 \
-		Kwiki::CGI.3 \
-		Kwiki::Command.3 \
-		Kwiki::Config.3 \
-		Kwiki::ContentObject.3 \
-		Kwiki::Cookie.3 \
-		Kwiki::CSS.3 \
-		Kwiki::Display.3 \
-		Kwiki::Edit.3 \
-		Kwiki::Formatter.3 \
-		Kwiki::Files.3 \
-		Kwiki::Hub.3 \
-		Kwiki::Icons.3 \
-		Kwiki::Installer.3 \
-		Kwiki::Javascript.3 \
-		Kwiki::Pages.3 \
-		Kwiki::Plugin.3 \
-		Kwiki::Preferences.3 \
-		Kwiki::Registry.3 \
-		Kwiki::Status.3 \
-		Kwiki::Template.3 Kwiki::Template::TT2.3 \
-		Kwiki::Theme.3 Kwiki::Theme::Basic.3 \
-		Kwiki::Toolbar.3 \
-		Kwiki::Users.3 \
-		Kwiki::WebFile.3 \
-		Kwiki::Widgets.3
+do-install:
+	@${MKDIR} ${PREFIX}/${KWIKIDIR}
+	${CP} -RH ${WRKSRC}/ ${PREFIX}/${KWIKIDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${KWIKIDIR}
 
 post-install:
+	@${FIND} ${WRKSRC}/${file} -not -type d \
+		| ${SED} -ne 's,^${WRKSRC},${KWIKIDIR},p' >> ${TMPPLIST}
+	@${FIND} -d ${WRKSRC}/${file} -type d \
+		| ${SED} -ne 's,^${WRKSRC},@dirrm ${KWIKIDIR},p' >> ${TMPPLIST}
+	@${SED} -e 's|%%KWIKIDIR%%|${PREFIX}/${KWIKIDIR}|' ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE=		requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-Kwiki/distinfo b/www/p5-Kwiki/distinfo
index 6d9524522792..0295efc92666 100644
--- a/www/p5-Kwiki/distinfo
+++ b/www/p5-Kwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (Kwiki-0.38.tar.gz) = 85508ce6bdadba28a0512d27c9e83841
-SHA256 (Kwiki-0.38.tar.gz) = dc53def1146f6293f8eb9d8423ab6532ce12be2de219f485d8b52d87b1fc062b
-SIZE (Kwiki-0.38.tar.gz) = 41456
+MD5 (kwiki-trunk-20070327.tar.gz) = 2c2b58f89dca84585a2f6b57232bf531
+SHA256 (kwiki-trunk-20070327.tar.gz) = ba1631770cb371689975954700c0b548197b24f1218c0b2dfac8f1aa502c2647
+SIZE (kwiki-trunk-20070327.tar.gz) = 2716490
diff --git a/www/p5-Kwiki/pkg-message b/www/p5-Kwiki/pkg-message
index acbea292aaf6..c133e8184bd6 100644
--- a/www/p5-Kwiki/pkg-message
+++ b/www/p5-Kwiki/pkg-message
@@ -1,9 +1,18 @@
 /* ================================================================= */
-Note: 
+/* Note:                                                             */
 	Kwiki software installed! Now you can install 
 	your kwiki web directory by yourself:
 
-$ kwiki -new cgi-bin/my-kwiki
+$ export PATH=%%KWIKIDIR%%/bin:$PATH
+$ kwiki -new path/to/cgi/kwiki-01
 
 	Finally remember to point your browser at this location.
+
+/* Note for upgrade from 0.38 or prior version:                      */
+
+$ cd <into your Kwiki site directory>
+$ rm index.cgi
+$ rm -rf ./lib  # Remove ./lib, if you have one
+$kwiki -update
+
 /* ================================================================= */
diff --git a/www/p5-Kwiki/pkg-plist b/www/p5-Kwiki/pkg-plist
deleted file mode 100644
index 153798eb98c9..000000000000
--- a/www/p5-Kwiki/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/kwiki
-%%SITE_PERL%%/Kwiki.pm
-%%SITE_PERL%%/Kwiki/Archive.pm
-%%SITE_PERL%%/Kwiki/Base.pm
-%%SITE_PERL%%/Kwiki/BrowserDetect.pm
-%%SITE_PERL%%/Kwiki/CGI.pm
-%%SITE_PERL%%/Kwiki/Command.pm
-%%SITE_PERL%%/Kwiki/Config.pm
-%%SITE_PERL%%/Kwiki/ContentObject.pm
-%%SITE_PERL%%/Kwiki/Cookie.pm
-%%SITE_PERL%%/Kwiki/CSS.pm
-%%SITE_PERL%%/Kwiki/Display.pm
-%%SITE_PERL%%/Kwiki/Edit.pm
-%%SITE_PERL%%/Kwiki/Files.pm
-%%SITE_PERL%%/Kwiki/Formatter.pm
-%%SITE_PERL%%/Kwiki/Icons.pm
-%%SITE_PERL%%/Kwiki/Installer.pm
-%%SITE_PERL%%/Kwiki/Javascript.pm
-%%SITE_PERL%%/Kwiki/Hub.pm
-%%SITE_PERL%%/Kwiki/Pages.pm
-%%SITE_PERL%%/Kwiki/Pane.pm
-%%SITE_PERL%%/Kwiki/Plugin.pm
-%%SITE_PERL%%/Kwiki/Preferences.pm
-%%SITE_PERL%%/Kwiki/Registry.pm
-%%SITE_PERL%%/Kwiki/Status.pm
-%%SITE_PERL%%/Kwiki/Template.pm
-%%SITE_PERL%%/Kwiki/Template/TT2.pm
-%%SITE_PERL%%/Kwiki/Theme.pm
-%%SITE_PERL%%/Kwiki/Theme/Basic.pm
-%%SITE_PERL%%/Kwiki/Toolbar.pm
-%%SITE_PERL%%/Kwiki/Users.pm
-%%SITE_PERL%%/Kwiki/WebFile.pm
-%%SITE_PERL%%/Kwiki/Widgets.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki
-@dirrm %%SITE_PERL%%/Kwiki/Theme
-@dirrm %%SITE_PERL%%/Kwiki/Template
-@dirrm %%SITE_PERL%%/Kwiki