pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
focuswriter: Use some default values and install a man page under PKGMANDIR
Module Name: pkgsrc-wip
Committed By: Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By: ryoon
Date: Mon Feb 17 21:34:23 2020 +0900
Changeset: 7d4ebb1ddf15f50715c91f68f8b5a6e2381f6415
Modified Files:
focuswriter/Makefile
focuswriter/distinfo
focuswriter/patches/patch-focuswriter.pro
Added Files:
focuswriter/CL
Log Message:
focuswriter: Use some default values and install a man page under PKGMANDIR
* https://github.com/gottcode/focuswriter/archive/v1.7.4.tar.gz returns
focuswriter-1.7.4.tar.gz. Use this as DISTNAME.
* Use default WRKSRC.
* Install the man page under PKGMANDIR.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7d4ebb1ddf15f50715c91f68f8b5a6e2381f6415
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
focuswriter/CL | 7 +++++++
focuswriter/Makefile | 7 +++----
focuswriter/distinfo | 10 +++++-----
focuswriter/patches/patch-focuswriter.pro | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
diffs:
diff --git a/focuswriter/CL b/focuswriter/CL
new file mode 100644
index 0000000000..7d52a9dd63
--- /dev/null
+++ b/focuswriter/CL
@@ -0,0 +1,7 @@
+focuswriter: Use some default values and install a man page under PKGMANDIR
+
+* https://github.com/gottcode/focuswriter/archive/v1.7.4.tar.gz returns
+ focuswriter-1.7.4.tar.gz. Use this as DISTNAME.
+* Use default WRKSRC.
+
+* Install the man page under PKGMANDIR.
diff --git a/focuswriter/Makefile b/focuswriter/Makefile
index f950f170f6..1622c4722c 100644
--- a/focuswriter/Makefile
+++ b/focuswriter/Makefile
@@ -1,7 +1,6 @@
# $NetBSD$
-DISTNAME= focuswriter-v1.7.4
-PKGNAME= focuswriter-1.7.4
+DISTNAME= focuswriter-1.7.4
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GITHUB:=gottcode/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -11,7 +10,6 @@ HOMEPAGE= https://gottcode.org/focuswriter/
COMMENT= Simple, distraction-free writing environment
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/focuswriter-1.7.4
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c++
USE_TOOLS+= pkg-config
@@ -21,7 +19,8 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
do-configure:
cd ${WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} \
- ${QTDIR}/bin/qmake -o Makefile PREFIX=${PREFIX}
+ ${QTDIR}/bin/qmake -o Makefile \
+ PREFIX=${PREFIX} PKGMANDIR=${PKGMANDIR}
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
diff --git a/focuswriter/distinfo b/focuswriter/distinfo
index e75059a22f..3c147687dd 100644
--- a/focuswriter/distinfo
+++ b/focuswriter/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-SHA1 (focuswriter-v1.7.4.tar.gz) = 1509242e22eed2d51b3e439d7e7f736cda55f734
-RMD160 (focuswriter-v1.7.4.tar.gz) = e74330854c3bad04781cc5e643b951520e6e5a0e
-SHA512 (focuswriter-v1.7.4.tar.gz) = ffe2827f3209eafb35c37eda76d218808760ac287e1c3462ccf05a96d8f546699eb5cf21ecfdf8960b4ef414e2a0aca04f1b6bd8b507a7edda4e0029fd83e875
-Size (focuswriter-v1.7.4.tar.gz) = 10512419 bytes
-SHA1 (patch-focuswriter.pro) = 42591dbbfeed7160decbf23cbc8207067a560d2f
+SHA1 (focuswriter-1.7.4.tar.gz) = 1509242e22eed2d51b3e439d7e7f736cda55f734
+RMD160 (focuswriter-1.7.4.tar.gz) = e74330854c3bad04781cc5e643b951520e6e5a0e
+SHA512 (focuswriter-1.7.4.tar.gz) = ffe2827f3209eafb35c37eda76d218808760ac287e1c3462ccf05a96d8f546699eb5cf21ecfdf8960b4ef414e2a0aca04f1b6bd8b507a7edda4e0029fd83e875
+Size (focuswriter-1.7.4.tar.gz) = 10512419 bytes
+SHA1 (patch-focuswriter.pro) = 23764285b604fc533c28b67d25e62d5498d5f7b0
diff --git a/focuswriter/patches/patch-focuswriter.pro b/focuswriter/patches/patch-focuswriter.pro
index ce645ee365..c090137a2b 100644
--- a/focuswriter/patches/patch-focuswriter.pro
+++ b/focuswriter/patches/patch-focuswriter.pro
@@ -9,7 +9,7 @@ Add man to the correct location
man.files = resources/unix/focuswriter.1
- man.path = $$PREFIX/share/man/man1
-+ man.path = $$PREFIX/man/man1
++ man.path = $$PREFIX/$$PKGMANDIR/man1
qm.files = $$replace(TRANSLATIONS, .ts, .qm)
qm.path = $$DATADIR/focuswriter/translations
Home |
Main Index |
Thread Index |
Old Index