From 8e37ba06e08e7f038d543b6ee29711d50702c816 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 23 Jul 2017 12:32:53 +0000 Subject: [PATCH] Update to gsmartcontrol-1.0.2. --- sysutils/gsmartcontrol/Makefile | 40 ++++++++---------- sysutils/gsmartcontrol/distinfo | 4 +- .../patches/patch-data_gsmartcontrol-root_in | 42 +++---------------- .../patches/patch-src_res_Makefile_in | 17 ++++---- sysutils/gsmartcontrol/pkg/PLIST | 4 +- 5 files changed, 38 insertions(+), 69 deletions(-) diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index 4f4460392c9..da1032d446a 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -1,41 +1,37 @@ -# $OpenBSD: Makefile,v 1.14 2017/05/31 08:08:17 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2017/07/23 12:32:53 ajacoutot Exp $ # XXX check if still needed at next update CXXFLAGS += -std=c++11 -COMMENT= graphical hard drive inspection tool (smartctl front-end) +COMMENT= graphical hard drive inspection tool (smartctl front-end) -DISTNAME= gsmartcontrol-0.8.7 -EXTRACT_SUFX= .tar.bz2 -REVISION= 0 +DISTNAME= gsmartcontrol-1.0.2 +EXTRACT_SUFX= .tar.bz2 -CATEGORIES= sysutils x11 +CATEGORIES= sysutils x11 -HOMEPAGE= http://gsmartcontrol.sourceforge.net/ +HOMEPAGE= http://gsmartcontrol.sourceforge.net/ # GPLv2 or GPLv3 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 atkmm-1.6 c cairo cairomm-1.0 -WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 -WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-x11-2.0 -WANTLIB += gtkmm-2.4 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 -WANTLIB += pcre pthread sigc-2.0 util z +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 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsmartcontrol/} - -MODULES= devel/gettext +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gsmartcontrol/} # c++11 -COMPILER = gcc +COMPILER = gcc -RUN_DEPENDS= devel/desktop-file-utils \ - sysutils/smartmontools \ - x11/gtk+3,-guic -LIB_DEPENDS= x11/gtk2mm +RUN_DEPENDS= devel/desktop-file-utils \ + sysutils/smartmontools \ + x11/gtk+3,-guic -CONFIGURE_STYLE=gnu +LIB_DEPENDS= x11/gtk3mm + +CONFIGURE_STYLE= gnu pre-configure: ${SUBST_CMD} ${WRKSRC}/src/gsc_settings.h diff --git a/sysutils/gsmartcontrol/distinfo b/sysutils/gsmartcontrol/distinfo index d45c6b48cb8..d7df8492851 100644 --- a/sysutils/gsmartcontrol/distinfo +++ b/sysutils/gsmartcontrol/distinfo @@ -1,2 +1,2 @@ -SHA256 (gsmartcontrol-0.8.7.tar.bz2) = cI+oAyQ6u4Uu1SBQ/ILNNZKnmMAnQzQkQZlud/Gf/sY= -SIZE (gsmartcontrol-0.8.7.tar.bz2) = 684394 +SHA256 (gsmartcontrol-1.0.2.tar.bz2) = T3BFHDWdle3JdEmLhgaWtpjxmxhzQNxyB7SzjLr14gc= +SIZE (gsmartcontrol-1.0.2.tar.bz2) = 695445 diff --git a/sysutils/gsmartcontrol/patches/patch-data_gsmartcontrol-root_in b/sysutils/gsmartcontrol/patches/patch-data_gsmartcontrol-root_in index 5cee9b69c38..2a78959de0d 100644 --- a/sysutils/gsmartcontrol/patches/patch-data_gsmartcontrol-root_in +++ b/sysutils/gsmartcontrol/patches/patch-data_gsmartcontrol-root_in @@ -1,49 +1,19 @@ -$OpenBSD: patch-data_gsmartcontrol-root_in,v 1.2 2015/05/09 15:24:44 ajacoutot Exp $ ---- data/gsmartcontrol-root.in.orig Sun Feb 19 15:57:50 2012 -+++ data/gsmartcontrol-root.in Sat May 9 17:14:41 2015 +$OpenBSD: patch-data_gsmartcontrol-root_in,v 1.3 2017/07/23 12:32:53 ajacoutot Exp $ +Index: data/gsmartcontrol-root.in +--- data/gsmartcontrol-root.in.orig ++++ data/gsmartcontrol-root.in @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################ # Copyright: - # (C) 2008 - 2012 Alexander Shaduri -@@ -74,8 +74,8 @@ fi - # sux requires xterm to ask for the password. - # xdg-su is basically like this script, except worse :) - # su-to-root is a debian/ubuntu official method (although gksu is available). --gnome_sus="su-to-root gnomesu gksu kdesu beesu xdg-su sux"; --kde_sus="su-to-root kdesu gnomesu gksu beesu xdg-su sux"; -+gnome_sus="gksu-polkit"; -+kde_sus="kdesu"; - other_sus="$gnome_sus"; - - + # (C) 2008 - 2014 Alexander Shaduri @@ -92,7 +92,7 @@ fi if [ "$GSMARTCONTROL_SU" = "" ]; then for subin in $candidates; do - which $subin &>/dev/null -+ which $subin > /dev/null 2>&1 ++ which $subin >/dev/null 2>&1 if [ $? -eq 0 ]; then found_su="$subin"; break; -@@ -101,7 +101,7 @@ if [ "$GSMARTCONTROL_SU" = "" ]; then - - if [ "$found_su" = "" ]; then - xmessage "Error launching ${prog_name}: No suitable su mechanism found. --Try installing kdesu, gnomesu, gksu, beesu or sux first."; -+Try installing kdesu or gksu-polkit first."; - exit 1; - fi - fi -@@ -148,7 +148,9 @@ elif [ "$found_su" = "beesu" ]; then - elif [ "$found_su" = "su-to-root" ]; then - full_cmd="$found_su -X -c '$EXEC_BIN $final_args_quoted'"; - --else # gnomesu, kdesu, xdg-su -+elif [ "$found_su" = "$gnome_sus" ]; then -+ full_cmd="$found_su $EXEC_BIN $@"; -+else # kdesu, xdg-su - full_cmd="$found_su -c '$EXEC_BIN $final_args_quoted'"; - fi - diff --git a/sysutils/gsmartcontrol/patches/patch-src_res_Makefile_in b/sysutils/gsmartcontrol/patches/patch-src_res_Makefile_in index 8795ffb9a9a..039fba96617 100644 --- a/sysutils/gsmartcontrol/patches/patch-src_res_Makefile_in +++ b/sysutils/gsmartcontrol/patches/patch-src_res_Makefile_in @@ -1,18 +1,19 @@ -$OpenBSD: patch-src_res_Makefile_in,v 1.1 2014/07/20 14:29:34 pascal Exp $ +$OpenBSD: patch-src_res_Makefile_in,v 1.2 2017/07/23 12:32:53 ajacoutot Exp $ Work around .cpp suffix rules. These rules are not actually needed as the files are distributed with the tarball. Upstream workaround of setting SUFFIXES= earlier in the Makefile only works with GNU make. ---- src/res/Makefile.in.orig Sun Jul 20 13:10:41 2014 -+++ src/res/Makefile.in Sun Jul 20 13:11:00 2014 -@@ -517,9 +517,6 @@ uninstall-am: +Index: src/res/Makefile.in +--- src/res/Makefile.in.orig ++++ src/res/Makefile.in +@@ -605,9 +605,6 @@ uninstall-am: mostlyclean-local: - rm -f *.glade.cpp *.ui.cpp *.tmp_ui *.txt.cpp + rm -f *.ui.cpp *.tmp_ui *.txt.cpp -# This lists the actual makefile rules for each target. -@RES_TARGETS@ - - # # List all local resource files here. Note: noinst_DATA doesn't put them into distribution (why?) - # EXTRA_DIST = gsc_about_dialog.glade gsc_executor_log_window.glade \ - # gsc_help_window.glade gsc_info_window.glade gsc_main_window.glade \ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/sysutils/gsmartcontrol/pkg/PLIST b/sysutils/gsmartcontrol/pkg/PLIST index 58eec4d5578..3702965912c 100644 --- a/sysutils/gsmartcontrol/pkg/PLIST +++ b/sysutils/gsmartcontrol/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2012/06/15 08:32:17 ajacoutot Exp $ +@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 @@ -36,6 +36,8 @@ share/icons/hicolor/256x256/apps/gsmartcontrol.png share/icons/hicolor/32x32/apps/gsmartcontrol.png share/icons/hicolor/48x48/apps/gsmartcontrol.png share/icons/hicolor/64x64/apps/gsmartcontrol.png +share/metainfo/ +share/metainfo/gsmartcontrol.appdata.xml share/pixmaps/ share/pixmaps/gsmartcontrol.png share/pixmaps/gsmartcontrol.xpm