From nobody@FreeBSD.org  Fri Dec  4 22:20:52 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7E921065692
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Dec 2009 22:20:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id A5F398FC25
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  4 Dec 2009 22:20:52 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nB4MKqXq035393
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 4 Dec 2009 22:20:52 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id nB4MKpCe035392;
	Fri, 4 Dec 2009 22:20:51 GMT
	(envelope-from nobody)
Message-Id: <200912042220.nB4MKpCe035392@www.freebsd.org>
Date: Fri, 4 Dec 2009 22:20:51 GMT
From: kevin <kevinxlinuz@163.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: conky can't build with --enable-lua-cairo
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: ntarmos@cs.uoi.gr

>Number:         141176
>Category:       ports
>Synopsis:       sysutils/conky can't build with --enable-lua-cairo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 04 22:30:01 UTC 2009
>Closed-Date:    Fri Dec 18 20:14:52 UTC 2009
>Last-Modified:  Fri Dec 18 20:20:04 UTC 2009
>Originator:     kevin
>Release:        9.0current
>Organization:
163.org
>Environment:
FreeBSD people.163.org 9.0-CURRENT FreeBSD 9.0-CURRENT #4 r200091: Fri Dec  4 14:03:47 CST 2009     root@people.163.org:/usr/obj/usr/home/datastream/freebsd/sys/G9laptop  amd64
>Description:
1. conky should add option --enable-lua-cairo.
2. when i add --enable-lua-cairo into conky's Makefile, it can't build.
3. --enable-lua-cairo request dependency tolua++.
4. conky's configure has many mistakes when --enable-lua-cairo was added.some test case should be rewrited.
./configure --disable-portmon --disable-hddtemp --enable-lua-cairo --disable-audacious --disable-bmpx --enable-lua --enable-imlib2 --enable-xft --disable-mpd --disable-xmms2 --x-libraries=/usr/local/lib --x-includes=/usr/local/include --prefix=/usr/local --mandir=/usr/local/man --infodir=/usr/local/info/ --build=amd64-portbld-freebsd9.0
5. tolua++ in freebsd is tolua++-5.1,but in conky's configure files it was tolua++5.1

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:

From: kevin <kevinxlinuz@163.com>
To: FreeBSD-gnats-submit <FreeBSD-gnats-submit@FreeBSD.org>, 
	freebsd-ports-bugs <freebsd-ports-bugs@FreeBSD.org>
Cc:  
Subject: Re:Re: ports/141176: conky can't build with --enable-lua-cairo
Date: Sun, 6 Dec 2009 03:00:46 +0800 (CST)

 ------=_Part_75220_1519151.1260039646762
 Content-Type: text/plain; charset=gbk
 Content-Transfer-Encoding: base64
 
 SSByZWFkIHRoZSBlcnJvciBsb2cgYWdhaW4saSB0aGluayBmb2xsb3dpbmcgcGF0Y2ggd2lsbCBm
 aXggdGhlIGJ1Zy4KCgoKLS0tIHdvcmsvY29ua3ktMS43LjIvY29uZmlndXJlICAgIDIwMDktMTIt
 MDYgMDI6NTQ6MDEuMDExNDI5MzM4ICswODAwCisrKyBjb25maWd1cmUgICAgMjAwOS0xMi0wNiAw
 Mjo1Mzo1NS4wNTEzMDM4MzggKzA4MDAKQEAgLTE1OTMwLDcgKzE1OTMwLDcgQEAKIAogICAgICAg
 ICAgICAgZmkKICAgICAgICAgZmkKLSAgICAgICAgZm9yIGFjX3Byb2cgaW4gdG9sdWErKyB0b2x1
 YSsrNS4xCisgICAgICAgIGZvciBhY19wcm9nIGluIHRvbHVhKystNS4xCiBkbwogICAjIEV4dHJh
 Y3QgdGhlIGZpcnN0IHdvcmQgb2YgIiRhY19wcm9nIiwgc28gaXQgY2FuIGJlIGEgcHJvZ3JhbSBu
 YW1lIHdpdGggYXJncy4KIHNldCBkdW1teSAkYWNfcHJvZzsgYWNfd29yZD0kMgpAQCAtMTYwMDYs
 NyArMTYwMDYsNyBAQAogICByZXR1cm4gMDsKIH0KIF9BQ0VPRgotZm9yIGFjX2xpYiBpbiAnJyB0
 b2x1YSsrIHRvbHVhKys1LjE7IGRvCitmb3IgYWNfbGliIGluICcnIHRvbHVhKystNS4xOyBkbwog
 ICBpZiB0ZXN0IC16ICIkYWNfbGliIjsgdGhlbgogICAgIGFjX3Jlcz0ibm9uZSByZXF1aXJlZCIK
 ICAgZWxzZQoKCk9uIDIwMDktMTItMDWjrEZyZWVCU0QtZ25hdHMtc3VibWl0QEZyZWVCU0Qub3Jn
 IHdyb3Rlo7oKPlRoYW5rIHlvdSB2ZXJ5IG11Y2ggZm9yIHlvdXIgcHJvYmxlbSByZXBvcnQuCj5J
 dCBoYXMgdGhlIGludGVybmFsIGlkZW50aWZpY2F0aW9uIGBwb3J0cy8xNDExNzYnLgo+VGhlIGlu
 ZGl2aWR1YWwgYXNzaWduZWQgdG8gbG9vayBhdCB5b3VyCj5yZXBvcnQgaXM6IGZyZWVic2QtcG9y
 dHMtYnVncy4gCj4KPllvdSBjYW4gYWNjZXNzIHRoZSBzdGF0ZSBvZiB5b3VyIHByb2JsZW0gcmVw
 b3J0IGF0IGFueSB0aW1lCj52aWEgdGhpcyBsaW5rOgo+Cj5odHRwOi8vd3d3LmZyZWVic2Qub3Jn
 L2NnaS9xdWVyeS1wci5jZ2k/cHI9MTQxMTc2Cj4KPj5DYXRlZ29yeTogICAgICAgcG9ydHMKPj5S
 ZXNwb25zaWJsZTogICAgZnJlZWJzZC1wb3J0cy1idWdzCj4+U3lub3BzaXM6ICAgICAgIGNvbmt5
 IGNhbid0IGJ1aWxkIHdpdGggLS1lbmFibGUtbHVhLWNhaXJvCj4+QXJyaXZhbC1EYXRlOiAgIEZy
 aSBEZWMgMDQgMjI6MzA6MDEgVVRDIDIwMDkK
 ------=_Part_75220_1519151.1260039646762
 Content-Type: text/html; charset=gbk
 Content-Transfer-Encoding: base64
 
 PGRpdj5JIHJlYWQgdGhlIGVycm9yIGxvZyBhZ2FpbixpIHRoaW5rIGZvbGxvd2luZyBwYXRjaCB3
 aWxsIGZpeCB0aGUgYnVnLjxicj48YnI+PGJyPjwvZGl2Pi0tLSB3b3JrL2Nvbmt5LTEuNy4yL2Nv
 bmZpZ3VyZSZuYnNwOyZuYnNwOyZuYnNwOyAyMDA5LTEyLTA2IDAyOjU0OjAxLjAxMTQyOTMzOCAr
 MDgwMDxicj4rKysgY29uZmlndXJlJm5ic3A7Jm5ic3A7Jm5ic3A7IDIwMDktMTItMDYgMDI6NTM6
 NTUuMDUxMzAzODM4ICswODAwPGJyPkBAIC0xNTkzMCw3ICsxNTkzMCw3IEBAPGJyPiZuYnNwOzxi
 cj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgJm5ic3A7Jm5ic3A7Jm5ic3A7ICZuYnNwOyZuYnNw
 OyZuYnNwOyBmaTxicj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgJm5ic3A7Jm5ic3A7Jm5ic3A7
 IGZpPGJyPi0mbmJzcDsmbmJzcDsmbmJzcDsgJm5ic3A7Jm5ic3A7Jm5ic3A7IGZvciBhY19wcm9n
 IGluIHRvbHVhKysgdG9sdWErKzUuMTxicj4rJm5ic3A7Jm5ic3A7Jm5ic3A7ICZuYnNwOyZuYnNw
 OyZuYnNwOyBmb3IgYWNfcHJvZyBpbiB0b2x1YSsrLTUuMTxicj4mbmJzcDtkbzxicj4mbmJzcDsm
 bmJzcDsgIyBFeHRyYWN0IHRoZSBmaXJzdCB3b3JkIG9mICIkYWNfcHJvZyIsIHNvIGl0IGNhbiBi
 ZSBhIHByb2dyYW0gbmFtZSB3aXRoIGFyZ3MuPGJyPiZuYnNwO3NldCBkdW1teSAkYWNfcHJvZzsg
 YWNfd29yZD0kMjxicj5AQCAtMTYwMDYsNyArMTYwMDYsNyBAQDxicj4mbmJzcDsmbmJzcDsgcmV0
 dXJuIDA7PGJyPiZuYnNwO308YnI+Jm5ic3A7X0FDRU9GPGJyPi1mb3IgYWNfbGliIGluICcnIHRv
 bHVhKysgdG9sdWErKzUuMTsgZG88YnI+K2ZvciBhY19saWIgaW4gJycgdG9sdWErKy01LjE7IGRv
 PGJyPiZuYnNwOyZuYnNwOyBpZiB0ZXN0IC16ICIkYWNfbGliIjsgdGhlbjxicj4mbmJzcDsmbmJz
 cDsmbmJzcDsmbmJzcDsgYWNfcmVzPSJub25lIHJlcXVpcmVkIjxicj4mbmJzcDsmbmJzcDsgZWxz
 ZTxicj48YnI+PHByZT5PbiAyMDA5LTEyLTA1o6xGcmVlQlNELWduYXRzLXN1Ym1pdEBGcmVlQlNE
 Lm9yZyB3cm90ZaO6CiZndDtUaGFuayB5b3UgdmVyeSBtdWNoIGZvciB5b3VyIHByb2JsZW0gcmVw
 b3J0LgomZ3Q7SXQgaGFzIHRoZSBpbnRlcm5hbCBpZGVudGlmaWNhdGlvbiBgcG9ydHMvMTQxMTc2
 Jy4KJmd0O1RoZSBpbmRpdmlkdWFsIGFzc2lnbmVkIHRvIGxvb2sgYXQgeW91cgomZ3Q7cmVwb3J0
 IGlzOiBmcmVlYnNkLXBvcnRzLWJ1Z3MuIAomZ3Q7CiZndDtZb3UgY2FuIGFjY2VzcyB0aGUgc3Rh
 dGUgb2YgeW91ciBwcm9ibGVtIHJlcG9ydCBhdCBhbnkgdGltZQomZ3Q7dmlhIHRoaXMgbGluazoK
 Jmd0OwomZ3Q7aHR0cDovL3d3dy5mcmVlYnNkLm9yZy9jZ2kvcXVlcnktcHIuY2dpP3ByPTE0MTE3
 NgomZ3Q7CiZndDsmZ3Q7Q2F0ZWdvcnk6ICAgICAgIHBvcnRzCiZndDsmZ3Q7UmVzcG9uc2libGU6
 ICAgIGZyZWVic2QtcG9ydHMtYnVncwomZ3Q7Jmd0O1N5bm9wc2lzOiAgICAgICBjb25reSBjYW4n
 dCBidWlsZCB3aXRoIC0tZW5hYmxlLWx1YS1jYWlybwomZ3Q7Jmd0O0Fycml2YWwtRGF0ZTogICBG
 cmkgRGVjIDA0IDIyOjMwOjAxIFVUQyAyMDA5CjwvcHJlPg==
 ------=_Part_75220_1519151.1260039646762--
 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ntarmos@cs.uoi.gr
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/141176: sysutils/conky can't build with --enable-lua-cairo
Date: Sun, 6 Dec 2009 20:56:39 UT

 Maintainer of sysutils/conky,
 
 Please note that PR ports/141176 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/141176
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Dec 6 21:03:02 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141176 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: ntarmos@cs.uoi.gr
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/141176: sysutils/conky can't build with --enable-lua-cairo
Date: Sun, 6 Dec 2009 21:03:00 UT

 Maintainer of sysutils/conky,
 
 Please note that PR ports/141176 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/141176
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Nikos Ntarmos <ntarmos@cs.uoi.gr>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/141176: sysutils/conky can't build with
 --enable-lua-cairo
Date: Wed, 16 Dec 2009 16:32:25 +0200

 It is a bit more complicated than that. I've prepared a comprehensive
 patch (some more things changed since the last version) and I'm now
 waiting for a tinderbox build to complete. I'll submit it in a day or
 two.
 
 Cheers.
 
 \n\n

From: Nikos Ntarmos <ntarmos@cs.uoi.gr>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/141176: sysutils/conky can't build with
 --enable-lua-cairo
Date: Fri, 18 Dec 2009 20:06:23 +0200

 --J/dobhs11T7y2rNN
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Patch attached, along with an accompanying patch for conky-awesome.
 
 Cheers.
 
 \n\n
 
 --J/dobhs11T7y2rNN
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="conky.diff"
 
 --- Makefile.orig
 +++ Makefile
 @@ -6,8 +6,8 @@
  #
  
  PORTNAME=	conky
  PORTVERSION=	1.7.2
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	sysutils
  MASTER_SITES=	SF
  
 @@ -17,6 +17,7 @@
  CONFLICTS?=	conky-awesome-[0-9]*
  SLAVEDIRS=	sysutils/conky-awesome
  
 +USE_ICONV=	yes
  USE_BZIP2=	yes
  GNU_CONFIGURE=	yes
  USE_XORG?=	x11 xext xdamage
 @@ -24,7 +25,9 @@
  USE_ICONV=	yes
  USE_GMAKE=	yes
  CONFIGURE_ARGS+=	--disable-portmon \
 -			--disable-hddtemp
 +			--disable-hddtemp \
 +			--disable-apcupsd \
 +			--disable-iostats
  CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
  		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
  
 @@ -36,21 +39,29 @@
  
  OPTIONS+=	AUDACIOUS "Enable Audacious support" Off \
  		BMPX "Enable BMPX support" Off \
 -		LUA "Enable Lua support" Off \
  		MPD "Enable MPD support" Off \
 +		RSS "Enable RSS support" Off \
  		XMMS2 "Enable XMMS2 support" Off
  
  .if !empty(USE_XORG)
  OPTIONS+=	DOUBLE_BUFFER "Enable double buffering" On \
  		IMLIB2 "Enable Imlib2 support" Off \
 +		LUA "Enable Lua support" Off \
 +		LUA_CAIRO "Enable Lua-Cairo binding (impl. Lua)" Off \
 +		LUA_IMLIB2 "Enable Lua-Imlib2 binding (impl. Lua/Imlib2)" Off \
  		XFT "Enable Xft support" Off
 +.else
 +OPTIONS+=	LUA "Enable Lua support" Off
  .endif
  
  .include <bsd.port.pre.mk>
  
  .if empty(USE_XORG)
  WITHOUT_DOUBLE_BUFFER=	On
 +CONFIGURE_ARGS+=	--disable-x11 --disable-own-window
  .undef WITH_IMLIB2
 +.undef WITH_LUA_CAIRO
 +.undef WITH_LUA_IMLIB2
  .undef WITH_XFT
  .endif
  
 @@ -70,20 +81,31 @@
  CONFIGURE_ARGS+=	--disable-bmpx
  .endif
  
 -.if defined(WITH_LUA)
 +.if defined(WITH_LUA) || defined(WITH_LUA_CAIRO) || defined(WITH_LUA_IMLIB2)
  USE_LUA=		5.1+
  CONFIGURE_ARGS+=	--enable-lua
  .else
  CONFIGURE_ARGS+=	--disable-lua
  .endif
  
 -.if defined(WITH_IMLIB2)
 +.if defined(WITH_LUA_CAIRO)
 +LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 +BUILD_DEPENDS+=		tolua++-5.1:${PORTSDIR}/lang/tolua++
 +CONFIGURE_ARGS+=	--enable-lua-cairo
 +.endif
 +
 +.if defined(WITH_IMLIB2) || defined(WITH_LUA_IMLIB2)
  LIB_DEPENDS+=		Imlib2.5:${PORTSDIR}/graphics/imlib2
  CONFIGURE_ARGS+=	--enable-imlib2
  .else
  CONFIGURE_ARGS+=	--disable-imlib2
  .endif
  
 +.if defined(WITH_LUA_IMLIB2)
 +BUILD_DEPENDS+=		tolua++-5.1:${PORTSDIR}/lang/tolua++
 +CONFIGURE_ARGS+=	--enable-lua-imlib2
 +.endif
 +
  .if defined(WITH_XFT)
  LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
  CONFIGURE_ARGS+=	--enable-xft
 @@ -95,6 +117,13 @@
  CONFIGURE_ARGS+=	--disable-mpd
  .endif
  
 +.if defined(WITH_RSS)
 +LIB_DEPENDS+=		curl.5:${PORTSDIR}/ftp/curl \
 +			xml2.5:${PORTSDIR}/textproc/libxml2
 +CONFIGURE_ARGS+=	--enable-rss
 +USE_GNOME+=		glib20
 +.endif
 +
  .if defined(WITH_XMMS2)
  LIB_DEPENDS+=		xmmsclient.5:${PORTSDIR}/audio/xmms2
  CONFIGURE_ARGS+=	--enable-xmms2
 --- files/patch-configure.orig
 +++ files/patch-configure
 @@ -1,5 +1,23 @@
 ---- configure.orig	2009-09-17 09:53:21.000000000 +0300
 -+++ configure	2009-09-17 10:13:11.000000000 +0300
 +--- configure.orig
 ++++ configure
 +@@ -15930,7 +15930,7 @@
 + 
 + 			fi
 + 		fi
 +-		for ac_prog in tolua++ tolua++5.1
 ++		for ac_prog in tolua++ tolua++5.1 tolua++-5.1
 + do
 +   # Extract the first word of "$ac_prog", so it can be a program name with args.
 + set dummy $ac_prog; ac_word=$2
 +@@ -16006,7 +16006,7 @@
 +   return 0;
 + }
 + _ACEOF
 +-for ac_lib in '' tolua++ tolua++5.1; do
 ++for ac_lib in '' tolua++-5.1 tolua++ tolua++5.1; do
 +   if test -z "$ac_lib"; then
 +     ac_res="none required"
 +   else
  @@ -19845,7 +19845,6 @@
   ac_res=$ac_cv_search_clock_gettime
   if test "$ac_res" != no; then
 --- files/patch-data-conky_no_x11.conf.orig
 +++ files/patch-data-conky_no_x11.conf
 @@ -1,56 +0,0 @@
 ---- /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}
 
 --J/dobhs11T7y2rNN
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="conky-awesome.diff"
 
 --- Makefile.orig
 +++ Makefile
  MAINTAINER=	ntarmos@cs.uoi.gr
  COMMENT=	An advanced, highly configurable system monitor (configured for x11-wm/awesome)
  
 -MASTERDIR=	${.CURDIR}/../../sysutils/conky
 +MASTERDIR=	${.CURDIR}/../conky
  DESCR=		${.CURDIR}/pkg-descr
  
  CONFLICTS=	conky-[0-9]*
  
  USE_XORG=	# This is a comment
 -USE_GNOME=	pkgconfig
 -CONFIGURE_ARGS+=	--disable-x11 --disable-own-window
  
  .include "${MASTERDIR}/Makefile"
 
 --J/dobhs11T7y2rNN--
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Fri Dec 18 19:41:07 UTC 2009 
State-Changed-Why:  
maintainer has replied with patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141176 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Dec 18 20:09:12 UTC 2009 
State-Changed-Why:  
Maintainer's patches committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141176 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/141176: commit references a PR
Date: Fri, 18 Dec 2009 20:14:43 +0000 (UTC)

 pav         2009-12-18 20:14:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/conky       Makefile 
     sysutils/conky/files patch-configure 
     sysutils/conky-awesome Makefile 
   Removed files:
     sysutils/conky/files patch-data-conky_no_x11.conf 
   Log:
   - Add RSS, LUA_CAIRO and LUA_IMLIB2 options
   
   PR:             ports/141176
   Submitted by:   Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)
   
   Revision  Changes    Path
   1.40      +1 -3      ports/sysutils/conky-awesome/Makefile
   1.50      +34 -5     ports/sysutils/conky/Makefile
   1.2       +20 -2     ports/sysutils/conky/files/patch-configure
   1.2       +0 -56     ports/sysutils/conky/files/patch-data-conky_no_x11.conf (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
