Date: 7 Oct 2012 04:15:29 -0000 From: Michael Gmelin <freebsd@grem.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172424: [PATCH] sysutils/jfbterm: Converting port to new options framework Message-ID: <20121007041529.60487.qmail@mail.grem.de> Resent-Message-ID: <201210070420.q974KGgU064128@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172424 >Category: ports >Synopsis: [PATCH] sysutils/jfbterm: 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:16 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: --- jfbterm-0.6.1_5.patch begins here --- diff -ruN --exclude=CVS ../jfbterm.orig/Makefile ./Makefile --- ../jfbterm.orig/Makefile 2012-10-07 01:33:42.975292247 +0200 +++ ./Makefile 2012-10-07 02:01:25.405444124 +0200 @@ -1,48 +1,47 @@ -# New ports collection makefile for: jfbterm -# Date created: Feb 23 2008 -# Whom: nrg milk <bsdports@gmail.com> -# -# $FreeBSD: ports/sysutils/jfbterm/Makefile,v 1.18 2012/06/01 05:24:19 dinoex Exp $ - -PORTNAME= jfbterm -PORTVERSION= 0.6.1 -DISTVERSIONPREFIX=${OPSYS}- -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= http://www.ac.auone-net.jp/~baba/${PORTNAME}/ \ - http://chirashi-no-ura.net/files/ +# Created by: nrg milk <bsdports@gmail.com> +# $FreeBSD: $ -MAINTAINER= ports@FreeBSD.org -COMMENT= Multilingual terminal emulator for framebuffer +PORTNAME= jfbterm +PORTVERSION= 0.6.1 +DISTVERSIONPREFIX= ${OPSYS}- +PORTREVISION= 5 +CATEGORIES= sysutils +MASTER_SITES= http://www.ac.auone-net.jp/~baba/${PORTNAME}/ \ + http://chirashi-no-ura.net/files/ -LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYING +MAINTAINER= ports@FreeBSD.org +COMMENT= Multilingual terminal emulator for framebuffer -ONLY_FOR_ARCHS= i386 amd64 +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYING + +ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= requires VESA support in kernel -MAKE_JOBS_SAFE= yes -MAKEFILE= ${FILESDIR}/BSDmakefile -MAKE_ENV+= VERSION=${PORTVERSION} GUNZIP=${GUNZIP_CMD:N-*} -PLIST_SUB+= TERMCAP_ADD_RECORD="@exec ${TERMCAP_ADD_RECORD:S,^${PREFIX},%D,}" \ - TERMCAP_DEL_RECORD="@unexec ${TERMCAP_DEL_RECORD}" \ - TIC="@exec ${TIC} ${TERMINFO_FILE:S,^${PREFIX},%D,} 2>/dev/null || ${TRUE}" - -CAP_MKDB?= /usr/bin/cap_mkdb -TIC?= ${LOCALBASE}/bin/tic -TERMINFO_FILE?= ${PREFIX}/share/misc/${PORTNAME}.terminfo - -OPTIONS= ICONV "encodings support" On \ - PNG "splash .png support" On \ - TERMCAP "add entry to termcap(5) file" On \ - UNIFONT "install pan-unicode font" On +MAKE_JOBS_SAFE= yes +MAKEFILE= ${FILESDIR}/BSDmakefile +MAKE_ENV+= VERSION=${PORTVERSION} GUNZIP=${GUNZIP_CMD:N-*} +PLIST_SUB+= TERMCAP_ADD_RECORD="@exec ${TERMCAP_ADD_RECORD:S,^${PREFIX},%D,}" \ + TERMCAP_DEL_RECORD="@unexec ${TERMCAP_DEL_RECORD}" \ + TIC="@exec ${TIC} ${TERMINFO_FILE:S,^${PREFIX},%D,} 2>/dev/null || ${TRUE}" + +CAP_MKDB?= /usr/bin/cap_mkdb +TIC?= ${LOCALBASE}/bin/tic +TERMINFO_FILE?= ${PREFIX}/share/misc/${PORTNAME}.terminfo + +OPTIONS_DEFINE= ICONV PNG SETUID TERMCAP UNIFONT +OPTIONS_DEFAULT= ICONV PNG SETUID TERMCAP UNIFONT +PNG_DESC= Splash .png support +SETUID_DESC= Install jfbterm with setuid bit set +TERMCAP_DESC= Add entry to termcap(5) file +UNIFONT_DESC= Install pan-unicode font + +.include <bsd.port.options.mk> -.if !defined(WITHOUT_SETUID) +.if ${PORT_OPTIONS:MSETUID} BINMODE?= 4555 .endif -.include <bsd.port.pre.mk> - .if ${OSVERSION} >= 800504 ONLY_FOR_ARCHS+=amd64 .endif @@ -58,12 +57,12 @@ MAN5= ${PORTNAME}.conf.5 .endif -.if defined(WITHOUT_ICONV) +.if !${PORT_OPTIONS:MICONV} MAKE_ENV+= WITHOUT_ICONV= .endif .if !exists(/usr/include/iconv.h) -. if !defined(WITHOUT_ICONV) +. if ${PORT_OPTIONS:MICONV} . if !defined(NO_SHARED) USE_ICONV= yes . else @@ -74,7 +73,7 @@ . endif .endif -.if !defined(WITHOUT_PNG) +.if ${PORT_OPTIONS:MPNG} . if !defined(NO_SHARED) LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png . else @@ -84,7 +83,7 @@ MAKE_ENV+= WITHOUT_PNG= .endif -.if !defined(WITHOUT_TERMCAP) +.if ${PORT_OPTIONS:MTERMCAP} TERMCAP_ADD_RECORD= \ ${ECHO_CMD} '\# begin of ${PORTNAME}.termcap' \ >>${TERMCAP_FILE}; \ @@ -107,7 +106,7 @@ TERMCAP_DEL_RECORD= ${DO_NADA} .endif -.if !defined(WITHOUT_UNIFONT) +.if ${PORT_OPTIONS:MUNIFONT} RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont .endif @@ -122,7 +121,7 @@ ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ -e 's|\(share\)/${PORTNAME}/\(fonts\)|\1/misc/\2|' \ ${WRKSRC}/*.[0-9] ${WRKSRC}/*.conf.sample -.if defined(WITHOUT_TERMCAP) +.if !${PORT_OPTIONS:MTERMCAP} ${REINPLACE_CMD} '/^term/s/:.*/: xterm/' \ ${WRKSRC}/${PORTNAME}.conf.sample .endif @@ -143,10 +142,10 @@ ${INSTALL_DATA} ${WRKSRC}/terminfo.${PORTNAME} ${PREFIX}/share/misc/${PORTNAME}.terminfo ${MKDIR} ${PREFIX}/share/misc/fonts ${INSTALL_DATA} ${WRKSRC}/fonts/*.pcf.gz ${PREFIX}/share/misc/fonts -. if !defined(WITHOUT_TERMCAP) +. if ${PORT_OPTIONS:MTERMCAP} ${TERMCAP_ADD_RECORD} . endif -${TIC} ${TERMINFO_FILE} 2>/dev/null .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> --- jfbterm-0.6.1_5.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?20121007041529.60487.qmail>