1 files changed, 17 insertions, 15 deletions

diff --git a/www/wiliki/Makefile b/www/wiliki/Makefile
index 2ca741390255..90eac25f06a9 100644
--- a/www/wiliki/Makefile
+++ b/www/wiliki/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	wiliki
-PORTVERSION=	0.4p1
+PORTVERSION=	0.5
 CATEGORIES=	www scheme
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	WiLiKi-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	fuyuki@nigredo.org
+MAINTAINER=	fuyuki@hadaly.org
 COMMENT=	A lightweight Wiki engine written in Scheme
 
 BUILD_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
@@ -24,33 +24,35 @@ GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${ARCH} == "alpha"
 BROKEN=		"Does not build"
 .endif
 
 .if exists(${LOCALBASE}/bin/gauche-config)
-GAUCHE_VER!=	gauche-config -V
+GAUCHE_VER!=	${LOCALBASE}/bin/gauche-config -V
 .else
 GAUCHE_VER=	none
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's,/usr/bin,${PREFIX}/bin,' \
+	${REINPLACE_CMD} -E \
+		-e 's,/usr/bin,${PREFIX}/bin,' \
 		-e 's,/home/shiro/data/wikidata.dbm,/var/wiliki/data.dbm,' \
-		-e 's/"wiliki-sample.css"/#f/' \
-		-e "s/:language 'jp/:language 'en/" ${WRKSRC}/src/wiliki.cgi
-
-pre-install:
-	${MKDIR} `gauche-config --sitelibdir`
+		-e 's,wiliki2?\.css,/&,' \
+		-e "s/:language 'jp/:language 'en/" ${WRKSRC}/src/*.cgi
 
 post-install:
 	${MKDIR} ${PREFIX}/www/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/src/wiliki.cgi \
-		${PREFIX}/www/cgi-bin/wiliki.cgi.dist
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/wiliki-sample.css ${EXAMPLESDIR}
+.for f in wiliki.cgi wiliki2.cgi
+	${INSTALL_DATA} ${WRKSRC}/src/${f} ${PREFIX}/www/cgi-bin/${f}.dist
+.endfor
+	${MKDIR} ${PREFIX}/www/data
+	${INSTALL_DATA} ${WRKSRC}/src/*.css ${PREFIX}/www/data
 	${MKDIR} /var/wiliki
 	${CHOWN} www:www /var/wiliki
 	@${CAT} ${PKGMESSAGE}
 
+test:
+	cd ${WRKSRC}; ${MAKE} check
+
 .include <bsd.port.post.mk>