Update to 0.4.15

* Update dependencies.
* Use cmake instead of configure.
* Use qt4 instead of qt3.
* Set LICENSE.

Changelog:
* Many GUI improvements.
* Translation updates.
* Many new features.
* Bugfixes.

13 files changed, 159 insertions, 178 deletions

diff --git a/audio/lmms/patches/patch-CMakeLists.txt b/audio/lmms/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..82b6ac8c65e
--- /dev/null
+++ b/audio/lmms/patches/patch-CMakeLists.txt
@@ -0,0 +1,45 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+* Install plain (un-gzipped) man page.
+* 
+
+--- CMakeLists.txt.orig	2013-06-11 20:57:16.000000000 +0000
++++ CMakeLists.txt
+@@ -417,9 +417,7 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} 
+ LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
+ LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})
+ 
+-ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz")
+-
+-ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz)
++ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1)
+ 
+ IF(LMMS_BUILD_WIN32)
+ 
+@@ -453,7 +451,7 @@ ELSE(LMMS_BUILD_WIN32)
+ 	ENDIF(NOT LMMS_BUILD_APPLE)
+ 
+ 	INSTALL(TARGETS lmms RUNTIME DESTINATION bin)
+-	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
++	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ 
+ ENDIF(LMMS_BUILD_WIN32)
+ 
+@@ -507,7 +505,7 @@ ENDIF(LMMS_BUILD_WIN32)
+ #
+ ADD_CUSTOM_TARGET(distclean
+ 			COMMAND make clean
+-			COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz)
++			COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1)
+ 
+ #
+ # add tarball-target
+@@ -557,7 +555,7 @@ ADD_CUSTOM_TARGET(win32-pkg
+ )
+ 
+ 
+-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1")
+ 
+ 
+ #
diff --git a/audio/lmms/patches/patch-aa b/audio/lmms/patches/patch-aa
deleted file mode 100644
index f5e1728d5f9..00000000000
--- a/audio/lmms/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
-Since some systems (among them NetBSD 3.0) don't have a log2f function,
-precompute the values.
-
---- plugins/organic/organic.cpp.orig	2006-07-03 08:34:22.000000000 +0200
-+++ plugins/organic/organic.cpp	2006-07-23 12:07:40.000000000 +0200
-@@ -106,14 +106,14 @@ organicInstrument::organicInstrument( in
- 
- 	m_osc = new oscillatorData[m_num_oscillators];
- 	
--	m_osc[0].harmonic = log2f( 0.5f );	//	one octave below
--	m_osc[1].harmonic = log2f( 0.75f );	//	a fifth below
--	m_osc[2].harmonic = log2f( 1.0f );	// base freq
--	m_osc[3].harmonic = log2f( 2.0f );	// first overtone
--	m_osc[4].harmonic = log2f( 3.0f );	// second overtone
--	m_osc[5].harmonic = log2f( 4.0f );	// .
--	m_osc[6].harmonic = log2f( 5.0f );	// .
--	m_osc[7].harmonic = log2f( 6.0f );	// .
-+	m_osc[0].harmonic = -1.0000000f;	//	one octave below
-+	m_osc[1].harmonic = -0.4150375f;	//	a fifth below
-+	m_osc[2].harmonic =  0.0000000f;	// base freq
-+	m_osc[3].harmonic =  1.0000000f;	// first overtone
-+	m_osc[4].harmonic =  1.5849625f;	// second overtone
-+	m_osc[5].harmonic =  2.0000000f;	// .
-+	m_osc[6].harmonic =  2.3219281f;	// .
-+	m_osc[7].harmonic =  2.5849625f;	// .
- 
- 	for (int i=0; i < m_num_oscillators; i++)
- 	{
diff --git a/audio/lmms/patches/patch-ab b/audio/lmms/patches/patch-ab
deleted file mode 100644
index f66fb27197f..00000000000
--- a/audio/lmms/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
---- plugins/vibed/vibrating_string.cpp.orig	2006-07-23 12:20:50.000000000 +0200
-+++ plugins/vibed/vibrating_string.cpp	2006-07-23 13:07:47.000000000 +0200
-@@ -23,6 +23,18 @@
-  */
- #include <math.h>
- 
-+/* These two headers need to be included very early to work around a
-+ * parse error in g++-3.3.3:
-+ *
-+ * g++/bits/stl_pair.h: In function `bool std::operator<(const std::pair<_T1, _T2>&, const std::pair<_T1, _T2>&)':
-+ * g++/bits/stl_pair.h:103: error: parse error before `)' token
-+ *
-+ * qt3/include/qpair.h: In function `bool operator<(const QPair<T1, T2>&, const QPair<T1, T2>&)':
-+ * qt3/include/qpair.h:80: error: parse error before `)' token
-+ */
-+#include <utility>
-+#include <qpair.h>
-+
- #include "vibrating_string.h"
- #include "templates.h"
- #include "interpolation.h"
diff --git a/audio/lmms/patches/patch-ac b/audio/lmms/patches/patch-ac
deleted file mode 100644
index 4affbc50edc..00000000000
--- a/audio/lmms/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
-Not every system needs -ldl.
-
---- Makefile.in.orig	2006-07-19 11:47:47.000000000 +0200
-+++ Makefile.in	2006-07-23 13:30:16.000000000 +0200
-@@ -571,7 +571,7 @@ CLEANFILES = $(lmms_MOC) ./embedded_reso
- @HAVE_LIBVORBIS_TRUE@LIB_VORBIS_LDADD = -lvorbis -lvorbisenc -lvorbisfile
- @HAVE_LIBSRC_TRUE@LIB_SRC_LDADD = -lsamplerate
- @HAVE_LIBSF_TRUE@LIB_SF_LDADD = -lsndfile
--lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl
-+lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) $(LIBS)
- lmms_LDFLAGS = -rdynamic
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/audio/lmms/patches/patch-ad b/audio/lmms/patches/patch-ad
deleted file mode 100644
index 224eb22db80..00000000000
--- a/audio/lmms/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/07/23 11:50:25 rillig Exp $
-
---- src/audio/audio_oss.cpp.orig	2006-07-10 09:28:46.000000000 +0200
-+++ src/audio/audio_oss.cpp	2006-07-23 13:46:10.000000000 +0200
-@@ -84,7 +84,7 @@
- 
- 
- #ifndef _PATH_DEV_DSP
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #define _PATH_DEV_DSP  "/dev/audio"
- #else
- #define _PATH_DEV_DSP  "/dev/dsp"
diff --git a/audio/lmms/patches/patch-ae b/audio/lmms/patches/patch-ae
deleted file mode 100644
index 78f32cda169..00000000000
--- a/audio/lmms/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/08/22 14:29:07 joerg Exp $
-
---- plugins/vestige/Makefile.in.orig	2006-08-22 16:13:41.000000000 +0000
-+++ plugins/vestige/Makefile.in
-@@ -241,7 +241,7 @@ EXTRA_DIST = $(EMBEDDED_RESOURCES)
- pkglib_LTLIBRARIES = libvestige.la
- libvestige_la_SOURCES = vestige.cpp vestige.h lvsl_client.cpp lvsl_client.h
- lvsl_server_SOURCES = lvsl_server.c communication.h
--lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 -lpthread -o $(pkglib_PROGRAMS)
-+lvsl_server_LDFLAGS = -mwindows -L/usr/X11R6/lib -lX11 ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -o $(pkglib_PROGRAMS)
- lvsl_server_LINK = wineg++
- nobase_pkglib_DATA = $(pkglib_PROGRAMS).exe.so
- CLEANFILES = $(MOC_FILES) ./embedded_resources.h $(nobase_pkglib_DATA)
diff --git a/audio/lmms/patches/patch-af b/audio/lmms/patches/patch-af
deleted file mode 100644
index 5ca03d52c48..00000000000
--- a/audio/lmms/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/10/10 20:13:48 rillig Exp $
-
---- configure.orig	2006-07-19 10:34:35.000000000 +0200
-+++ configure	2006-10-10 22:12:44.000000000 +0200
-@@ -21822,7 +21822,7 @@ fi
- 
- if test x"$QT_IS_MT" = "xyes" ; then
-         QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
--	QT_LIBS="$QT_LIBS -lpthread"
-+	QT_LIBS="$QT_LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
- if test x"$QT_TRANSLATIONS" != x ; then
-@@ -24717,7 +24717,7 @@ done
- 
- 
- OLD_LIBS="$LIBS"
--LIBS="$LIBS -lpthread"
-+LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- 
- # check for SDL-lib
- 
-@@ -28912,7 +28912,7 @@ lmmsdatadir="$datadir/$PACKAGE"
- 
- #CFLAGS="$CXXFLAGS -g -O2"
- #CXXFLAGS="$CXXFLAGS -g -O2"
--if test $CXX == "g++" ; then
-+if test "$GCC" = "yes" ; then
- 	CXXFLAGS="$CXXFLAGS -ansi -Wall -fno-exceptions"
- fi
- 
diff --git a/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_configh.cmake.in b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_configh.cmake.in
new file mode 100644
index 00000000000..a5b887316d3
--- /dev/null
+++ b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_configh.cmake.in
@@ -0,0 +1,21 @@
+$NetBSD: patch-plugins_zynaddsubfx_fltk_configh.cmake.in,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+--- plugins/zynaddsubfx/fltk/configh.cmake.in.orig	2013-06-11 20:57:16.000000000 +0000
++++ plugins/zynaddsubfx/fltk/configh.cmake.in
+@@ -307,16 +307,6 @@
+ #endif /* HAVE_LONG_LONG */
+ 
+ /*
+- * Do we have the strtoll() function?
+- */
+-
+-#cmakedefine HAVE_STRTOLL @HAVE_STRTOLL@
+-
+-#ifndef HAVE_STRTOLL
+-#  define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base))
+-#endif /* !HAVE_STRTOLL */
+-
+-/*
+  * Do we have the dlsym() function and header?
+  */
+ 
diff --git a/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_numericsort.c b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_numericsort.c
new file mode 100644
index 00000000000..351b49e4e96
--- /dev/null
+++ b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_numericsort.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-plugins_zynaddsubfx_fltk_src_numericsort.c,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+--- plugins/zynaddsubfx/fltk/src/numericsort.c.orig	2013-06-11 20:57:16.000000000 +0000
++++ plugins/zynaddsubfx/fltk/src/numericsort.c
+@@ -34,20 +34,7 @@
+ #include <sys/types.h>
+ 
+ #if !defined(WIN32) || defined(__CYGWIN__)
+-#  ifdef HAVE_DIRENT_H
+ #    include <dirent.h>
+-#  else
+-#    define dirent direct
+-#    if HAVE_SYS_NDIR_H
+-#      include <sys/ndir.h>
+-#    endif /* HAVE_SYS_NDIR_H */
+-#    if HAVE_SYS_DIR_H
+-#      include <sys/dir.h>
+-#    endif /* HAVE_SYS_DIR_H */
+-#    if HAVE_NDIR_H
+-#      include <ndir.h>
+-#    endif /* HAVE_NDIR_H */
+-#  endif /* HAVE_DIRENT_H */
+ #else /* For WIN32 variants */
+ #  include <FL/filename.H>
+ #endif /* !WIN32 || __CYGWIN__ */
diff --git a/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_scandir.c b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_scandir.c
new file mode 100644
index 00000000000..792edcf327a
--- /dev/null
+++ b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_src_scandir.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-plugins_zynaddsubfx_fltk_src_scandir.c,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+--- plugins/zynaddsubfx/fltk/src/scandir.c.orig	2013-06-11 20:57:16.000000000 +0000
++++ plugins/zynaddsubfx/fltk/src/scandir.c
+@@ -23,25 +23,10 @@ USA.  */
+ #  include "flstring.h"
+ 
+-#  if !HAVE_SCANDIR
+ #    include <stdlib.h>
+ #    include <sys/types.h>
+ #    include <errno.h>
+ 
+-#    if HAVE_DIRENT_H
+ #      include <dirent.h>
+ #      define NAMLEN(dirent) strlen((dirent)->d_name)
+-#    else
+-#      define dirent direct
+-#      define NAMLEN(dirent) (dirent)->d_namlen
+-#      if HAVE_SYS_NDIR_H
+-#        include <sys/ndir.h>
+-#      endif
+-#      if HAVE_SYS_DIR_H
+-#        include <sys/dir.h>
+-#      endif
+-#      if HAVE_NDIR_H
+-#        include <ndir.h>
+-#      endif
+-#    endif
+ 
+ int
+@@ -118,5 +103,4 @@ fl_scandir(const char *dir, struct diren
+ 
+ #  endif
+-#endif
+ 
+ /*
diff --git a/audio/lmms/patches/patch-src_core_audio_AudioAlsa.cpp b/audio/lmms/patches/patch-src_core_audio_AudioAlsa.cpp
new file mode 100644
index 00000000000..d3e65491b3a
--- /dev/null
+++ b/audio/lmms/patches/patch-src_core_audio_AudioAlsa.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_core_audio_AudioAlsa.cpp,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+* Define ESTRPIPE for NetBSD at least.
+
+--- src/core/audio/AudioAlsa.cpp.orig	2013-06-11 20:57:16.000000000 +0000
++++ src/core/audio/AudioAlsa.cpp
+@@ -36,7 +36,9 @@
+ #include "gui_templates.h"
+ #include "templates.h"
+ 
+-
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
+ 
+ AudioAlsa::AudioAlsa( bool & _success_ful, mixer * _mixer ) :
+ 	AudioDevice( tLimit<ch_cnt_t>(
diff --git a/audio/lmms/patches/patch-src_core_audio_AudioOss.cpp b/audio/lmms/patches/patch-src_core_audio_AudioOss.cpp
new file mode 100644
index 00000000000..b05bb872d40
--- /dev/null
+++ b/audio/lmms/patches/patch-src_core_audio_AudioOss.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_audio_AudioOss.cpp,v 1.1 2013/06/17 15:16:47 ryoon Exp $
+
+* Define dsp path for NetBSD.
+
+--- src/core/audio/AudioOss.cpp.orig	2013-06-11 20:57:16.000000000 +0000
++++ src/core/audio/AudioOss.cpp
+@@ -62,7 +62,7 @@
+ 
+ 
+ #ifndef _PATH_DEV_DSP
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+ #define _PATH_DEV_DSP  "/dev/audio"
+ #else
+ #define _PATH_DEV_DSP  "/dev/dsp"
diff --git a/audio/lmms/patches/patch-src_tracks_instrument__track.cpp b/audio/lmms/patches/patch-src_tracks_instrument__track.cpp
deleted file mode 100644
index a8277a6221a..00000000000
--- a/audio/lmms/patches/patch-src_tracks_instrument__track.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-src_tracks_instrument__track.cpp,v 1.1 2012/07/03 18:19:53 joerg Exp $
-
---- src/tracks/instrument_track.cpp.orig	2012-07-03 15:40:56.000000000 +0000
-+++ src/tracks/instrument_track.cpp
-@@ -946,7 +946,7 @@ bool FASTCALL instrumentTrack::play( con
- 		// get all notes from the given pattern...
- 		noteVector & notes = p->notes();
- 		// ...and set our index to zero
--		noteVector::iterator it = notes.begin();
-+		noteVector::iterator it2 = notes.begin();
- 
- 		// very effective algorithm for playing notes that are
- 		// posated within the current sample-frame
-@@ -955,23 +955,23 @@ bool FASTCALL instrumentTrack::play( con
- 		if( cur_start > 0 )
- 		{
- 			// skip notes which are posated before start-tact
--			while( it != notes.end() && ( *it )->pos() < cur_start )
-+			while( it2 != notes.end() && ( *it2 )->pos() < cur_start )
- 			{
--				++it;
-+				++it2;
- 			}
- 		}
- 
- 		// skip notes before sample-frame
--		while( it != notes.end() &&
--			( *it )->pos( cur_start ).frames( frames_per_tact ) <
-+		while( it2 != notes.end() &&
-+			( *it2 )->pos( cur_start ).frames( frames_per_tact ) <
- 								_start_frame )
- 		{
--			++it;
-+			++it2;
- 		}
- 
- 		note * cur_note;
--		while( it != notes.end() &&
--			( ( cur_note = *it )->pos( cur_start ).frames(
-+		while( it2 != notes.end() &&
-+			( ( cur_note = *it2 )->pos( cur_start ).frames(
- 					frames_per_tact ) ) <= end_frame )
- 		{
- 			if( cur_note->length() != 0 )
-@@ -1024,7 +1024,7 @@ bool FASTCALL instrumentTrack::play( con
- 				}
- 				played_a_note = TRUE;
- 			}
--			++it;
-+			++it2;
- 		}
- 	}
- 	return( played_a_note );