- Hide irrelevant options from awesome slave, and fix his install

Submitted by:	Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)

2 files changed, 74 insertions, 3 deletions

diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index ec732f1fc146..6e73d21fd41c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.7.1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,6 +23,7 @@ GNU_CONFIGURE=	yes
 USE_XORG?=	x11 xext xdamage
 USE_GNOME?=	pkgconfig
 USE_ICONV=	yes
+USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-hddtemp
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@@ -35,15 +37,24 @@ PORTDOCS=	README AUTHORS ChangeLog TODO NEWS \
 
 OPTIONS+=	AUDACIOUS "Enable Audacious support" Off \
 		BMPX "Enable BMPX support" Off \
-		DOUBLE_BUFFER "Enable double buffering" On \
-		IMLIB2 "Enable Imlib2 support" Off \
 		LUA "Enable Lua support" Off \
 		MPD "Enable MPD support" Off \
-		XFT "Enable Xft support" Off \
 		XMMS2 "Enable XMMS2 support" Off
 
+.if !empty(USE_XORG)
+OPTIONS+=	DOUBLE_BUFFER "Enable double buffering" On \
+		IMLIB2 "Enable Imlib2 support" Off \
+		XFT "Enable Xft support" Off
+.endif
+
 .include <bsd.port.pre.mk>
 
+.if empty(USE_XORG)
+WITHOUT_DOUBLE_BUFFER=	On
+.undef WITH_IMLIB2
+.undef WITH_XFT
+.endif
+
 .if defined(WITH_AUDACIOUS)
 LIB_DEPENDS+=		audclient.2:${PORTSDIR}/multimedia/audacious
 CONFIGURE_ARGS+=	--enable-audacious
@@ -107,7 +118,11 @@ do-install:
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
+.	if !empty(USE_XORG)
 	@${INSTALL_DATA} ${WRKSRC}/data/conky.conf ${EXAMPLESDIR}/conkyrc.sample
+.	else
+	@${INSTALL_DATA} ${WRKSRC}/data/conky_no_x11.conf ${EXAMPLESDIR}/conkyrc.sample
+.	endif
 .endif
 
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/conky/files/patch-data-conky_no_x11.conf b/sysutils/conky/files/patch-data-conky_no_x11.conf
new file mode 100644
index 000000000000..4f336303ae17
--- /dev/null
+++ b/sysutils/conky/files/patch-data-conky_no_x11.conf
@@ -0,0 +1,56 @@
+--- /dev/null
++++ data/conky_no_x11.conf
+@@ -0,0 +1,53 @@
++# Conky, a system monitor, based on torsmo
++#
++# Any original torsmo code is licensed under the BSD license
++#
++# All code written since the fork of torsmo is licensed under the GPL
++#
++# Please see COPYING for details
++#
++# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
++# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
++# All rights reserved.
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++background no
++cpu_avg_samples 2
++net_avg_samples 2
++no_buffers yes
++out_to_console no
++out_to_stderr no
++update_interval 1.0
++uppercase no
++use_spacer none
++
++TEXT
++${scroll 16 $nodename - $sysname $kernel on $machine | }
++Uptime: $uptime
++Frequency (in MHz): $freq
++Frequency (in GHz): $freq_g
++RAM Usage: $mem/$memmax - $memperc% ${membar 4}
++Swap Usage: $swap/$swapmax - $swapperc% ${swapbar 4}
++CPU Usage: $cpu% ${cpubar 4}
++Processes: $processes  Running: $running_processes
++File systems:
++ / ${fs_used /}/${fs_size /} ${fs_bar 6 /}
++Networking:
++Up: ${upspeed eth0}  - Down: ${downspeed eth0}
++Name              PID   CPU%   MEM%
++ ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
++ ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
++ ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
++ ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}