From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 21 18:10:04 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 4ED7016A420 for ; Tue, 21 Mar 2006 18:10:04 +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 A8D1E43D46 for ; Tue, 21 Mar 2006 18:10:03 +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 k2LIA3si022282 for ; Tue, 21 Mar 2006 18:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2LIA3c9022278; Tue, 21 Mar 2006 18:10:03 GMT (envelope-from gnats) Resent-Date: Tue, 21 Mar 2006 18:10:03 GMT Resent-Message-Id: <200603211810.k2LIA3c9022278@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 744B116A422 for ; Tue, 21 Mar 2006 18:05:57 +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 0991F43D45 for ; Tue, 21 Mar 2006 18:05:57 +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 DBE111774A for ; Tue, 21 Mar 2006 20:05:55 +0200 (EET) Message-Id: <1142964355.1869@it.buh.tecnik93.com> Date: Tue, 21 Mar 2006 20:05:55 +0200 From: "Ion-Mihai "IOnut" Tetcu" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/94801: [PATCH] x11/xmotd: 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: Tue, 21 Mar 2006 18:10:04 -0000 >Number: 94801 >Category: ports >Synopsis: [PATCH] x11/xmotd: 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: Tue Mar 21 18:10:03 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 thus replase USE_* with WITH_* and respect PH standars with this. Tested on 4-STABLE tinderbox. >How-To-Repeat: >Fix: --- xmotd.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xmotd/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 22 Feb 2004 02:09:15 -0000 1.6 +++ Makefile 21 Mar 2006 18:03:51 -0000 @@ -21,23 +21,20 @@ MAN8= xmotd.8 PLIST_FILES= bin/xmotd -.if defined(USE_HTML) +OPTIONS= HTML "Use HTML widget instead of ASCII text" off +OPTIONS+= MOTIF "Use Motif widget library" off +OPTIONS+= XPM "Allows colour XPM pixmaps" off + +.include + +.if defined(WITH_HTML) MAKE_ARGS+= -DHAVE_HTML .endif -.if defined(USE_MOTIF) +.if defined(WITH_MOTIF) MAKE_ARGS+= -DMOTIF .endif -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " USE_HTML=yes uses HTML widget instead of ASCII text" - @${ECHO} " USE_MOTIF=yes uses Motif widget library" - @${ECHO} " USE_XPM=yes allows colour XPM pixmaps" - @${ECHO} "" - post-extract: @${TOUCH} ${WRKSRC}/xmotd.man @@ -46,13 +43,13 @@ .for file in libhtmlw/HTML-PSformat.c main.c textmode.c xmotd.c @${PERL} -pi -e 's:malloc.h:stdlib.h:' ${WRKSRC}/${file} .endfor -.if defined(USE_HTML) +.if defined(WITH_HTML) @${PERL} -pi.orig -e 's:XCOMM #define HAVE_HTML:#define HAVE_HTML:g' ${WRKSRC}/Imakefile .endif -.if defined (USE_MOTIF) +.if defined (WITH_MOTIF) @${PERL} -pi.orig -e 's:XCOMM #define MOTIF:#define MOTIF:g' ${WRKSRC}/Imakefile .endif -.if defined(USE_XPM) +.if defined(WITH_XPM) @${PERL} -pi.orig -e 's:XCOMM #define HAVE_XPM:#define HAVE_XPM:g' ${WRKSRC}/Imakefile .endif @@ -60,4 +57,4 @@ ${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${X11BASE}/bin/xmotd ${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${MANPREFIX}/man/man8 -.include +.include --- xmotd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: