On Tue, November 28, 2017 11:28, Landry Breuil wrote:
> On Tue, Nov 28, 2017 at 11:25:02AM +0300, Kirill Bychkov wrote:
>> On Sat, November 18, 2017 16:26, Kirill Bychkov wrote:
>> > On Sun, November 12, 2017 13:54, Kirill Bychkov wrote:
>> >> Hi!
>> >> This updates gsmartcontrol to latest version. Works fine on amd64.
>> >> OK to commit?
>> >
>> > ping
>>
>> anyone?
>
> Patch doesnt apply; mangled by mailer.. also, can you please keep the
> @exec lines at the bottom of pkg/PLIST, even if update-plist is stupid ?
>
> Landry
>
>
Hi!
Updated diff attached.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/gsmartcontrol/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 16 Nov 2017 23:20:40 -0000 1.17
+++ Makefile 28 Nov 2017 09:23:19 -0000
@@ -1,13 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2017/11/16 23:20:40 naddy Exp $
-# XXX check if still needed at next update
-CXXFLAGS += -std=c++11
-
COMMENT= graphical hard drive inspection tool (smartctl front-end)
-DISTNAME= gsmartcontrol-1.0.2
+DISTNAME= gsmartcontrol-1.1.3
EXTRACT_SUFX= .tar.bz2
-REVISION= 0
CATEGORIES= sysutils x11
@@ -19,8 +15,8 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += atk-1.0 atkmm-1.6 c cairo cairo-gobject cairomm-1.0
WANTLIB += gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0
WANTLIB += glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0 intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangomm-1.4 pcre pthread sigc-2.0 util
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += pangocairo-1.0 pangomm-1.4 pcre pcrecpp pthread sigc-2.0
+WANTLIB += util ${COMPILER_LIBCXX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsmartcontrol/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/gsmartcontrol/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 23 Jul 2017 12:32:53 -0000 1.4
+++ distinfo 28 Nov 2017 09:23:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (gsmartcontrol-1.0.2.tar.bz2) = T3BFHDWdle3JdEmLhgaWtpjxmxhzQNxyB7SzjLr14gc=
-SIZE (gsmartcontrol-1.0.2.tar.bz2) = 695445
+SHA256 (gsmartcontrol-1.1.3.tar.bz2) = tk9iz/pEMKkLbQbNUuut1bzznVSN9YHmffsnWmc7Eqk=
+SIZE (gsmartcontrol-1.1.3.tar.bz2) = 677998
Index: patches/patch-data_gsmartcontrol-root_in
===================================================================
RCS file: /cvs/ports/sysutils/gsmartcontrol/patches/patch-data_gsmartcontrol-root_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-data_gsmartcontrol-root_in
--- patches/patch-data_gsmartcontrol-root_in 23 Jul 2017 12:32:53 -0000 1.3
+++ patches/patch-data_gsmartcontrol-root_in 28 Nov 2017 09:23:19 -0000
@@ -8,7 +8,7 @@ Index: data/gsmartcontrol-root.in
############################################################################
# Copyright:
# (C) 2008 - 2014 Alexander Shaduri <ashaduri 'at' gmail.com>
-@@ -92,7 +92,7 @@ fi
+@@ -93,7 +93,7 @@ fi
if [ "$GSMARTCONTROL_SU" = "" ]; then
for subin in $candidates; do
Index: patches/patch-src_res_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/gsmartcontrol/patches/patch-src_res_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_res_Makefile_in
--- patches/patch-src_res_Makefile_in 23 Jul 2017 12:32:53 -0000 1.2
+++ patches/patch-src_res_Makefile_in 28 Nov 2017 09:23:19 -0000
@@ -7,7 +7,7 @@ earlier in the Makefile only works with
Index: src/res/Makefile.in
--- src/res/Makefile.in.orig
+++ src/res/Makefile.in
-@@ -605,9 +605,6 @@ uninstall-am:
+@@ -604,9 +604,6 @@ uninstall-am:
mostlyclean-local:
rm -f *.ui.cpp *.tmp_ui *.txt.cpp
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/gsmartcontrol/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 23 Jul 2017 12:32:53 -0000 1.5
+++ pkg/PLIST 28 Nov 2017 09:23:19 -0000
@@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2017/07/23 12:32:53 ajacoutot Exp $
-@bin bin/gsmartcontrol
bin/gsmartcontrol-root
@man man/man1/gsmartcontrol-root.1
@man man/man1/gsmartcontrol.1
+@bin sbin/gsmartcontrol
share/applications/gsmartcontrol.desktop
share/doc/gsmartcontrol/
share/doc/gsmartcontrol/AUTHORS.txt
@@ -14,7 +14,6 @@ share/doc/gsmartcontrol/LICENSE_gpl2.txt
share/doc/gsmartcontrol/LICENSE_gpl3.txt
share/doc/gsmartcontrol/LICENSE_gsmartcontrol.txt
share/doc/gsmartcontrol/LICENSE_hz.txt
-share/doc/gsmartcontrol/LICENSE_pcrecpp.txt
share/doc/gsmartcontrol/LICENSE_unlicense.txt
share/doc/gsmartcontrol/LICENSE_zlib.txt
share/doc/gsmartcontrol/NEWS
@@ -41,6 +40,9 @@ share/metainfo/gsmartcontrol.appdata.xml
share/pixmaps/
share/pixmaps/gsmartcontrol.png
share/pixmaps/gsmartcontrol.xpm
+share/polkit-1/
+share/polkit-1/actions/
+share/polkit-1/actions/org.gsmartcontrol.policy
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
