- Update to 5.11.1

PR:		139991
Submitted by:	Chris Petrik <chris@officialunix.com> (maintainer)

audio/csound/Makefile

@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	csound
-PORTVERSION=	5.07
-PORTREVISION=	1
+PORTVERSION=	5.11.1
 CATEGORIES=	audio lang
-MASTER_SITES=	http://garr.dl.sourceforge.net/sourceforge/csound/:src \
-		${MASTER_SITE_LOCAL:S/$/:manual/}
-MASTER_SITE_SUBDIR=	${PORTNAME:S/$/:src/} wxs/:manual
-DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}.0
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.11/:src \
+		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual
+# Developer does not include a newer version of the manual.
+MASTER_SITE_SUBDIR=	${PORTNAME:S/$/:src/}
+DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
 DIST_SUBDIR=	csound
 
@@ -24,26 +24,31 @@ LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 
-WRKSRC=		${WRKDIR}/csound5
-USE_PYTHON=	2.4+
+WRKSRC=		${WRKDIR}/${DISTNAME}/
+USE_PYTHON=	2.6+
 USE_SCONS=	yes
 SCONS_ARGS+=	prefix=${PREFIX} CC=${CC} CXX=${CXX} \
 		usePortAudio=0 usePortMIDI=0 useALSA=0 \
 		useJack=0 useFLTK=1 buildCsoundAC=0 buildCsoundVST=0 \
 		buildCsound5GUI=1 buildRelease=1 install=1 \
 		useCoreAudio=1 buildWinsound=1 buildInterfaces=1 \
-		buildVirtual=1 buildCSEditor=1 buildDSSI=0
+		buildVirtual=1 buildCSEditor=1 buildDSSI=0 \
+		useGettext=1 dynamicCsoundLibrary=1 useDouble=1
+USE_GETTEXT=	yes
 SUB_FILES=	custom.py pkg-message
 SUB_LIST+=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_LDCONFIG=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-USE_LDCONFIG=	${PREFIX}/lib/csound/plugins
+# Please note:
+# This option is not needed, if the specific port or new port
+# does not support double float.
+# This was only added to please audio/smasher.
 
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
-DISTFILES+=	${DISTNAME}-manual.tar.gz:manual
+BUILD_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+DISTFILES+=	Csound5.10_manual_html.zip:manual
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -65,10 +70,14 @@ post-patch: apply-slist
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/csound-manual/tutorial_${PORTVERSION}.pdf ${DOCSDIR}
-	${CP} -r ${WRKDIR}/csound-manual/html ${DOCSDIR}
+	@${ECHO_MSG} " Installing the manual."
+	cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${DOCSDIR}
+	@${ECHO_MSG} " Done."
 .endif
+	@${ECHO_MSG} " Moving ${PREFIX}/bin/mixer to ${PREFIX}/bin/csmixer"
+	@${ECHO_MSG} " This is to prevent conflicts with /usr/bin/mixer"
 	${MV} ${PREFIX}/bin/mixer ${PREFIX}/bin/csmixer
+	@${ECHO_MSG} " Done."
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

audio/csound/distinfo

@@ -1,6 +1,6 @@
-MD5 (csound/Csound5.07.0.tar.gz) = 29b2c8d4fbe866e50a70bc6d7a7c96af
-SHA256 (csound/Csound5.07.0.tar.gz) = d5fa1905163b5f389feba9a01e655ea1f97fbd7c782f05b3e99e653d185f3d6c
-SIZE (csound/Csound5.07.0.tar.gz) = 2972932
-MD5 (csound/Csound5.07.0-manual.tar.gz) = 44085d7e054cf63ee88a6288e5770fce
-SHA256 (csound/Csound5.07.0-manual.tar.gz) = e620e2497dc776742c9da318e3280732251aa520b1a140d1774c97aa39c6d11e
-SIZE (csound/Csound5.07.0-manual.tar.gz) = 10546817
+MD5 (csound/Csound5.11.1.tar.gz) = 12d56dcead29004b4d0d052c2a1fbdb8
+SHA256 (csound/Csound5.11.1.tar.gz) = e011c47c067df6d020f7927dc1cb951e8ea4ca81a8f058fdf74e3b827ae202d8
+SIZE (csound/Csound5.11.1.tar.gz) = 6073214
+MD5 (csound/Csound5.10_manual_html.zip) = e1eba0da11cfc1d85ef2113a81af91eb
+SHA256 (csound/Csound5.10_manual_html.zip) = 2c544a1bda8897a8364fa806109bdfca6f9e01495bace014d207db145f8324b1
+SIZE (csound/Csound5.10_manual_html.zip) = 5381988

audio/csound/files/custom.py.in

@@ -4,8 +4,8 @@ import sys
 
 customCPPPATH = [ '%%LOCALBASE%%/include', '%%PYTHON_INCLUDEDIR%%' ]
 customCCFLAGS = [  ]
-customCXXFLAGS = [  ]
-customLIBS = []
+customCXXFLAGS = [ ]
+customLIBS = [ '-lintl' ]
 customLIBPATH = [ '%%LOCALBASE%%/lib/portaudio2', '%%LOCALBASE%%/lib' ]
 customSHLINKFLAGS = []
 customSWIGFLAGS = []

audio/csound/files/patch-SConstruct

@@ -0,0 +1,11 @@
+--- SConstruct.bak	2009-10-26 06:07:13.000000000 -0600
++++ SConstruct	2009-10-26 06:07:29.000000000 -0600
+@@ -1357,7 +1357,7 @@
+     print 'CONFIGURATION DECISION: Building Csound C++ interface library.'
+     csoundInterfacesEnvironment.Append(CPPPATH = ['interfaces'])
+     csoundInterfacesSources = []
+-    headers += ['csPerfThread.hpp']
++    headers += ['interfaces/csPerfThread.hpp']
+     for i in Split('CppSound CsoundFile Soundfile csPerfThread cs_glue filebuilding'):
+         csoundInterfacesSources.append(csoundInterfacesEnvironment.SharedObject('interfaces/%s.cpp' % i))
+     if commonEnvironment['dynamicCsoundLibrary'] == '1' or getPlatform() == 'win32':

audio/csound/files/patch-Top-csound.c

@@ -1,64 +1,63 @@
---- Top/csound.c.orig	2007-06-03 04:03:48.000000000 +0200
-+++ Top/csound.c	2007-09-10 00:52:03.000000000 +0200
-@@ -54,6 +54,7 @@
+--- Top/csound.c.old	2009-10-15 16:24:10.000000000 -0500
++++ Top/csound.c	2009-10-15 16:25:28.000000000 -0500
+@@ -58,6 +58,7 @@
  #include "namedins.h"
  #include "pvfileio.h"
  #include "fftlib.h"
 +#include <sys/sysctl.h>
  
- extern void MakeAscii(CSOUND *, WINDAT *, const char *);
- extern void DrawAscii(CSOUND *, WINDAT *);
-@@ -2444,46 +2445,17 @@
+   extern void MakeAscii(CSOUND *, WINDAT *, const char *);
+   extern void DrawAscii(CSOUND *, WINDAT *);
+@@ -2566,46 +2567,17 @@
    static int getTimeResolution(void)
    {
  #if defined(HAVE_RDTSC)
--    FILE    *f;
--    char    buf[256];
-+		size_t size;
-+		int timeResolutionSeconds;
-+		size = sizeof timeResolutionSeconds;
-+		sysctlbyname("hw.clockrate", &timeResolutionSeconds, &size, NULL, 0);
+-      FILE    *f;
+-      char    buf[256];
++     size_t size;
++     int timeResolutionSeconds;
++     size = sizeof timeResolutionSeconds;
++     sysctlbyname("hw.clockrate", &timeResolutionSeconds, &size, NULL, 0);
  
--    /* if frequency is not known yet */
--    f = fopen("/proc/cpuinfo", "r");
--    if (f == NULL) {
--      fprintf(stderr, "Cannot open /proc/cpuinfo. "
--                      "Support for RDTSC is not available.\n");
--      return -1;
--    }
--    /* find CPU frequency */
--    while (fgets(buf, 256, f) != NULL) {
--      int     i;
--      char    *s = (char*) buf - 1;
--
--      buf[255] = '\0';          /* safety */
--      if (strlen(buf) < 9)
--        continue;                       /* too short, skip */
--      while (*++s != '\0')
--        if (isupper(*s))
--          *s = tolower(*s);             /* convert to lower case */
--      if (strncmp(buf, "cpu mhz", 7) != 0)
--        continue;                       /* check key name */
--      s = strchr(buf, ':');             /* find frequency value */
--      if (s == NULL) continue;              /* invalid entry */
--      do {
--        s++;
--      } while (*s == ' ' || *s == '\t');    /* skip white space */
--      i = sscanf(s, "%lf", &timeResolutionSeconds);
--      if (i < 1 || timeResolutionSeconds < 1.0) {
--        timeResolutionSeconds = -1.0;       /* invalid entry */
--        continue;
+-      /* if frequency is not known yet */
+-      f = fopen("/proc/cpuinfo", "r");
+-      if (UNLIKELY(f == NULL)) {
+-        fprintf(stderr, Str("Cannot open /proc/cpuinfo. "
+-                            "Support for RDTSC is not available.\n"));
+-        return -1;
 -      }
--    }
--    fclose(f);
--    if (timeResolutionSeconds <= 0.0) {
-+		if (timeResolutionSeconds <= 0.0) {
-       fprintf(stderr, "No valid CPU frequency entry "
--                      "was found in /proc/cpuinfo.\n");
-+                      "was found.\n");
-       return -1;
-     }
-+		
-     /* MHz -> seconds */
-     timeResolutionSeconds = 0.000001 / timeResolutionSeconds;
+-      /* find CPU frequency */
+-      while (fgets(buf, 256, f) != NULL) {
+-        int     i;
+-        char    *s = (char*) buf - 1;
+-
+-        buf[255] = '\0';          /* safety */
+-        if (strlen(buf) < 9)
+-          continue;                       /* too short, skip */
+-        while (*++s != '\0')
+-          if (isupper(*s))
+-            *s = tolower(*s);             /* convert to lower case */
+-        if (strncmp(buf, "cpu mhz", 7) != 0)
+-          continue;                       /* check key name */
+-        s = strchr(buf, ':');             /* find frequency value */
+-        if (s == NULL) continue;              /* invalid entry */
+-        do {
+-          s++;
+-        } while (*s == ' ' || *s == '\t');    /* skip white space */
+-        i = sscanf(s, "%lf", &timeResolutionSeconds);
+-        if (i < 1 || timeResolutionSeconds < 1.0) {
+-          timeResolutionSeconds = -1.0;       /* invalid entry */
+-          continue;
+-        }
+-      }
+-      fclose(f);
+       if (UNLIKELY(timeResolutionSeconds <= 0.0)) {
+         fprintf(stderr, Str("No valid CPU frequency entry "
+-                            "was found in /proc/cpuinfo.\n"));
++                            "was found \n"));
+         return -1;
+       }
++
+       /* MHz -> seconds */
+       timeResolutionSeconds = 0.000001 / timeResolutionSeconds;
  #elif defined(WIN32)

audio/csound/files/pkg-message.in

@@ -1,4 +1,4 @@
-=====================================================================
+===================-Please Note:-====================================
 %%PREFIX%%/bin/mixer has been renamed to %%PREFIX%%/bin/cs_mixer so it
 won't conflict with /usr/bin/mixer
 =====================================================================