UPDATE: x11/qdirstat

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: x11/qdirstat

Rafael Sadowski

Very simple update to the latest stable version. Works fine on amd64.

- Replace many patches by setting INSTALL_PREFIX
- fix man page install path

Best regards,

Rafael Sadowski

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qdirstat/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 29 Jun 2018 22:16:34 -0000 1.3
+++ Makefile 6 Dec 2018 20:55:36 -0000
@@ -4,8 +4,7 @@ COMMENT = Qt-based directory statistics
 
 GH_ACCOUNT = shundhammer
 GH_PROJECT = qdirstat
-GH_TAGNAME = 1.4
-REVISION = 1
+GH_TAGNAME = 1.5
 
 CATEGORIES = x11
 
@@ -22,6 +21,8 @@ MODULES = devel/qmake \
 
 RUN_DEPENDS += devel/desktop-file-utils \
  x11/gtk+3,-guic
+
+MODQMAKE_ARGS += INSTALL_PREFIX=${PREFIX}
 
 post-install:
  ${INSTALL_PROGRAM} ${WRKBUILD}/src/qdirstat ${PREFIX}/bin/
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/qdirstat/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ distinfo 6 Dec 2018 20:55:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (qdirstat-1.4.tar.gz) = f5oKcwTFXr+tHlDHdHunYrBwaPSDBLPTkZvbZe4DeZk=
-SIZE (qdirstat-1.4.tar.gz) = 2534241
+SHA256 (qdirstat-1.5.tar.gz) = XeIfsczJ9N8pspaaplIje0Qw4s++N/btoIhILtRL2/U=
+SIZE (qdirstat-1.5.tar.gz) = 4546980
Index: patches/patch-doc_doc_pro
===================================================================
RCS file: patches/patch-doc_doc_pro
diff -N patches/patch-doc_doc_pro
--- patches/patch-doc_doc_pro 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_doc_pro,v 1.1.1.1 2017/10/26 12:54:07 rsadowski Exp $
-
-Index: doc/doc.pro
---- doc/doc.pro.orig
-+++ doc/doc.pro
-@@ -5,7 +5,7 @@ TARGET     = $(nothing)
- doc.files  = *.txt *.md ../*.md ../LICENSE
-
- # Ubuntu / Debian pkg doc path
--doc.path = /usr/share/doc/qdirstat
-+doc.path = $$PREFIX/share/doc/qdirstat
-
- exists( /usr/share/doc/packages ) {
-     # SUSE pkg doc path
Index: patches/patch-doc_stats_stats_pro
===================================================================
RCS file: patches/patch-doc_stats_stats_pro
diff -N patches/patch-doc_stats_stats_pro
--- patches/patch-doc_stats_stats_pro 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_stats_stats_pro,v 1.1.1.1 2017/10/26 12:54:07 rsadowski Exp $
-
-Index: doc/stats/stats.pro
---- doc/stats/stats.pro.orig
-+++ doc/stats/stats.pro
-@@ -5,7 +5,7 @@ TARGET     = $(nothing)
- doc.files  = *.txt *.md
-
- # Ubuntu / Debian pkg doc path
--doc.path = /usr/share/doc/qdirstat/stats
-+doc.path = $$PREFIX/share/doc/qdirstat/stats
-
- exists( /usr/share/doc/packages ) {
-     # SUSE pkg doc path
Index: patches/patch-man_man_pro
===================================================================
RCS file: patches/patch-man_man_pro
diff -N patches/patch-man_man_pro
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-man_man_pro 6 Dec 2018 20:55:36 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: man/man.pro
+--- man/man.pro.orig
++++ man/man.pro
+@@ -13,8 +13,7 @@ MAN_TARGET  ~= s/.1$/.1.gz/g
+ # message(target: $$MAN_TARGET)
+
+ man.files    = $$MAN_TARGET
+-man.commands = gzip --keep --force $$MAN_SRC
+-man.path     = $$INSTALL_PREFIX/share/man/man1
++man.path     = $$INSTALL_PREFIX/man/man1
+
+ INSTALLS    += man
+ QMAKE_CLEAN += $$MAN_TARGET
Index: patches/patch-scripts_scripts_pro
===================================================================
RCS file: patches/patch-scripts_scripts_pro
diff -N patches/patch-scripts_scripts_pro
--- patches/patch-scripts_scripts_pro 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_scripts_pro,v 1.1.1.1 2017/10/26 12:54:07 rsadowski Exp $
-
-Index: scripts/scripts.pro
---- scripts/scripts.pro.orig
-+++ scripts/scripts.pro
-@@ -5,7 +5,7 @@ TARGET         = $(nothing)
- QMAKE_STRIP    = /bin/true # prevent stripping the script(s)
-
- scripts.files  = qdirstat-cache-writer
--scripts.path   = /usr/bin
-+scripts.path   = $$PREFIX/bin
-
- INSTALLS      += scripts
-
Index: patches/patch-src_Exception_cpp
===================================================================
RCS file: patches/patch-src_Exception_cpp
diff -N patches/patch-src_Exception_cpp
--- patches/patch-src_Exception_cpp 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_Exception_cpp,v 1.1.1.1 2017/10/26 12:54:07 rsadowski Exp $
-
-fix errno(2) include
-
-Index: src/Exception.cpp
---- src/Exception.cpp.orig
-+++ src/Exception.cpp
-@@ -7,7 +7,7 @@
-  */
-
-
--#include <sys/errno.h>
-+#include <errno.h>
-
- #include "Exception.h"
-
Index: patches/patch-src_src_pro
===================================================================
RCS file: /cvs/ports/x11/qdirstat/patches/patch-src_src_pro,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_src_pro
--- patches/patch-src_src_pro 26 Oct 2017 12:54:07 -0000 1.1.1.1
+++ patches/patch-src_src_pro 6 Dec 2018 20:55:36 -0000
@@ -3,24 +3,12 @@ $OpenBSD: patch-src_src_pro,v 1.1.1.1 20
 Index: src/src.pro
 --- src/src.pro.orig
 +++ src/src.pro
-@@ -23,7 +23,7 @@ major_is_less_5 = $$find(QT_MAJOR_VERSION, [234])
+@@ -174,7 +174,7 @@ desktop.files   = *.desktop
+ desktop.path    = $$INSTALL_PREFIX/share/applications
 
- TARGET = qdirstat
- TARGET.files = qdirstat
--TARGET.path = /usr/bin
-+TARGET.path = $$PREFIX/bin
- INSTALLS += TARGET desktop icons
+ icons.files     = icons/qdirstat.svg
+-icons.path      = $$INSTALL_PREFIX/share/icons/hicolor/scalable/apps
++icons.path      = $$INSTALL_PREFIX/share/icons/hicolor/32x32/apps
 
- SOURCES  = main.cpp \
-@@ -155,9 +155,9 @@ FORMS  = main-window.ui   \
- RESOURCES = icons.qrc
 
- desktop.files = *.desktop
--desktop.path  = /usr/share/applications
-+desktop.path  = $$PREFIX/share/applications
-
- icons.files   = icons/qdirstat.png
--icons.path    = /usr/share/icons/hicolor/32x32/apps
-+icons.path    = $$PREFIX/share/icons/hicolor/32x32/apps
-
- mac:ICON      = icons/qdirstat.icns
+ mac:ICON        = icons/qdirstat.icns
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/qdirstat/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:34 -0000 1.3
+++ pkg/PLIST 6 Dec 2018 20:55:36 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:34 espie Exp $
-@pkgpath x11/kdirstat
 @conflict kdirstat-*
+@pkgpath x11/kdirstat
 @bin bin/qdirstat
 bin/qdirstat-cache-writer
 share/applications/qdirstat.desktop
@@ -11,7 +11,6 @@ share/doc/qdirstat/Debugging-Tips.md
 share/doc/qdirstat/DevHistory.md
 share/doc/qdirstat/GitHub-Workflow.md
 share/doc/qdirstat/Installing.md
-share/doc/qdirstat/LICENSE
 share/doc/qdirstat/QDirStat-for-Servers.md
 share/doc/qdirstat/README.md
 share/doc/qdirstat/TODO.md
@@ -27,6 +26,6 @@ share/doc/qdirstat/stats/Overflow-Area.m
 share/doc/qdirstat/stats/Percentiles-Table.md
 share/doc/qdirstat/stats/README.md
 share/doc/qdirstat/stats/Statistics.md
-share/icons/hicolor/32x32/apps/qdirstat.png
+share/icons/hicolor/32x32/apps/qdirstat.svg
 @tag update-desktop-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/qdirstat

Klemens Nanni-2
On Thu, Dec 06, 2018 at 10:00:28PM +0100, Rafael Sadowski wrote:
>
> Very simple update to the latest stable version. Works fine on amd64.
>
> - Replace many patches by setting INSTALL_PREFIX
> - fix man page install path
Packages/works fine, OK kn.