3 files changed, 42 insertions, 55 deletions

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index caadaafc7355..592bd26c66e7 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	csound
-PORTVERSION=	4.08
-PORTREVISION=	1
+PORTVERSION=	4.11
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.maths.bath.ac.uk/pub/dream/newest/
-DISTFILES=	Csound.tar.gz
-.if !defined(NOPORTDOCS)
-DISTFILES+=	Version${PORTVERSION:S/./_/}.Notes
-.endif
+DISTFILES=	Csound${PORTVERSION}.tar.gz
 DIST_SUBDIR=	csound
-EXTRACT_ONLY=	Csound.tar.gz
+EXTRACT_ONLY=	Csound${PORTVERSION}.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
@@ -39,10 +35,6 @@ post-build:
 		${ECHO} bin/`${BASENAME} $${i}` >> ${PLIST}; \
 	done
 	${ECHO} share/csound/csound.dat >> ${PLIST}
-.if !defined(NOPORTDOCS)
-	${ECHO} share/doc/csound/Version${PORTVERSION:S/./_/}.Notes >> ${PLIST}
-	${ECHO} "@dirrm share/doc/csound" >> ${PLIST}
-.endif
 	${ECHO} "@dirrm share/csound" >> ${PLIST}
 
 post-patch:
@@ -50,11 +42,6 @@ post-patch:
 
 do-install:
 	${MKDIR} ${PREFIX}/share/csound
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/csound
-	${INSTALL_DATA} ${_DISTDIR}/Version${PORTVERSION:S/./_/}.Notes \
-		${PREFIX}/share/doc/csound
-.endif
 	${INSTALL_DATA} ${WRKSRC}/csound.txt ${PREFIX}/share/csound/csound.dat
 	for i in `find ${WRKDIR} -type f -perm 755`; do \
 		${INSTALL_PROGRAM} $${i} ${PREFIX}/bin ; \
diff --git a/audio/csound/distinfo b/audio/csound/distinfo
index 455ec939b55f..805295231149 100644
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@@ -1,2 +1 @@
-MD5 (csound/Csound.tar.gz) = 79995aa525d2b3ce6c21d148de5a660a
-MD5 (csound/Version4_08.Notes) = 8d60c60237f2142f28ce5304ee7bd81a
+MD5 (csound/Csound4.11.tar.gz) = a26c513217ffed56882c30c540885378
diff --git a/audio/csound/files/patch-Makefile b/audio/csound/files/patch-Makefile
index 162ae80e8285..d9a9d57ae0e5 100644
--- a/audio/csound/files/patch-Makefile
+++ b/audio/csound/files/patch-Makefile
@@ -1,16 +1,17 @@
---- Makefile.orig	Wed Sep 20 09:29:02 2000
-+++ Makefile	Wed Oct 11 18:17:37 2000
-@@ -1,17 +1,17 @@
+--- Makefile.orig	Fri Jan  5 04:38:27 2001
++++ Makefile	Sun Jan 21 18:52:58 2001
+@@ -1,18 +1,18 @@
  #								Csound Makefile
  # edit the following definitions according to need:
  
 -INCLUDE	= /usr/local/include
 -LIB	= /usr/local/lib
 -DEST	= /usr/local/bin
--MAN	= /usr/local/man
 +INCLUDE	= $(PREFIX)/include
 +LIB	= $(PREFIX)/lib
 +DEST	= $(PREFIX)/bin
+ SHARE	= /usr/share/csound
+-MAN	= /usr/local/man
 +MAN	= $(PREFIX)/man
  MAN1	= $(MAN)/man1
  CAT1	= $(MAN)/cat1
@@ -23,46 +24,35 @@
  # choose either -
  #	CDEP =			for UNIX
  #	COBS = $(COBJS)
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,8 @@
  #	.c.o:
  #		$(CC) $(CFLAGS) -c $*.c -o $@
  
--DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DSGI -DPIPES -DMACROS
-+DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DPIPES -DMACROS -DLINUX -DFREE_BSD
+-DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DLINUX -DPIPES -DMACROS -DTCLTK
++DEFINES = -DWINDOWS -DRTAUDIO -DSFIRCAM -DSYS5 -DPIPES -DMACROS -DLINUX -DFREE_BSD -DTCLTK
++
  # choose any of -
  #	-DSYS5	    invoke System 5 headers (e.g. 'string.h' for 'strings.h')
  #	-DWINDOWS   include window system calls (X11, SGI, or FG graphics)
-@@ -53,7 +53,7 @@
+@@ -52,7 +53,7 @@
  # Be sure to include 'LINUXaudio.o' under 'AUDOBJ' below as well.
  #                                  --  Jonathan Mohr  1995 Oct 17
  
--CFLAGS = -O2 $(DEFINES)
-+CFLAGS += $(CPPFLAGS) $(DEFINES) $(LDFLAGS)
+-CFLAGS = -O2 $(RPM_OPT_FLAGS) $(DEFINES)
++CFLAGS += -g $(CPPFLAGS) $(DEFINES) $(LDFLAGS)
  #	-O		Simple optimisation
  #	-O2		to be more specific about the optimization level
  #	-f		compile single-precision floats (4.3,VAX,DEC-RISC)
-@@ -74,7 +74,7 @@
+@@ -73,7 +74,7 @@
  #	-I/usr/openwin/include		Solaris openwin interface
  #	-I/usr/demo/SOUND/include	Solaris sound interface
  
--LIBS =	-lX11 -laudio -lm 
-+LIBS =	-lX11 -lXt -laudio -lm -ltcl83 -ltk83
+-LIBS =	-L /usr/X11R6/lib -lX11 -lbsd -ltcl -ltk -lm 
++LIBS =	-L$(X11BASE)/lib -L$(LOCALBASE)/lib -lX11 -ltcl83 -ltk83 -lm 
  #	-lefence
  #	-lm		    		required
  #	-lX11				for X window calls
-@@ -99,8 +99,9 @@
- #	winfg.o 	for PC  Flash Graphics
- 
- 
--AUDSRC = rtSGI.c SGIplay.c
--AUDOBJ = rtSGI.o SGIplay.o
-+AUDSRC = rtlinux.c LINUXaudio.c
-+AUDOBJ = rtlinux.o LINUXaudio.o
-+
- # ;if RTAUDIO enabled in DEFINES, include one of
- #	rtaudio.o		general interface to audio handlers & libraries
- #	rtDEC.c		rtSGI.c		rtHP.c		rtSUN.c
-@@ -235,7 +236,7 @@
+@@ -236,7 +237,7 @@
  all:		$(PROGS) $(SUBDIRS)            	#must be run in this order
  
  csound:		$(COBJS) $(CSUM) $(CDEP) csound.txt
@@ -71,16 +61,27 @@
  
  TAGS:	$(CSRCS) $(HDRS)
  		etags $(CSRCS) $(HDRS)
-@@ -261,10 +262,10 @@
- 	$(CC) -o makedb makedb.c
- 
- entry.o:
--	$(CC) -Wf,-XNp8000 $(CFLAGS) -c entry.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c entry.c
+@@ -335,15 +336,15 @@
+ 		cd midifils; rm -f *.bak *~
+ 		cd cscofils; rm -f *.bak *~
  
- .c.o:
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c
+-CSLinux.bin.tgz: /usr/local/bin/csound /usr/local/bin/hetro \
+-	/usr/local/bin/lpanal /usr/local/bin/pvanal /usr/local/bin/scot \
+-	/usr/local/bin/scsort /usr/local/bin/extract /usr/local/bin/sndinfo \
+-	/usr/local/bin/scale /usr/local/bin/mixer /usr/local/bin/extractor \
+-	/usr/local/bin/envext /usr/local/bin/pvlook /usr/local/bin/sdif2ad \
+-	/usr/local/bin/dnoise /usr/local/bin/srconv /usr/local/lib/csound.txt
+-	(cd /usr/local/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \
++CSLinux.bin.tgz: $(PREFIX)/bin/csound $(PREFIX)/bin/hetro \
++	$(PREFIX)/bin/lpanal $(PREFIX)/bin/pvanal $(PREFIX)/bin/scot \
++	$(PREFIX)/bin/scsort $(PREFIX)/bin/extract $(PREFIX)/bin/sndinfo \
++	$(PREFIX)/bin/scale $(PREFIX)/bin/mixer $(PREFIX)/bin/extractor \
++	$(PREFIX)/bin/envext $(PREFIX)/bin/pvlook $(PREFIX)/bin/sdif2ad \
++	$(PREFIX)/bin/dnoise $(PREFIX)/lib/csound.txt
++	(cd $(PREFIX)/bin; tar cvzf ~/csound/CSLinux.bin.tgz csound \
+ 	hetro lpanal pvanal scot scsort extract sndinfo scale mixer \
+-	extractor envext pvlook sdif2ad dnoise srconv -C /usr/local/lib csound.txt)
++	extractor envext pvlook sdif2ad dnoise -C $(PREFIX)/lib csound.txt)
  
- ADSYNS = hetro 						#targets in anal/adsyn
- LPCS = lpanal						#targets in anal/lpc
+ Csound.tar.gz:  all_files \
+ 	$(CSRCS) $(HDRS) \