4 files changed, 29 insertions, 9 deletions

diff --git a/www/abyssws/Makefile b/www/abyssws/Makefile
index 6d454bb0f250..8dd4b28d68b8 100644
--- a/www/abyssws/Makefile
+++ b/www/abyssws/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	abyssws
 # Date created:				26 August 2007
-# Whom:					Daniel Voisine
+# Whom:					Daniel Voisine <voisined@wit.edu>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	abyssws
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.aprelium.com/data/
 DISTNAME=	abwsx1-freebsd
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	voisined@wit.edu
 COMMENT=	Abyss Web Server is a compact and easy to use web server
 
-LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS=	c.6:${PORTSDIR}/misc/compat6x
 
 WRKSRC=		${WRKDIR}/abyssws
 ONLY_FOR_ARCHS=	i386
@@ -28,8 +28,11 @@ pre-install:
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/abyssws
+	@${INSTALL} -d ${PREFIX}/lib/abyssws
 	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX}/lib/abyssws -xf -
+	@ ${CHOWN} -R abyssws:abyssws ${PREFIX}/lib/abyssws/
+	@${ECHO_CMD} '@exec ${CHOWN} -R abyssws:abyssws \
+		${PREFIX}/lib/abyssws' >> ${TMPPLIST}
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/www/abyssws/distinfo b/www/abyssws/distinfo
index 7e128bca4785..b0b63730caa3 100644
--- a/www/abyssws/distinfo
+++ b/www/abyssws/distinfo
@@ -1,3 +1,3 @@
-MD5 (abwsx1-freebsd.tgz) = b97675bf528ca336fa7b68fb616c0df1
-SHA256 (abwsx1-freebsd.tgz) = ce1d575abc6ffaa75b60293a2ffc6b5488c8193bb948b2797f7f946848519adb
-SIZE (abwsx1-freebsd.tgz) = 338272
+MD5 (abwsx1-freebsd.tgz) = 9937313e5781b05442023387c29ce51b
+SHA256 (abwsx1-freebsd.tgz) = b98f030a95912b6f03e0ea7f6b691feb4c38e72a4f63d41a6762bb3aeec0dcaf
+SIZE (abwsx1-freebsd.tgz) = 606588
diff --git a/www/abyssws/pkg-install b/www/abyssws/pkg-install
index 36925b9a26e9..eb516276e4ad 100644
--- a/www/abyssws/pkg-install
+++ b/www/abyssws/pkg-install
@@ -38,12 +38,22 @@ PRE-INSTALL)
 		mkdir -p ${WSHOME}
 		chown ${USER}:${GROUP} ${WSHOME}
 	fi
+
+	if [ -r ${WSHOME}/htdocs/index.html ] ; then
+	       mv ${WSHOME}/htdocs/index.html ${WSHOME}/htdocs/index.html.bak
+	fi
+
 	;;
 
 POST-INSTALL)
 	chown -R ${USER}:${GROUP} ${WSHOME}
 	chmod -R u+w,o-rx ${WSHOME}
 	chmod u+s ${WSHOME}/abyssws
+	
+	if [ -r ${WSHOME}/htdocs/index.html.bak ] ; then
+	       mv ${WSHOME}/htdocs/index.html.bak ${WSHOME}/htdocs/index.html
+	fi
+
 	;;
 
 
diff --git a/www/abyssws/pkg-plist b/www/abyssws/pkg-plist
index 747a5cbb38da..94cc571a2de1 100644
--- a/www/abyssws/pkg-plist
+++ b/www/abyssws/pkg-plist
@@ -1,10 +1,12 @@
 lib/abyssws/Installation Instructions.html
 lib/abyssws/abyssws
+lib/abyssws/autostart-setup
 lib/abyssws/console/about.gif
 lib/abyssws/console/alias.gif
 lib/abyssws/console/antileech.gif
 lib/abyssws/console/aspnet.gif
 lib/abyssws/console/bandwidth.gif
+lib/abyssws/console/cert.gif
 lib/abyssws/console/console.css
 lib/abyssws/console/console.gif
 lib/abyssws/console/delete.gif
@@ -71,7 +73,7 @@ lib/abyssws/doc/intro.html
 lib/abyssws/doc/ipformat.html
 lib/abyssws/doc/isapi.html
 lib/abyssws/doc/knowledge.html
-lib/abyssws/doc/ln63.html
+lib/abyssws/doc/ln72.html
 lib/abyssws/doc/patternsformat.html
 lib/abyssws/doc/portsproblems.html
 lib/abyssws/doc/preface.html
@@ -86,18 +88,23 @@ lib/abyssws/doc/shutdown.html
 lib/abyssws/doc/ssi.html
 lib/abyssws/doc/ssiencoding.html
 lib/abyssws/doc/ssisyntax.html
+lib/abyssws/doc/ssl.html
 lib/abyssws/doc/start.html
+lib/abyssws/doc/startup.html
 lib/abyssws/doc/stylesheet.css
 lib/abyssws/doc/troubleshooting.html
 lib/abyssws/doc/useroption.html
 lib/abyssws/lang/ar.lng
 lib/abyssws/lang/fr.lng
 lib/abyssws/license.txt
-lib/abyssws/htdocs/index.html
 lib/abyssws/htdocs/pwrabyss.gif
+lib/abyssws/htdocs/index.html
 @dirrm lib/abyssws/console
 @dirrm lib/abyssws/doc
 @dirrmtry lib/abyssws/htdocs
+@exec mkdir -p %D/lib/abyssws/kcstore
+@dirrm lib/abyssws/kcstore
 @dirrm lib/abyssws/lang
+@exec mkdir -p %D/lib/abyssws/log
 @dirrmtry lib/abyssws/log
 @dirrmtry lib/abyssws