Date: Wed, 15 Mar 2006 20:48:01 +0200 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/94512: [PATCH] sysutils/conky: OPTIONify Message-ID: <1142448481.1219@it.buh.tecnik93.com> Resent-Message-ID: <200603151850.k2FIoQ7H003683@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94512
>Category: ports
>Synopsis: [PATCH] sysutils/conky: OPTIONify
>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: Wed Mar 15 18:50:26 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.1-PRERELEASE #0: Fri Feb 24 07:01:54 EET 2006
root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_B_P
>Description:
Use OPTIONs.
portlint a little while here.
Part of: "OPTIONs are good, let's use them" effort.
Tinderbox QC: passed.
>How-To-Repeat:
>Fix:
--- conky.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 15 Mar 2006 12:55:17 -0000 1.13
+++ Makefile 15 Mar 2006 18:40:18 -0000
@@ -15,7 +15,6 @@
COMMENT= An advanced, highly configurable system monitor for X
USE_BZIP2= yes
-USE_REINPLACE= yes
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
CONFIGURE_ARGS+= --disable-portmon --disable-proc-uptime
@@ -27,6 +26,14 @@
PORTDOCS= README AUTHORS ChangeLog TODO \
docs.html variables.html config_settings.html
+OPTIONS= BMPX "enable BMPx support" off
+OPTIONS+= XFT "enable XFT support" off
+OPTIONS+= OWN_WINDOW "own window support" on
+OPTIONS+= MPD "MPD support" off
+OPTIONS+= DOUBLE_BUFFER "double buffer support" on
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_BMPX)
BUILD_DEPENDS+= bmpx:${PORTSDIR}/multimedia/bmpx
RUN_DEPENDS+= bmpx:${PORTSDIR}/multimedia/bmpx
@@ -43,7 +50,7 @@
CONFIGURE_ARGS+= --disable-xft
.endif
-.if !defined(WITHOUT_OWN_WINDOW)
+.if defined(WITH_OWN_WINDOW)
CONFIGURE_ARGS+= --enable-own-window
.else
CONFIGURE_ARGS+= --disable-own-widnow
@@ -59,16 +66,6 @@
CONFIGURE_ARGS+= --disable-double-buffer
.endif
-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
${INSTALL_MAN} ${WRKSRC}/doc/conky.1 ${PREFIX}/man/man1
@@ -87,10 +84,8 @@
.endfor
.endif
-.include <bsd.port.pre.mk>
-
.if ${OSVERSION} < 500000
-BROKEN= "Doesn't compile on 4.x"
+BROKEN= Doesn't compile on 4.x
.endif
.include <bsd.port.post.mk>
--- 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?1142448481.1219>