Date: Tue, 2 Feb 2010 01:55:06 +0200 (EET) From: Nikos Ntarmos <ntarmos@cs.uoi.gr> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143457: [maintainer-update] sysutils/conky support for weather and apcupsd Message-ID: <201002012355.o11Nt5sL007681@zeus.cs.uoi.gr> Resent-Message-ID: <201002020000.o12009up049021@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143457
>Category: ports
>Synopsis: [maintainer-update] sysutils/conky support for weather and apcupsd
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 02 00:00:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Nikos Ntarmos
>Release: FreeBSD 8.0-RELEASE-p2 i386
>Organization:
Computer Science Dept., U. of Ioannina, Greece
>Environment:
System: FreeBSD ace.cs.uoi.gr 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Sat Jan 9 05:01:41 EET 2010 ntarmos@ace.cs.uoi.gr:/opt/src/sys/i386/compile/ACE i386
>Description:
Adding support for weather reports and apcupsd status reading to
sysutils/conky.
>How-To-Repeat:
>Fix:
--- conky.diff begins here ---
--- Makefile.orig
+++ Makefile
@@ -7,7 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.7.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF
@@ -26,7 +26,6 @@
USE_GMAKE= yes
CONFIGURE_ARGS+= --disable-portmon \
--disable-hddtemp \
- --disable-apcupsd \
--disable-iostats
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
@@ -37,10 +36,13 @@
PORTDOCS= README AUTHORS ChangeLog TODO NEWS \
docs.html variables.html config_settings.html
-OPTIONS+= AUDACIOUS "Enable Audacious support" Off \
+OPTIONS+= APCUPSD "Enable APCUPSD support" Off \
+ AUDACIOUS "Enable Audacious support" Off \
BMPX "Enable BMPX support" Off \
MPD "Enable MPD support" Off \
RSS "Enable RSS support" Off \
+ METAR "Enable METAR Weather support" Off \
+ XOAP "Enable XOAP Weather support" Off \
XMMS2 "Enable XMMS2 support" Off
.if !empty(USE_XORG)
@@ -65,6 +67,13 @@
.undef WITH_XFT
.endif
+.if defined(WITH_APCUPSD)
+RUN_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
+CONFIGURE_ARGS+= --enable-apcupsd
+.else
+CONFIGURE_ARGS+= --disable-apcupsd
+.endif
+
.if defined(WITH_AUDACIOUS)
LIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious
CONFIGURE_ARGS+= --enable-audacious
@@ -124,6 +133,17 @@
USE_GNOME+= glib20
.endif
+.if defined(WITH_METAR)
+LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+= --enable-weather-metar
+.endif
+
+.if defined(WITH_XOAP)
+LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl \
+ xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+= --enable-weather-xoap
+.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,14 @@
--- configure.orig
+++ configure
+@@ -12805,7 +12805,7 @@
+
+
+ if test x$want_apcupsd = xyes; then
+- if test x"$uname" != xLinux; then
++ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
+ { $as_echo "$as_me:$LINENO: apcupsd not supported on $uname... disabling" >&5
+ $as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;}
+ want_apcupsd=no
@@ -15930,7 +15930,7 @@
fi
--- conky.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002012355.o11Nt5sL007681>