upgrade to 2.2.0-0.4

5 files changed, 36 insertions, 283 deletions

diff --git a/ftp/emirror/Makefile b/ftp/emirror/Makefile
index ff9871f43dea..22350bc145ca 100644
--- a/ftp/emirror/Makefile
+++ b/ftp/emirror/Makefile
@@ -7,22 +7,53 @@
 #
 
 PORTNAME=	emirror
-PORTVERSION=	2.1.21
-PORTREVISION=	2
+PORTVERSION=	2.2.0.0.4
+PORTREVISION=	0
 CATEGORIES=	ftp python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://eclipt.uni-klu.ac.at/pub/projects/emirror/
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-2.2.0-0.4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full features FTP-mirroring software with nice logfiles
 
+HTMLDIR?=	${PREFIX}/www/emirror
+LOCKDIR?=	/tmp/emirror-locks
+
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
+CONFIGURE_ARGS=	--with-htmldir=${HTMLDIR}
 USE_GMAKE=	yes
 NO_BUILD=	yes
 
+PLIST_FILES=	bin/emirror bin/mirror bin/updateindex
 MAN1=	emirror.1
 
+post-patch:
+	@${REINPLACE_CMD} -e "s| -b | |" \
+		-e "s|[$$][(]prefix[)]/var/emirror/locks|${LOCKDIR}|" \
+		${WRKSRC}/Makefile.in
+.for file in cgi/status.cgi.in etc/general.cfg.in
+	@${REINPLACE_CMD} -e "s|@prefix@/var/emirror/locks|${LOCKDIR}|" \
+		${WRKSRC}/${file}
+.endfor
+	@${REINPLACE_CMD} -e "s|/var/tmp/emirror-locks/|${LOCKDIR}|" \
+		${WRKSRC}/main.py
+	@${GREP} -lR "/var/www" ${WRKSRC}/etc | ${XARGS} \
+		${REINPLACE_CMD} -e "s,/var/www,${HTMLDIR},"
+
+post-install:
+	@${FIND} ${PREFIX}/lib/emirror -type f | \
+		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/emirror" >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/etc/emirror -type f | \
+		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/etc/emirror -type d | ${SORT} -r | \
+		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
+	@${FIND} ${HTMLDIR} -type f | \
+		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm ${HTMLDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
+
 .include <bsd.port.mk>
diff --git a/ftp/emirror/distinfo b/ftp/emirror/distinfo
index 3fc30ef23266..9cea2563b253 100644
--- a/ftp/emirror/distinfo
+++ b/ftp/emirror/distinfo
@@ -1,2 +1,2 @@
-MD5 (emirror-2.1.21.tar.gz) = 4223966e49284e70a8eeabe9603d1ae3
-SIZE (emirror-2.1.21.tar.gz) = 105328
+MD5 (emirror-2.2.0-0.4.tar.gz) = b59f4d0d2e470b6f3c8b0daf36f04bd1
+SIZE (emirror-2.2.0-0.4.tar.gz) = 137954
diff --git a/ftp/emirror/files/patch-Makefile.in b/ftp/emirror/files/patch-Makefile.in
deleted file mode 100644
index 708d4eedc0ce..000000000000
--- a/ftp/emirror/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Thu Apr 19 15:17:30 2001
-+++ Makefile.in	Thu Apr 19 15:19:51 2001
-@@ -26,8 +26,8 @@
- 	@$(INSTALL) -m 644 ftplibbeta.py $(libdir)
- 	@echo Copying example configuration files to $(etcdir) ...
- 	@$(INSTALL) -d $(etcdir)
--	@$(INSTALL) -b -m 644 etc/*.cfg $(etcdir)
--	@$(INSTALL) -b -m 644 etc/email-addresses $(etcdir)
-+	@$(INSTALL) -m 644 etc/*.cfg $(etcdir)
-+	@$(INSTALL) -m 644 etc/email-addresses $(etcdir)
- 	@$(INSTALL) -m 644 etc/*.template $(etcdir)
- 	@$(INSTALL) -m 644 etc/*.gif $(etcdir)
- 	@$(INSTALL) -d $(etcdir)/active
diff --git a/ftp/emirror/files/patch-main.py b/ftp/emirror/files/patch-main.py
deleted file mode 100644
index 40a0aadb8db4..000000000000
--- a/ftp/emirror/files/patch-main.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- main.py.orig	Tue Apr  8 12:09:31 2003
-+++ main.py	Tue Apr  8 12:09:55 2003
-@@ -1036,6 +1036,7 @@
- 
-     # Do some error handling
-     def HandleError(self, error, source, extra = None):
-+        """ Perform error handling for given errors. """
-         if (str(error) != ""):
-             if (type(error) == TupleType) or (type(error) == InstanceType):
-                 errornumber = atoi(str(error[0]))
-@@ -1044,8 +1045,13 @@
-                 errornumber = atoi(str(error)[0:3])
-                 errormessage = strip(str(error)[4:])
-         else:
--            errornumber = 999
--            errormessage = "emirror internal: unknown error"
-+            # If no error is given, use the traceback
-+            if (str(sys.exc_info()[0].__name__) == "EOFError"):
-+                errornumber = 902
-+                errormessage = "EOFError"
-+            else:
-+                errornumber = 999
-+                errormessage = format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])
-         self.log4py.error("[ %s ] Error: #%d - %s" % (str(self.title), errornumber, errormessage)) 
-         found = FALSE
-         for i in range(len(errormsgs)):
-@@ -1098,7 +1104,7 @@
-                 self.log4py.error("Please report this error to Martin.Preishuber@eclipt.at")
-                 self.log4py.error("or check error.py and adapt it (it's not really difficult ;-))")
- 
--            self.AppendLog([LMError, str(errornumber) + "-" + errormessage])
-+            self.AppendLog([LMError, str(errornumber) + "-" + str(errormessage)])
-             self.WriteLog()
-             exit(1)
- 
diff --git a/ftp/emirror/pkg-plist b/ftp/emirror/pkg-plist
deleted file mode 100644
index 45ae1dfba43a..000000000000
--- a/ftp/emirror/pkg-plist
+++ /dev/null
@@ -1,230 +0,0 @@
-bin/emirror
-bin/mirror
-bin/updateindex
-lib/emirror/constants.py
-lib/emirror/constants.pyc
-lib/emirror/error.py
-lib/emirror/error.pyc
-lib/emirror/ftplibbeta.py
-lib/emirror/ftplibbeta.pyc
-lib/emirror/log4py.py
-lib/emirror/log4py.pyc
-lib/emirror/main.py
-lib/emirror/main.pyc
-lib/emirror/process.py
-lib/emirror/process.pyc
-lib/emirror/tools.py
-lib/emirror/tools.pyc
-@dirrm lib/emirror
-etc/emirror/email-addresses
-etc/emirror/general.cfg
-etc/emirror/index.template
-etc/emirror/logfile.template
-etc/emirror/summary.template
-etc/emirror/themes/blue/emirror-information.gif
-etc/emirror/themes/blue/index.template
-etc/emirror/themes/blue/logfile.template
-etc/emirror/themes/eclipt-php/index.template
-etc/emirror/themes/eclipt-php/logfile.template
-etc/emirror/themes/eclipt-php/summary.template
-etc/emirror/themes/eclipt/index.template
-etc/emirror/themes/eclipt/logfile.template
-etc/emirror/themes/freshmeat/index.template
-etc/emirror/themes/freshmeat/logfile.template
-etc/emirror/themes/zope/index.template
-etc/emirror/themes/zope/logfile.template
-etc/emirror/unused/a2ps.cfg
-etc/emirror/unused/acrobat.cfg
-etc/emirror/unused/afbackup.cfg
-etc/emirror/unused/afterstep.cfg
-etc/emirror/unused/alancox.cfg
-etc/emirror/unused/alsa.cfg
-etc/emirror/unused/apache-ssl.cfg
-etc/emirror/unused/apache.cfg
-etc/emirror/unused/bash.cfg
-etc/emirror/unused/beroftpd.cfg
-etc/emirror/unused/bitchx.cfg
-etc/emirror/unused/blender.cfg
-etc/emirror/unused/boulderdash.cfg
-etc/emirror/unused/burnit.cfg
-etc/emirror/unused/cdda2wav.cfg
-etc/emirror/unused/cdrecord.cfg
-etc/emirror/unused/cheops.cfg
-etc/emirror/unused/clisp.cfg
-etc/emirror/unused/coda.cfg
-etc/emirror/unused/communicator.cfg
-etc/emirror/unused/cooledit.cfg
-etc/emirror/unused/corellinux.cfg
-etc/emirror/unused/debian.cfg
-etc/emirror/unused/demolinux.cfg
-etc/emirror/unused/descent.cfg
-etc/emirror/unused/digi-cam.cfg
-etc/emirror/unused/docbook.cfg
-etc/emirror/unused/dosdoom.cfg
-etc/emirror/unused/dosemu.cfg
-etc/emirror/unused/egcs-pgcc.cfg
-etc/emirror/unused/engelschall.cfg
-etc/emirror/unused/enlightenment-snaps.cfg
-etc/emirror/unused/enlightenment.cfg
-etc/emirror/unused/enscript.cfg
-etc/emirror/unused/esquire.cfg
-etc/emirror/unused/eterm.cfg
-etc/emirror/unused/ethereal.cfg
-etc/emirror/unused/fetchmail.cfg
-etc/emirror/unused/fftw.cfg
-etc/emirror/unused/fortify.cfg
-etc/emirror/unused/fourdos.cfg
-etc/emirror/unused/fpk-pascal.cfg
-etc/emirror/unused/freeamp.cfg
-etc/emirror/unused/freeciv.cfg
-etc/emirror/unused/freedos.cfg
-etc/emirror/unused/freemware.cfg
-etc/emirror/unused/freshmeat.cfg
-etc/emirror/unused/ftp4all.cfg
-etc/emirror/unused/gcc.cfg
-etc/emirror/unused/gcl.cfg
-etc/emirror/unused/gd.cfg
-etc/emirror/unused/gftp.cfg
-etc/emirror/unused/ggi.cfg
-etc/emirror/unused/gimp-manual.cfg
-etc/emirror/unused/gimp.cfg
-etc/emirror/unused/glui.cfg
-etc/emirror/unused/gmp.cfg
-etc/emirror/unused/gnome.cfg
-etc/emirror/unused/gnomeicu.cfg
-etc/emirror/unused/gnupg.cfg
-etc/emirror/unused/golgotha.cfg
-etc/emirror/unused/gphoto.cfg
-etc/emirror/unused/gtk.cfg
-etc/emirror/unused/htdig.cfg
-etc/emirror/unused/iptraf.cfg
-etc/emirror/unused/jdk-blackdown.cfg
-etc/emirror/unused/jdk-sn.cfg
-etc/emirror/unused/jed.cfg
-etc/emirror/unused/jfs.cfg
-etc/emirror/unused/jpython.cfg
-etc/emirror/unused/kde.cfg
-etc/emirror/unused/kaffe.cfg
-etc/emirror/unused/karpski.cfg
-etc/emirror/unused/kernel.cfg
-etc/emirror/unused/lame.cfg
-etc/emirror/unused/latex-packages.cfg
-etc/emirror/unused/lesstif.cfg
-etc/emirror/unused/libpcap.cfg
-etc/emirror/unused/licq.cfg
-etc/emirror/unused/maelstrom.cfg
-etc/emirror/unused/mailman.cfg
-etc/emirror/unused/mandrake-devel.cfg
-etc/emirror/unused/mandrake.cfg
-etc/emirror/unused/mc.cfg
-etc/emirror/unused/mesa.cfg
-etc/emirror/unused/mgetty.cfg
-etc/emirror/unused/modula-3.cfg
-etc/emirror/unused/moonlight.cfg
-etc/emirror/unused/mozilla.cfg
-etc/emirror/unused/mp3info.cfg
-etc/emirror/unused/mpegtv.cfg
-etc/emirror/unused/mpg123.cfg
-etc/emirror/unused/mtools.cfg
-etc/emirror/unused/mtr.cfg
-etc/emirror/unused/mupad.cfg
-etc/emirror/unused/mysql.cfg
-etc/emirror/unused/nannie.cfg
-etc/emirror/unused/nasm.cfg
-etc/emirror/unused/ncftp.cfg
-etc/emirror/unused/ncftpd.cfg
-etc/emirror/unused/nessus.cfg
-etc/emirror/unused/ntop.cfg
-etc/emirror/unused/ntp.cfg
-etc/emirror/unused/ocs.cfg
-etc/emirror/unused/octave.cfg
-etc/emirror/unused/openssh.cfg
-etc/emirror/unused/openssl.cfg
-etc/emirror/unused/pavuk.cfg
-etc/emirror/unused/perl-cpan.cfg
-etc/emirror/unused/pgp.cfg
-etc/emirror/unused/photopc.cfg
-etc/emirror/unused/php.cfg
-etc/emirror/unused/pine.cfg
-etc/emirror/unused/pm-3.cfg
-etc/emirror/unused/postfix.cfg
-etc/emirror/unused/postgres.cfg
-etc/emirror/unused/povray.cfg
-etc/emirror/unused/proftpd.cfg
-etc/emirror/unused/pygtk.cfg
-etc/emirror/unused/python-patches.cfg
-etc/emirror/unused/python-rpms.cfg
-etc/emirror/unused/python.cfg
-etc/emirror/unused/qiv.cfg
-etc/emirror/unused/qmail.cfg
-etc/emirror/unused/qps.cfg
-etc/emirror/unused/qt.cfg
-etc/emirror/unused/quake2.cfg
-etc/emirror/unused/quake3.cfg
-etc/emirror/unused/quakeworld.cfg
-etc/emirror/unused/raidtools.cfg
-etc/emirror/unused/redhat-5.0-updates.cfg
-etc/emirror/unused/redhat-5.1-updates.cfg
-etc/emirror/unused/redhat-5.2-updates.cfg
-etc/emirror/unused/redhat-6.0-updates.cfg
-etc/emirror/unused/redhat-6.0.cfg
-etc/emirror/unused/redhat-6.1-updates.cfg
-etc/emirror/unused/redhat-6.1.cfg
-etc/emirror/unused/redhat-contrib.cfg
-etc/emirror/unused/redhat-developer.cfg
-etc/emirror/unused/redhat-powertools.cfg
-etc/emirror/unused/redhat-rawhide.cfg
-etc/emirror/unused/redhat.cfg
-etc/emirror/unused/reiserfs.cfg
-etc/emirror/unused/replayredhat.cfg
-etc/emirror/unused/roxen.cfg
-etc/emirror/unused/rpm2html.cfg
-etc/emirror/unused/rpmfind.cfg
-etc/emirror/unused/rxvt.cfg
-etc/emirror/unused/sajber.cfg
-etc/emirror/unused/samba.cfg
-etc/emirror/unused/sane.cfg
-etc/emirror/unused/scilab.cfg
-etc/emirror/unused/sendmail.cfg
-etc/emirror/unused/sgml-tools.cfg
-etc/emirror/unused/slang.cfg
-etc/emirror/unused/squid.cfg
-etc/emirror/unused/ssh.cfg
-etc/emirror/unused/ssleay.cfg
-etc/emirror/unused/stampede.cfg
-etc/emirror/unused/staroffice.cfg
-etc/emirror/unused/stormix.cfg
-etc/emirror/unused/suse.cfg
-etc/emirror/unused/swig.cfg
-etc/emirror/unused/ted.cfg
-etc/emirror/unused/swiprolog.cfg
-etc/emirror/unused/tf.cfg
-etc/emirror/unused/tomsrb.cfg
-etc/emirror/unused/trinux.cfg
-etc/emirror/unused/udmsearch.cfg
-etc/emirror/unused/vacation.cfg
-etc/emirror/unused/vim.cfg
-etc/emirror/unused/vmware.cfg
-etc/emirror/unused/webalizer.cfg
-etc/emirror/unused/wget.cfg
-etc/emirror/unused/windowmaker.cfg
-etc/emirror/unused/wine.cfg
-etc/emirror/unused/xemacs.cfg
-etc/emirror/unused/xfig.cfg
-etc/emirror/unused/xforms.cfg
-etc/emirror/unused/xfree86.cfg
-etc/emirror/unused/xfs.cfg
-etc/emirror/unused/xmame.cfg
-etc/emirror/unused/xmms.cfg
-etc/emirror/unused/xosview.cfg
-etc/emirror/unused/yafc.cfg
-etc/emirror/unused/zedz-crypto.cfg
-@dirrm etc/emirror/active
-@dirrm etc/emirror/themes/blue
-@dirrm etc/emirror/themes/eclipt-php
-@dirrm etc/emirror/themes/eclipt
-@dirrm etc/emirror/themes/freshmeat
-@dirrm etc/emirror/themes/zope
-@dirrm etc/emirror/themes
-@dirrm etc/emirror/unused
-@dirrm etc/emirror