5 files changed, 19 insertions, 27 deletions

diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile
index 48eda2833984..453d21e8a457 100644
--- a/mail/pygmy/Makefile
+++ b/mail/pygmy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pygmy
-PORTVERSION=	0.4.5
+PORTVERSION=	0.5.2
 CATEGORIES=	mail python gnome
 MASTER_SITES=	http://pygmy.sourceforge.net/
 
@@ -27,7 +27,9 @@ do-install:
 	${MKDIR} ${PREFIX}/share/pygmy/icons
 	${INSTALL_DATA} ${WRKSRC}/*.pyo ${WRKSRC}/*.pyc ${PREFIX}/share/pygmy
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${PREFIX}/share/pygmy/icons
-	${INSTALL_SCRIPT} ${WRKSRC}/pygmy ${PREFIX}/share/pygmy
-	${LN} -sf ${PREFIX}/share/pygmy/pygmy ${PREFIX}/bin/pygmy
+	${INSTALL_DATA} ${WRKSRC}/pygmy ${PREFIX}/share/pygmy
+	@printf "#!/bin/sh\n${PYTHON_CMD} ${PREFIX}/share/pygmy/pygmy" > \
+		${WRKDIR}/pygmy.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/pygmy.sh ${PREFIX}/bin/pygmy
 
 .include <bsd.port.mk>
diff --git a/mail/pygmy/distinfo b/mail/pygmy/distinfo
index 345cdced77c0..a82f2ebe6ca5 100644
--- a/mail/pygmy/distinfo
+++ b/mail/pygmy/distinfo
@@ -1 +1 @@
-MD5 (pygmy-0.4.5.tar.gz) = a2eb4ec2a616c0f23306555050b59462
+MD5 (pygmy-0.5.2.tar.gz) = 25a79930a5e90a7a363cb3ca77137b4c
diff --git a/mail/pygmy/files/patch-aa b/mail/pygmy/files/patch-aa
index e12eaf95b3a7..c3563e40ae54 100644
--- a/mail/pygmy/files/patch-aa
+++ b/mail/pygmy/files/patch-aa
@@ -1,17 +1,20 @@
---- Makefile.orig	Tue Aug 29 14:59:10 2000
-+++ Makefile	Thu Sep 21 17:51:17 2000
+
+$FreeBSD$
+
+--- Makefile.orig	Fri Mar 16 14:48:21 2001
++++ Makefile	Fri Mar 16 19:21:58 2001
 @@ -1,12 +1,12 @@
- # $Id: Makefile,v 1.4 2000/08/14 10:39:17 kjetilja Exp $
+ # $Id: Makefile,v 1.11 2001/03/15 12:31:46 kjetilja Exp $
  
  # Installation prefix -- modify to your preferences
 -PREFIX=/usr/local
-+#PREFIX=/usr/local
++PREFIX?=/usr/local
  
  
  # NOTE: Normally nothing below this point need to be changed
--PYTHON=/usr/bin/env python
+-PYTHON=/usr/bin/env python1.5
 -PYTHONLIBPATH=`$(PYTHON) -c 'import sys; print sys.prefix'`/lib/python1.5
-+PYTHON=${LOCALBASE}/bin/python
++PYTHON=${LOCALBASE}/bin/$(PYTHON_VERSION)
 +PYTHONLIBPATH=`$(PYTHON) -c 'import sys; print sys.prefix'`/lib/$(PYTHON_VERSION)
  COMPILEPROG=compileall.py
  COMPILEPROGOPT=-l .
diff --git a/mail/pygmy/files/patch-ae b/mail/pygmy/files/patch-ae
deleted file mode 100644
index 9eaede479ce8..000000000000
--- a/mail/pygmy/files/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
---- pygmy	2000/10/02 06:42:12	1.1
-+++ pygmy	2000/10/02 06:42:43
-@@ -43,10 +43,10 @@
-             # Upgrade existing configuration with new params
-             p.version = v
-             p.replyto = None
--	    p.fld_font = '-*-helvetica-medium-r-normal--12-120-75-75-p-70-iso8859-1'
--	    p.sub_font = '-*-helvetica-medium-r-normal--12-120-75-75-p-70-iso8859-1'
--	    p.msg_font = '-*-helvetica-medium-r-normal--12-120-75-75-p-70-iso8859-1'
--	    p.compose_font = '-*-helvetica-medium-r-normal--12-120-75-75-p-70-iso8859-1'
-+	    p.fld_font = '-*-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1'
-+	    p.sub_font = '-*-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1'
-+	    p.msg_font = '-*-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1'
-+	    p.compose_font = '-*-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1'
-             p.auto = 0
-             p.flistfile = os.path.join(homedir, ".pygmy-filterlist")
-             p.external_cmd = ""
diff --git a/mail/pygmy/pkg-plist b/mail/pygmy/pkg-plist
index cc1e51e776a8..1a4cc6b31de3 100644
--- a/mail/pygmy/pkg-plist
+++ b/mail/pygmy/pkg-plist
@@ -5,6 +5,8 @@ share/pygmy/cite.pyc
 share/pygmy/cite.pyo
 share/pygmy/edit.pyc
 share/pygmy/edit.pyo
+share/pygmy/error.pyc
+share/pygmy/error.pyo
 share/pygmy/expand.pyc
 share/pygmy/expand.pyo
 share/pygmy/fileops.pyc
@@ -38,6 +40,8 @@ share/pygmy/prefix.pyc
 share/pygmy/prefix.pyo
 share/pygmy/prefs.pyc
 share/pygmy/prefs.pyo
+share/pygmy/privacy.pyc
+share/pygmy/privacy.pyo
 share/pygmy/pygmy
 share/pygmy/pygmymailbox.pyc
 share/pygmy/pygmymailbox.pyo