Thu Mar 26 13:11:16 2020 UTC ()
milkytracker: Resolve inconsistent PLIST on different platforms


(nia)
diff -r1.14 -r1.15 pkgsrc/audio/milkytracker/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/milkytracker/PLIST
diff -r1.10 -r1.11 pkgsrc/audio/milkytracker/distinfo
diff -r0 -r1.1 pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt
cvs diff -r1.14 -r1.15 pkgsrc/audio/milkytracker/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/milkytracker/Makefile 2020/03/08 16:48:46 1.14
+++ pkgsrc/audio/milkytracker/Makefile 2020/03/26 13:11:16 1.15
@@ -1,31 +1,37 @@ @@ -1,31 +1,37 @@
1# $NetBSD: Makefile,v 1.14 2020/03/08 16:48:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2020/03/26 13:11:16 nia Exp $
2 2
3DISTNAME= milkytracker-1.02.00 3DISTNAME= milkytracker-1.02.00
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=milkytracker/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=milkytracker/}
7GITHUB_PROJECT= MilkyTracker 7GITHUB_PROJECT= MilkyTracker
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://milkytracker.titandemo.org/ 11HOMEPAGE= https://milkytracker.titandemo.org/
12COMMENT= Music tracker inspired by Fast Tracker 2 12COMMENT= Music tracker inspired by Fast Tracker 2
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15USE_CMAKE= yes 15USE_CMAKE= yes
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17USE_LANGUAGES= c c++03 17USE_LANGUAGES= c c++03
18 18
 19# Resolve inconsistent PLIST on diferent platforms.
 20# As in docs/CMakeLists.txt, on "BSD", "share/doc/milkytracker" is always used
 21# Otherwise, "share/doc/MilkyTracker" is used.
 22# This is silly.
 23CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR="share/doc/milkytracker"
 24
19INSTALLATION_DIRS+= share/appdata 25INSTALLATION_DIRS+= share/appdata
20INSTALLATION_DIRS+= share/applications 26INSTALLATION_DIRS+= share/applications
21INSTALLATION_DIRS+= share/pixmaps 27INSTALLATION_DIRS+= share/pixmaps
22 28
23post-install: 29post-install:
24 ${INSTALL_DATA} ${WRKSRC}/resources/pictures/carton.png \ 30 ${INSTALL_DATA} ${WRKSRC}/resources/pictures/carton.png \
25 ${DESTDIR}${PREFIX}/share/pixmaps/milkytracker.png 31 ${DESTDIR}${PREFIX}/share/pixmaps/milkytracker.png
26 ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.appdata \ 32 ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.appdata \
27 ${DESTDIR}${PREFIX}/share/appdata/milkytracker.appdata.xml 33 ${DESTDIR}${PREFIX}/share/appdata/milkytracker.appdata.xml
28 ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.desktop \ 34 ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.desktop \
29 ${DESTDIR}${PREFIX}/share/applications 35 ${DESTDIR}${PREFIX}/share/applications
30 36
31.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
cvs diff -r1.3 -r1.4 pkgsrc/audio/milkytracker/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/milkytracker/PLIST 2019/09/21 11:32:08 1.3
+++ pkgsrc/audio/milkytracker/PLIST 2020/03/26 13:11:16 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1@comment $NetBSD: PLIST,v 1.3 2019/09/21 11:32:08 nia Exp $ 1@comment $NetBSD: PLIST,v 1.4 2020/03/26 13:11:16 nia Exp $
2bin/milkytracker 2bin/milkytracker
3share/appdata/milkytracker.appdata.xml 3share/appdata/milkytracker.appdata.xml
4share/applications/milkytracker.desktop 4share/applications/milkytracker.desktop
5share/doc/milkytracker/Authors.txt 5share/doc/milkytracker/Authors.txt
6share/doc/milkytracker/ChangeLog.html 6share/doc/milkytracker/ChangeLog.html
7share/doc/milkytracker/Copying.txt 7share/doc/milkytracker/Copying.txt
8share/doc/milkytracker/FAQ.html 8share/doc/milkytracker/FAQ.html
9share/doc/milkytracker/MilkyTracker.html 9share/doc/milkytracker/MilkyTracker.html
10share/doc/milkytracker/TiTAN.nfo 10share/doc/milkytracker/TiTAN.nfo
 11share/doc/milkytracker/readme_unix
11share/milkytracker/songs/milky.xm 12share/milkytracker/songs/milky.xm
12share/milkytracker/songs/slumberjack.xm 13share/milkytracker/songs/slumberjack.xm
13share/milkytracker/songs/sv_ttt.xm 14share/milkytracker/songs/sv_ttt.xm
14share/milkytracker/songs/theday.xm 15share/milkytracker/songs/theday.xm
15share/milkytracker/songs/universalnetwork2_real.xm 16share/milkytracker/songs/universalnetwork2_real.xm
16share/pixmaps/milkytracker.png 17share/pixmaps/milkytracker.png
cvs diff -r1.10 -r1.11 pkgsrc/audio/milkytracker/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/milkytracker/distinfo 2019/09/21 11:32:08 1.10
+++ pkgsrc/audio/milkytracker/distinfo 2020/03/26 13:11:16 1.11
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.10 2019/09/21 11:32:08 nia Exp $ 1$NetBSD: distinfo,v 1.11 2020/03/26 13:11:16 nia Exp $
2 2
3SHA1 (milkytracker-1.02.00.tar.gz) = 04c04fd429316cabe197baa1c510c4a81e9aef40 3SHA1 (milkytracker-1.02.00.tar.gz) = 04c04fd429316cabe197baa1c510c4a81e9aef40
4RMD160 (milkytracker-1.02.00.tar.gz) = 1376ce67426b46e90f871c48ef5469ec6eae46c7 4RMD160 (milkytracker-1.02.00.tar.gz) = 1376ce67426b46e90f871c48ef5469ec6eae46c7
5SHA512 (milkytracker-1.02.00.tar.gz) = 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134 5SHA512 (milkytracker-1.02.00.tar.gz) = 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
6Size (milkytracker-1.02.00.tar.gz) = 3753882 bytes 6Size (milkytracker-1.02.00.tar.gz) = 3753882 bytes
 7SHA1 (patch-docs_CMakeLists.txt) = 096dc06a4f898665a00d409cfb124925df9f93f6
File Added: pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt
$NetBSD: patch-docs_CMakeLists.txt,v 1.1 2020/03/26 13:11:16 nia Exp $

Resolve inconsistent PLIST.

--- docs/CMakeLists.txt.orig	2018-02-24 17:43:23.000000000 +0000
+++ docs/CMakeLists.txt
@@ -28,14 +28,8 @@ set(
     ChangeLog.html
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "BSD")
-    set(BSD TRUE)
-endif()
-
 if(APPLE)
     set(INSTALL_DEST Documentation)
-elseif(BSD)
-    set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
 elseif(WIN32)
     list(APPEND DOCUMENTS readme_rtaudio)
     set(INSTALL_DEST .)