From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 18:40:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99DEC106567D for ; Tue, 17 May 2011 18:40:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 776C48FC23 for ; Tue, 17 May 2011 18:40:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4HIeCfZ038847 for ; Tue, 17 May 2011 18:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4HIeCxh038846; Tue, 17 May 2011 18:40:12 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2011 18:40:12 GMT Resent-Message-Id: <201105171840.p4HIeCxh038846@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Felder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 864EF106566C; Tue, 17 May 2011 18:36:07 +0000 (UTC) (envelope-from feld@feld.me) Received: from que31.charter.net (que31.charter.net [209.225.8.23]) by mx1.freebsd.org (Postfix) with ESMTP id 2F2708FC1B; Tue, 17 May 2011 18:36:06 +0000 (UTC) Received: from imp10 ([10.20.200.15]) by mta21.charter.net (InterMail vM.7.09.02.04 201-2219-117-106-20090629) with ESMTP id <20110517182430.GIZC11595.mta21.charter.net@imp10>; Tue, 17 May 2011 14:24:30 -0400 Received: from feld.me ([68.117.126.78]) by imp10 with smtp.charter.net id kiQW1g00F1hcoSk05iQWEb; Tue, 17 May 2011 14:24:30 -0400 Received: from feld by feld.me with local (Exim 4.75 (FreeBSD)) (envelope-from ) id 1QMOwY-000FmZ-5n; Tue, 17 May 2011 13:24:30 -0500 Message-Id: Date: Tue, 17 May 2011 13:24:30 -0500 From: Mark Felder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: lx@FreeBSD.org Subject: ports/157127: [PATCH] x11/workrave: update to 1.9.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2011 18:40:12 -0000 >Number: 157127 >Category: ports >Synopsis: [PATCH] x11/workrave: update to 1.9.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 17 18:40:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Mark Felder >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD nas.feld.me 8.2-STABLE FreeBSD 8.2-STABLE #0: Sun May 1 00:16:54 CDT >Description: - Update to 1.9.4 Port maintainer (lx@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- workrave-1.9.4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11/workrave.orig/Makefile /usr/ports/x11/workrave/Makefile --- /usr/ports/x11/workrave.orig/Makefile 2010-07-05 14:37:29.000000000 -0500 +++ /usr/ports/x11/workrave/Makefile 2011-05-17 13:22:21.000000000 -0500 @@ -6,8 +6,7 @@ # PORTNAME= workrave -PORTVERSION= 1.9.1 -PORTREVISION= 4 +PORTVERSION= 1.9.4 CATEGORIES= x11 gnome MASTER_SITES= SF @@ -19,11 +18,12 @@ OPTIONS= GNOME "Build with Gnome support" off \ NETWORK "Build with network support" off +INSTALLS_ICONS= yes DESKTOP_ENTRIES= "Workrave" "An RSI prevention tool" \ "${DATADIR}/images/workrave-icon-small.png" \ "workrave" \ "Application;Utility;" \ - false + ${FALSE} USE_XORG= x11 xmu recordproto xtst xext USE_GMAKE= yes @@ -31,10 +31,9 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2 intltool USE_GSTREAMER= good GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ - LDFLAGS="-L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="`pkg-config --libs libgnomeui-2.0`" -CONFIGURE_ARGS= --enable-gconf +CONFIGURE_ARGS= --enable-gconf --disable-pulse .include LIB_DEPENDS+= gdome.8:${PORTSDIR}/textproc/gdome2 @@ -63,17 +62,4 @@ PLIST_SUB+= NLS="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|#include ||g ; \ - s|SigC::Signal|sigc::signal|g ; \ - s|SigC::slot_class|sigc::mem_fun|g ; \ - s|SigC::Connection|sigc::connection|g ; \ - s|SigC::Slot|sigc::slot|g ; \ - s|SigC::Object|sigc::trackable|g ; \ - s|SigC::slot|sigc::mem_fun|g' \ - ${WRKSRC}/frontend/gtkmm/src/*.* \ - ${WRKSRC}/frontend/plugin/*/gtkmm/src/*.* - @${REINPLACE_CMD} -e 's|Gtk::HButtonBox|Gtk::ButtonBox|g' \ - ${WRKSRC}/frontend/plugin/exercises/gtkmm/src/ExercisesPanel.* - .include diff -ruN --exclude=CVS /usr/ports/x11/workrave.orig/distinfo /usr/ports/x11/workrave/distinfo --- /usr/ports/x11/workrave.orig/distinfo 2011-03-19 07:38:06.000000000 -0500 +++ /usr/ports/x11/workrave/distinfo 2011-05-17 10:49:19.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (workrave-1.9.1.tar.gz) = 5c23af4b36fc6dd27b0f1b58373868d925fb91ec9ff40b7c7bbcec52a1b28ab9 -SIZE (workrave-1.9.1.tar.gz) = 6594737 +SHA256 (workrave-1.9.4.tar.gz) = ce1efa57a37192029c4dcbe8a0ac2b893b2286c42828f19b0fb86867cbbcde1a +SIZE (workrave-1.9.4.tar.gz) = 6748495 diff -ruN --exclude=CVS /usr/ports/x11/workrave.orig/files/patch-System.cc /usr/ports/x11/workrave/files/patch-System.cc --- /usr/ports/x11/workrave.orig/files/patch-System.cc 2010-03-25 14:06:36.000000000 -0500 +++ /usr/ports/x11/workrave/files/patch-System.cc 2011-05-17 11:56:27.000000000 -0500 @@ -1,12 +1,20 @@ ---- frontend/common/src/System.cc.old 2010-03-25 11:16:41.000000000 -0700 -+++ frontend/common/src/System.cc 2010-03-25 11:16:55.000000000 -0700 -@@ -41,9 +41,6 @@ +--- frontend/common/src/System.cc.old 2011-05-17 11:54:41.000000000 -0500 ++++ frontend/common/src/System.cc 2011-05-17 11:55:13.000000000 -0500 +@@ -41,15 +41,12 @@ #include #include #include --#endif -- --#if defined(HAVE_UNIX) - #include ++#include + #ifdef HAVE_APP_GTK + #include + #endif #endif +-#if defined(HAVE_UNIX) +-#include +-#endif +- + #ifdef PLATFORM_OS_WIN32 + #include + #include + diff -ruN --exclude=CVS /usr/ports/x11/workrave.orig/pkg-plist /usr/ports/x11/workrave/pkg-plist --- /usr/ports/x11/workrave.orig/pkg-plist 2010-03-25 14:06:36.000000000 -0500 +++ /usr/ports/x11/workrave/pkg-plist 2011-05-17 13:22:12.000000000 -0500 @@ -3,8 +3,12 @@ %%GNOME%%libdata/bonobo/servers/Workrave-Control.server %%GNOME%%libexec/workrave-applet %%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml -share/pixmaps/workrave/workrave.xpm -share/pixmaps/workrave/workrave-icon-huge.png +share/dbus-1/services/org.workrave.Workrave.service +share/locale/ga/LC_MESSAGES/workrave.mo +share/locale/ko/LC_MESSAGES/workrave.mo +share/locale/te/LC_MESSAGES/workrave.mo +share/icons/hicolor/48x48/apps/workrave-icon-huge.png +share/icons/hicolor/scalable/apps/workrave-sheep.svg share/sounds/workrave/subtle/break-ignored.wav share/sounds/workrave/subtle/break-prelude.wav share/sounds/workrave/subtle/daily-limit.wav @@ -27,7 +31,7 @@ share/sounds/workrave/default/rest-break-ended.wav share/sounds/workrave/default/rest-break-started.wav share/sounds/workrave/default/soundtheme -%%DATADIR%%/images/workrave.xpm +share/workrave/images/workrave.xpm %%DATADIR%%/exercises/backward-shoulder-stretch.png %%DATADIR%%/exercises/chair-pushup-1.png %%DATADIR%%/exercises/chair-pushup-2.png @@ -105,4 +109,3 @@ @dirrm share/sounds/workrave/default @dirrm share/sounds/workrave/subtle @dirrm share/sounds/workrave -@dirrm share/pixmaps/workrave --- workrave-1.9.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: