Update www/websvn to 1.40, and honour CONF_FILES and PKG_SYSCONFDIR.

Changes:

ADD: RSS feed support (thanks to Lübbe Onken for his work on this)
ADD: Translatations for French and Portuguese
ADD: .exe is recognised by default as having content-type
     application/x-msdownload
ADD: Recognised links are now 'linkified' in the log messages
ADD: Tabs in file/diff listings are now expanded by a user
     configurable number of spaces.
ADD: WebSVN URLs now access the repository by name rather than number.
     This means that bookmarks will stay the same when new projects
     are added.  The old behaviour can be configure in config.inc.

FIX: Removed the revision 0 that has appeared in the previous version
FIX: Repositories were not sorted alphabetically when using ParentPath
FIX: The PNG support script needed for IE (and the BlueGrey scheme) is
     now only loaded with IE

4 files changed, 29 insertions, 22 deletions

diff --git a/www/websvn/MESSAGE b/www/websvn/MESSAGE
deleted file mode 100644
index a5c85d1c589..00000000000
--- a/www/websvn/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/06/20 19:36:55 xtraeme Exp $
-
-${PKGBASE} is now installed into ${HTTPD_ROOT}, 
-you'll have to copy the file distconfig.inc to config.inc found in the
-includes directory and adapt it to your subversion server.
-
-More information can be found in 
-${HTTPD_ROOT}/websvn/install.txt.
-
-===========================================================================
diff --git a/www/websvn/Makefile b/www/websvn/Makefile
index b2c8f57b057..473377a94a5 100644
--- a/www/websvn/Makefile
+++ b/www/websvn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/20 19:36:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/21 01:34:16 xtraeme Exp $
 #
 
-DISTNAME=	WebSVN_139
-PKGNAME=	websvn-1.39
+DISTNAME=	WebSVN_140
+PKGNAME=	websvn-1.40
 CATEGORIES=	www
 MASTER_SITES=	http://websvn.tigris.org/files/documents/1380/10659/
 
@@ -15,6 +15,9 @@ BUILD_DEPENDS+=	ap-php-[0-9]*:../../www/ap-php4
 
 WRKSRC=		${WRKDIR}/WebSVN
 NO_BUILD=	yes
+USE_PKGINSTALL=	yes
+
+PKG_SYSCONFDIR.websvn=	${PREFIX}/${HTTPD_ROOT}/websvn/include	
 
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
 MESSAGE_SUBST+=	HTTPD_ROOT=${HTTPD_ROOT}
@@ -24,8 +27,17 @@ HTTPD_ROOT?=	share/httpd/htdocs
 
 BUILD_DEFS+=	HTTPD_ROOT
 
+EGDIR=		${PREFIX}/share/examples/${PKGBASE}
+MAKE_DIRS=	${PREFIX}/${HTTPD_ROOT}/websvn/include
+CONF_FILES=	${EGDIR}/distconfig.inc ${PKG_SYSCONFDIR}/config.inc
+
+INSTALLATION_DIRS=	${HTTPD_ROOT}/websvn share/examples/${PKGBASE}
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${HTTPD_ROOT}/websvn
+	${INSTALL_DATA} ${WRKSRC}/include/distconfig.inc ${EGDIR}
 	cd ${WRKSRC} && ${PAX} -rwppm . ${PREFIX}/${HTTPD_ROOT}/websvn
 
+post-install:
+	${RM} ${PREFIX}/${HTTPD_ROOT}/websvn/include/distconfig.inc
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/websvn/PLIST b/www/websvn/PLIST
index 78965f8b478..0fd0ec73da3 100644
--- a/www/websvn/PLIST
+++ b/www/websvn/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/20 19:36:56 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/21 01:34:16 xtraeme Exp $
+share/examples/websvn/distconfig.inc
 ${HTTPD_ROOT}/websvn/cache/tmp
 ${HTTPD_ROOT}/websvn/changes.txt
 ${HTTPD_ROOT}/websvn/diff.php
@@ -6,7 +7,7 @@ ${HTTPD_ROOT}/websvn/filedetails.php
 ${HTTPD_ROOT}/websvn/form.php
 ${HTTPD_ROOT}/websvn/include/command.inc
 ${HTTPD_ROOT}/websvn/include/configclass.inc
-${HTTPD_ROOT}/websvn/include/distconfig.inc
+${HTTPD_ROOT}/websvn/include/feedcreator.class.php
 ${HTTPD_ROOT}/websvn/include/setup.inc
 ${HTTPD_ROOT}/websvn/include/svnlook.inc
 ${HTTPD_ROOT}/websvn/include/template.inc
@@ -15,10 +16,13 @@ ${HTTPD_ROOT}/websvn/include/version.inc
 ${HTTPD_ROOT}/websvn/index.php
 ${HTTPD_ROOT}/websvn/install.txt
 ${HTTPD_ROOT}/websvn/languages/english.inc
+${HTTPD_ROOT}/websvn/languages/french.inc
 ${HTTPD_ROOT}/websvn/languages/german.inc
+${HTTPD_ROOT}/websvn/languages/portuguese.inc
 ${HTTPD_ROOT}/websvn/licence.txt
 ${HTTPD_ROOT}/websvn/listing.php
 ${HTTPD_ROOT}/websvn/log.php
+${HTTPD_ROOT}/websvn/rss.php
 ${HTTPD_ROOT}/websvn/templates.txt
 ${HTTPD_ROOT}/websvn/templates/BlueGrey/diff.tmpl
 ${HTTPD_ROOT}/websvn/templates/BlueGrey/directory.tmpl
@@ -36,6 +40,7 @@ ${HTTPD_ROOT}/websvn/templates/BlueGrey/png.js
 ${HTTPD_ROOT}/websvn/templates/BlueGrey/repo.png
 ${HTTPD_ROOT}/websvn/templates/BlueGrey/styles.css
 ${HTTPD_ROOT}/websvn/templates/BlueGrey/subversion.png
+${HTTPD_ROOT}/websvn/templates/BlueGrey/xml.gif
 ${HTTPD_ROOT}/websvn/templates/Standard/diff.tmpl
 ${HTTPD_ROOT}/websvn/templates/Standard/directory.tmpl
 ${HTTPD_ROOT}/websvn/templates/Standard/file.tmpl
@@ -44,12 +49,13 @@ ${HTTPD_ROOT}/websvn/templates/Standard/header.tmpl
 ${HTTPD_ROOT}/websvn/templates/Standard/index.tmpl
 ${HTTPD_ROOT}/websvn/templates/Standard/log.tmpl
 ${HTTPD_ROOT}/websvn/templates/Standard/styles.css
+${HTTPD_ROOT}/websvn/templates/Standard/xml.gif
 ${HTTPD_ROOT}/websvn/wsvn.php
 @dirrm ${HTTPD_ROOT}/websvn/templates/Standard
 @dirrm ${HTTPD_ROOT}/websvn/templates/BlueGrey
 @dirrm ${HTTPD_ROOT}/websvn/templates
+@exec ${MKDIR} %D/${HTTPD_ROOT}/websvn/temp
 @dirrm ${HTTPD_ROOT}/websvn/temp
 @dirrm ${HTTPD_ROOT}/websvn/languages
-@dirrm ${HTTPD_ROOT}/websvn/include
 @dirrm ${HTTPD_ROOT}/websvn/cache
-@dirrm ${HTTPD_ROOT}/websvn
+@dirrm share/examples/websvn
diff --git a/www/websvn/distinfo b/www/websvn/distinfo
index fc1ea868e21..922c1b5b3e9 100644
--- a/www/websvn/distinfo
+++ b/www/websvn/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/20 19:36:56 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/06/21 01:34:16 xtraeme Exp $
 
-SHA1 (WebSVN_139.tar.gz) = 286b154b5d53dede88c764b601232a2949178ba8
-Size (WebSVN_139.tar.gz) = 51393 bytes
+SHA1 (WebSVN_140.tar.gz) = 251b2714b4c025b19e0ed9662e49f626e00f8380
+Size (WebSVN_140.tar.gz) = 65979 bytes