4 files changed, 40 insertions, 35 deletions

diff --git a/audio/mixxx21/Makefile b/audio/mixxx21/Makefile
index c75772685910..82c8a0d79641 100644
--- a/audio/mixxx21/Makefile
+++ b/audio/mixxx21/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
-DISTVERSION=	2.1.5
-PORTREVISION=	3
+DISTVERSION=	2.1.6
 CATEGORIES=	audio
 PKGNAMESUFFIX=  21
 
@@ -44,7 +43,7 @@ USE_QT=		buildtools concurrent core dbus gui network opengl script scripttools \
 		sql sql-sqlite3 svg testlib xml xmlpatterns linguisttools_build \
 		qmake_build widgets
 
-CONFLICTS=	mixxx20*
+CONFLICTS=	mixxx20* mixxx
 
 MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
 		build=release optimize=native ${GUI} battery=0 vamp=1 modplug=1
diff --git a/audio/mixxx21/distinfo b/audio/mixxx21/distinfo
index bcb8cf419458..306e21a8bf61 100644
--- a/audio/mixxx21/distinfo
+++ b/audio/mixxx21/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541529337
-SHA256 (mixxxdj-mixxx-release-2.1.5_GH0.tar.gz) = 09ef59c1f8ba9fb5d7c31880f5989b8ef198ca026ffeffda7523e94ee068122f
-SIZE (mixxxdj-mixxx-release-2.1.5_GH0.tar.gz) = 34474975
+TIMESTAMP = 1546748571
+SHA256 (mixxxdj-mixxx-release-2.1.6_GH0.tar.gz) = a85bb6bce70d9de22b35cd4bb9dd7330e963f02829a2b12730d731315e91bb5f
+SIZE (mixxxdj-mixxx-release-2.1.6_GH0.tar.gz) = 34533966
diff --git a/audio/mixxx21/files/patch-build_depends.py b/audio/mixxx21/files/patch-build_depends.py
index 5117b406f0d4..8277d88b7cf1 100644
--- a/audio/mixxx21/files/patch-build_depends.py
+++ b/audio/mixxx21/files/patch-build_depends.py
@@ -1,5 +1,5 @@
---- build/depends.py	2018-09-05 15:20:52.000000000 -0500
-+++ build/depends.py	2018-10-30 14:47:39.928944000 -0500
+--- build/depends.py	2018-12-27 02:36:10.000000000 -0500
++++ build/depends.py	2019-01-05 23:40:05.463593000 -0500
 @@ -12,7 +12,7 @@
          if not conf.CheckLib('portaudio'):
              raise Exception(
@@ -33,41 +33,43 @@
  class Qt(Dependence):
      DEFAULT_QT4DIRS = {'linux': '/usr/share/qt4',
 -                       'bsd': '/usr/local/lib/qt4',
-+                       'bsd': '%%LOCALBASE%%/share/qt4',
++		       'bsd': '%%LOCALBASE%%/share/qt4',
                         'osx': '/Library/Frameworks',
                         'windows': 'C:\\qt\\4.6.0'}
  
      DEFAULT_QT5DIRS64 = {'linux': '/usr/lib/x86_64-linux-gnu/qt5',
-+                         'bsd': '%%LOCALBASE%%/lib/qt5',
++			 'bsd': '%%LOCALBASE%%/lib/qt5',
                           'osx': '/Library/Frameworks',
                           'windows': 'C:\\qt\\5.0.1'}
  
      DEFAULT_QT5DIRS32 = {'linux': '/usr/lib/i386-linux-gnu/qt5',
-+                         'bsd': '%%LOCALBASE%%/lib/qt5',
++			 'bsd': '%%LOCALBASE%%/lib/qt5',
                           'osx': '/Library/Frameworks',
                           'windows': 'C:\\qt\\5.0.1'}
  
-@@ -319,9 +322,17 @@
+@@ -319,10 +322,18 @@
                  build.env.Append(CCFLAGS='-fPIC')
  
          elif build.platform_is_bsd:
 -            build.env.Append(LIBS=qt_modules)
 -            include_paths = ['$QTDIR/include/%s' % module
 -                             for module in qt_modules]
-+	    qt_modules.extend(['QtDBus'])
-+	    if qt5:
-+		qt5_modules = [w.replace('Qt', 'Qt5') for w in qt_modules]
-+		build.env.Append(LIBS = qt5_modules)
-+		build.env.Append(CCFLAGS='-fPIC')
-+                include_paths = ['%%LOCALBASE%%/include/qt5/%s' % module
+-            build.env.Append(CPPPATH=include_paths)
++           qt_modules.extend(['QtDBus'])
++           if qt5:
++               qt5_modules = [w.replace('Qt', 'Qt5') for w in qt_modules]
++               build.env.Append(LIBS = qt5_modules)
++               build.env.Append(CCFLAGS='-fPIC')
++               include_paths = ['%%LOCALBASE%%/include/qt5/%s' % module
 +                                for module in qt_modules]
-+            else:
-+		build.env.Append(LIBS = qt_modules)
-+                include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
++           else:
++               build.env.Append(LIBS = qt_modules)
++               include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
 +                                for module in qt_modules]
-             build.env.Append(CPPPATH=include_paths)
++           build.env.Append(CPPPATH=include_paths)
          elif build.platform_is_osx:
              qtdir = build.env['QTDIR']
+             build.env.Append(
 @@ -487,7 +498,7 @@
          if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
              qtdir = build.env['QTDIR']
@@ -91,7 +93,7 @@
          # it, though might cause issues. This is safe to remove once we
          # deprecate Karmic support. rryan 2/2011
 -        build.env.Append(CPPPATH='/usr/include/taglib/')
-+        build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
++	build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
  
          if build.platform_is_windows and build.static_dependencies:
              build.env.Append(CPPDEFINES='TAGLIB_STATIC')
@@ -103,29 +105,33 @@
              build.env.Append(CCFLAGS='-Wall')
              if build.compiler_is_clang:
                  # Quiet down Clang warnings about inconsistent use of override
-@@ -1445,9 +1455,9 @@
+@@ -1445,12 +1455,13 @@
  
          elif build.platform_is_osx:
              # Stuff you may have compiled by hand
 -            if os.path.isdir('/usr/local/include'):
 -                build.env.Append(LIBPATH=['/usr/local/lib'])
--                build.env.Append(CPPPATH=['/usr/local/include'])
 +            if os.path.isdir('%%LOCALBASE%%/include'):
 +                build.env.Append(LIBPATH=['%%LOCALBASE%%/lib'])
+                 # Use -isystem instead of -I to avoid compiler warnings from
+                 # system libraries. This cuts down on Mixxx's compilation output
+                 # significantly when using Homebrew installed to /usr/local.
+-                build.env.Append(CCFLAGS=['-isystem', '/usr/local/include'])
 +                build.env.Append(CPPPATH=['%%LOCALBASE%%/include'])
++                build.env.Append(CCFLAGS=['-isystem', '%%LOCALBASE%%/include'])
  
              # Non-standard libpaths for fink and certain (most?) darwin ports
              if os.path.isdir('/sw/include'):
-@@ -1460,17 +1470,24 @@
+@@ -1463,17 +1474,24 @@
                  build.env.Append(CPPPATH=['/opt/local/include'])
  
          elif build.platform_is_bsd:
-+	    qt5 = Qt.qt5_enabled(build)
++            qt5 = Qt.qt5_enabled(build)
 +
-+	    if qt5:
-+	      qtdirectory = 'qt5'
++            if qt5:
++              qtdirectory = 'qt5'
 +            else:
-+	      qtdirectory = 'qt4'
++              qtdirectory = 'qt4'
 +
              build.env.Append(CPPDEFINES='__BSD__')
              build.env.Append(CPPPATH=['/usr/include',
@@ -146,7 +152,7 @@
  
          # Define for things that would like to special case UNIX (Linux or BSD)
          if build.platform_is_bsd or build.platform_is_linux:
-@@ -1503,7 +1520,7 @@
+@@ -1506,7 +1524,7 @@
          # Say where to find resources on Unix. TODO(XXX) replace this with a
          # RESOURCE_PATH that covers Win and OSX too:
          if build.platform_is_linux or build.platform_is_bsd:
@@ -155,7 +161,7 @@
              share_path = os.path.join (prefix, build.env.get(
                  'SHAREDIR', default='share'), 'mixxx')
              build.env.Append(
-@@ -1514,7 +1531,7 @@
+@@ -1517,7 +1535,7 @@
                  CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
  
      def depends(self, build):
diff --git a/audio/mixxx21/pkg-plist b/audio/mixxx21/pkg-plist
index 097a4944dc41..43032a033426 100644
--- a/audio/mixxx21/pkg-plist
+++ b/audio/mixxx21/pkg-plist
@@ -1,7 +1,7 @@
 bin/mixxx
-%%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
-%%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
-lib/mixxx/plugins/vamp/libmixxxminimal.so
+%%FAAD%%lib/mixxx/plugins/soundsourceqt5/libsoundsourcem4a.so
+%%WAVPACK%%lib/mixxx/plugins/soundsourceqt5/libsoundsourcewv.so
+lib/mixxx/plugins/vampqt5/libmixxxminimal.so
 share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
 share/pixmaps/mixxx-icon.png