diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
| commit | 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch) | |
| tree | 961839899dce7f75292a08c079f548973bdbd40d /sysutils/gnome-system-monitor | |
| parent | 85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff) | |
| download | ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.tar.gz ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.zip | |
Notes
Diffstat (limited to 'sysutils/gnome-system-monitor')
| -rw-r--r-- | sysutils/gnome-system-monitor/Makefile | 20 | ||||
| -rw-r--r-- | sysutils/gnome-system-monitor/files/patch-src_interface.h | 11 |
2 files changed, 23 insertions, 8 deletions
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 9296e0c53f11..28d090a7f0c9 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: gnomesystemmonitor -# Date created: 09 May 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $ -# +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.147 2012/10/02 15:10:10 kwm Exp $ PORTNAME= gnome-system-monitor PORTVERSION= 2.28.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,6 +17,8 @@ LIB_DEPENDS= gtop-2.0.7:${PORTSDIR}/devel/libgtop \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme +CONFLICTS= gnome-system-monitor-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes @@ -28,9 +26,15 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \ librsvg2 GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lutil" CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lutil GCONF_SCHEMAS= gnome-system-monitor.schemas +post-patch: + @${REINPLACE_CMD} -e 's|<glib/gtypes.h>|<glib.h>|g' \ + -e 's|<glib/gmacros.h>|<glib.h>|g' \ + -e 's|<glib/gstring.h>|<glib.h>|g' \ + ${WRKSRC}/src/*.[ch] ${WRKSRC}/src/*.cpp + .include <bsd.port.mk> diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.h b/sysutils/gnome-system-monitor/files/patch-src_interface.h new file mode 100644 index 000000000000..3e8eea33973d --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_interface.h @@ -0,0 +1,11 @@ +--- src/interface.h.orig 2012-06-12 22:10:02.000000000 +0200 ++++ src/interface.h 2012-06-12 22:10:12.000000000 +0200 +@@ -20,7 +20,7 @@ + #ifndef _PROCMAN_INTERFACE_H_ + #define _PROCMAN_INTERFACE_H_ + +-#include <glib/gtypes.h> ++#include <glib.h> + #include <gtk/gtk.h> + #include "procman.h" + |