audio/drumstick: Update 2.2.1 -> 2.3.0

Reported by:	portscout

4 files changed, 20 insertions, 42 deletions

diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile
index 849280d9fb51..c13dfdf67a95 100644
--- a/audio/drumstick/Makefile
+++ b/audio/drumstick/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	drumstick
-DISTVERSION=	2.2.1
+DISTVERSION=	2.3.0
 CATEGORIES=	audio multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff --git a/audio/drumstick/distinfo b/audio/drumstick/distinfo
index ab5cbb83521e..c39f4fbce189 100644
--- a/audio/drumstick/distinfo
+++ b/audio/drumstick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622537489
-SHA256 (drumstick-2.2.1.tar.bz2) = 5315d41243b9a973c88f0f7d05d900b298a447d365bb7d9c95fdbc713c9ff96e
-SIZE (drumstick-2.2.1.tar.bz2) = 1461686
+TIMESTAMP = 1625100496
+SHA256 (drumstick-2.3.0.tar.bz2) = 132ab9af7504939eb1ffd3500d89e4484bc2591e8c5ade0a2f2a87e4ac9e0a8a
+SIZE (drumstick-2.3.0.tar.bz2) = 1463890
diff --git a/audio/drumstick/files/patch-CMakeLists.txt b/audio/drumstick/files/patch-CMakeLists.txt
index eb7077a07302..fe58b34635eb 100644
--- a/audio/drumstick/files/patch-CMakeLists.txt
+++ b/audio/drumstick/files/patch-CMakeLists.txt
@@ -1,15 +1,6 @@
---- CMakeLists.txt.orig	2021-05-09 10:45:44 UTC
+--- CMakeLists.txt.orig	2021-06-28 15:28:22 UTC
 +++ CMakeLists.txt
-@@ -69,7 +69,7 @@ endif ()
- option(BUILD_DOCS "Build Doxygen documentation and man pages" ${_DOCS_INIT})
- option(BUILD_UTILS "Build Utilities and Examples" ON)
- option(STATIC_DRUMSTICK "Build static libraries instead of dynamic" OFF)
--option(USE_DBUS "Include DBus support (required for RealtimeKit)" ${_DBUS_INIT})
-+#option(USE_DBUS "Include DBus support (required for RealtimeKit)" ${_DBUS_INIT})
- 
- if(STATIC_DRUMSTICK)
-     set(BUILD_SHARED_LIBS OFF)
-@@ -96,15 +96,17 @@ else()
+@@ -111,8 +111,8 @@ else()
  	message(FATAL_ERROR "Program pkg-config not found")
  endif()
  
@@ -20,38 +11,25 @@
      if(ALSA_FOUND)
          message(STATUS "Found ALSA version = ${ALSA_VERSION}")
      endif()
- endif()
- 
- if(UNIX AND NOT APPLE)
--    pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple)
-+    if (USE_PULSEAUDIO)
-+      pkg_check_modules(PULSE IMPORTED_TARGET libpulse-simple)
-+    endif()
-     if(PULSE_FOUND)
-         message(STATUS "Found PulseAudio version = ${PULSE_VERSION}")
-     else()
-@@ -149,7 +151,7 @@ endif()
+@@ -179,7 +179,7 @@ endif()
  
  if(UNIX AND NOT APPLE)
      if (BUILD_DOCS)
 -        find_package(Doxygen REQUIRED dot)
 +        #find_package(Doxygen REQUIRED dot)
          if(DOXYGEN_FOUND)
-             string(REPLACE ";" " " DOXYGEN_INCLUDE_DIRS "${Qt5Core_INCLUDE_DIRS}")
+             string(REPLACE ";" " " DOXYGEN_INCLUDE_DIRS "${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}")
              configure_file("${CMAKE_SOURCE_DIR}/Doxyfile.in"
-@@ -160,11 +162,11 @@ if(UNIX AND NOT APPLE)
-         endif()
-         add_subdirectory(doc)
+@@ -192,9 +192,9 @@ if(UNIX AND NOT APPLE)
      endif()
--    configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
-+    #configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
      configure_file(drumstick.spec.in drumstick.spec IMMEDIATE @ONLY)
--    install(FILES
--        ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc
--        DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
-+    #install(FILES
-+    #    ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc
-+    #    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+     if(ALSA_FOUND AND PKG_CONFIG_FOUND)
+-        configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
+-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc
+-            DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
++        #configure_file(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
++        #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc
++        #    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
+     endif()
      # XML mime types
      set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" )
-     set( XDG_MIME_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages" )
diff --git a/audio/drumstick/pkg-plist b/audio/drumstick/pkg-plist
index ddb2ad593860..e2f0e5240338 100644
--- a/audio/drumstick/pkg-plist
+++ b/audio/drumstick/pkg-plist
@@ -33,13 +33,13 @@ lib/drumstick2/libdrumstick-rt-oss-in.so
 lib/drumstick2/libdrumstick-rt-oss-out.so
 lib/libdrumstick-file.so
 lib/libdrumstick-file.so.2
-lib/libdrumstick-file.so.2.2.1
+lib/libdrumstick-file.so.2.3.0
 lib/libdrumstick-rt.so
 lib/libdrumstick-rt.so.2
-lib/libdrumstick-rt.so.2.2.1
+lib/libdrumstick-rt.so.2.3.0
 lib/libdrumstick-widgets.so
 lib/libdrumstick-widgets.so.2
-lib/libdrumstick-widgets.so.2.2.1
+lib/libdrumstick-widgets.so.2.3.0
 %%QT_PLUGINDIR%%/designer/libdrumstick-vpiano-plugin.so
 libdata/pkgconfig/drumstick-file.pc
 libdata/pkgconfig/drumstick-rt.pc