Update to 0.56

PR:		18438
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

5 files changed, 40 insertions, 38 deletions

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index a6a0b6b7c5ba..d0b4eaa1b95c 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -6,32 +6,34 @@
 #
 
 PORTNAME=	asmail
-PORTVERSION= 	0.54
+PORTVERSION=	0.56
 CATEGORIES=	mail afterstep
-MASTER_SITES=	http://www.tigr.net/afterstep/as-apps/download/asmail/ \
-		ftp://ftp.afterstep.org/apps/asmail/
+MASTER_SITES=	http://asmail.sourceforge.net/files/ \
+		ftp://gates.enemy.at/pub/
 
 MAINTAINER=	brett@peloton.runet.edu
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shaping
 
 MAN1=	asmail.1
 
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.asmailrc
+
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/asmail.man ${PREFIX}/man/man1/asmail.1
 	@${MKDIR} ${PREFIX}/include/X11/pixmaps/cloud-e
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/cloud-e/*.xpm ${PREFIX}/include/X11/pixmaps/cloud-e
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/include/X11/pixmaps
-	@${INSTALL_MAN} ${WRKSRC}/asmail.man ${PREFIX}/man/man1/asmail.1
-	@${MKDIR} ${PREFIX}/share/doc/asmail
-	@${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/doc/asmail
-	@strip ${PREFIX}/bin/asmail
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/cloud-e/*.xpm ${PREFIX}/include/X11/pixmaps/cloud-e
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/include/X11/pixmaps
+	@${MKDIR} ${PREFIX}/share/examples/asmail
+	${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/examples/asmail
 .if !defined(NOPORTDOCS)
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/asmail
-	@${ECHO} "===>   README installed in ${PREFIX}/share/doc/asmail"
+	@${MKDIR} ${PREFIX}/share/doc/asmail
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/asmail
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/asmail/distinfo b/mail/asmail/distinfo
index a3c8b295e79e..ce4c4d73852f 100644
--- a/mail/asmail/distinfo
+++ b/mail/asmail/distinfo
@@ -1 +1 @@
-MD5 (asmail-0.54.tar.gz) = d8f9a18eba13d470785c85669b803969
+MD5 (asmail-0.56.tar.gz) = 71d3eebbc7b4451be44bab1a95e4b310
diff --git a/mail/asmail/files/patch-ab b/mail/asmail/files/patch-ab
index 46fd31600014..20429c9cc7a2 100644
--- a/mail/asmail/files/patch-ab
+++ b/mail/asmail/files/patch-ab
@@ -1,6 +1,6 @@
---- sample.asmailrc.orig	Mon Jun 21 10:11:24 1999
-+++ sample.asmailrc	Sat Jul 17 14:10:08 1999
-@@ -69,7 +69,7 @@
+--- sample.asmailrc.orig	Thu Apr 13 18:55:58 2000
++++ sample.asmailrc	Mon May  1 22:48:33 2000
+@@ -70,7 +70,7 @@
  #########################################################
  # Turns off shaped window				#
  #########################################################
@@ -9,39 +9,36 @@
  
  
  #########################################################
-@@ -115,25 +115,25 @@
+@@ -116,25 +116,25 @@
  #########################################################
  # Assign frame if not shaped				#
  #########################################################
 -#Frame ~/GNUstep/Library/AfterStep/desktop/icons/8bpp/frame.xpm
-+#Frame /usr/X11R6/include/X11/pixmaps/frame.xpm
++#Frame %%PREFIX%%/include/X11/pixmaps/frame.xpm
  
  
  #########################################################
  # Assign icons/animations				#
  #########################################################
--NoMail  
--        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
-+NoMail
-+	/usr/X11R6/include/X11/pixmaps/nomail_s.xpm
+ NoMail  
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
++        %%PREFIX%%/include/X11/pixmaps/nomail_s.xpm
  End
  
--OldMail  	
--        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
-+OldMail
-+	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
+ OldMail  	
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
++        %%PREFIX%%/include/X11/pixmaps/oldmail_s.xpm
  End
  
--NewMail  
--        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
--        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
--        /usr/local/share/afterstep/desktop/icons/common/Mail3.xpm
--        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
-+NewMail
-+	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
-+	/usr/X11R6/include/X11/pixmaps/newmail_s.xpm
-+	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
-+	/usr/X11R6/include/X11/pixmaps/newmail_s.xpm
+ NewMail  
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail3.xpm
+-#        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
++        %%PREFIX%%/include/X11/pixmaps/oldmail_s.xpm
++        %%PREFIX%%/include/X11/pixmaps/newmail_s.xpm
++        %%PREFIX%%/include/X11/pixmaps/oldmail_s.xpm
++        %%PREFIX%%/include/X11/pixmaps/newmail_s.xpm
  End
  
  #########################################################
diff --git a/mail/asmail/pkg-descr b/mail/asmail/pkg-descr
index b046f401a1b3..22ef431f419e 100644
--- a/mail/asmail/pkg-descr
+++ b/mail/asmail/pkg-descr
@@ -3,5 +3,7 @@ look & feel. It indicates the status of your mailbox.
 It can be put in the Wharf, execute a program on incoming mail,
 execute a program upon mouseclick, show animations and more...
 
+WWW: http://asmail.sourceforge.net/
+
 -Brett
 brett@peloton.physics.montana.edu
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index f0c6ecc575de..23fd6dca0440 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -72,7 +72,8 @@ include/X11/pixmaps/cloud-e/m-e27.xpm
 include/X11/pixmaps/cloud-e/m-e28.xpm
 include/X11/pixmaps/cloud-e/m-e29.xpm
 include/X11/pixmaps/cloud-e/m-e30.xpm
-share/doc/asmail/sample.asmailrc
+share/examples/asmail/sample.asmailrc
 share/doc/asmail/README
-@dirrm include/X11/pixmaps/cloud-e
+@dirrm share/examples/asmail
 @dirrm share/doc/asmail
+@dirrm include/X11/pixmaps/cloud-e