Update to version 1.3.1

4 files changed, 23 insertions, 34 deletions

diff --git a/www/evg/Makefile b/www/evg/Makefile
index 28ed4aaa089b..49ff81dbf7bf 100644
--- a/www/evg/Makefile
+++ b/www/evg/Makefile
@@ -6,30 +6,36 @@
 #
 
 PORTNAME=	evg
-PORTVERSION=	1.0.1
+PORTVERSION=	1.3.1
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.uni-klu.ac.at/pub/projects/evg/	\
+MASTER_SITES=	ftp://ftp.zurich.ibm.com//pub/sob/www/halloween/ \
 		http://www.chg.ru/~dima/
-DISTNAME=	evg-1.01
+DISTNAME=	evg-1_3_1
+EXTRACT_SUFX=	_tar
 
 MAINTAINER=	demon@FreeBSD.org
 
-RUN_DEPENDS=	python1.5:${PORTSDIR}/lang/python15
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	xv:${PORTSDIR}/graphics/xv
 
+USE_PYTHON=	yes
+
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 post-patch:
-		@ ${MV} ${WRKSRC}/evg.py ${WRKSRC}/evg.py.sed
-		@ ${SED} -e 's%!!PREFIX!!%${PREFIX}%' < ${WRKSRC}/evg.py.sed \
-		  > ${WRKSRC}/evg.py.sed1
-		@ ${SED} -e 's%!!XPREF!!%${X11BASE}%' < ${WRKSRC}/evg.py.sed1 \
-		  > ${WRKSRC}/evg.py
+	@ ${PERL} -pi -e 's#/usr/bin/python#${PYTHON_CMD}#' ${WRKSRC}/evg
+	@ ${PERL} -pi -e 's#/usr/X11R6#${X11BASE}#' ${WRKSRC}/evg
+	@ ${PERL} -pi -e 's#/usr/bin/ee#${X11BASE}/bin/xv#' ${WRKSRC}/evg
 
 do-install:
-		@ ${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/eclipthtml.py ${PREFIX}/lib/python1.5/site-packages
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/evg.py ${PREFIX}/bin
+	@ ${MKDIR} ${PYTHON_SITELIBDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/eclipthtml.py ${PYTHON_SITELIBDIR}
+	@ ${INSTALL_SCRIPT} ${WRKSRC}/evg ${PREFIX}/bin
+.ifndef{NOPORTDOC}
+	@ ${MKDIR} ${PREFIX}/share/doc/evg
+	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/evg
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/evg/distinfo b/www/evg/distinfo
index bc6de8e58dc1..c36023a303bd 100644
--- a/www/evg/distinfo
+++ b/www/evg/distinfo
@@ -1 +1 @@
-MD5 (evg-1.01.tar.gz) = e56a7557bccfe008bd4d5d45b2abb7a6
+MD5 (evg-1_3_1_tar) = a238dc78cebd0b8c98b696bc077fd0b8
diff --git a/www/evg/files/patch-aa b/www/evg/files/patch-aa
deleted file mode 100644
index 2db7bf056ecb..000000000000
--- a/www/evg/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- evg.py.orig	Sun Apr 18 18:55:42 1999
-+++ evg.py	Sun Apr 18 18:57:00 1999
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/python
-+#!!!PREFIX!!/bin/python
- # EVG - ECLiPt Virtual Gallery Creator
- # (c) 1999 by Emanuel Pirker <epirker@edu.uni-klu.ac.at>
- # Distributed under the GNU GPL. 
-@@ -10,8 +10,8 @@
- # ----------------------------------------------------------------------
- # Constants
- 
--CONVERTCMD = '/usr/X11R6/bin/convert'
--VIEWERCMD = '/usr/bin/ee'
-+CONVERTCMD = '!!PREFIX!!/bin/convert'
-+VIEWERCMD = '!!XPREF!!/bin/xv'
- THUMBNAILDIR = 'thumbnails'
- THUMBPERCENT = '20%'
- SERDBFILE = "serdb"
diff --git a/www/evg/pkg-plist b/www/evg/pkg-plist
index e4c8c6117b22..eba7d0b0b2d6 100644
--- a/www/evg/pkg-plist
+++ b/www/evg/pkg-plist
@@ -1,2 +1,4 @@
-bin/evg.py
-lib/python1.5/site-packages/eclipthtml.py
+bin/evg
+lib/%%PYTHON_VERSION%%/site-packages/eclipthtml.py
+share/doc/evg/README
+@dirrm share/doc/evg