6 files changed, 46 insertions, 40 deletions

diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 26645c448485..88654cd06571 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	conky
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +18,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+CONFIGURE_ARGS+=	--disable-portmon --disable-proc-uptime
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
 
@@ -26,6 +27,15 @@ MAN1=		conky.1
 PORTDOCS=	README AUTHORS ChangeLog TODO \
 		docs.html variables.html config_settings.html
 
+.if defined(WITH_BMPX)
+BUILD_DEPENDS+=		bmpx:${PORTSDIR}/multimedia/bmpx
+RUN_DEPENDS+=		bmpx:${PORTSDIR}/multimedia/bmpx
+LIB_DEPENDS+=		dbus-1.1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-bmpx
+.else
+CONFIGURE_ARGS+=	--disable-bmpx
+.endif
+
 .if defined(WITH_XFT)
 LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
@@ -49,8 +59,15 @@ CONFIGURE_ARGS+=	--disable-mpd
 CONFIGURE_ARGS+=	--disable-double-buffer
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e "s|== xyes|= xyes|g" ${WRKSRC}/configure
+pre-everything::
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} " "
+	@${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} "WITHOUT_DOUBLE_BUFFER=yes to disable double buffer support"
+	@${ECHO_MSG} " "
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin
diff --git a/sysutils/conky-awesome/distinfo b/sysutils/conky-awesome/distinfo
index 8de58a439439..c3b0d2bd3312 100644
--- a/sysutils/conky-awesome/distinfo
+++ b/sysutils/conky-awesome/distinfo
@@ -1,3 +1,3 @@
-MD5 (conky-1.3.4.tar.bz2) = 91f7d4ce29a6bc2d785f13224ea4aaac
-SHA256 (conky-1.3.4.tar.bz2) = 049e490936769d3b4ce7c2d9a240dc61a31aa065ec0ccd8e4ab0dcd35cdca99e
-SIZE (conky-1.3.4.tar.bz2) = 332871
+MD5 (conky-1.3.5.tar.bz2) = e93e0f930dc2d8adfff6dec1e8db301b
+SHA256 (conky-1.3.5.tar.bz2) = 5e7ac1fb87073bef4565066920e98923a04207cf7519a4552de99f19d027a6e5
+SIZE (conky-1.3.5.tar.bz2) = 339478
diff --git a/sysutils/conky-awesome/files/patch-src-freebsd.c b/sysutils/conky-awesome/files/patch-src-freebsd.c
deleted file mode 100644
index e42eabd93114..000000000000
--- a/sysutils/conky-awesome/files/patch-src-freebsd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/freebsd.c.orig	Fri Dec  9 16:24:52 2005
-+++ src/freebsd.c	Fri Dec  9 16:25:12 2005
-@@ -741,9 +741,9 @@
- 	return out;
- }
- 
-+#endif
-+
- /* empty stub so conky links */
- void free_all_processes( void )
- {
- }
--	
--#endif
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 26645c448485..88654cd06571 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	conky
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +18,7 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+CONFIGURE_ARGS+=	--disable-portmon --disable-proc-uptime
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
 
@@ -26,6 +27,15 @@ MAN1=		conky.1
 PORTDOCS=	README AUTHORS ChangeLog TODO \
 		docs.html variables.html config_settings.html
 
+.if defined(WITH_BMPX)
+BUILD_DEPENDS+=		bmpx:${PORTSDIR}/multimedia/bmpx
+RUN_DEPENDS+=		bmpx:${PORTSDIR}/multimedia/bmpx
+LIB_DEPENDS+=		dbus-1.1:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-bmpx
+.else
+CONFIGURE_ARGS+=	--disable-bmpx
+.endif
+
 .if defined(WITH_XFT)
 LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--enable-xft
@@ -49,8 +59,15 @@ CONFIGURE_ARGS+=	--disable-mpd
 CONFIGURE_ARGS+=	--disable-double-buffer
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e "s|== xyes|= xyes|g" ${WRKSRC}/configure
+pre-everything::
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} " "
+	@${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} "WITHOUT_DOUBLE_BUFFER=yes to disable double buffer support"
+	@${ECHO_MSG} " "
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 8de58a439439..c3b0d2bd3312 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-MD5 (conky-1.3.4.tar.bz2) = 91f7d4ce29a6bc2d785f13224ea4aaac
-SHA256 (conky-1.3.4.tar.bz2) = 049e490936769d3b4ce7c2d9a240dc61a31aa065ec0ccd8e4ab0dcd35cdca99e
-SIZE (conky-1.3.4.tar.bz2) = 332871
+MD5 (conky-1.3.5.tar.bz2) = e93e0f930dc2d8adfff6dec1e8db301b
+SHA256 (conky-1.3.5.tar.bz2) = 5e7ac1fb87073bef4565066920e98923a04207cf7519a4552de99f19d027a6e5
+SIZE (conky-1.3.5.tar.bz2) = 339478
diff --git a/sysutils/conky/files/patch-src-freebsd.c b/sysutils/conky/files/patch-src-freebsd.c
deleted file mode 100644
index e42eabd93114..000000000000
--- a/sysutils/conky/files/patch-src-freebsd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/freebsd.c.orig	Fri Dec  9 16:24:52 2005
-+++ src/freebsd.c	Fri Dec  9 16:25:12 2005
-@@ -741,9 +741,9 @@
- 	return out;
- }
- 
-+#endif
-+
- /* empty stub so conky links */
- void free_all_processes( void )
- {
- }
--	
--#endif