Update csound4 to install into its own directory, in preparation for

coexistence with csound5.  Bump pkgrevision.

6 files changed, 223 insertions, 56 deletions

diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
index 6a0952e9ef1..0d03bb70686 100644
--- a/audio/csound4/Makefile
+++ b/audio/csound4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/05/15 18:42:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/05/21 22:29:09 ben Exp $
 #
 
 DISTNAME=		csound-4.23f13gbs.0
 PKGNAME=		csound4-4.23.13.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=csound/}
 
@@ -19,11 +19,15 @@ USE_TOOLS+=		gmake makeinfo
 GNU_CONFIGURE=		yes
 TEXINFO_REQD=		4.2
 CONFIGURE_ARGS+=	--enable-debug
+CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/csound4
 CFLAGS+=		-g
 INFO_FILES=		# PLIST
 
 NOT_FOR_PLATFORM=	*-*-alpha *-*-sparc64	# Severe LP64 problems
 
+post-install:
+	cd ${PREFIX} && ${LN} -s ../lib/csound4/csound bin/csound4
+
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound4/PLIST b/audio/csound4/PLIST
index 39aa783d45f..35da6b556e9 100644
--- a/audio/csound4/PLIST
+++ b/audio/csound4/PLIST
@@ -1,54 +1,55 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/30 03:44:41 jlam Exp $
-bin/csound
-bin/csound-config
-bin/cvanal
-bin/dnoise
-bin/envext
-bin/extract
-bin/extractor
-bin/flcsound
-bin/het_export
-bin/het_import
-bin/hetro
-bin/lpanal
-bin/lpc_export
-bin/mixer
-bin/pv_export
-bin/pv_import
-bin/pvanal
-bin/pvlook
-bin/scale
-bin/scot
-bin/scsort
-bin/sdif2ad
-bin/sndinfo
-bin/srconv
-include/csound/OpcodeBase.hpp
-include/csound/autoheader.h
-include/csound/config.h
-include/csound/cs.h
-include/csound/cscore.h
-include/csound/csound.h
-include/csound/cwindow.h
-include/csound/midiops.h
-include/csound/midiops2.h
-include/csound/opcode.h
-include/csound/prototyp.h
-include/csound/sort.h
-include/csound/sysdep.h
-include/csound/text.h
-include/csound/version.h
+@comment $NetBSD: PLIST,v 1.4 2006/05/21 22:29:09 ben Exp $
+bin/csound4
+lib/csound4/csound
+lib/csound4/csound-config
+lib/csound4/cvanal
+lib/csound4/dnoise
+lib/csound4/envext
+lib/csound4/extract
+lib/csound4/extractor
+lib/csound4/flcsound
+lib/csound4/het_export
+lib/csound4/het_import
+lib/csound4/hetro
+lib/csound4/lpanal
+lib/csound4/lpc_export
+lib/csound4/mixer
+lib/csound4/pv_export
+lib/csound4/pv_import
+lib/csound4/pvanal
+lib/csound4/pvlook
+lib/csound4/scale
+lib/csound4/scot
+lib/csound4/scsort
+lib/csound4/sdif2ad
+lib/csound4/sndinfo
+lib/csound4/srconv
+include/csound4/OpcodeBase.hpp
+include/csound4/autoheader.h
+include/csound4/config.h
+include/csound4/cs.h
+include/csound4/cscore.h
+include/csound4/csound.h
+include/csound4/cwindow.h
+include/csound4/midiops.h
+include/csound4/midiops2.h
+include/csound4/opcode.h
+include/csound4/prototyp.h
+include/csound4/sort.h
+include/csound4/sysdep.h
+include/csound4/text.h
+include/csound4/version.h
 info/csoundgbs.info
-lib/csound/gabops.la
-lib/csound/metro.la
-lib/csound/newfils.la
-lib/csound/syncgrain.la
-lib/csound/vectorial.la
-lib/libcscore.a
-lib/libcsound.la
-share/csound/csound.xmg
-share/csound/csoundgbs.html
-share/csound/flcsound.html
-@dirrm share/csound
-@dirrm lib/csound
-@dirrm include/csound
+lib/csound4/gabops.la
+lib/csound4/metro.la
+lib/csound4/newfils.la
+lib/csound4/syncgrain.la
+lib/csound4/vectorial.la
+lib/csound4/libcscore.a
+lib/csound4/libcsound.la
+share/csound4/csound.xmg
+share/csound4/csoundgbs.html
+share/csound4/flcsound.html
+@dirrm share/csound4
+@dirrm lib/csound4
+@dirrm include/csound4
diff --git a/audio/csound4/distinfo b/audio/csound4/distinfo
index 0b84729efcc..4b5a3ee605c 100644
--- a/audio/csound4/distinfo
+++ b/audio/csound4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/11/10 10:30:03 rillig Exp $
+$NetBSD: distinfo,v 1.9 2006/05/21 22:29:09 ben Exp $
 
 SHA1 (csound/csound-4.23f13gbs.0.tar.gz) = 2f86efb6e53f43cd16a6cfb0ff9a0786982f7af9
 RMD160 (csound/csound-4.23f13gbs.0.tar.gz) = 46e161975afbf68f5591842e2921ea1822df30b2
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = 3b1301614e80c9ace2a39c8385162bb8896f6c27
 SHA1 (patch-ae) = c4d1d57ffdcf6b091253d6e4523bdc8ff7f955f7
 SHA1 (patch-af) = dfb30631b332da5c2557cc8e2ef18679d12697d5
 SHA1 (patch-ag) = a3563963001e7b1fe9081e3137fdfc35c8ea953b
+SHA1 (patch-ah) = 4bd7cc1935be17c4d4629d1b59e93c9836868a04
+SHA1 (patch-ai) = b53a6e8fdb4cb53dd07ab122023f0bf291c350d3
+SHA1 (patch-aj) = fa3c05b0c5e24775d5c05838177fcec943809b35
diff --git a/audio/csound4/patches/patch-ah b/audio/csound4/patches/patch-ah
new file mode 100644
index 00000000000..5eaf940825f
--- /dev/null
+++ b/audio/csound4/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2006/05/21 22:29:09 ben Exp $
+
+--- csound/Makefile.am.orig	2005-03-24 18:55:53.000000000 -0800
++++ csound/Makefile.am
+@@ -1,10 +1,9 @@
+ bin_SCRIPTS = csound-config
+ bin_PROGRAMS = csound sdif2ad het_export het_import lpc_export	\
+ pv_export pv_import 
+-lib_LTLIBRARIES = libcsound.la 
+ pkglib_LTLIBRARIES = gabops.la metro.la newfils.la syncgrain.la	\
+-vectorial.la
+-lib_LIBRARIES = libcscore.a
++vectorial.la libcsound.la
++pkglib_LIBRARIES = libcscore.a
+ noinst_LIBRARIES = libanalutils.a
+ noinst_PROGRAMS = makedb
+ pkgdata_DATA = csound.xmg
diff --git a/audio/csound4/patches/patch-ai b/audio/csound4/patches/patch-ai
new file mode 100644
index 00000000000..9379fc1233f
--- /dev/null
+++ b/audio/csound4/patches/patch-ai
@@ -0,0 +1,129 @@
+$NetBSD: patch-ai,v 1.1 2006/05/21 22:29:09 ben Exp $
+
+--- csound/Makefile.in.orig	2005-05-20 15:11:23.000000000 -0700
++++ csound/Makefile.in
+@@ -68,8 +68,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ 	"$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
+ 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" \
+ 	"$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES)
++pkglibLIBRARIES_INSTALL = $(INSTALL_DATA)
++LIBRARIES = $(lib_LIBRARIES) $(noinst_LIBRARIES) $(pkglib_LIBRARIES)
+ ARFLAGS = cru
+ libanalutils_a_AR = $(AR) $(ARFLAGS)
+ am_libanalutils_a_OBJECTS = libanalutils_a-aifc.$(OBJEXT) \
+@@ -401,11 +401,10 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ bin_SCRIPTS = csound-config
+-lib_LTLIBRARIES = libcsound.la 
+ pkglib_LTLIBRARIES = gabops.la metro.la newfils.la syncgrain.la	\
+-vectorial.la
++vectorial.la libcsound.la
+ 
+-lib_LIBRARIES = libcscore.a
++pkglib_LIBRARIES = libcscore.a
+ noinst_LIBRARIES = libanalutils.a
+ pkgdata_DATA = csound.xmg
+ pkginclude_HEADERS = csound.h cwindow.h opcode.h sysdep.h autoheader.h	\
+@@ -600,35 +599,35 @@ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+ csound-config: $(top_builddir)/config.status $(srcdir)/csound-config.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-install-libLIBRARIES: $(lib_LIBRARIES)
++install-pkglibLIBRARIES: $(pkglib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
++	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+-	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
++	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    p=$(am__strip_dir) \
+-	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
+-	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
++	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
++	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-libLIBRARIES:
++uninstall-pkglibLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
++	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ 	done
+ 
+ clean-libLIBRARIES:
+-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
++	-test -z "$(pkglib_LIBRARIES)" || rm -f $(pkglib_LIBRARIES)
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+@@ -3124,7 +3123,7 @@ maintainer-clean-generic:
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
++clean-am: clean-binPROGRAMS clean-generic clean-pkglibLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool clean-noinstLIBRARIES \
+ 	clean-noinstPROGRAMS clean-pkglibLTLIBRARIES mostlyclean-am
+ 
+@@ -3148,7 +3147,7 @@ install-data-am: install-nodist_pkginclu
+ 	install-pkgincludeHEADERS
+ 
+ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+-	install-libLIBRARIES install-libLTLIBRARIES \
++	install-pkglibLIBRARIES install-libLTLIBRARIES \
+ 	install-pkglibLTLIBRARIES
+ 
+ install-info: install-info-am
+@@ -3176,20 +3175,20 @@ ps: ps-am
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+-	uninstall-info-am uninstall-libLIBRARIES \
++	uninstall-info-am uninstall-pkglibLIBRARIES \
+ 	uninstall-libLTLIBRARIES uninstall-nodist_pkgincludeHEADERS \
+ 	uninstall-pkgdataDATA uninstall-pkgincludeHEADERS \
+ 	uninstall-pkglibLTLIBRARIES
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+-	clean-generic clean-libLIBRARIES clean-libLTLIBRARIES \
++	clean-generic clean-pkglibLIBRARIES clean-libLTLIBRARIES \
+ 	clean-libtool clean-noinstLIBRARIES clean-noinstPROGRAMS \
+ 	clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
+ 	distclean-generic distclean-hdr distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-binPROGRAMS install-binSCRIPTS \
+ 	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-libLIBRARIES \
++	install-info install-info-am install-pkglibLIBRARIES \
+ 	install-libLTLIBRARIES install-man \
+ 	install-nodist_pkgincludeHEADERS install-pkgdataDATA \
+ 	install-pkgincludeHEADERS install-pkglibLTLIBRARIES \
+@@ -3198,7 +3197,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
+-	uninstall-libLIBRARIES uninstall-libLTLIBRARIES \
++	uninstall-pkglibLIBRARIES uninstall-libLTLIBRARIES \
+ 	uninstall-nodist_pkgincludeHEADERS uninstall-pkgdataDATA \
+ 	uninstall-pkgincludeHEADERS uninstall-pkglibLTLIBRARIES
+ 
diff --git a/audio/csound4/patches/patch-aj b/audio/csound4/patches/patch-aj
new file mode 100644
index 00000000000..692d7d5bac8
--- /dev/null
+++ b/audio/csound4/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2006/05/21 22:29:09 ben Exp $
+
+--- configure.orig	2006-05-20 10:58:05.000000000 -0700
++++ configure
+@@ -1849,7 +1849,7 @@ fi
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='csound'
++ PACKAGE='csound4'
+  VERSION='4.23f13gbs.0'
+ 
+