- update to 1.5

- new MASTER_SITES
- spell 'FreeBSD.org' correctly
- respect NOPORTDOCS correctly

PR:		51672
Submitted by:	Ports Fury

5 files changed, 92 insertions, 183 deletions

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index e0808e7d1717..7703f3c6b5a9 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -6,36 +6,40 @@
 #
 
 PORTNAME=	asmail
-PORTVERSION=	0.56
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	mail afterstep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://gates.enemy.at/pub/
+MASTER_SITES=	http://www.tigr.net/afterstep/download/asmail/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Biff-type program, designed to match AfterStep
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_OPENSSL=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shaping
 
-MAN1=	asmail.1
+MAN1=	asmail.1x 
+MAN5=	asmailrc.5x
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample.asmailrc
+.for file in configure autoconf/Makefile.defines.in
+	@${REINPLACE_CMD} -e 's|-lpthread -lrt|${PTHREAD_LIBS}|g ; \
+		 s|-lssl|-lcrypto -lssl|g ; \
+		 s|-D_REENTRANT|-D_REENTRANT ${PTHREAD_CFLAGS}|g ; \
+		 s|machine/soundcard|sys/soundcard|g' ${WRKSRC}/${file}
+.endfor
+	@${REINPLACE_CMD} -e \
+		's|/usr/local|${PREFIX}|g' ${WRKSRC}/asmailrc.sample
 
 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
-	@${MKDIR} ${PREFIX}/share/examples/asmail
-	${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/examples/asmail
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/asmail
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/asmail
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/asmailrc.sample ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/asmail/distinfo b/mail/asmail/distinfo
index ce4c4d73852f..dd5c63be2523 100644
--- a/mail/asmail/distinfo
+++ b/mail/asmail/distinfo
@@ -1 +1 @@
-MD5 (asmail-0.56.tar.gz) = 71d3eebbc7b4451be44bab1a95e4b310
+MD5 (asmail-1.5.tar.gz) = 71ee63275657bfa95296ab5959dc52c0
diff --git a/mail/asmail/files/patch-ab b/mail/asmail/files/patch-ab
deleted file mode 100644
index 20429c9cc7a2..000000000000
--- a/mail/asmail/files/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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				#
- #########################################################
--#NoShape
-+NoShape
- 
- 
- #########################################################
-@@ -116,25 +116,25 @@
- #########################################################
- # Assign frame if not shaped				#
- #########################################################
--#Frame ~/GNUstep/Library/AfterStep/desktop/icons/8bpp/frame.xpm
-+#Frame %%PREFIX%%/include/X11/pixmaps/frame.xpm
- 
- 
- #########################################################
- # Assign icons/animations				#
- #########################################################
- 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
-+        %%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
-+        %%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/files/patch-asmail-pop.c b/mail/asmail/files/patch-asmail-pop.c
deleted file mode 100644
index 15eca827d640..000000000000
--- a/mail/asmail/files/patch-asmail-pop.c
+++ /dev/null
@@ -1,45 +0,0 @@
-$FreeBSD$
-
---- pop.c.orig	Thu Apr 13 19:08:02 2000
-+++ pop.c	Sat May  5 04:06:47 2001
-@@ -196,7 +196,8 @@
- {
-     SOCKET *sock;
-     int sd, i, port = 0, type;
--    char server[100], user[100], password[100], mailbox[100];
-+    char server[100], user[100], password[100];
-+    char mailbox[100] = "INBOX";	/* default mailbox */
-     char *pnt;
-     static int InDuty = 0;
- 
-@@ -229,18 +230,19 @@
-         return -1;
-     }
-     
--    /* optional portnumber */
-+    /* optional portnumber and mailbox for IMAP4 */
-     pnt += strlen(password) + 1;
--    if (sscanf(pnt, "%d", &port) != 1)
--       switch (type) {
--          case TYPE_POP: port = DEFAULTPORT; break;
--          case TYPE_IMAP: port = DEFAULTIMAPPORT; break;
--       }
--
--    /* optional mailboxname for IMAP */
--    if (type == TYPE_IMAP)
--       if (sscanf(pnt, "%100s", &mailbox) != 1)
--          strcpy(mailbox, "INBOX");
-+    switch (type) {
-+	case TYPE_POP:
-+	    port = DEFAULTPORT;
-+	    sscanf(pnt, "%d", &port);
-+	    break;
-+	case TYPE_IMAP:
-+	    port = DEFAULTIMAPPORT;
-+	    if (sscanf(pnt, "%d %100s", &port, &mailbox) == 0)
-+		sscanf(pnt, "%100s", &mailbox);
-+	    break;
-+    }
- 
-     /* Feb. 17 2000: Removed toupper() of mailbox names.
-      * Some IMAP servers seem to have troubles with case-insensitive
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index 23fd6dca0440..14aa029f31d7 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -1,79 +1,73 @@
 bin/asmail
-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/examples/asmail/sample.asmailrc
-share/doc/asmail/README
-@dirrm share/examples/asmail
-@dirrm share/doc/asmail
-@dirrm include/X11/pixmaps/cloud-e
+share/asmail/pixmaps/e-no.xpm
+share/asmail/pixmaps/e0.xpm
+share/asmail/pixmaps/e1.xpm
+share/asmail/pixmaps/e10.xpm
+share/asmail/pixmaps/e11.xpm
+share/asmail/pixmaps/e12.xpm
+share/asmail/pixmaps/e13.xpm
+share/asmail/pixmaps/e14.xpm
+share/asmail/pixmaps/e15.xpm
+share/asmail/pixmaps/e16.xpm
+share/asmail/pixmaps/e17.xpm
+share/asmail/pixmaps/e18.xpm
+share/asmail/pixmaps/e19.xpm
+share/asmail/pixmaps/e2.xpm
+share/asmail/pixmaps/e20.xpm
+share/asmail/pixmaps/e21.xpm
+share/asmail/pixmaps/e22.xpm
+share/asmail/pixmaps/e23.xpm
+share/asmail/pixmaps/e24.xpm
+share/asmail/pixmaps/e25.xpm
+share/asmail/pixmaps/e26.xpm
+share/asmail/pixmaps/e27.xpm
+share/asmail/pixmaps/e28.xpm
+share/asmail/pixmaps/e29.xpm
+share/asmail/pixmaps/e3.xpm
+share/asmail/pixmaps/e30.xpm
+share/asmail/pixmaps/e4.xpm
+share/asmail/pixmaps/e5.xpm
+share/asmail/pixmaps/e6.xpm
+share/asmail/pixmaps/e7.xpm
+share/asmail/pixmaps/e8.xpm
+share/asmail/pixmaps/e9.xpm
+share/asmail/pixmaps/m-e0.xpm
+share/asmail/pixmaps/m-e1.xpm
+share/asmail/pixmaps/m-e10.xpm
+share/asmail/pixmaps/m-e11.xpm
+share/asmail/pixmaps/m-e12.xpm
+share/asmail/pixmaps/m-e13.xpm
+share/asmail/pixmaps/m-e14.xpm
+share/asmail/pixmaps/m-e15.xpm
+share/asmail/pixmaps/m-e16.xpm
+share/asmail/pixmaps/m-e17.xpm
+share/asmail/pixmaps/m-e18.xpm
+share/asmail/pixmaps/m-e19.xpm
+share/asmail/pixmaps/m-e2.xpm
+share/asmail/pixmaps/m-e20.xpm
+share/asmail/pixmaps/m-e21.xpm
+share/asmail/pixmaps/m-e22.xpm
+share/asmail/pixmaps/m-e23.xpm
+share/asmail/pixmaps/m-e24.xpm
+share/asmail/pixmaps/m-e25.xpm
+share/asmail/pixmaps/m-e26.xpm
+share/asmail/pixmaps/m-e27.xpm
+share/asmail/pixmaps/m-e28.xpm
+share/asmail/pixmaps/m-e29.xpm
+share/asmail/pixmaps/m-e3.xpm
+share/asmail/pixmaps/m-e30.xpm
+share/asmail/pixmaps/m-e4.xpm
+share/asmail/pixmaps/m-e5.xpm
+share/asmail/pixmaps/m-e6.xpm
+share/asmail/pixmaps/m-e7.xpm
+share/asmail/pixmaps/m-e8.xpm
+share/asmail/pixmaps/m-e9.xpm
+share/asmail/sounds/clink.au
+share/asmail/sounds/drip.au
+%%PORTDOCS%%share/doc/asmail/README
+%%PORTDOCS%%share/examples/asmail/asmailrc.sample
+%%PORTDOCS%%@dirrm share/examples/asmail
+%%PORTDOCS%%@dirrm share/doc/asmail
+@dirrm share/asmail/sounds
+@dirrm share/asmail/pixmaps
+@dirrm share/asmail