Date: 7 Oct 2012 04:15:40 -0000 From: Michael Gmelin <freebsd@grem.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172431: [PATCH] x11-toolkits/tk84: Converting port to new options framework Message-ID: <20121007041540.60517.qmail@mail.grem.de> Resent-Message-ID: <201210070420.q974KIj5064248@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172431 >Category: ports >Synopsis: [PATCH] x11-toolkits/tk84: 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:18 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 </path/to/patchfile No attempts have been made to fix any potential issues the port might have beyond this scope. I also didn't fix any indentation issues to keep the patch small and easy to audit, a future port maintainer might want to take care of this. See also: 1. http://lists.freebsd.org/pipermail/freebsd-ports/2012-October/078676.html 2. http://lists.freebsd.org/pipermail/freebsd-ports/2012-August/077801.html Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- tk-8.4.19_2,2.patch begins here --- diff -ruN --exclude=CVS ../tk84.orig/Makefile ./Makefile --- ../tk84.orig/Makefile 2012-10-07 04:18:59.415207096 +0200 +++ ./Makefile 2012-10-07 04:32:49.365756119 +0200 @@ -1,9 +1,5 @@ -# New ports collection makefile for: tk -# Date created: 19 August 1997 -# Whom: jkh -# -# $FreeBSD: ports/x11-toolkits/tk84/Makefile,v 1.118 2012/09/06 13:11:36 gahr Exp $ -# +# Created by: jkh +# $FreeBSD: $ PORTNAME= tk PORTVERSION= 8.4.19 @@ -40,7 +36,8 @@ .if !defined(BUILDING_TK_THREADS) USE_TCL= 84 -OPTIONS= TK84_DOC "Install tk 8.4 function manpages" off +OPTIONS_DEFINE= TK84_DOC +TK84_DOC_DESC= Install tk 8.4 function manpages .else USE_TK= ${SHORT_TK_VER} PLIST= ${PKGDIR}/pkg-plist.threads @@ -50,7 +47,7 @@ SUB_LIST+= THREADS_SUFFIX="${THREADS_SUFFIX}" -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} @@ -70,8 +67,7 @@ SUB_LIST+= TK_PROVIDE="" - -.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK84_DOC) +.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTK84_DOC} MAN3= 3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \ CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \ @@ -426,13 +422,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_TK84_DOC) +.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK84_DOC} .for mp in ${MAN3} ${MANN} @${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|' \ ${WRKSRC}/../doc/${mp} .endfor @cd ${WRKSRC} && ${MAKE} install-doc ${MAKE_ENV} -.endif # !defined(BUILDING_TK_THREADS) && defined(WITH_TK84_DOC) +.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK84_DOC} .endif # !defined(NO_INSTALL_MANPAGES) @@ -441,4 +437,4 @@ ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} ${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER} -.include <bsd.port.post.mk> +.include <bsd.port.mk> --- tk-8.4.19_2,2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121007041540.60517.qmail>