CVS commit: pkgsrc/textproc/sonnet

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jan 27 03:56:52 UTC 2018

Modified Files:
        pkgsrc/textproc/sonnet: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/sonnet/patches: patch-CMakeLists.txt

Log Message:
sonnet: install sonnet.categories properly


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/sonnet/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/sonnet/PLIST \
    pkgsrc/textproc/sonnet/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/sonnet/patches/patch-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/textproc/sonnet/Makefile
diff -u pkgsrc/textproc/sonnet/Makefile:1.15 pkgsrc/textproc/sonnet/Makefile:1.16
--- pkgsrc/textproc/sonnet/Makefile:1.15        Wed Jan 24 19:06:10 2018
+++ pkgsrc/textproc/sonnet/Makefile     Sat Jan 27 03:56:52 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2018/01/24 19:06:10 markd Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/27 03:56:52 markd Exp $
 
 DISTNAME=      sonnet-${KF5VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 
 HOMEPAGE=      https://community.kde.org/Frameworks
@@ -10,6 +10,10 @@ LICENSE=     gnu-lgpl-v2.1
 
 .include "../../meta-pkgs/kf5/Makefile.common"
 
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/sonnet.categories \
+               ${PKG_SYSCONFDIR}/xdg/sonnet.categories
+
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/textproc/sonnet/PLIST
diff -u pkgsrc/textproc/sonnet/PLIST:1.3 pkgsrc/textproc/sonnet/PLIST:1.4
--- pkgsrc/textproc/sonnet/PLIST:1.3    Wed Jan 17 20:11:06 2018
+++ pkgsrc/textproc/sonnet/PLIST        Sat Jan 27 03:56:52 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2018/01/17 20:11:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/27 03:56:52 markd Exp $
 bin/gentrigrams
 bin/parsetrigrams
 include/KF5/SonnetCore/Sonnet/BackgroundChecker
@@ -36,6 +36,7 @@ qt5/mkspecs/modules/qt_SonnetCore.pri
 qt5/mkspecs/modules/qt_SonnetUi.pri
 qt5/plugins/kf5/sonnet/aspell.so
 qt5/plugins/kf5/sonnet/hunspell.so
+share/examples/kde-xdg/sonnet.categories
 share/kf5/sonnet/trigrams.map
 share/locale/af/LC_MESSAGES/sonnet5_qt.qm
 share/locale/ar/LC_MESSAGES/sonnet5_qt.qm
Index: pkgsrc/textproc/sonnet/distinfo
diff -u pkgsrc/textproc/sonnet/distinfo:1.3 pkgsrc/textproc/sonnet/distinfo:1.4
--- pkgsrc/textproc/sonnet/distinfo:1.3 Wed Jan 17 20:11:06 2018
+++ pkgsrc/textproc/sonnet/distinfo     Sat Jan 27 03:56:52 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/01/17 20:11:06 markd Exp $
+$NetBSD: distinfo,v 1.4 2018/01/27 03:56:52 markd Exp $
 
 SHA1 (sonnet-5.41.0.tar.xz) = c945c1ea6486bfdb2e710c296b6a02f8dd038baa
 RMD160 (sonnet-5.41.0.tar.xz) = 6239134fb81af981d66d3dfd01836ef5e11006d5
 SHA512 (sonnet-5.41.0.tar.xz) = 608b0c476f6a1bb9e598c9c3dbb58882ec80f2e3d436cf4e4657cccc2ca5abd24bf7af5f7982ff79d80eb602c92a26be498a9bd02fcb8b6ac44298b42af6648b
 Size (sonnet-5.41.0.tar.xz) = 284748 bytes
+SHA1 (patch-CMakeLists.txt) = d64b508552169d4f9736a24c69b02cf401669068

Added files:

Index: pkgsrc/textproc/sonnet/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/sonnet/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jan 27 03:56:52 2018
+++ pkgsrc/textproc/sonnet/patches/patch-CMakeLists.txt Sat Jan 27 03:56:52 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/27 03:56:52 markd Exp $
+
+Install via examples dir
+
+--- CMakeLists.txt.orig        2018-01-27 03:47:45.549155864 +0000
++++ CMakeLists.txt
+@@ -85,6 +85,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
+         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
+ 
+ # contains list of debug categories, for kdebugsettings
+-install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_CONFDIR})
++install(FILES sonnet.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
+ 
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)