From 2d01ec4ee03ae58577c750f01622b553d85f0292 Mon Sep 17 00:00:00 2001 From: ume Date: Sat, 12 Oct 2013 18:08:23 +0000 Subject: - avoid package name collisions. - shorten pkg-descr. - use USES=gmake. --- sysutils/gkrellm/Makefile | 7 ++----- sysutils/gkrellm/pkg-descr | 32 -------------------------------- sysutils/gkrellm2/Makefile | 3 ++- sysutils/gkrellm2/pkg-descr | 1 - 4 files changed, 4 insertions(+), 39 deletions(-) diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index f03535c..2468778 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -12,14 +12,11 @@ MASTER_SITE_SUBDIR= ume MAINTAINER= ume@FreeBSD.org COMMENT= A GTK based system monitor -CONFLICTS= gkrellm-2.* - -NO_LATEST_LINK= yes +CONFLICTS= gkrellm-[^1].* gkrellm[^1]-[^1].* +USES= gettext gmake USE_BZIP2= yes USE_GNOME= imlib -USES= gettext -USE_GMAKE= yes INCLUDES= gkrellm.h gkrellm_public_proto.h MAN1= gkrellm.1 diff --git a/sysutils/gkrellm/pkg-descr b/sysutils/gkrellm/pkg-descr index 51f6bef..1656b7f 100644 --- a/sysutils/gkrellm/pkg-descr +++ b/sysutils/gkrellm/pkg-descr @@ -1,40 +1,8 @@ GKrellM - GNU (or Gtk) Krell Monitors (or Meters) (with an understood 'I' somewhere in appreciation for Imlib) -======================================================================= -Copyright (c) 1999-2000 by Bill Wilson. This program is free software -which I release under the GNU General Public License. -Read the COPYRIGHT file for more info. - -Description -=========== With a single process, GKrellM manages multiple stacked monitors and supports applying themes to match the monitors appearance to your window manager, Gtk, or any other theme. -GKrellM Features -================ - * SMP CPU, Disk, Proc, and active net interface monitors with LEDs. - * Internet monitor that displays current and charts historical port hits. - * Memory and swap space usage meters and a system uptime monitor. - * File system meters show capacity/free space and can mount/umount. - * A mbox/maildir/MH/POP3/IMAP mail monitor which can launch a mail reader - or remote mail fetch program. - * Clock/calendar and hostname display. - * APM laptop battery monitor. - * CPU/motherboard temperature/fan/voltages display if lm_sensors modules - installed. - - * Multiple monitors managed by a single process to reduce system load. - * A timer button that can execute PPP or ISDN logon/logoff scripts. - * Charts are autoscaling with configurable grid line resolution, or - can be set to a fixed scale mode. - * Separate colors for "in" and "out" data. The in color is used for - CPU user time, disk read, forks, and net receive data. The out color - is used for CPU sys time, disk write, load, and net transmit data. - * Commands can be configured to run when monitor labels are clicked. - * GKrellM is plugin capable so special interest monitors can be created. - * Many themes are available. - -Author: Bill Wilson bill@gkrellm.net WWW: http://gkrellm.net diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 9869e29..ccff454 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -7,6 +7,7 @@ CATEGORIES= sysutils ipv6 MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ume +PKGNAMESUFFIX= 2 MAINTAINER= ume@FreeBSD.org COMMENT= A GTK based system monitor @@ -28,7 +29,7 @@ GKRELLM_CLIENT_DESC= GKrellM Client .include .if ${PORT_OPTIONS:MGKRELLM_CLIENT} -CONFLICTS= gkrellm-1.* +CONFLICTS= gkrellm-[^2].* gkrellm[^2]-[^2].* USE_GNOME= gtk20 .if ${PORT_OPTIONS:MNLS} USES+= gettext diff --git a/sysutils/gkrellm2/pkg-descr b/sysutils/gkrellm2/pkg-descr index 7510056..e483af3 100644 --- a/sysutils/gkrellm2/pkg-descr +++ b/sysutils/gkrellm2/pkg-descr @@ -4,5 +4,4 @@ With a single process, GKrellM manages multiple stacked monitors and supports applying themes to match the monitors appearance to your window manager, Gtk, or any other theme. -Author: Bill Wilson bill@gkrellm.net WWW: http://gkrellm.net -- cgit v1.1