Attachment #103527 for bug #143457

View | Details | Raw Unified | Return to bug 143457
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-3 / +23 lines)
7		7
8	PORTNAME= conky	8	PORTNAME= conky
9	PORTVERSION= 1.7.2	9	PORTVERSION= 1.7.2
10	PORTREVISION= 4	10	PORTREVISION= 5
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13
Lines 26-32 Link Here
26	USE_GMAKE= yes	26	USE_GMAKE= yes
27	CONFIGURE_ARGS+= --disable-portmon \	27	CONFIGURE_ARGS+= --disable-portmon \
28	--disable-hddtemp \	28	--disable-hddtemp \
29	--disable-apcupsd \
30	--disable-iostats	29	--disable-iostats
31	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \	30	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
32	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"	31	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
Lines 37-46 Link Here
37	PORTDOCS= README AUTHORS ChangeLog TODO NEWS \	36	PORTDOCS= README AUTHORS ChangeLog TODO NEWS \
38	docs.html variables.html config_settings.html	37	docs.html variables.html config_settings.html
39		38
40	OPTIONS+= AUDACIOUS "Enable Audacious support" Off \	39	OPTIONS+= APCUPSD "Enable APCUPSD support" Off \
		40	AUDACIOUS "Enable Audacious support" Off \
41	BMPX "Enable BMPX support" Off \	41	BMPX "Enable BMPX support" Off \
42	MPD "Enable MPD support" Off \	42	MPD "Enable MPD support" Off \
43	RSS "Enable RSS support" Off \	43	RSS "Enable RSS support" Off \
		44	METAR "Enable METAR Weather support" Off \
		45	XOAP "Enable XOAP Weather support" Off \
44	XMMS2 "Enable XMMS2 support" Off	46	XMMS2 "Enable XMMS2 support" Off
45		47
46	.if !empty(USE_XORG)	48	.if !empty(USE_XORG)
Lines 65-70 Link Here
65	.undef WITH_XFT	67	.undef WITH_XFT
66	.endif	68	.endif
67		69
		70	.if defined(WITH_APCUPSD)
		71	RUN_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd
		72	CONFIGURE_ARGS+= --enable-apcupsd
		73	.else
		74	CONFIGURE_ARGS+= --disable-apcupsd
		75	.endif
		76
68	.if defined(WITH_AUDACIOUS)	77	.if defined(WITH_AUDACIOUS)
69	LIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious	78	LIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious
70	CONFIGURE_ARGS+= --enable-audacious	79	CONFIGURE_ARGS+= --enable-audacious
Lines 124-129 Link Here
124	USE_GNOME+= glib20	133	USE_GNOME+= glib20
125	.endif	134	.endif
126		135
		136	.if defined(WITH_METAR)
		137	LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl
		138	CONFIGURE_ARGS+= --enable-weather-metar
		139	.endif
		140
		141	.if defined(WITH_XOAP)
		142	LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl \
		143	xml2.5:${PORTSDIR}/textproc/libxml2
		144	CONFIGURE_ARGS+= --enable-weather-xoap
		145	.endif
		146
127	.if defined(WITH_XMMS2)	147	.if defined(WITH_XMMS2)
128	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2	148	LIB_DEPENDS+= xmmsclient.5:${PORTSDIR}/audio/xmms2
129	CONFIGURE_ARGS+= --enable-xmms2	149	CONFIGURE_ARGS+= --enable-xmms2

Lines 1-5 Link Here

(-)files/patch-configure (+9 lines)
1	--- configure.orig	1	--- configure.orig
2	+++ configure	2	+++ configure
		3	@@ -12805,7 +12805,7 @@
		4
		5
		6	if test x$want_apcupsd = xyes; then
		7	- if test x"$uname" != xLinux; then
		8	+ if test x"$uname" != xLinux -a x"$uname" != xFreeBSD; then
		9	{ $as_echo "$as_me:$LINENO: apcupsd not supported on $uname... disabling" >&5
		10	$as_echo "$as_me: apcupsd not supported on $uname... disabling" >&6;}
		11	want_apcupsd=no
3	@@ -15930,7 +15930,7 @@	12	@@ -15930,7 +15930,7 @@
4		13
5	fi	14	fi

Return to bug 143457