5 files changed, 19 insertions, 40 deletions

diff --git a/sysutils/cvsweb-converters/Makefile b/sysutils/cvsweb-converters/Makefile
index 9d08e2eb34dd..46ad0020bc7b 100644
--- a/sysutils/cvsweb-converters/Makefile
+++ b/sysutils/cvsweb-converters/Makefile
@@ -6,31 +6,34 @@
 #
 
 PORTNAME=	cvsweb-converters
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.sbox.TUGraz.at/home/d/dada/distfiles/
 
 MAINTAINER=	mkamm@gmx.net
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/Escape.pm:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time
 
 NO_BUILD=	yes
 USE_PERL5=	yes
 
 post-patch:
 	@${PERL} -i -wpe '			\
-	    s[ /usr/local ](${PREFIX})gx;	\
-	    s[ !!PERL!!   ](${PERL})gx;		\
-	' -- "${WRKSRC}"/*.pl
+	    s[ \@PREFIX\@ ](${PREFIX})gx;	\
+	    s[ \@PERL5\@  ](${PERL})gx;		\
+	' -- "${WRKSRC}"/*.pl.in
 
 do-install:
-	cd ${WRKSRC} &&							\
-	${MKDIR} -- "${PREFIX}/bin" "${PREFIX}/etc" &&			\
-	for f in *.pl; do						\
-	  ${INSTALL_SCRIPT} -- $$f "${PREFIX}/bin/`basename $$f .pl`";	\
-	done &&								\
-	${INSTALL_DATA} -- commitlog2cvsweb.conf.sample "${PREFIX}/etc"
+	cd ${WRKSRC} &&						\
+	${MKDIR} -- "${PREFIX}/bin" "${PREFIX}/etc" &&		\
+	for f in cvsuplog2cvsweb.pl.in cvsrdiff2cvsweb.pl.in	\
+	  commitlog2cvsweb.pl.in; do ${INSTALL_SCRIPT} --	\
+		$$f "${PREFIX}/bin/`basename $$f .pl.in`";	\
+	done &&							\
+	${INSTALL_DATA} -- cvsweb-converters.conf.sample "${PREFIX}/etc"
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/cvsweb-converters/distinfo b/sysutils/cvsweb-converters/distinfo
index e088b485f355..ccd3b3e45e69 100644
--- a/sysutils/cvsweb-converters/distinfo
+++ b/sysutils/cvsweb-converters/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-converters-0.1.tar.gz) = ca234e394c61fead3d84d835a6e46214
+MD5 (cvsweb-converters-0.2.tar.gz) = 8df90d0b88e11e0089f979f24f462be0
diff --git a/sysutils/cvsweb-converters/files/patch-aa b/sysutils/cvsweb-converters/files/patch-aa
deleted file mode 100644
index cb05e9cde8e9..000000000000
--- a/sysutils/cvsweb-converters/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- commitlog2cvsweb.pl~	Sun Mar  4 14:26:59 2001
-+++ commitlog2cvsweb.pl	Sun Mar  4 17:26:00 2001
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -wT
-+#! !!PERL!! -wT
- # Copyright ,A)(B 2001 Martin Kammerhofer <mkamm@gmx.net>
- # All rights reserved.
- #
---- cvsrdiff2cvsweb.pl~	Sun Mar  4 14:27:19 2001
-+++ cvsrdiff2cvsweb.pl	Sun Mar  4 17:26:00 2001
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -wT
-+#! !!PERL!! -wT
- # Copyright ,A)(B 2001 Martin Kammerhofer <mkamm@gmx.net>
- # All rights reserved.
- #
---- cvsuplog2cvsweb.pl~	Sun Mar  4 14:27:33 2001
-+++ cvsuplog2cvsweb.pl	Sun Mar  4 17:26:00 2001
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl -wT
-+#! !!PERL!! -wT
- # Copyright ,A)(B 2001 Martin Kammerhofer <mkamm@gmx.net>
- # All rights reserved.
- #
diff --git a/sysutils/cvsweb-converters/pkg-message b/sysutils/cvsweb-converters/pkg-message
index 98a4d34e1c02..5ea23f73636b 100644
--- a/sysutils/cvsweb-converters/pkg-message
+++ b/sysutils/cvsweb-converters/pkg-message
@@ -2,12 +2,12 @@
 If this is a first installation (not an upgrade) do this:
 
 	cd ${PREFIX}/etc
-	cp commitlog2cvsweb.conf.sample commitlog2cvsweb.conf
+	cp cvsweb-converters.conf.sample cvsweb-converters.conf
 
-and edit commitlog2cvsweb.conf. Change $cvsweb to your nearest
+and edit cvsweb-converters.conf. Change cvsweb to your nearest
 cvsweb mirror. Check http://www.FreeBSD.org/support.html#cvs for
 cvsweb mirror sites.
 
 Documentation is included inside the scripts in POD format.
-Use "perldoc <script>" to read the documentation for <script>.
+Invoke a script with option --help to read its documentation.
 ******************************************************************
diff --git a/sysutils/cvsweb-converters/pkg-plist b/sysutils/cvsweb-converters/pkg-plist
index e04eaa815fd0..f19213bd9c4f 100644
--- a/sysutils/cvsweb-converters/pkg-plist
+++ b/sysutils/cvsweb-converters/pkg-plist
@@ -1,4 +1,4 @@
 bin/commitlog2cvsweb
 bin/cvsrdiff2cvsweb
 bin/cvsuplog2cvsweb
-etc/commitlog2cvsweb.conf.sample
+etc/cvsweb-converters.conf.sample