Maintainer update for www/usermanager Fix: Here is the proper diff: How-To-Repeat: check http://machiel.generaal.net/index.php?subject=user_manager_pureftpd
I found a bug in my previous patch, so here is the good one. sorry... diff -ruN usermanager.orig/Makefile usermanager/Makefile --- usermanager.orig/Makefile Thu Sep 29 22:48:02 2005 +++ usermanager/Makefile Fri Sep 30 00:15:29 2005 @@ -6,7 +6,7 @@ # PORTNAME= UserManager -PORTVERSION= 2.0 +PORTVERSION= 2.1 CATEGORIES= www ftp MASTER_SITES= http://machiel.generaal.net/files/pureftpd/ DISTNAME= ftp_v${PORTVERSION} @@ -21,17 +21,30 @@ NO_BUILD= yes PKGMESSAGE= ${WRKDIR}/pkg-message +PLIST_SUB+= INSTALLDIR=${INSTALLDIR} + +pre-fetch: +.if !defined(INSTALLDIR) + @${ECHO_MSG} "" + @${ECHO_MSG} "Define INSTALLDIR to override default of 'www/data/UserManager'." + @${ECHO_MSG} "" +.endif + +INSTALLDIR?= www/data/UserManager post-patch: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%INSTALLDIR%%|${INSTALLDIR}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} do-install: - @${MKDIR} ${PREFIX}/www/data/UserManager - @${CP} -Rp ${WRKSRC}/* ${PREFIX}/www/data/UserManager - @${CHMOD} 666 ${PREFIX}/www/data/UserManager/config.php + @${MKDIR} ${PREFIX}/${INSTALLDIR} + @${CP} -Rp ${WRKSRC}/* ${PREFIX}/${INSTALLDIR} + @${CHMOD} 666 ${PREFIX}/${INSTALLDIR}/config.php @${ECHO_CMD} "" post-install: +.if !defined(BATCH) @${CAT} ${PKGMESSAGE} +.endif .include <bsd.port.mk> diff -ruN usermanager.orig/distinfo usermanager/distinfo --- usermanager.orig/distinfo Thu Sep 29 22:48:03 2005 +++ usermanager/distinfo Thu Sep 29 22:49:55 2005 @@ -1,2 +1,2 @@ -MD5 (ftp_v2.0.tar.gz) = 7a38fb06ee18f6bcb405a6c36d896fdf -SIZE (ftp_v2.0.tar.gz) = 87532 +MD5 (ftp_v2.1.tar.gz) = 37982c47185e009f7dc54b29ddd7d5fa +SIZE (ftp_v2.1.tar.gz) = 99536 diff -ruN usermanager.orig/files/pkg-message.in usermanager/files/pkg-message.in --- usermanager.orig/files/pkg-message.in Thu Sep 29 22:48:02 2005 +++ usermanager/files/pkg-message.in Thu Sep 29 23:12:24 2005 @@ -1,15 +1,15 @@ ***************************************************************** - Please check %%PREFIX%%/www/data/UserManager/readme.txt - You will need script.mysql to create MySQL tables and - to edit config.php. To use this manager, you will need to - compile your pure-ftpd with -DWITH_MYSQL + Please check %%PREFIX%%/%%INSTALLDIR%%/readme.txt + To use this manager, you will need to 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 + +Version 2.1 Installation: diff -ruN usermanager.orig/pkg-descr usermanager/pkg-descr --- usermanager.orig/pkg-descr Thu Sep 29 22:48:03 2005 +++ usermanager/pkg-descr Thu Sep 29 23:45:56 2005 @@ -4,5 +4,4 @@ WWW: http://machiel.generaal.net/index.php?subject=user_manager_pureftpd -- DanGer -danger@wilbury.sk +- Daniel Gerzo <danger@rulez.sk> diff -ruN usermanager.orig/pkg-plist usermanager/pkg-plist --- usermanager.orig/pkg-plist Thu Sep 29 22:48:03 2005 +++ usermanager/pkg-plist Thu Sep 29 23:10:35 2005 @@ -1,177 +1,185 @@ @comment $FreeBSD: ports/www/usermanager/pkg-plist,v 1.2 2005/07/17 21:03:50 pav Exp $ -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/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 -www/data/UserManager/images/edit.gif -www/data/UserManager/images/ftpuser.gif -www/data/UserManager/images/info.gif -www/data/UserManager/images/key.gif -www/data/UserManager/images/left.gif -www/data/UserManager/images/left_bottom.gif -www/data/UserManager/images/left_top.gif -www/data/UserManager/images/login.gif -www/data/UserManager/images/new_ftpuser.gif -www/data/UserManager/images/right.gif -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/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/index.php -www/data/UserManager/language/japanese.php -www/data/UserManager/language/spanish.php -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 +%%INSTALLDIR%%/CHANGELOG +%%INSTALLDIR%%/config.php +%%INSTALLDIR%%/index.php +%%INSTALLDIR%%/install.php +%%INSTALLDIR%%/readme.txt +%%INSTALLDIR%%/extra/script.mysql +%%INSTALLDIR%%/images/arrow_down.gif +%%INSTALLDIR%%/images/arrow_up.gif +%%INSTALLDIR%%/images/connect_gray.gif +%%INSTALLDIR%%/images/delete_gray.gif +%%INSTALLDIR%%/images/edit_gray.gif +%%INSTALLDIR%%/images/header.png +%%INSTALLDIR%%/images/header_seperator.png +%%INSTALLDIR%%/images/header_seperator2.png +%%INSTALLDIR%%/images/lock_closed.gif +%%INSTALLDIR%%/images/lock_open.gif +%%INSTALLDIR%%/images/arrow_right.gif +%%INSTALLDIR%%/images/connect.gif +%%INSTALLDIR%%/images/delete.gif +%%INSTALLDIR%%/images/edit.gif +%%INSTALLDIR%%/images/ftpuser.gif +%%INSTALLDIR%%/images/ftpuser_gray.gif +%%INSTALLDIR%%/images/help.gif +%%INSTALLDIR%%/images/info.gif +%%INSTALLDIR%%/images/key.gif +%%INSTALLDIR%%/images/left.gif +%%INSTALLDIR%%/images/left_bottom.gif +%%INSTALLDIR%%/images/left_top.gif +%%INSTALLDIR%%/images/login.gif +%%INSTALLDIR%%/images/new_ftpuser.gif +%%INSTALLDIR%%/images/right.gif +%%INSTALLDIR%%/images/right_bottom.gif +%%INSTALLDIR%%/images/right_top.gif +%%INSTALLDIR%%/images/top.gif +%%INSTALLDIR%%/images/user.gif +%%INSTALLDIR%%/images/icons/aca.png +%%INSTALLDIR%%/images/icons/api.png +%%INSTALLDIR%%/images/icons/ascx.png +%%INSTALLDIR%%/images/icons/asmx.png +%%INSTALLDIR%%/images/icons/asp.png +%%INSTALLDIR%%/images/icons/aspx.png +%%INSTALLDIR%%/images/icons/avi.png +%%INSTALLDIR%%/images/icons/avs.png +%%INSTALLDIR%%/images/icons/axt.png +%%INSTALLDIR%%/images/icons/bat.png +%%INSTALLDIR%%/images/icons/bmp.png +%%INSTALLDIR%%/images/icons/cab.png +%%INSTALLDIR%%/images/icons/cat.png +%%INSTALLDIR%%/images/icons/chm.png +%%INSTALLDIR%%/images/icons/cnf.png +%%INSTALLDIR%%/images/icons/config.png +%%INSTALLDIR%%/images/icons/cpl.png +%%INSTALLDIR%%/images/icons/crt.png +%%INSTALLDIR%%/images/icons/cs.png +%%INSTALLDIR%%/images/icons/csproj.png +%%INSTALLDIR%%/images/icons/csv.png +%%INSTALLDIR%%/images/icons/dbp.png +%%INSTALLDIR%%/images/icons/disco.png +%%INSTALLDIR%%/images/icons/dll.png +%%INSTALLDIR%%/images/icons/doc.png +%%INSTALLDIR%%/images/icons/dot.png +%%INSTALLDIR%%/images/icons/dpk.png +%%INSTALLDIR%%/images/icons/dpr.png +%%INSTALLDIR%%/images/icons/dps.png +%%INSTALLDIR%%/images/icons/dtq.png +%%INSTALLDIR%%/images/icons/dun.png +%%INSTALLDIR%%/images/icons/etp.png +%%INSTALLDIR%%/images/icons/exe.png +%%INSTALLDIR%%/images/icons/fdb.png +%%INSTALLDIR%%/images/icons/fnd.png +%%INSTALLDIR%%/images/icons/fon.png +%%INSTALLDIR%%/images/icons/gif.png +%%INSTALLDIR%%/images/icons/hlp.png +%%INSTALLDIR%%/images/icons/hol.png +%%INSTALLDIR%%/images/icons/html.png +%%INSTALLDIR%%/images/icons/htt.png +%%INSTALLDIR%%/images/icons/hxc.png +%%INSTALLDIR%%/images/icons/hxi.png +%%INSTALLDIR%%/images/icons/hxk.png +%%INSTALLDIR%%/images/icons/hxs.png +%%INSTALLDIR%%/images/icons/hxt.png +%%INSTALLDIR%%/images/icons/icm.png +%%INSTALLDIR%%/images/icons/ini.png +%%INSTALLDIR%%/images/icons/ins.png +%%INSTALLDIR%%/images/icons/iqy.png +%%INSTALLDIR%%/images/icons/its.png +%%INSTALLDIR%%/images/icons/jar.png +%%INSTALLDIR%%/images/icons/jbf.png +%%INSTALLDIR%%/images/icons/job.png +%%INSTALLDIR%%/images/icons/jpf.png +%%INSTALLDIR%%/images/icons/jpg.png +%%INSTALLDIR%%/images/icons/js.png +%%INSTALLDIR%%/images/icons/lnk.png +%%INSTALLDIR%%/images/icons/mad.png +%%INSTALLDIR%%/images/icons/map.png +%%INSTALLDIR%%/images/icons/mapup.png +%%INSTALLDIR%%/images/icons/mat.png +%%INSTALLDIR%%/images/icons/mdb.png +%%INSTALLDIR%%/images/icons/mht.png +%%INSTALLDIR%%/images/icons/mml.png +%%INSTALLDIR%%/images/icons/mp3.png +%%INSTALLDIR%%/images/icons/msc.png +%%INSTALLDIR%%/images/icons/msg.png +%%INSTALLDIR%%/images/icons/msi.png +%%INSTALLDIR%%/images/icons/ncd.png +%%INSTALLDIR%%/images/icons/nfo.png +%%INSTALLDIR%%/images/icons/none.png +%%INSTALLDIR%%/images/icons/ost.png +%%INSTALLDIR%%/images/icons/otf.png +%%INSTALLDIR%%/images/icons/pas.png +%%INSTALLDIR%%/images/icons/pdf.png +%%INSTALLDIR%%/images/icons/pdi.png +%%INSTALLDIR%%/images/icons/pfm.png +%%INSTALLDIR%%/images/icons/php.png +%%INSTALLDIR%%/images/icons/pif.png +%%INSTALLDIR%%/images/icons/pmc.png +%%INSTALLDIR%%/images/icons/pot.png +%%INSTALLDIR%%/images/icons/ppk.png +%%INSTALLDIR%%/images/icons/ppt.png +%%INSTALLDIR%%/images/icons/prf.png +%%INSTALLDIR%%/images/icons/psp.png +%%INSTALLDIR%%/images/icons/pub.png +%%INSTALLDIR%%/images/icons/rar.png +%%INSTALLDIR%%/images/icons/rc.png +%%INSTALLDIR%%/images/icons/rct.png +%%INSTALLDIR%%/images/icons/rdp.png +%%INSTALLDIR%%/images/icons/refresh.png +%%INSTALLDIR%%/images/icons/reg.png +%%INSTALLDIR%%/images/icons/res.png +%%INSTALLDIR%%/images/icons/resx.png +%%INSTALLDIR%%/images/icons/sdl.png +%%INSTALLDIR%%/images/icons/sln.png +%%INSTALLDIR%%/images/icons/sql.png +%%INSTALLDIR%%/images/icons/suo.png +%%INSTALLDIR%%/images/icons/swf.png +%%INSTALLDIR%%/images/icons/tdf.png +%%INSTALLDIR%%/images/icons/tdl.png +%%INSTALLDIR%%/images/icons/theme.png +%%INSTALLDIR%%/images/icons/tiff.png +%%INSTALLDIR%%/images/icons/ttf.png +%%INSTALLDIR%%/images/icons/txt.png +%%INSTALLDIR%%/images/icons/url.png +%%INSTALLDIR%%/images/icons/vb.png +%%INSTALLDIR%%/images/icons/vbproj.png +%%INSTALLDIR%%/images/icons/vbs.png +%%INSTALLDIR%%/images/icons/vcf.png +%%INSTALLDIR%%/images/icons/vsmacros.png +%%INSTALLDIR%%/images/icons/wab.png +%%INSTALLDIR%%/images/icons/wpl.png +%%INSTALLDIR%%/images/icons/wri.png +%%INSTALLDIR%%/images/icons/wsc.png +%%INSTALLDIR%%/images/icons/xla.png +%%INSTALLDIR%%/images/icons/xls.png +%%INSTALLDIR%%/images/icons/xml.png +%%INSTALLDIR%%/images/icons/xsd.png +%%INSTALLDIR%%/images/icons/xsl.png +%%INSTALLDIR%%/images/icons/xslt.png +%%INSTALLDIR%%/images/icons/xsn.png +%%INSTALLDIR%%/images/icons/zip.png +%%INSTALLDIR%%/language/bulgarian.php +%%INSTALLDIR%%/language/chinese.php +%%INSTALLDIR%%/language/dutch.php +%%INSTALLDIR%%/language/english.php +%%INSTALLDIR%%/language/french.php +%%INSTALLDIR%%/language/index.php +%%INSTALLDIR%%/language/italian.php +%%INSTALLDIR%%/language/japanese.php +%%INSTALLDIR%%/language/korean.php +%%INSTALLDIR%%/language/spanish.php +%%INSTALLDIR%%/language/slovenian.php +%%INSTALLDIR%%/style/default.css.php +%%INSTALLDIR%%/style/green.css.php +%%INSTALLDIR%%/style/orange.css.php +%%INSTALLDIR%%/includes/constants.php +%%INSTALLDIR%%/includes/files.php +%%INSTALLDIR%%/includes/login.php +%%INSTALLDIR%%/includes/wz_tooltip.php +@dirrm %%INSTALLDIR%%/extra +@dirrm %%INSTALLDIR%%/images/icons +@dirrm %%INSTALLDIR%%/images +@dirrm %%INSTALLDIR%%/language +@dirrm %%INSTALLDIR%%/style +@dirrm %%INSTALLDIR%%/includes +@dirrm %%INSTALLDIR%% -- Sincerely, Daniel Gerzo
Responsible Changed From-To: freebsd-ports-bugs->garga I'll take it.
State Changed From-To: open->closed Committed. Thanks!