From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 15 18:50:28 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F75E16A423 for ; Wed, 15 Mar 2006 18:50:28 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C204D43D5A for ; Wed, 15 Mar 2006 18:50:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2FIoQPK003684 for ; Wed, 15 Mar 2006 18:50:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2FIoQ7H003683; Wed, 15 Mar 2006 18:50:26 GMT (envelope-from gnats) Resent-Date: Wed, 15 Mar 2006 18:50:26 GMT Resent-Message-Id: <200603151850.k2FIoQ7H003683@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Ion-Mihai "IOnut" Tetcu" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E6ED16A400 for ; Wed, 15 Mar 2006 18:48:04 +0000 (UTC) (envelope-from itetcu@people.tecnik93.com) Received: from it.buh.tecnik93.com (it.buh.tecnik93.com [81.196.204.98]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2651943D53 for ; Wed, 15 Mar 2006 18:48:04 +0000 (GMT) (envelope-from itetcu@people.tecnik93.com) Received: from it.buh.tecnik93.com (localhost [127.0.0.1]) by it.buh.tecnik93.com (Postfix) with ESMTP id D2A2E1758E for ; Wed, 15 Mar 2006 20:48:01 +0200 (EET) Message-Id: <1142448481.1219@it.buh.tecnik93.com> Date: Wed, 15 Mar 2006 20:48:01 +0200 From: "Ion-Mihai "IOnut" Tetcu" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/94512: [PATCH] sysutils/conky: OPTIONify X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 18:50:28 -0000 >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 + .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 - .if ${OSVERSION} < 500000 -BROKEN= "Doesn't compile on 4.x" +BROKEN= Doesn't compile on 4.x .endif .include --- conky.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: