7 files changed, 35 insertions, 47 deletions

diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index a7d7c303c039..dd9718db75cc 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -5,29 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	napster
-PORTVERSION=	1.4.4
+PORTNAME=	nap
+PORTVERSION=	1.4.5
 CATEGORIES=	audio net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	nap
-DISTNAME=	nap-${PORTVERSION}
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
 GNU_CONFIGURE=	yes
 
-pre-install:
-	${MKDIR} ${PREFIX}/share/nap
-	${INSTALL_DATA} ${WRKSRC}/nap.conf.dist ${PREFIX}/share/nap
-
-.if (!defined(NOPORTDOCS))
-	@${ECHO_MSG} "===>  Installing NEWS + README in ${PREFIX}/share/doc/nap"
-	${MKDIR} ${PREFIX}/share/doc/nap
+post-install:
+.if !defined(NOPORTDOCS)
+	@${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} | ${SED} 's:@PREFIX@:${PREFIX}:g'
-
 .include <bsd.port.mk>
diff --git a/audio/napster/distinfo b/audio/napster/distinfo
index d7c12e3b0723..bdb88eac5540 100644
--- a/audio/napster/distinfo
+++ b/audio/napster/distinfo
@@ -1,2 +1 @@
-MD5 (nap-bsd-0.9BETA.tar.gz) = 3fd3aa290456d33d2a96be1cc82e9edb
-MD5 (nap-1.4.4.tar.gz) = c00062ea018579ffcccfb48703b6aab0
+MD5 (nap-1.4.5.tar.gz) = 2de4a21323cbb2c72d6d7cca04ec2550
diff --git a/audio/napster/files/patch-event.c b/audio/napster/files/patch-event.c
new file mode 100644
index 000000000000..89594cf3654d
--- /dev/null
+++ b/audio/napster/files/patch-event.c
@@ -0,0 +1,17 @@
+Oops, forgot to include patch-event.c:
+
+--- event.c.orig	Tue Jul  3 00:46:38 2001
++++ event.c	Tue Jul  3 00:47:24 2001
+@@ -11,6 +11,7 @@
+ #endif
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+
+--
+Pete Fritchman <petef@databits.net>
+Databits Network Services, Inc. <http://databits.net>
+finger petef@databits.net for PGP key
diff --git a/audio/napster/pkg-comment b/audio/napster/pkg-comment
index 732c2e031ac1..b951c5142ef2 100644
--- a/audio/napster/pkg-comment
+++ b/audio/napster/pkg-comment
@@ -1 +1 @@
-An MP3 sharing, search, and chat client
+An MP3 sharing, search, and chat client for the OpenNAP network
diff --git a/audio/napster/pkg-descr b/audio/napster/pkg-descr
index ff277ad2f3dc..cc203bb75e31 100644
--- a/audio/napster/pkg-descr
+++ b/audio/napster/pkg-descr
@@ -1,11 +1,10 @@
-Napster is a MP3 file sharing, search, and chat client, all rolled
-into one.  With it, you can join a global community of MP3 enthusiasts,
-sharing your MP3 collection with them and downloading from their shared
-MP3 collections.
+Nap is a console Napster client that supports MP3 sharing, search, and
+chatting.  It now defaults to connecting to the OpenNAP network because
+the official Napster.com network has client filters.
 
-For more info on Napster, please visit http://www.napster.com/ and
-http://www.napster.com/FAQ/.
+For more information on OpenNAP, visit http://www.opennap.com/.
 
-WWW: http://www.gis.net/~nite/
+WWW: http://nap.sourceforge.net/
 
-Donald Burr <dburr@FreeBSD.ORG>
+- Pete
+petef@databits.net
diff --git a/audio/napster/pkg-message b/audio/napster/pkg-message
deleted file mode 100644
index 11d6c0538ee9..000000000000
--- a/audio/napster/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-MP3's to your archives as well.
-
-If you already have a Napster account, just enter it in nap.conf.  Or,
-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/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 0791d82f1de2..d14ed1f2af98 100644
--- a/audio/napster/pkg-plist
+++ b/audio/napster/pkg-plist
@@ -1,6 +1,4 @@
 bin/nap
-share/nap/nap.conf.dist
-@dirrm share/nap
-%%PORTDOCSshare/doc/nap/NEWS
-%%PORTDOCSshare/doc/nap/README
-%%PORTDOCS@dirrm share/doc/nap
+%%PORTDOCS%%share/doc/nap/NEWS
+%%PORTDOCS%%share/doc/nap/README
+%%PORTDOCS%%@dirrm share/doc/nap