ports/185302: sysutils/conky staging support, option helpers

[Zsolt Udvari]

>Number:         185302
>Category:       ports
>Synopsis:       sysutils/conky staging support, option helpers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 30 17:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Zsolt Udvari
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD bsd-zsolt 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root at bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
sysutils/conky staging support and use option helpers.
>How-To-Repeat:
>Fix:

--- conky.diff begins here ---
diff -ur /usr/ports/sysutils/conky/Makefile conky/Makefile
--- /usr/ports/sysutils/conky/Makefile	2013-09-21 01:05:58.000000000 +0200
+++ conky/Makefile	2013-12-30 18:34:53.000000000 +0100
@@ -25,8 +25,7 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		conky.1
-PLIST_FILES=	bin/conky
+PLIST_FILES=	bin/conky man/man1/conky.1.gz
 PORTEXAMPLES=	conkyrc.sample
 PORTDOCS=	README AUTHORS ChangeLog TODO NEWS \
 		docs.html variables.html config_settings.html
@@ -53,7 +52,23 @@
 XMMS2_DESC=		Control XMMS2 media player
 XOAP_DESC=		Display XOAP weather reports
 
-NO_STAGE=	yes
+APCUPSD_CONFIGURE_ENABLE=apcupsd
+ARGB_CONFIGURE_ENABLE=argb
+AUDACIOUS_CONFIGURE_ENABLE=audacious
+AUDACIOUS_LIB_DEPENDS=audclient:${PORTSDIR}/multimedia/audacious
+DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer
+INOTIFY_CONFIGURE_ENABLE=inotify
+INOTIFY_LIB_DEPENDS=inotify:${PORTSDIR}/devel/libinotify
+METAR_CONFIGURE_ENABLE=weather-metar
+METAR_LIB_DEPENDS=curl:${PORTSDIR}/ftp/curl
+MOC_CONFIGURE_ENABLE=moc
+MPD_CONFIGURE_ENABLE=mpd
+NCURSES_CONFIGURE_ENABLE=ncurses
+XFT_CONFIGURE_ENABLE=xft
+XFT_LIB_DEPENDS=Xft:${PORTSDIR}/x11-fonts/libXft
+XMMS2_CONFIGURE_ENABLE=xmms2
+XMMS2_LIB_DEPENDS=xmmsclient:${PORTSDIR}/audio/xmms2
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MARGB} || ${PORT_OPTIONS:MDOUBLE_BUFFER} || ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2} || ${PORT_OPTIONS:MXFT} || ${PORT_OPTIONS:MX11}
@@ -65,31 +80,6 @@
 EXAMPLE_CONF_FILE=	${WRKSRC}/data/conky_no_x11.conf
 .endif
 
-.if ${PORT_OPTIONS:MAPCUPSD}
-CONFIGURE_ARGS+=	--enable-apcupsd
-.else
-CONFIGURE_ARGS+=	--disable-apcupsd
-.endif
-
-.if ${PORT_OPTIONS:MARGB}
-CONFIGURE_ARGS+=	--enable-argb
-.else
-CONFIGURE_ARGS+=	--disable-argb
-.endif
-
-.if ${PORT_OPTIONS:MAUDACIOUS}
-LIB_DEPENDS+=		audclient:${PORTSDIR}/multimedia/audacious
-CONFIGURE_ARGS+=	--enable-audacious
-.else
-CONFIGURE_ARGS+=	--disable-audacious
-.endif
-
-.if ${PORT_OPTIONS:MDOUBLE_BUFFER}
-CONFIGURE_ARGS+=	--enable-double-buffer
-.else
-CONFIGURE_ARGS+=	--disable-double-buffer
-.endif
-
 .if ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_IMLIB2}
 LIB_DEPENDS+=		Imlib2:${PORTSDIR}/graphics/imlib2
 CONFIGURE_ARGS+=	--enable-imlib2
@@ -97,13 +87,6 @@
 CONFIGURE_ARGS+=	--disable-imlib2
 .endif
 
-.if ${PORT_OPTIONS:MINOTIFY}
-LIB_DEPENDS+=		inotify:${PORTSDIR}/devel/libinotify
-CONFIGURE_ARGS+=	--enable-inotify
-.else
-CONFIGURE_ARGS+=	--disable-inotify
-.endif
-
 .if ${PORT_OPTIONS:MLUA_CAIRO}
 LIB_DEPENDS+=		cairo:${PORTSDIR}/graphics/cairo
 BUILD_DEPENDS+=		tolua++-5.1:${PORTSDIR}/lang/tolua++
@@ -128,31 +111,6 @@
 CONFIGURE_ARGS+=	--disable-lua
 .endif
 
-.if ${PORT_OPTIONS:MMETAR}
-LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--enable-weather-metar
-.else
-CONFIGURE_ARGS+=	--disable-weather-metar
-.endif
-
-.if ${PORT_OPTIONS:MMOC}
-CONFIGURE_ARGS+=	--enable-moc
-.else
-CONFIGURE_ARGS+=	--disable-moc
-.endif
-
-.if ${PORT_OPTIONS:MMPD}
-CONFIGURE_ARGS+=	--enable-mpd
-.else
-CONFIGURE_ARGS+=	--disable-mpd
-.endif
-
-.if ${PORT_OPTIONS:MNCURSES}
-CONFIGURE_ARGS+=	--enable-ncurses
-.else
-CONFIGURE_ARGS+=	--disable-ncurses
-.endif
-
 .if ${PORT_OPTIONS:MRSS}
 LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl \
 			xml2:${PORTSDIR}/textproc/libxml2
@@ -162,20 +120,6 @@
 CONFIGURE_ARGS+=	--disable-rss
 .endif
 
-.if ${PORT_OPTIONS:MXFT}
-LIB_DEPENDS+=		Xft:${PORTSDIR}/x11-fonts/libXft
-CONFIGURE_ARGS+=	--enable-xft
-.else
-CONFIGURE_ARGS+=	--disable-xft
-.endif
-
-.if ${PORT_OPTIONS:MXMMS2}
-LIB_DEPENDS+=		xmmsclient:${PORTSDIR}/audio/xmms2
-CONFIGURE_ARGS+=	--enable-xmms2
-.else
-CONFIGURE_ARGS+=	--disable-xmms2
-.endif
-
 .if ${PORT_OPTIONS:MXOAP}
 LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl \
 			xml2:${PORTSDIR}/textproc/libxml2
@@ -191,22 +135,22 @@
 		${WRKSRC}/src/imlib2.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${STAGEDIR}${PREFIX}/man/man1
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${EXAMPLESDIR}/conkyrc.sample
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${EXAMPLE_CONF_FILE} ${STAGEDIR}${EXAMPLESDIR}/conkyrc.sample
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README AUTHORS ChangeLog TODO NEWS
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in docs.html variables.html config_settings.html
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
--- conky.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: