CVS commit: pkgsrc/audio/milkytracker

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 26 13:11:16 UTC 2020

Modified Files:
        pkgsrc/audio/milkytracker: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/milkytracker/patches: patch-docs_CMakeLists.txt

Log Message:
milkytracker: Resolve inconsistent PLIST on different platforms


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/milkytracker/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/milkytracker/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/milkytracker/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt

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

Modified files:

Index: pkgsrc/audio/milkytracker/Makefile
diff -u pkgsrc/audio/milkytracker/Makefile:1.14 pkgsrc/audio/milkytracker/Makefile:1.15
--- pkgsrc/audio/milkytracker/Makefile:1.14     Sun Mar  8 16:48:46 2020
+++ pkgsrc/audio/milkytracker/Makefile  Thu Mar 26 13:11:16 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2020/03/08 16:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/26 13:11:16 nia Exp $
 
 DISTNAME=      milkytracker-1.02.00
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=milkytracker/}
 GITHUB_PROJECT=        MilkyTracker
@@ -16,6 +16,12 @@ USE_CMAKE=   yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++03
 
+# Resolve inconsistent PLIST on diferent platforms.
+# As in docs/CMakeLists.txt, on "BSD", "share/doc/milkytracker" is always used
+# Otherwise, "share/doc/MilkyTracker" is used.
+# This is silly.
+CMAKE_ARGS+=   -DCMAKE_INSTALL_DOCDIR="share/doc/milkytracker"
+
 INSTALLATION_DIRS+=    share/appdata
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/pixmaps

Index: pkgsrc/audio/milkytracker/PLIST
diff -u pkgsrc/audio/milkytracker/PLIST:1.3 pkgsrc/audio/milkytracker/PLIST:1.4
--- pkgsrc/audio/milkytracker/PLIST:1.3 Sat Sep 21 11:32:08 2019
+++ pkgsrc/audio/milkytracker/PLIST     Thu Mar 26 13:11:16 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/09/21 11:32:08 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/26 13:11:16 nia Exp $
 bin/milkytracker
 share/appdata/milkytracker.appdata.xml
 share/applications/milkytracker.desktop
@@ -8,6 +8,7 @@ share/doc/milkytracker/Copying.txt
 share/doc/milkytracker/FAQ.html
 share/doc/milkytracker/MilkyTracker.html
 share/doc/milkytracker/TiTAN.nfo
+share/doc/milkytracker/readme_unix
 share/milkytracker/songs/milky.xm
 share/milkytracker/songs/slumberjack.xm
 share/milkytracker/songs/sv_ttt.xm

Index: pkgsrc/audio/milkytracker/distinfo
diff -u pkgsrc/audio/milkytracker/distinfo:1.10 pkgsrc/audio/milkytracker/distinfo:1.11
--- pkgsrc/audio/milkytracker/distinfo:1.10     Sat Sep 21 11:32:08 2019
+++ pkgsrc/audio/milkytracker/distinfo  Thu Mar 26 13:11:16 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2019/09/21 11:32:08 nia Exp $
+$NetBSD: distinfo,v 1.11 2020/03/26 13:11:16 nia Exp $
 
 SHA1 (milkytracker-1.02.00.tar.gz) = 04c04fd429316cabe197baa1c510c4a81e9aef40
 RMD160 (milkytracker-1.02.00.tar.gz) = 1376ce67426b46e90f871c48ef5469ec6eae46c7
 SHA512 (milkytracker-1.02.00.tar.gz) = 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
 Size (milkytracker-1.02.00.tar.gz) = 3753882 bytes
+SHA1 (patch-docs_CMakeLists.txt) = 096dc06a4f898665a00d409cfb124925df9f93f6

Added files:

Index: pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt
diff -u /dev/null pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt:1.1
--- /dev/null   Thu Mar 26 13:11:16 2020
+++ pkgsrc/audio/milkytracker/patches/patch-docs_CMakeLists.txt Thu Mar 26 13:11:16 2020
@@ -0,0 +1,21 @@
+$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 .)