ports/135368: [maintainer-update] sysutils/conky v1.7.1
Nikos Ntarmos
ntarmos at cs.uoi.gr
Mon Jun 8 12:50:05 UTC 2009
>Number: 135368
>Category: ports
>Synopsis: [maintainer-update] sysutils/conky v1.7.1
>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: Mon Jun 08 12:50:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Nikos Ntarmos
>Release: FreeBSD 7.2-RELEASE i386
>Organization:
Computer Science Dept., U. of Ioannina, Greece
>Environment:
System: FreeBSD ace.cs.uoi.gr 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Wed May 6 03:50:47 EEST 2009 ntarmos at ace.cs.uoi.gr:/opt/obj/opt/src/sys/ACE i386
>Description:
Updating sysutils/conky to version 1.7.1. I've migrated all WITH_*
options to use the OPTIONS framework. The last hunk in the attached
patch is against ports/UPDATING, stating this change.
>How-To-Repeat:
>Fix:
--- conky-1.7.1.diff begins here ---
--- Makefile.orig
+++ Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= conky
-PORTVERSION= 1.7.0
-PORTREVISION= 1
+PORTVERSION= 1.7.1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -24,16 +23,27 @@
USE_GNOME?= pkgconfig
USE_ICONV= yes
CONFIGURE_ARGS+= --disable-portmon \
- --disable-config-output \
--disable-hddtemp
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
MAN1= conky.1
-
+PLIST_FILES= bin/conky
+PORTEXAMPLES= conkyrc.sample
PORTDOCS= README AUTHORS ChangeLog TODO NEWS \
docs.html variables.html config_settings.html
+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
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_AUDACIOUS)
LIB_DEPENDS+= audclient.2:${PORTSDIR}/multimedia/audacious
CONFIGURE_ARGS+= --enable-audacious
@@ -50,6 +60,20 @@
CONFIGURE_ARGS+= --disable-bmpx
.endif
+.if defined(WITH_LUA)
+USE_LUA= 5.1+
+CONFIGURE_ARGS+= --enable-lua
+.else
+CONFIGURE_ARGS+= --disable-lua
+.endif
+
+.if defined(WITH_IMLIB2)
+LIB_DEPENDS+= Imlib2.5:${PORTSDIR}/graphics/imlib2
+CONFIGURE_ARGS+= --enable-imlib2
+.else
+CONFIGURE_ARGS+= --disable-imlib2
+.endif
+
.if defined(WITH_XFT)
LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
CONFIGURE_ARGS+= --enable-xft
@@ -57,15 +81,7 @@
CONFIGURE_ARGS+= --disable-xft
.endif
-#.if !defined(WITHOUT_OWN_WINDOW)
-#CONFIGURE_ARGS+= --enable-own-window
-#.else
-#CONFIGURE_ARGS+= --disable-own-window
-#.endif
-
-.if defined(WITH_MPD)
-CONFIGURE_ARGS+= --enable-mpd
-.else
+.if defined(WITHOUT_MPD)
CONFIGURE_ARGS+= --disable-mpd
.endif
@@ -80,29 +96,19 @@
CONFIGURE_ARGS+= --disable-double-buffer
.endif
-.if defined(WITHOUT_SETI)
-CONFIGURE_ARGS+= --disable-seti
-.endif
-
-pre-everything::
- @${ECHO_MSG} "You may specify the following on the command line:"
- @${ECHO_MSG} " "
- @${ECHO_MSG} "WITH_AUDACIOUS=yes to enable Audacious support"
- @${ECHO_MSG} "WITH_BMPX=yes to enable BMPx support"
- @${ECHO_MSG} "WITH_XFT=yes to enable XFT support"
- @${ECHO_MSG} "WITHOUT_OWN_WINDOW=yes to disable own window support"
- @${ECHO_MSG} "WITH_MPD=yes to enable MPD support"
- @${ECHO_MSG} "WITH_XMMS2=yes to enable XMMS2 support"
- @${ECHO_MSG} "WITHOUT_DOUBLE_BUFFER=yes to disable double buffer support"
- @${ECHO_MSG} " "
+post-patch:
+ @${REINPLACE_CMD} -e 's,lua5\.1,lua-5.1,g' \
+ ${WRKSRC}/configure
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1
post-install:
+.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/data/conky.conf ${EXAMPLESDIR}/conkyrc.sample
+.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@@ -114,4 +120,4 @@
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- distinfo.orig
+++ distinfo
@@ -1,3 +1,3 @@
-MD5 (conky-1.7.0.tar.bz2) = 10360c37d76ab25f4d585bcdfd07f075
-SHA256 (conky-1.7.0.tar.bz2) = 088594166c33a03fc5aacb63ecb15a6b83ffb80dc3aa40e1f10b897ca1733355
-SIZE (conky-1.7.0.tar.bz2) = 478369
+MD5 (conky-1.7.1.tar.bz2) = 5b6dc0daccec578350f36bb2d6deb843
+SHA256 (conky-1.7.1.tar.bz2) = 3d847583966a2755df495aac589cbdfda59563bdc0be4d8b5cb288373e99b02b
+SIZE (conky-1.7.1.tar.bz2) = 510058
--- files/patch-src-conf_cookie.c.orig
+++ files/patch-src-conf_cookie.c
@@ -1,14 +0,0 @@
---- src/conf_cookie.c.orig 2009-05-03 12:39:27.000000000 +0300
-+++ src/conf_cookie.c 2009-05-03 12:39:48.000000000 +0300
-@@ -23,11 +23,3 @@
- }
- return i;
- }
--
--cookie_io_functions_t conf_cookie = {
-- .read = &conf_read,
-- .write = NULL,
-- .seek = NULL,
-- .close = NULL,
--};
--
--- pkg-plist.orig
+++ pkg-plist
@@ -1,4 +0,0 @@
- at comment $FreeBSD: ports/sysutils/conky/pkg-plist,v 1.2 2006/10/14 08:53:22 marcus Exp $
-bin/conky
-%%EXAMPLESDIR%%/conkyrc.sample
- at dirrm %%EXAMPLESDIR%%
--- UPDATING.orig
+++ UPDATING
@@ -6,6 +6,13 @@
time you update your ports collection, before attempting any port
upgrades.
+20090608:
+ AFFECTS: users of sysutils/conky
+ AUTHOR: ntarmos at cs.uoi.gr
+
+ Starting from version 1.7.1 conky is using the OPTIONS framework.
+ Please, use 'make config' to set your options.
+
20090606:
AFFECTS: users of java/eclipse
AUTHOR: glewis at FreeBSD.org
--- conky-1.7.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list