pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Fix man page install.



Module Name:	pkgsrc-wip
Committed By:	yrmt <youri.mout%gmail.com@localhost>
Pushed By:	youri
Date:		Sat Jul 15 01:01:23 2017 +0200
Changeset:	65718d3a962cb4bf9c8e0e1a457040b88e8fd530

Modified Files:
	musescore/Makefile
	musescore/PLIST
	musescore/distinfo
	musescore/patches/patch-CMakeLists.txt

Log Message:
Fix man page install.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=65718d3a962cb4bf9c8e0e1a457040b88e8fd530

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 musescore/Makefile                     |  5 +----
 musescore/PLIST                        |  2 +-
 musescore/distinfo                     |  2 +-
 musescore/patches/patch-CMakeLists.txt | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diffs:
diff --git a/musescore/Makefile b/musescore/Makefile
index 981cba4282..b89d2fdeb7 100644
--- a/musescore/Makefile
+++ b/musescore/Makefile
@@ -12,7 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/${DISTNAME} # More than one possibility -- please check manually.
 
-USE_TOOLS+=	make
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++11
 
@@ -28,12 +27,10 @@ CMAKE_ARGS+=	-DBUILD_PORTAUDIO:BOOL=OFF
 #option(BUILD_ALSA "Build with support for ALSA audio backend." ON)
 #option(BUILD_PORTAUDIO "Build with support for Portaudio audio backend." ON)
 
+BUILD_TARGET=	all lrelease
 DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 DEPENDS+=	texlive-collection-basic-[0-9]*:../../meta-pkgs/texlive-collection-basic
 
-pre-install:
-	cd ${WRKSCR} && make lrelease
-
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff --git a/musescore/PLIST b/musescore/PLIST
index acfa5047cd..10ab88d74e 100644
--- a/musescore/PLIST
+++ b/musescore/PLIST
@@ -2,7 +2,7 @@
 bin/mscore
 bin/musescore
 man/man1/mscore.1
-man/man1/musescore.1
+man/man1/musescore.1.gz
 share/applications/mscore.desktop
 share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml+xml.png
 share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml.png
diff --git a/musescore/distinfo b/musescore/distinfo
index a4f4bd1075..37a4111e90 100644
--- a/musescore/distinfo
+++ b/musescore/distinfo
@@ -4,5 +4,5 @@ SHA1 (MuseScore-2.0.3.zip) = be98f5867f2060aedf15e9f20a89bf2e33b423af
 RMD160 (MuseScore-2.0.3.zip) = 28748c9f554cfdb25cdcb799baaa9cc2235197f7
 SHA512 (MuseScore-2.0.3.zip) = d028b0fb7d042c3fc9b4eaaa52d72e4ad381c3aa4aacfce577fe7a7df4b8e5234fda9af3afff26e0cc612ca21a1801a6fdc804937384763e7ef4179d3c302211
 Size (MuseScore-2.0.3.zip) = 55961927 bytes
-SHA1 (patch-CMakeLists.txt) = 2b36ef24dfa884ef6830a97e871d11a45a9542f4
+SHA1 (patch-CMakeLists.txt) = 7089bc8d20da11d03d4bd9a2db3869bbb65cb2ab
 SHA1 (patch-mscore_CMakeLists.txt) = b226bd4dd4d20a0549baadb7196273467f07a594
diff --git a/musescore/patches/patch-CMakeLists.txt b/musescore/patches/patch-CMakeLists.txt
index 14a73d059d..a16ab90f5a 100644
--- a/musescore/patches/patch-CMakeLists.txt
+++ b/musescore/patches/patch-CMakeLists.txt
@@ -4,6 +4,15 @@ Install man pages properly.
 
 --- CMakeLists.txt.orig	2016-04-01 02:46:08.000000000 +0000
 +++ CMakeLists.txt
+@@ -56,7 +56,7 @@ include (${PROJECT_SOURCE_DIR}/build/ECM
+ include (${PROJECT_SOURCE_DIR}/build/FindQt5Transitional.cmake)
+ 
+ #include modules
+-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build" ${CMAKE_MODULE_PATH})
++set (CMAKE_MODULE_PATH "/pkgsrc-work/wrk/wip/musescore/work/.buildlink/cmake-Modules" "${CMAKE_CURRENT_SOURCE_DIR}/build" ${CMAKE_MODULE_PATH})
+ include (UsePkgConfig1) #defines MACRO(PKGCONFIG1 _package _minVersion _include_DIR _link_DIR _link_FLAGS _cflags)
+ include (TargetDoc)
+ include (FindPulseAudio)
 @@ -521,7 +521,7 @@ if (NOT MINGW AND NOT APPLE)
              )
      endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
@@ -13,3 +22,12 @@ Install man pages properly.
      # create symlink alias for man pages so `man musescore` = `man mscore`
      find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." )
      if (LN_EXECUTABLE)
+@@ -532,7 +532,7 @@ if (NOT MINGW AND NOT APPLE)
+             COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}"
+             COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}'
+             )
+-        install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION share/man/man1 COMPONENT doc)
++        install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION man/man1 COMPONENT doc)
+      else (LN_EXECUTABLE)
+          message(STATUS "ln not found (it is optional). No symlink aliases will be created.")
+      endif (LN_EXECUTABLE)


Home | Main Index | Thread Index | Old Index