4 files changed, 76 insertions, 77 deletions

diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index b85cd94eb95a..0930280fd65f 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	asmail
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	mail afterstep
 MASTER_SITES=	http://www.tigr.net/afterstep/download/asmail/
-MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Biff-type program, designed to match AfterStep
diff --git a/mail/asmail/distinfo b/mail/asmail/distinfo
index 319d6c1bc30a..f89e565de845 100644
--- a/mail/asmail/distinfo
+++ b/mail/asmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (asmail-1.6.tar.gz) = 0a4bbc90afac2afa871ebf52f0439e18
-SIZE (asmail-1.6.tar.gz) = 266805
+MD5 (asmail-1.7.tar.gz) = 2fb24aa491fa3088710a10876e86cebe
+SIZE (asmail-1.7.tar.gz) = 267156
diff --git a/mail/asmail/pkg-descr b/mail/asmail/pkg-descr
index 22ef431f419e..8d65bc7196b9 100644
--- a/mail/asmail/pkg-descr
+++ b/mail/asmail/pkg-descr
@@ -3,7 +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/
+WWW: http://www.tigr.net/afterstep/
 
 -Brett
 brett@peloton.physics.montana.edu
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index 14aa029f31d7..75d69b56dc3d 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -1,73 +1,73 @@
 bin/asmail
-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
+%%DATADIR%%/pixmaps/e-no.xpm
+%%DATADIR%%/pixmaps/e0.xpm
+%%DATADIR%%/pixmaps/e1.xpm
+%%DATADIR%%/pixmaps/e10.xpm
+%%DATADIR%%/pixmaps/e11.xpm
+%%DATADIR%%/pixmaps/e12.xpm
+%%DATADIR%%/pixmaps/e13.xpm
+%%DATADIR%%/pixmaps/e14.xpm
+%%DATADIR%%/pixmaps/e15.xpm
+%%DATADIR%%/pixmaps/e16.xpm
+%%DATADIR%%/pixmaps/e17.xpm
+%%DATADIR%%/pixmaps/e18.xpm
+%%DATADIR%%/pixmaps/e19.xpm
+%%DATADIR%%/pixmaps/e2.xpm
+%%DATADIR%%/pixmaps/e20.xpm
+%%DATADIR%%/pixmaps/e21.xpm
+%%DATADIR%%/pixmaps/e22.xpm
+%%DATADIR%%/pixmaps/e23.xpm
+%%DATADIR%%/pixmaps/e24.xpm
+%%DATADIR%%/pixmaps/e25.xpm
+%%DATADIR%%/pixmaps/e26.xpm
+%%DATADIR%%/pixmaps/e27.xpm
+%%DATADIR%%/pixmaps/e28.xpm
+%%DATADIR%%/pixmaps/e29.xpm
+%%DATADIR%%/pixmaps/e3.xpm
+%%DATADIR%%/pixmaps/e30.xpm
+%%DATADIR%%/pixmaps/e4.xpm
+%%DATADIR%%/pixmaps/e5.xpm
+%%DATADIR%%/pixmaps/e6.xpm
+%%DATADIR%%/pixmaps/e7.xpm
+%%DATADIR%%/pixmaps/e8.xpm
+%%DATADIR%%/pixmaps/e9.xpm
+%%DATADIR%%/pixmaps/m-e0.xpm
+%%DATADIR%%/pixmaps/m-e1.xpm
+%%DATADIR%%/pixmaps/m-e10.xpm
+%%DATADIR%%/pixmaps/m-e11.xpm
+%%DATADIR%%/pixmaps/m-e12.xpm
+%%DATADIR%%/pixmaps/m-e13.xpm
+%%DATADIR%%/pixmaps/m-e14.xpm
+%%DATADIR%%/pixmaps/m-e15.xpm
+%%DATADIR%%/pixmaps/m-e16.xpm
+%%DATADIR%%/pixmaps/m-e17.xpm
+%%DATADIR%%/pixmaps/m-e18.xpm
+%%DATADIR%%/pixmaps/m-e19.xpm
+%%DATADIR%%/pixmaps/m-e2.xpm
+%%DATADIR%%/pixmaps/m-e20.xpm
+%%DATADIR%%/pixmaps/m-e21.xpm
+%%DATADIR%%/pixmaps/m-e22.xpm
+%%DATADIR%%/pixmaps/m-e23.xpm
+%%DATADIR%%/pixmaps/m-e24.xpm
+%%DATADIR%%/pixmaps/m-e25.xpm
+%%DATADIR%%/pixmaps/m-e26.xpm
+%%DATADIR%%/pixmaps/m-e27.xpm
+%%DATADIR%%/pixmaps/m-e28.xpm
+%%DATADIR%%/pixmaps/m-e29.xpm
+%%DATADIR%%/pixmaps/m-e3.xpm
+%%DATADIR%%/pixmaps/m-e30.xpm
+%%DATADIR%%/pixmaps/m-e4.xpm
+%%DATADIR%%/pixmaps/m-e5.xpm
+%%DATADIR%%/pixmaps/m-e6.xpm
+%%DATADIR%%/pixmaps/m-e7.xpm
+%%DATADIR%%/pixmaps/m-e8.xpm
+%%DATADIR%%/pixmaps/m-e9.xpm
+%%DATADIR%%/sounds/clink.au
+%%DATADIR%%/sounds/drip.au
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/asmailrc.sample
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%