4 files changed, 17 insertions, 24 deletions

diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index 9f80619b2ad8..800bb606e3a4 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -6,37 +6,27 @@
 #
 
 PORTNAME=	napster
-PORTVERSION=	0.9b
+PORTVERSION=	1.4.4
 CATEGORIES=	audio net
-MASTER_SITES=	http://www.gis.net/~nite/
-DISTNAME=	nap-bsd-0.9BETA
+MASTER_SITES=	http://download.sourceforge.net/nap/
+DISTNAME=	nap-${PORTVERSION}
 
 MAINTAINER=	dburr@FreeBSD.org
 
-FORBIDDEN=	"Remote vulnerabilities"
+GNU_CONFIGURE=  yes
 
-# leaving this here, in case they decide to drop the BSD version again *sigh*
-# RUN_DEPENDS=	/compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS=	i386
-WRKSRC=		${WRKDIR}/nap
-NO_BUILD=	yes
-
-# leaving this here in case they decide to drop the BSD version again *sigh*
-# do-patch:
-#	brandelf -t Linux ${WRKSRC}/nap
-
-do-install:
-	${INSTALL} -c -o root -g wheel -m 555 ${WRKSRC}/nap ${PREFIX}/bin/nap
+pre-install:
 	${MKDIR} ${PREFIX}/share/nap
-	${INSTALL_DATA} ${WRKSRC}/nap.conf ${PREFIX}/share/nap
+	${INSTALL_DATA} ${WRKSRC}/nap.conf.dist ${PREFIX}/share/nap
+
 .if (!defined(NOPORTDOCS))
-	@${ECHO_MSG} "===>  Installing README in ${PREFIX}/share/doc/nap"
+	@${ECHO_MSG} "===>  Installing NEWS + README in ${PREFIX}/share/doc/nap"
 	${MKDIR} ${PREFIX}/share/doc/nap
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/nap
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nap
 .endif
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE} | ${SED} 's:@PREFIX@:${PREFIX}:g'
 
 .include <bsd.port.mk>
diff --git a/audio/napster/distinfo b/audio/napster/distinfo
index 9490459b1ec2..d7c12e3b0723 100644
--- a/audio/napster/distinfo
+++ b/audio/napster/distinfo
@@ -1 +1,2 @@
 MD5 (nap-bsd-0.9BETA.tar.gz) = 3fd3aa290456d33d2a96be1cc82e9edb
+MD5 (nap-1.4.4.tar.gz) = c00062ea018579ffcccfb48703b6aab0
diff --git a/audio/napster/pkg-message b/audio/napster/pkg-message
index f380361c8bce..11d6c0538ee9 100644
--- a/audio/napster/pkg-message
+++ b/audio/napster/pkg-message
@@ -1,5 +1,6 @@
-Each user will have to make their own copy of ${PREFIX}/share/nap/nap.conf
-into a directory of their choice, then run nap from that directory.
+Each user will have to make their own copy of @PREFIX@/share/nap/nap.conf.dist
+(named nap.conf) into a directory of their choice, then run nap from that 
+directory.
 
 The first time you run nap, run it with the '-b' file to create an index
 of your available MP3's.  You'll have to do this whenever you add new
@@ -10,7 +11,7 @@ to create an account, enter the desired username/password in nap.conf
 and run `nap -m'.
 
 For more documentation on this version of Napster, read the file
-${PREFIX}/share/doc/nap.  For information about Napster in general,
+@PREFIX@/share/doc/nap/README.  For information about Napster in general,
 check http://www.napster.com/ and http://www.napster.com/FAQ/
 
 Have fun!
diff --git a/audio/napster/pkg-plist b/audio/napster/pkg-plist
index 035a2f564008..1717b2f749fe 100644
--- a/audio/napster/pkg-plist
+++ b/audio/napster/pkg-plist
@@ -1,5 +1,6 @@
 bin/nap
-share/nap/nap.conf
+share/nap/nap.conf.dist
 @dirrm share/nap
+share/doc/nap/NEWS
 share/doc/nap/README
 @dirrm share/doc/nap