From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 7 04:20:21 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6268106567F for ; Sun, 7 Oct 2012 04:20:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 738DF8FC17 for ; Sun, 7 Oct 2012 04:20:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q974KJi4064259 for ; Sun, 7 Oct 2012 04:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q974KJc3064258; Sun, 7 Oct 2012 04:20:19 GMT (envelope-from gnats) Resent-Date: Sun, 7 Oct 2012 04:20:19 GMT Resent-Message-Id: <201210070420.q974KJc3064258@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, Michael Gmelin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3F3A1065679 for ; Sun, 7 Oct 2012 04:15:43 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.grem.de (outcast.grem.de [213.239.217.27]) by mx1.freebsd.org (Postfix) with SMTP id 5923B8FC16 for ; Sun, 7 Oct 2012 04:15:43 +0000 (UTC) Received: (qmail 60524 invoked by uid 0); 7 Oct 2012 04:15:42 -0000 Message-Id: <20121007041542.60523.qmail@mail.grem.de> Date: 7 Oct 2012 04:15:42 -0000 From: Michael Gmelin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/172432: [PATCH] x11-toolkits/tk86: Converting port to new options framework 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: Sun, 07 Oct 2012 04:20:21 -0000 >Number: 172432 >Category: ports >Synopsis: [PATCH] x11-toolkits/tk86: Converting port to new options framework >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: Sun Oct 07 04:20:19 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Michael Gmelin >Release: FreeBSD 9.0-RELEASE amd64 >Organization: Grem Equity GmbH >Environment: System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: The patch below converts the port to use the new options framework[1] and converts the Makefile header to the new format[2]. The patch is to be applied using: patch -p0 -E How-To-Repeat: >Fix: --- tk-8.6.b.2.patch begins here --- diff -ruN --exclude=CVS ../tk86.orig/Makefile ./Makefile --- ../tk86.orig/Makefile 2012-10-07 04:29:44.295215589 +0200 +++ ./Makefile 2012-10-07 06:12:26.705392581 +0200 @@ -1,9 +1,5 @@ -# New ports collection makefile for: tk -# Date created: 17 January 2007 -# Whom: Martin Matuska -# -# $FreeBSD: ports/x11-toolkits/tk86/Makefile,v 1.34 2012/08/03 22:57:36 mm Exp $ -# +# Created by: Martin Matuska +# $FreeBSD: $ PORTNAME= tk PORTVERSION= 8.6.b.2 @@ -37,9 +33,10 @@ .if !defined(BUILDING_TK_THREADS) USE_TCL= ${SHORT_TK_VER} -OPTIONS= TK86_MAN "Install tk 8.6 function manpages" off \ - XFT "Use Xft fonts" on \ - DEMOS "Install demos" off +OPTIONS_DEFINE= DEMOS TK86_MAN XFT +OPTIONS_DEFAULT=XFT +TK86_MAN_DESC= Install tk 8.6 function manpages +DEMOS_DESC= Install demos .else USE_TK= ${SHORT_TK_VER} PLIST= ${PKGDIR}/pkg-plist.threads @@ -50,11 +47,11 @@ SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" \ TCLPATCHLEVEL="8.6b1" -.include +.include DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -.if !defined(WITHOUT_XFT) +.if ${PORT_OPTIONS:MXFT} CONFIGURE_ARGS+= --enable-xft LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .else @@ -77,14 +74,14 @@ SUB_LIST+= TK_PROVIDE="" -.if defined(WITH_DEMOS) +.if ${PORT_OPTIONS:MDEMOS} INSTALL_TARGET+= install install-demos PLIST_SUB+= DEMOS="" .else PLIST_SUB+= DEMOS="@comment " .endif -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK86_MAN) +.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK86_MAN} MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \ CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \ @@ -401,7 +398,7 @@ text.n tk_textCut.n \ text.n tk_textPaste.n -.endif #!defined(NO_INSTALL_MANPAGES) && !defined(WITH_TK86_MAN) +.endif #!defined(NO_INSTALL_MANPAGES) && !${PORT_OPTIONS:MTK86_MAN} .endif # defined(BUILDING_TK_THREADS) @@ -454,13 +451,13 @@ .if !defined(NO_INSTALL_MANPAGES) ${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1 -.if !defined(BUILDING_TK_THREADS) && defined(WITH_TK86_MAN) +.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK86_MAN} . for mp in ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} . endfor @cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV} -.endif # !defined(BUILDING_TK_THREADS) && defined(WITH_TK86_MAN) +.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK86_MAN} .endif # !defined(NO_INSTALL_MANPAGES) @@ -469,4 +466,4 @@ ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} ${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER} -.include +.include --- tk-8.6.b.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: