Date: Tue, 21 Mar 2006 20:05:55 +0200 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/94801: [PATCH] x11/xmotd: OPTIONify Message-ID: <1142964355.1869@it.buh.tecnik93.com> Resent-Message-ID: <200603211810.k2LIA3c9022278@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
+
+.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 <bsd.port.mk>
+.include <bsd.port.post.mk>
--- xmotd.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?1142964355.1869>