From fuyuki@hadaly.org  Mon May 24 22:45:46 2004
Return-Path: <fuyuki@hadaly.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4CD3716A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 May 2004 22:45:46 -0700 (PDT)
Received: from mgate14.so-net.ne.jp (mgate14.so-net.ne.jp [210.139.254.161])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A755443D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 24 May 2004 22:45:45 -0700 (PDT)
	(envelope-from fuyuki@hadaly.org)
Received: from mail.dg8.so-net.ne.jp (mspool12.so-net.ne.jp [210.139.248.12])
	by mgate14.so-net.ne.jp  with ESMTP id i4P5jMb16059
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 May 2004 14:45:22 +0900 (JST)
Received: from ns.nigredo.org (p624231.spprac00.ap.so-net.ne.jp [219.98.66.49])
	by mail.dg8.so-net.ne.jp  with ESMTP id i4P5jM418020
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 May 2004 14:45:22 +0900 (JST)
Message-Id: <86r7t9hxfy.wl%fuyuki@hadaly.org>
Date: Tue, 25 May 2004 14:45:21 +0900
From: Kimura Fuyuki <fuyuki@hadaly.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: www/wiliki to 0.5

>Number:         67161
>Category:       ports
>Synopsis:       Update port: www/wiliki to 0.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 24 22:50:20 PDT 2004
>Closed-Date:    Tue May 25 00:26:48 PDT 2004
>Last-Modified:  Tue May 25 00:26:48 PDT 2004
>Originator:     Kimura Fuyuki
>Release:        FreeBSD 5.2.1-RELEASE-p7 i386
>Organization:
>Environment:

  FreeBSD ns.nigredo.org 5.2.1-RELEASE-p7 i386

>Description:
Update to 0.5

>How-To-Repeat:

>Fix:

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvs/FreeBSD/ports/www/wiliki/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	13 Feb 2004 15:33:09 -0000	1.7
+++ Makefile	25 May 2004 05:36:32 -0000
@@ -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 @@
 
 .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>
Index: distinfo
===================================================================
RCS file: /cvs/FreeBSD/ports/www/wiliki/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	13 Feb 2004 15:33:09 -0000	1.3
+++ distinfo	25 May 2004 04:46:08 -0000
@@ -1,2 +1,2 @@
-MD5 (WiLiKi-0.4p1.tgz) = 23b4910077d471a7f2e544ea4c723d25
-SIZE (WiLiKi-0.4p1.tgz) = 83208
+MD5 (WiLiKi-0.5.tgz) = 0eee968cb23bad3c1d533c3b65f11763
+SIZE (WiLiKi-0.5.tgz) = 105489
Index: pkg-plist
===================================================================
RCS file: /cvs/FreeBSD/ports/www/wiliki/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	9 Oct 2003 13:36:58 -0000	1.2
+++ pkg-plist	25 May 2004 05:07:16 -0000
@@ -1,5 +1,9 @@
 www/cgi-bin/wiliki.cgi.dist
+www/cgi-bin/wiliki2.cgi.dist
 @unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+www/data/wiliki.css
+www/data/wiliki2.css
+@unexec rmdir %D/www/data 2>/dev/null || true
 share/gauche/site/lib/wiliki.scm
 share/gauche/site/lib/wiliki/db.scm
 share/gauche/site/lib/wiliki/edit.scm
@@ -11,8 +15,9 @@
 share/gauche/site/lib/wiliki/msgs.jp
 share/gauche/site/lib/wiliki/pasttime.scm
 share/gauche/site/lib/wiliki/rss.scm
+share/gauche/site/lib/wiliki/rssmix.scm
+share/gauche/site/lib/wiliki/util.scm
+share/gauche/site/lib/wiliki/version.scm
 @dirrm share/gauche/site/lib/wiliki
-%%EXAMPLESDIR%%/wiliki-sample.css
-@dirrm %%EXAMPLESDIR%%
 @exec mkdir -p /var/wiliki
 @exec chown www:www /var/wiliki
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Tue May 25 00:26:43 PDT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67161 
>Unformatted:
