Change to the Alternative Csound Reference Manual and fix packing

list.

to do:  generate HTML, text and PDF formats from the Docbook files
	with lynx, jade and htmldoc instead of downloading them
	ready-made

3 files changed, 18 insertions, 39 deletions

diff --git a/audio/csound-manual/Makefile b/audio/csound-manual/Makefile
index e0fb01374118..ad926802f451 100644
--- a/audio/csound-manual/Makefile
+++ b/audio/csound-manual/Makefile
@@ -6,18 +6,14 @@
 #
 
 PORTNAME=	csound-manual
-PORTVERSION=	4.10
+PORTVERSION=	4.23
 CATEGORIES=	audio
-MASTER_SITES=	ftp://csounds.com/manual/current/
-DISTFILES=	ascii.zip \
-		espanol.zip \
-		html.zip \
-		manual1.zip \
-		manual2.zip \
-		spplmnt1.zip \
-		spplmnt2.zip \
-		spplmtxt.zip \
-		toots.zip
+MASTER_SITES=	http://www.kevindumpscore.com/download/ \
+		ftp://ftp.cs.bath.ac.uk/pub/dream/documentation/manuals/
+DISTFILES=	manual-docbook-${PORTVERSION}.tar.gz \
+		manual-html-${PORTVERSION}.tar.gz \
+		manual-pdf-${PORTVERSION}.tar.gz \
+		manual-text-${PORTVERSION}.tar.gz
 DIST_SUBDIR=	csound
 
 MAINTAINER=	trevor@FreeBSD.org
@@ -25,29 +21,17 @@ COMMENT=	Manuals for Csound
 
 RUN_DEPENDS=	csound:${PORTSDIR}/audio/csound
 
-BROKEN=		Files are not available for distribution anymore. \
-		Owner has withdrawn the files due to bandwidth costs.
-
-RESTRICTED=	"no redistribution; no commercial use except to make music (see http://mitpress.mit.edu/e-books/csound/fpage/FAQml/faq/faq.html)"
-NO_CDROM=	${RESTRICTED}
-NO_FTP=		${RESTRICTED}
-
 NO_BUILD=		yes
 NO_MTREE=		yes
 PLIST=			${WRKDIR}/pkg-plist
 PREFIX=			${X11BASE}/share/doc/csound
-USE_ZIP=		yes
-WRKSRC=			${WRKDIR}/manual
-EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-
-pre-extract:
-	${MKDIR} ${WRKSRC}
+WRKSRC=			${WRKDIR}/csound-${PORTVERSION}
 
 pre-install:
 	${RM} -f ${PLIST}
-	cd ${WRKDIR}/manual && ${FIND} -s . -type f | \
+	cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${CUT} -c3-999 >> ${PLIST} \
-		&& ${FIND} * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
+		&& ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
 do-install:
 	cd ${WRKSRC} && pax -r -w * ${PREFIX}
diff --git a/audio/csound-manual/distinfo b/audio/csound-manual/distinfo
index 939982ccbe1e..219c6d036444 100644
--- a/audio/csound-manual/distinfo
+++ b/audio/csound-manual/distinfo
@@ -1,9 +1,5 @@
-MD5 (csound/ascii.zip) = 65d25859c0ea510460f9b0de5c979027
-MD5 (csound/espanol.zip) = a7b8fa9a2b73c1453e45fb851f9bd34b
-MD5 (csound/html.zip) = 39032016aecda280cfc68c7c2484a6b0
-MD5 (csound/manual1.zip) = 4209ece6ced8020795313f2055bf004d
-MD5 (csound/manual2.zip) = 79f4ec433e5955b5a153a8a78b48357b
-MD5 (csound/spplmnt1.zip) = 5ab0e041212973cb158eb3ca15109066
-MD5 (csound/spplmnt2.zip) = 04462793896af722ebcffe79de3df6f5
-MD5 (csound/spplmtxt.zip) = 93a2d4ec575eb8fb3d9d20050413a800
-MD5 (csound/toots.zip) = 270b857fd17af28644fb68de81424b00
+$FreeBSD$
+MD5 (csound/manual-docbook-4.23.tar.gz) = 8201c6184df2620161a059a90a31c414
+MD5 (csound/manual-html-4.23.tar.gz) = 582852b692c254dab6ec797bc3de161b
+MD5 (csound/manual-pdf-4.23.tar.gz) = 1075642721676183815431388d9b6750
+MD5 (csound/manual-text-4.23.tar.gz) = a4089336656a3a4da14801c82c9e6754
diff --git a/audio/csound-manual/pkg-descr b/audio/csound-manual/pkg-descr
index 1bbb7da78862..188f513e0712 100644
--- a/audio/csound-manual/pkg-descr
+++ b/audio/csound-manual/pkg-descr
@@ -1,7 +1,6 @@
-These are the manuals for Csound, in HTML, plain text and PDF.  A Spanish
-manual, in PDF only, is included.  Orchestra and score files are included.
+This is the Alternative Csound Reference Manual, in HTML, plain
+text, Docbook and PDF.
 
-http://www.lakewoodsound.com/csound/maindownload.htm
+WWW:  http://www.kevindumpscore.com/download.html#csound-manual
 
 Trevor Johnson
-trevor@FreeBSD.org