Update to version 3.10.

5 files changed, 20 insertions, 30 deletions

diff --git a/www/mod_watch/Makefile b/www/mod_watch/Makefile
index 6723ef48799b..46586af6aa5c 100644
--- a/www/mod_watch/Makefile
+++ b/www/mod_watch/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	mod_watch
-PORTVERSION=	2.4
+PORTVERSION=	3.10
 CATEGORIES=	www
 MASTER_SITES=	http://www.snert.com/Software/mod_watch/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
-DISTNAME=	${PORTNAME}204
+DISTNAME=	${PORTNAME}310
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	anders@FreeBSD.org
@@ -23,37 +23,29 @@ USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 APXS?=		${LOCALBASE}/sbin/apxs
+MAKE_ARGS+=	APXS="${APXS}"
 
-DOCS=	apache2mrtg.html dbm-client.html dbm-server.html index.shtml \
-	mod_watch.html style.css
+ALL_TARGET=	build-dynamic
 
-FIXCONVERT=	CHANGES.TXT convert.pl index.shtml
+DOCS=	apache2mrtg.html index.shtml mailto.js mod_watch.html style.css
+DOCS_HTMLIMAGES=	apache-header-476-62.png mrpixel.gif mrtg-bar.png \
+			sun-logo.jpg wave1.jpg
 
 post-patch:
-.for f in ${FIXCONVERT}
-	@${SED} -e 's:convert.pl:convertdbm.pl:g' < ${WRKSRC}/${f} \
-		> ${WRKSRC}/${f}.tmp
-	@${MV} ${WRKSRC}/${f}.tmp ${WRKSRC}/${f}
-.endfor
-
-do-build:
-	@cd ${WRKSRC} && ${APXS} -c mod_watch.c
+	${PERL} -pi -e "s@^APXS.*@@" ${WRKSRC}/Makefile
 
 do-install:
 	${APXS} -i -A -n watch ${WRKSRC}/mod_watch.so
 	${INSTALL_SCRIPT} ${WRKSRC}/apache2mrtg.pl ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/mod_watch.pl ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/convert.pl ${PREFIX}/sbin/convertdbm.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/dbm-client.pl ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/dbm-server.pl ${PREFIX}/sbin
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -m 0755 ${PREFIX}/share/doc/mod_watch/html/Img
-	${INSTALL_DATA} ${WRKSRC}/CHANGES.TXT ${PREFIX}/share/doc/mod_watch/
-	${INSTALL_DATA} ${WRKSRC}/Img/mrpixel.gif ${PREFIX}/share/doc/mod_watch/html/Img/
-	${INSTALL_DATA} ${WRKSRC}/Img/sun-logo.jpg ${PREFIX}/share/doc/mod_watch/html/Img/
-	${INSTALL_DATA} ${WRKSRC}/Img/wave1.jpg ${PREFIX}/share/doc/mod_watch/html/Img/
+	@${INSTALL} -d -m 0755 ${DOCSDIR}/html/Img
+	${INSTALL_DATA} ${WRKSRC}/CHANGES.TXT ${DOCSDIR}/
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/mod_watch/html/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/html/
+.endfor
+.for f in ${DOCS_HTMLIMAGES}
+	${INSTALL_DATA} ${WRKSRC}/Img/${f} ${DOCSDIR}/html/Img/
 .endfor
 .endif
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/www/mod_watch/distinfo b/www/mod_watch/distinfo
index 2a6cc0c2d13b..b31d23b8c367 100644
--- a/www/mod_watch/distinfo
+++ b/www/mod_watch/distinfo
@@ -1 +1 @@
-MD5 (mod_watch204.tgz) = 0b87bad1cfc5904bd1a3e64d0d593b17
+MD5 (mod_watch310.tgz) = d66c1bcd1ec0e67cfbf12781dad67af3
diff --git a/www/mod_watch/pkg-install b/www/mod_watch/pkg-install
index 0c7f66126020..97ac46175592 100644
--- a/www/mod_watch/pkg-install
+++ b/www/mod_watch/pkg-install
@@ -4,7 +4,7 @@ case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
-	install -d -o nobody -g nobody -m 0755 /var/spool/mod_watch
+	install -d -o www -g www -m 0755 /var/spool/mod_watch
 	;;
     *)
 	echo "Unexpected Argument $2."
diff --git a/www/mod_watch/pkg-message b/www/mod_watch/pkg-message
index 349b0b88f4d3..e24a59f37b94 100644
--- a/www/mod_watch/pkg-message
+++ b/www/mod_watch/pkg-message
@@ -3,7 +3,7 @@ You've installed mod_watch, a module to monitor bandwidth
 usage.
 
 /var/spool/mod_watch has been created. It's owned by user 
-nobody and group nobody. For mod_watch to work, the Apache
+www and group www. For mod_watch to work, the Apache
 user/group must be able to create and update files in this
 directory.
 
diff --git a/www/mod_watch/pkg-plist b/www/mod_watch/pkg-plist
index 9be3736f95f1..57e9b1ff7171 100644
--- a/www/mod_watch/pkg-plist
+++ b/www/mod_watch/pkg-plist
@@ -1,18 +1,16 @@
 sbin/apache2mrtg.pl
 sbin/mod_watch.pl
-sbin/convertdbm.pl
-sbin/dbm-client.pl
-sbin/dbm-server.pl
 libexec/apache/mod_watch.so
 @exec %D/sbin/apxs -e -A -n watch %D/%F
 @unexec %D/sbin/apxs -e -A -n watch %D/%F
+%%PORTDOCS%%share/doc/mod_watch/html/Img/apache-header-476-62.png
 %%PORTDOCS%%share/doc/mod_watch/html/Img/mrpixel.gif
+%%PORTDOCS%%share/doc/mod_watch/html/Img/mrtg-bar.png
 %%PORTDOCS%%share/doc/mod_watch/html/Img/sun-logo.jpg
 %%PORTDOCS%%share/doc/mod_watch/html/Img/wave1.jpg
 %%PORTDOCS%%share/doc/mod_watch/html/apache2mrtg.html
-%%PORTDOCS%%share/doc/mod_watch/html/dbm-client.html
-%%PORTDOCS%%share/doc/mod_watch/html/dbm-server.html
 %%PORTDOCS%%share/doc/mod_watch/html/index.shtml
+%%PORTDOCS%%share/doc/mod_watch/html/mailto.js
 %%PORTDOCS%%share/doc/mod_watch/html/mod_watch.html
 %%PORTDOCS%%share/doc/mod_watch/html/style.css
 %%PORTDOCS%%share/doc/mod_watch/CHANGES.TXT