Update to 0.54

PR:		12678
Submitted by:	Jim Mock <jim@phrantic.phear.net>

4 files changed, 137 insertions, 124 deletions

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index c596f335f956..b3f8b56277d6 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -1,42 +1,37 @@
 # New ports collection makefile for:	 asmail
-# Version required:	0.50
+# Version required:	0.54
 # Date created:		15 August 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
-# $Id: Makefile,v 1.5 1998/11/21 07:27:38 steve Exp $
+# $Id: Makefile,v 1.6 1999/01/18 06:38:07 asami Exp $
 #
 
-DISTNAME=	asmail-0.50
+DISTNAME=	asmail-0.54
 CATEGORIES=	mail afterstep
-MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/apps/asmail/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/apps/asmail/
+MASTER_SITES=	http://www.tigr.net/afterstep/as-apps/download/asmail/ \
+		ftp://ftp.afterstep.org/apps/asmail/
 
 MAINTAINER=	brett@peloton.physics.montana.edu
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
+CONFIGURE_ARGS=	--enable-shaping
 
-PIXMAPS=	e/e-no.xpm e/e0.xpm e/e1.xpm e/e10.xpm e/e11.xpm e/e2.xpm \
-		e/e3.xpm e/e4.xpm e/e5.xpm e/e6.xpm e/e7.xpm e/e8.xpm e/e9.xpm \
-		monitor-e/monitor-e0.xpm monitor-e/monitor-e1.xpm \
-		monitor-e/monitor-e10.xpm monitor-e/monitor-e11.xpm \
-		monitor-e/monitor-e2.xpm monitor-e/monitor-e3.xpm \
-		monitor-e/monitor-e4.xpm monitor-e/monitor-e5.xpm \
-		monitor-e/monitor-e6.xpm monitor-e/monitor-e7.xpm \
-		monitor-e/monitor-e8.xpm monitor-e/monitor-e9.xpm \
-		monitor-e/monitor-no.xpm std/newmail.xpm \
-		std/newmail_s.xpm std/nomail.xpm std/nomail_s.xpm \
-		std/oldmail.xpm std/oldmail_s.xpm
-
-MAN1=		asmail.1
+MAN1=	asmail.1
 
 post-install:
-.for pixmap in ${PIXMAPS}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${PREFIX}/include/X11/pixmaps
-.endfor
-	${MKDIR} ${PREFIX}/share/doc/asmail
-	${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/doc/asmail
-	strip ${PREFIX}/bin/asmail
+	@${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
+.if !defined(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/asmail
+	@${ECHO} "===>   README installed in ${PREFIX}/share/doc/asmail"
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/asmail/distinfo b/mail/asmail/distinfo
index 74d577ea289e..a3c8b295e79e 100644
--- a/mail/asmail/distinfo
+++ b/mail/asmail/distinfo
@@ -1 +1 @@
-MD5 (asmail-0.50.tar.gz) = 3f6f2aa9cf9d91ee77f2190b45ea6e94
+MD5 (asmail-0.54.tar.gz) = d8f9a18eba13d470785c85669b803969
diff --git a/mail/asmail/files/patch-ab b/mail/asmail/files/patch-ab
index 841c3be8c6ad..46fd31600014 100644
--- a/mail/asmail/files/patch-ab
+++ b/mail/asmail/files/patch-ab
@@ -1,72 +1,47 @@
-*** sample.asmailrc.orig	Fri Feb 27 22:58:09 1998
---- sample.asmailrc	Fri Feb 27 22:59:21 1998
-***************
-*** 66,72 ****
-  #########################################################
-  # Truns off shaped window				#
-  #########################################################
-! #NoShape
-  
-  
-  #########################################################
---- 66,72 ----
-  #########################################################
-  # Truns off shaped window				#
-  #########################################################
-! NoShape
-  
-  
-  #########################################################
-***************
-*** 106,130 ****
-  # Assign icons/animations				#
-  #########################################################
-  NoMail  
-! 	/usr/include/X11/pixmaps/e-no.xpm
-  End
-  
-  OldMail  	
-! 	/usr/include/X11/pixmaps/e1.xpm
-  End
-  
-  NewMail  
-! 	/usr/include/X11/pixmaps/e1.xpm
-! 	/usr/include/X11/pixmaps/e2.xpm
-! 	/usr/include/X11/pixmaps/e3.xpm
-! 	/usr/include/X11/pixmaps/e4.xpm
-! 	/usr/include/X11/pixmaps/e5.xpm
-! 	/usr/include/X11/pixmaps/e6.xpm
-! 	/usr/include/X11/pixmaps/e7.xpm
-! 	/usr/include/X11/pixmaps/e8.xpm
-! 	/usr/include/X11/pixmaps/e9.xpm
-! 	/usr/include/X11/pixmaps/e10.xpm
-! 	/usr/include/X11/pixmaps/e11.xpm
-  End
-  
-  #########################################################
---- 106,130 ----
-  # Assign icons/animations				#
-  #########################################################
-  NoMail  
-! 	/usr/X11R6/include/X11/pixmaps/e-no.xpm
-  End
-  
-  OldMail  	
-! 	/usr/X11R6/include/X11/pixmaps/e1.xpm
-  End
-  
-  NewMail  
-! 	/usr/X11R6/include/X11/pixmaps/e1.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e2.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e3.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e4.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e5.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e6.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e7.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e8.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e9.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e10.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e11.xpm
-  End
-  
-  #########################################################
+--- sample.asmailrc.orig	Mon Jun 21 10:11:24 1999
++++ sample.asmailrc	Sat Jul 17 14:10:08 1999
+@@ -69,7 +69,7 @@
+ #########################################################
+ # Turns off shaped window				#
+ #########################################################
+-#NoShape
++NoShape
+ 
+ 
+ #########################################################
+@@ -115,25 +115,25 @@
+ #########################################################
+ # Assign frame if not shaped				#
+ #########################################################
+-#Frame ~/GNUstep/Library/AfterStep/desktop/icons/8bpp/frame.xpm
++#Frame /usr/X11R6/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
+ End
+ 
+-OldMail  	
+-        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
++OldMail
++	/usr/X11R6/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
+ End
+ 
+ #########################################################
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index ed344c580b38..f0c6ecc575de 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -1,35 +1,78 @@
 bin/asmail
-include/X11/pixmaps/e-no.xpm
-include/X11/pixmaps/e0.xpm
-include/X11/pixmaps/e1.xpm
-include/X11/pixmaps/e10.xpm
-include/X11/pixmaps/e11.xpm
-include/X11/pixmaps/e2.xpm
-include/X11/pixmaps/e3.xpm
-include/X11/pixmaps/e4.xpm
-include/X11/pixmaps/e5.xpm
-include/X11/pixmaps/e6.xpm
-include/X11/pixmaps/e7.xpm
-include/X11/pixmaps/e8.xpm
-include/X11/pixmaps/e9.xpm
-include/X11/pixmaps/monitor-e0.xpm
-include/X11/pixmaps/monitor-e1.xpm
-include/X11/pixmaps/monitor-e10.xpm
-include/X11/pixmaps/monitor-e11.xpm
-include/X11/pixmaps/monitor-e2.xpm
-include/X11/pixmaps/monitor-e3.xpm
-include/X11/pixmaps/monitor-e4.xpm
-include/X11/pixmaps/monitor-e5.xpm
-include/X11/pixmaps/monitor-e6.xpm
-include/X11/pixmaps/monitor-e7.xpm
-include/X11/pixmaps/monitor-e8.xpm
-include/X11/pixmaps/monitor-e9.xpm
-include/X11/pixmaps/monitor-no.xpm
+include/X11/pixmaps/frame.xpm
+include/X11/pixmaps/m-newmail.xpm
+include/X11/pixmaps/m-newmail_s.xpm
+include/X11/pixmaps/m-oldmail.xpm
+include/X11/pixmaps/m-oldmail_s.xpm
 include/X11/pixmaps/newmail.xpm
 include/X11/pixmaps/newmail_s.xpm
 include/X11/pixmaps/nomail.xpm
 include/X11/pixmaps/nomail_s.xpm
 include/X11/pixmaps/oldmail.xpm
 include/X11/pixmaps/oldmail_s.xpm
+include/X11/pixmaps/cloud-e/e0.xpm
+include/X11/pixmaps/cloud-e/e1.xpm
+include/X11/pixmaps/cloud-e/e2.xpm
+include/X11/pixmaps/cloud-e/e3.xpm
+include/X11/pixmaps/cloud-e/e4.xpm
+include/X11/pixmaps/cloud-e/e5.xpm
+include/X11/pixmaps/cloud-e/e6.xpm
+include/X11/pixmaps/cloud-e/e7.xpm
+include/X11/pixmaps/cloud-e/e8.xpm
+include/X11/pixmaps/cloud-e/e9.xpm
+include/X11/pixmaps/cloud-e/e10.xpm
+include/X11/pixmaps/cloud-e/e11.xpm
+include/X11/pixmaps/cloud-e/e12.xpm
+include/X11/pixmaps/cloud-e/e13.xpm
+include/X11/pixmaps/cloud-e/e14.xpm
+include/X11/pixmaps/cloud-e/e15.xpm
+include/X11/pixmaps/cloud-e/e16.xpm
+include/X11/pixmaps/cloud-e/e17.xpm
+include/X11/pixmaps/cloud-e/e18.xpm
+include/X11/pixmaps/cloud-e/e19.xpm
+include/X11/pixmaps/cloud-e/e20.xpm
+include/X11/pixmaps/cloud-e/e21.xpm
+include/X11/pixmaps/cloud-e/e22.xpm
+include/X11/pixmaps/cloud-e/e23.xpm
+include/X11/pixmaps/cloud-e/e24.xpm
+include/X11/pixmaps/cloud-e/e25.xpm
+include/X11/pixmaps/cloud-e/e26.xpm
+include/X11/pixmaps/cloud-e/e27.xpm
+include/X11/pixmaps/cloud-e/e28.xpm
+include/X11/pixmaps/cloud-e/e29.xpm
+include/X11/pixmaps/cloud-e/e30.xpm
+include/X11/pixmaps/cloud-e/m-e0.xpm
+include/X11/pixmaps/cloud-e/m-e1.xpm
+include/X11/pixmaps/cloud-e/m-e2.xpm
+include/X11/pixmaps/cloud-e/m-e3.xpm
+include/X11/pixmaps/cloud-e/m-e4.xpm
+include/X11/pixmaps/cloud-e/m-e5.xpm
+include/X11/pixmaps/cloud-e/m-e6.xpm
+include/X11/pixmaps/cloud-e/m-e7.xpm
+include/X11/pixmaps/cloud-e/m-e8.xpm
+include/X11/pixmaps/cloud-e/m-e9.xpm
+include/X11/pixmaps/cloud-e/m-e10.xpm
+include/X11/pixmaps/cloud-e/m-e11.xpm
+include/X11/pixmaps/cloud-e/m-e12.xpm
+include/X11/pixmaps/cloud-e/m-e13.xpm
+include/X11/pixmaps/cloud-e/m-e14.xpm
+include/X11/pixmaps/cloud-e/m-e15.xpm
+include/X11/pixmaps/cloud-e/m-e16.xpm
+include/X11/pixmaps/cloud-e/m-e17.xpm
+include/X11/pixmaps/cloud-e/m-e18.xpm
+include/X11/pixmaps/cloud-e/m-e19.xpm
+include/X11/pixmaps/cloud-e/m-e20.xpm
+include/X11/pixmaps/cloud-e/m-e21.xpm
+include/X11/pixmaps/cloud-e/m-e22.xpm
+include/X11/pixmaps/cloud-e/m-e23.xpm
+include/X11/pixmaps/cloud-e/m-e24.xpm
+include/X11/pixmaps/cloud-e/m-e25.xpm
+include/X11/pixmaps/cloud-e/m-e26.xpm
+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/doc/asmail/README
+@dirrm include/X11/pixmaps/cloud-e
 @dirrm share/doc/asmail