ports/176548: audio/musescore: Update to version 1.3

KATO Tsuguru tkato432 at yahoo.com
Thu Feb 28 18:10:08 UTC 2013 

>Number:         176548
>Category:       ports
>Synopsis:       audio/musescore: Update to version 1.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 28 18:10:07 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.3

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/musescore/Makefile audio/musescore/Makefile
--- /usr/ports/audio/musescore/Makefile	2012-11-08 05:48:45.000000000 +0900
+++ audio/musescore/Makefile	2013-03-01 01:43:10.000000000 +0900
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	musescore
-# Date created:		28 Jul 2011
-# Whom:			Dmitry Marakasov <amdmi3 at FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3 at FreeBSD.org>
 # $FreeBSD: head/audio/musescore/Makefile 300895 2012-07-14 12:56:14Z beat $
-#
 
 PORTNAME=	musescore
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	audio
 MASTER_SITES=	SF/mscore/mscore/MuseScore-${PORTVERSION}
 DISTNAME=	mscore-${PORTVERSION}
@@ -23,7 +19,6 @@
 OPTIONS_DEFINE=	JACK PORTAUDIO
 OPTIONS_DEFAULT=PORTAUDIO
 
-USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_QT4=	corelib designer gui network script scripttools svg webkit xml \
 		linguist_build moc_build qmake_build rcc_build uic_build
@@ -32,7 +27,7 @@
 CMAKE_SOURCE_PATH=	${WRKSRC}/mscore
 CMAKE_ARGS=	-DBUILD_ALSA:BOOL=OFF
 ALL_TARGET=	lrelease all
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 
 DATADIR=	${PREFIX}/share/mscore-${PORTVERSION}
 
diff -urN /usr/ports/audio/musescore/distinfo audio/musescore/distinfo
--- /usr/ports/audio/musescore/distinfo	2012-11-08 05:48:45.000000000 +0900
+++ audio/musescore/distinfo	2013-02-28 13:48:35.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mscore-1.2.tar.bz2) = e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81
-SIZE (mscore-1.2.tar.bz2) = 85739954
+SHA256 (mscore-1.3.tar.bz2) = a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683
+SIZE (mscore-1.3.tar.bz2) = 94704857
diff -urN /usr/ports/audio/musescore/files/patch-mscore-CMakeLists.txt audio/musescore/files/patch-mscore-CMakeLists.txt
--- /usr/ports/audio/musescore/files/patch-mscore-CMakeLists.txt	2012-11-08 05:48:45.000000000 +0900
+++ audio/musescore/files/patch-mscore-CMakeLists.txt	2013-03-01 01:43:30.000000000 +0900
@@ -9,7 +9,7 @@
  set(STATIC_SCRIPT_BINDINGS FALSE)
  set(USE_SSE FALSE)
  
-@@ -147,6 +147,8 @@
+@@ -151,6 +151,8 @@
  ## alsa >= 1.0.0
  ##
  
@@ -18,7 +18,7 @@
  if (APPLE OR MINGW)
  	message("Disabling ALSA support due to OS X or MINGW build.")
        set (USE_ALSA 0)
-@@ -161,6 +163,11 @@
+@@ -165,6 +167,11 @@
              set (HAS_MIDI 1)
        endif (NOT ALSA_INCDIR)
  endif (APPLE OR MINGW)
@@ -30,7 +30,7 @@
  
  
  ##
-@@ -215,6 +222,8 @@
+@@ -219,6 +226,8 @@
  ## portaudio
  ##
  
@@ -39,7 +39,7 @@
  if (MINGW)
        set ( USE_PORTAUDIO 1 )
        set ( USE_PORTMIDI  1 )
-@@ -233,6 +242,9 @@
+@@ -237,6 +246,9 @@
        set (USE_PORTMIDI 0)
     endif (APPLE)
  endif (MINGW)
@@ -49,34 +49,26 @@
  
  ##
  ## produce config.h file
-@@ -254,7 +266,7 @@
+@@ -257,9 +269,6 @@
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     )
  
- set(CMAKE_CXX_FLAGS_DEBUG   "")
--set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG")
- 
+-set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+-
  if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
        if (MINGW)
-@@ -276,7 +288,7 @@
-       add_custom_command(
-          OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
-          COMMAND ${CMAKE_CXX_COMPILER}
--           -x c++-header -g ${FLAGS}
-+           -x c++-header ${FLAGS}
-            -I${QT_INCLUDE_DIR}
-            -o all.h.pch all.h
-          DEPENDS ${PROJECT_BINARY_DIR}/all.h
-@@ -287,7 +299,7 @@
-       add_custom_command(
-          OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
-          COMMAND ${CMAKE_CXX_COMPILER}
--           -x c++-header -g  ${FLAGS} -m32
-+           -x c++-header ${FLAGS}
-            -I${QT_HEADERS_DIR}
-            -o all.h.gch all.h
-          DEPENDS ${PROJECT_BINARY_DIR}/all.h
-@@ -324,9 +336,10 @@
+             set(FLAGS -DQT_DEBUG -DQT_DLL)
+@@ -284,7 +293,7 @@
+ add_custom_command(
+  OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+  COMMAND ${CMAKE_CXX_COMPILER}
+-   -x c++-header -g  ${FLAGS}
++   -x c++-header ${FLAGS}
+    -I${QT_HEADERS_DIR}
+    -o all.h.gch all.h
+  DEPENDS ${PROJECT_BINARY_DIR}/all.h
+@@ -321,9 +330,10 @@
     ${PROJECT_SOURCE_DIR}/mscore
     ${PROJECT_BINARY_DIR}
     ${PROJECT_BINARY_DIR}/mscore
@@ -88,7 +80,7 @@
  )
  
  ##
-@@ -421,8 +434,8 @@
+@@ -427,8 +437,8 @@
  
  add_custom_target(lrelease
     COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
diff -urN /usr/ports/audio/musescore/files/xxxxx audio/musescore/files/xxxxx
--- /usr/ports/audio/musescore/files/xxxxx	1970-01-01 09:00:00.000000000 +0900
+++ audio/musescore/files/xxxxx	2013-03-01 01:41:46.000000000 +0900
@@ -0,0 +1,93 @@
+--- mscore/CMakeLists.txt.orig	2013-02-27 20:31:02.000000000 +0900
++++ mscore/CMakeLists.txt	2013-03-01 01:41:13.000000000 +0900
+@@ -32,7 +32,7 @@
+ set(HAS_AUDIOFILE TRUE)                   # requires libsndfile
+ set(OSC           TRUE)                   # osc remote control
+ 
+-set(BUILD_SCRIPTGEN TRUE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
++set(BUILD_SCRIPTGEN FALSE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
+ set(STATIC_SCRIPT_BINDINGS FALSE)
+ set(USE_SSE FALSE)
+ 
+@@ -151,6 +151,8 @@
+ ## alsa >= 1.0.0
+ ##
+ 
++SET(BUILD_ALSA AUTO CACHE STRING "Build with support for ALSA. [ON/OFF/AUTO]")
++IF(BUILD_ALSA)
+ if (APPLE OR MINGW)
+ 	message("Disabling ALSA support due to OS X or MINGW build.")
+       set (USE_ALSA 0)
+@@ -165,6 +167,11 @@
+             set (HAS_MIDI 1)
+       endif (NOT ALSA_INCDIR)
+ endif (APPLE OR MINGW)
++ELSE(BUILD_ALSA)
++	MESSAGE(STATUS "alsa support disabled")
++      set (USE_ALSA 0)
++      set (HAS_MIDI 1)
++ENDIF(BUILD_ALSA)
+ 
+ 
+ ##
+@@ -219,6 +226,8 @@
+ ## portaudio
+ ##
+ 
++SET(BUILD_PORTAUDIO AUTO CACHE STRING "Build with support for portaudio. [ON/OFF/AUTO]")
++IF(BUILD_PORTAUDIO)
+ if (MINGW)
+       set ( USE_PORTAUDIO 1 )
+       set ( USE_PORTMIDI  1 )
+@@ -237,6 +246,9 @@
+       set (USE_PORTMIDI 0)
+    endif (APPLE)
+ endif (MINGW)
++ELSE(BUILD_PORTAUDIO)
++	MESSAGE(STATUS "portaudio support disabled")
++ENDIF(BUILD_PORTAUDIO)
+ 
+ ##
+ ## produce config.h file
+@@ -257,9 +269,6 @@
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
+-set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+-
+ if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+       if (MINGW)
+             set(FLAGS -DQT_DEBUG -DQT_DLL)
+@@ -284,7 +293,7 @@
+ add_custom_command(
+  OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+  COMMAND ${CMAKE_CXX_COMPILER}
+-   -x c++-header -g  ${FLAGS}
++   -x c++-header ${FLAGS}
+    -I${QT_HEADERS_DIR}
+    -o all.h.gch all.h
+  DEPENDS ${PROJECT_BINARY_DIR}/all.h
+@@ -321,9 +330,10 @@
+    ${PROJECT_SOURCE_DIR}/mscore
+    ${PROJECT_BINARY_DIR}
+    ${PROJECT_BINARY_DIR}/mscore
++   ${PORTAUDIO_INCDIR}
+    ${ALSA_INCDIR}
+    ${JACK_INCDIR}
+-   ${PORTAUDIO_INCDIR}
++   /usr/local/include
+ )
+ 
+ ##
+@@ -427,8 +437,8 @@
+ 
+ add_custom_target(lrelease
+    COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
diff -urN /usr/ports/audio/musescore/pkg-plist audio/musescore/pkg-plist
--- /usr/ports/audio/musescore/pkg-plist	2012-11-08 05:48:45.000000000 +0900
+++ audio/musescore/pkg-plist	2013-02-28 14:14:29.000000000 +0900
@@ -120,12 +120,12 @@
 %%DATADIR%%/man/MuseScore-ro.pdf
 %%DATADIR%%/man/MuseScore-ru.pdf
 %%DATADIR%%/man/MuseScore-zh_CN.pdf
-%%DATADIR%%/plugins/abc_import.js
+%%DATADIR%%/plugins/abc_import/abc_import.js
+%%DATADIR%%/plugins/abc_import/abc_import.ui
 %%DATADIR%%/plugins/break/break.js
 %%DATADIR%%/plugins/break/break.ui
 %%DATADIR%%/plugins/chordchart.js
 %%DATADIR%%/plugins/colornotes.js
-%%DATADIR%%/plugins/createscore.js
 %%DATADIR%%/plugins/musescore.com/README.txt
 %%DATADIR%%/plugins/musescore.com/icons/filesaveonline.svg
 %%DATADIR%%/plugins/musescore.com/musescore.com.js
@@ -197,6 +197,7 @@
 @dirrm %%DATADIR%%/plugins/musescore.com/icons
 @dirrm %%DATADIR%%/plugins/musescore.com
 @dirrm %%DATADIR%%/plugins/break
+ at dirrm %%DATADIR%%/plugins/abc_import
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/man
 @dirrm %%DATADIR%%/locale
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list