4 files changed, 170 insertions, 31 deletions

diff --git a/www/usermanager/Makefile b/www/usermanager/Makefile
index 833f8b9460b8..6c9a2ddaeb42 100644
--- a/www/usermanager/Makefile
+++ b/www/usermanager/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	UserManager
-PORTVERSION=	1.4.0
-CATEGORIES=	www
+PORTVERSION=	2.0
+CATEGORIES=	www ftp
 MASTER_SITES=	http://machiel.generaal.net/files/pureftpd/
 DISTNAME=	ftp_v${PORTVERSION}
 
@@ -17,7 +17,7 @@ COMMENT=	Easily create, change, or delete virtual PureFTPd users
 WRKSRC=		${WRKDIR}/ftp
 
 BROKEN_WITH_PHP=	5
-USE_PHP=	mysql
+USE_PHP=	mysql pcre posix session
 
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -27,16 +27,8 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/data/UserManager
-	@${MKDIR} ${PREFIX}/www/data/UserManager/images
-	@${MKDIR} ${PREFIX}/www/data/UserManager/language
-	@${MKDIR} ${PREFIX}/www/data/UserManager/style
-	${INSTALL_DATA} ${WRKSRC}/script.mysql ${PREFIX}/www/data/UserManager
-	${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/www/data/UserManager
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/www/data/UserManager
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/www/data/UserManager
-	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/data/UserManager/images
-	${INSTALL_DATA} ${WRKSRC}/language/* ${PREFIX}/www/data/UserManager/language
-	${INSTALL_DATA} ${WRKSRC}/style/*  ${PREFIX}/www/data/UserManager/style
+	@${CP} -Rp ${WRKSRC}/* ${PREFIX}/www/data/UserManager
+	@${CHMOD} 666 ${PREFIX}/www/data/UserManager/config.php
 	@${ECHO_CMD} ""
 
 post-install:
diff --git a/www/usermanager/distinfo b/www/usermanager/distinfo
index 3555a4fb697c..8be62d123ea7 100644
--- a/www/usermanager/distinfo
+++ b/www/usermanager/distinfo
@@ -1,2 +1,2 @@
-MD5 (ftp_v1.4.0.tar.gz) = 4a991f288912a888f561f8e1139660ee
-SIZE (ftp_v1.4.0.tar.gz) = 21112
+MD5 (ftp_v2.0.tar.gz) = 7a38fb06ee18f6bcb405a6c36d896fdf
+SIZE (ftp_v2.0.tar.gz) = 87532
diff --git a/www/usermanager/files/pkg-message.in b/www/usermanager/files/pkg-message.in
index f875c26144b9..dd217fa26d38 100644
--- a/www/usermanager/files/pkg-message.in
+++ b/www/usermanager/files/pkg-message.in
@@ -6,3 +6,20 @@
     compile your pure-ftpd with -DWITH_MYSQL
 
 *****************************************************************
+
+'User manager for PureFTPd' is made by M.Mastenbroek 2002 - 2005
+For more info look at http://machiel.generaal.net
+Version 2.0
+
+Installation:
+
+Run the installation wizard install.php in your web browser.
+
+The installation wizard will lead you step by step
+through the configuration of the User manager for PureFTPd.
+
+Running:
+
+The User manager for PureFTPd starts from the index.php file.
+
+*****************************************************************
diff --git a/www/usermanager/pkg-plist b/www/usermanager/pkg-plist
index 6f030127c0e0..729981d02af8 100644
--- a/www/usermanager/pkg-plist
+++ b/www/usermanager/pkg-plist
@@ -1,9 +1,20 @@
-www/data/UserManager/admin.php
+@comment $FreeBSD$
 www/data/UserManager/CHANGELOG
 www/data/UserManager/config.php
 www/data/UserManager/index.php
+www/data/UserManager/install.php
 www/data/UserManager/readme.txt
-www/data/UserManager/script.mysql
+www/data/UserManager/extra/script.mysql
+www/data/UserManager/images/arrow_down.gif
+www/data/UserManager/images/arrow_up.gif
+www/data/UserManager/images/connect_gray.gif
+www/data/UserManager/images/delete_gray.gif
+www/data/UserManager/images/edit_gray.gif
+www/data/UserManager/images/header.png
+www/data/UserManager/images/header_seperator.png
+www/data/UserManager/images/header_seperator2.png
+www/data/UserManager/images/lock_closed.gif
+www/data/UserManager/images/lock_open.gif
 www/data/UserManager/images/arrow_right.gif
 www/data/UserManager/images/connect.gif
 www/data/UserManager/images/delete.gif
@@ -21,27 +32,146 @@ www/data/UserManager/images/right_bottom.gif
 www/data/UserManager/images/right_top.gif
 www/data/UserManager/images/top.gif
 www/data/UserManager/images/user.gif
-www/data/UserManager/language/chinese.php
-www/data/UserManager/language/danish.php
+www/data/UserManager/images/icons/aca.png
+www/data/UserManager/images/icons/api.png
+www/data/UserManager/images/icons/ascx.png
+www/data/UserManager/images/icons/asmx.png
+www/data/UserManager/images/icons/asp.png
+www/data/UserManager/images/icons/aspx.png
+www/data/UserManager/images/icons/avi.png
+www/data/UserManager/images/icons/avs.png
+www/data/UserManager/images/icons/axt.png
+www/data/UserManager/images/icons/bat.png
+www/data/UserManager/images/icons/bmp.png
+www/data/UserManager/images/icons/cab.png
+www/data/UserManager/images/icons/cat.png
+www/data/UserManager/images/icons/chm.png
+www/data/UserManager/images/icons/cnf.png
+www/data/UserManager/images/icons/config.png
+www/data/UserManager/images/icons/cpl.png
+www/data/UserManager/images/icons/crt.png
+www/data/UserManager/images/icons/cs.png
+www/data/UserManager/images/icons/csproj.png
+www/data/UserManager/images/icons/csv.png
+www/data/UserManager/images/icons/dbp.png
+www/data/UserManager/images/icons/disco.png
+www/data/UserManager/images/icons/dll.png
+www/data/UserManager/images/icons/doc.png
+www/data/UserManager/images/icons/dot.png
+www/data/UserManager/images/icons/dpk.png
+www/data/UserManager/images/icons/dpr.png
+www/data/UserManager/images/icons/dps.png
+www/data/UserManager/images/icons/dtq.png
+www/data/UserManager/images/icons/dun.png
+www/data/UserManager/images/icons/etp.png
+www/data/UserManager/images/icons/exe.png
+www/data/UserManager/images/icons/fdb.png
+www/data/UserManager/images/icons/fnd.png
+www/data/UserManager/images/icons/fon.png
+www/data/UserManager/images/icons/gif.png
+www/data/UserManager/images/icons/hlp.png
+www/data/UserManager/images/icons/hol.png
+www/data/UserManager/images/icons/html.png
+www/data/UserManager/images/icons/htt.png
+www/data/UserManager/images/icons/hxc.png
+www/data/UserManager/images/icons/hxi.png
+www/data/UserManager/images/icons/hxk.png
+www/data/UserManager/images/icons/hxs.png
+www/data/UserManager/images/icons/hxt.png
+www/data/UserManager/images/icons/icm.png
+www/data/UserManager/images/icons/ini.png
+www/data/UserManager/images/icons/ins.png
+www/data/UserManager/images/icons/iqy.png
+www/data/UserManager/images/icons/its.png
+www/data/UserManager/images/icons/jar.png
+www/data/UserManager/images/icons/jbf.png
+www/data/UserManager/images/icons/job.png
+www/data/UserManager/images/icons/jpf.png
+www/data/UserManager/images/icons/jpg.png
+www/data/UserManager/images/icons/js.png
+www/data/UserManager/images/icons/lnk.png
+www/data/UserManager/images/icons/mad.png
+www/data/UserManager/images/icons/map.png
+www/data/UserManager/images/icons/mapup.png
+www/data/UserManager/images/icons/mat.png
+www/data/UserManager/images/icons/mdb.png
+www/data/UserManager/images/icons/mht.png
+www/data/UserManager/images/icons/mml.png
+www/data/UserManager/images/icons/mp3.png
+www/data/UserManager/images/icons/msc.png
+www/data/UserManager/images/icons/msg.png
+www/data/UserManager/images/icons/msi.png
+www/data/UserManager/images/icons/ncd.png
+www/data/UserManager/images/icons/nfo.png
+www/data/UserManager/images/icons/none.png
+www/data/UserManager/images/icons/ost.png
+www/data/UserManager/images/icons/otf.png
+www/data/UserManager/images/icons/pas.png
+www/data/UserManager/images/icons/pdf.png
+www/data/UserManager/images/icons/pdi.png
+www/data/UserManager/images/icons/pfm.png
+www/data/UserManager/images/icons/php.png
+www/data/UserManager/images/icons/pif.png
+www/data/UserManager/images/icons/pmc.png
+www/data/UserManager/images/icons/pot.png
+www/data/UserManager/images/icons/ppk.png
+www/data/UserManager/images/icons/ppt.png
+www/data/UserManager/images/icons/prf.png
+www/data/UserManager/images/icons/psp.png
+www/data/UserManager/images/icons/pub.png
+www/data/UserManager/images/icons/rar.png
+www/data/UserManager/images/icons/rc.png
+www/data/UserManager/images/icons/rct.png
+www/data/UserManager/images/icons/rdp.png
+www/data/UserManager/images/icons/refresh.png
+www/data/UserManager/images/icons/reg.png
+www/data/UserManager/images/icons/res.png
+www/data/UserManager/images/icons/resx.png
+www/data/UserManager/images/icons/sdl.png
+www/data/UserManager/images/icons/sln.png
+www/data/UserManager/images/icons/sql.png
+www/data/UserManager/images/icons/suo.png
+www/data/UserManager/images/icons/swf.png
+www/data/UserManager/images/icons/tdf.png
+www/data/UserManager/images/icons/tdl.png
+www/data/UserManager/images/icons/theme.png
+www/data/UserManager/images/icons/tiff.png
+www/data/UserManager/images/icons/ttf.png
+www/data/UserManager/images/icons/txt.png
+www/data/UserManager/images/icons/url.png
+www/data/UserManager/images/icons/vb.png
+www/data/UserManager/images/icons/vbproj.png
+www/data/UserManager/images/icons/vbs.png
+www/data/UserManager/images/icons/vcf.png
+www/data/UserManager/images/icons/vsmacros.png
+www/data/UserManager/images/icons/wab.png
+www/data/UserManager/images/icons/wpl.png
+www/data/UserManager/images/icons/wri.png
+www/data/UserManager/images/icons/wsc.png
+www/data/UserManager/images/icons/xla.png
+www/data/UserManager/images/icons/xls.png
+www/data/UserManager/images/icons/xml.png
+www/data/UserManager/images/icons/xsd.png
+www/data/UserManager/images/icons/xsl.png
+www/data/UserManager/images/icons/xslt.png
+www/data/UserManager/images/icons/xsn.png
+www/data/UserManager/images/icons/zip.png
 www/data/UserManager/language/dutch.php
 www/data/UserManager/language/english.php
 www/data/UserManager/language/french.php
-www/data/UserManager/language/german.php
-www/data/UserManager/language/hungarian.php
 www/data/UserManager/language/index.php
-www/data/UserManager/language/italian.php
 www/data/UserManager/language/japanese.php
-www/data/UserManager/language/korean.php
-www/data/UserManager/language/norwegian.php
-www/data/UserManager/language/polish.php
-www/data/UserManager/language/portuguese.php
-www/data/UserManager/language/russian.php
 www/data/UserManager/language/spanish.php
-www/data/UserManager/language/swedish.php
-www/data/UserManager/language/turkish.php
-www/data/UserManager/style/default.css
-www/data/UserManager/style/orange.css
+www/data/UserManager/language/slovenian.php
+www/data/UserManager/style/default.css.php
+www/data/UserManager/style/orange.css.php
+www/data/UserManager/includes/constants.php
+www/data/UserManager/includes/files.php
+www/data/UserManager/includes/login.php
+@dirrm www/data/UserManager/extra
+@dirrm www/data/UserManager/images/icons
 @dirrm www/data/UserManager/images
 @dirrm www/data/UserManager/language
 @dirrm www/data/UserManager/style
+@dirrm www/data/UserManager/includes
 @dirrm www/data/UserManager