From owner-svn-ports-head@FreeBSD.ORG Sat Oct 12 18:08:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 390C1F36; Sat, 12 Oct 2013 18:08:25 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24CAE29D5; Sat, 12 Oct 2013 18:08:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CI8P5R069631; Sat, 12 Oct 2013 18:08:25 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CI8ODt069626; Sat, 12 Oct 2013 18:08:24 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201310121808.r9CI8ODt069626@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 12 Oct 2013 18:08:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330163 - in head/sysutils: gkrellm gkrellm2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Oct 2013 18:08:25 -0000 Author: ume Date: Sat Oct 12 18:08:23 2013 New Revision: 330163 URL: http://svnweb.freebsd.org/changeset/ports/330163 Log: - avoid package name collisions. - shorten pkg-descr. - use USES=gmake. Modified: head/sysutils/gkrellm/Makefile head/sysutils/gkrellm/pkg-descr head/sysutils/gkrellm2/Makefile head/sysutils/gkrellm2/pkg-descr Modified: head/sysutils/gkrellm/Makefile ============================================================================== --- head/sysutils/gkrellm/Makefile Sat Oct 12 18:05:15 2013 (r330162) +++ head/sysutils/gkrellm/Makefile Sat Oct 12 18:08:23 2013 (r330163) @@ -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 Modified: head/sysutils/gkrellm/pkg-descr ============================================================================== --- head/sysutils/gkrellm/pkg-descr Sat Oct 12 18:05:15 2013 (r330162) +++ head/sysutils/gkrellm/pkg-descr Sat Oct 12 18:08:23 2013 (r330163) @@ -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 Modified: head/sysutils/gkrellm2/Makefile ============================================================================== --- head/sysutils/gkrellm2/Makefile Sat Oct 12 18:05:15 2013 (r330162) +++ head/sysutils/gkrellm2/Makefile Sat Oct 12 18:08:23 2013 (r330163) @@ -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 Modified: head/sysutils/gkrellm2/pkg-descr ============================================================================== --- head/sysutils/gkrellm2/pkg-descr Sat Oct 12 18:05:15 2013 (r330162) +++ head/sysutils/gkrellm2/pkg-descr Sat Oct 12 18:08:23 2013 (r330163) @@ -4,5 +4,4 @@ With a single process, GKrellM manages m 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