From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 2 13:20:06 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66BE61065675 for ; Sun, 2 Jan 2011 13:20:06 +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 217158FC16 for ; Sun, 2 Jan 2011 13:20:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p02DK5nj005742 for ; Sun, 2 Jan 2011 13:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p02DK5lv005741; Sun, 2 Jan 2011 13:20:05 GMT (envelope-from gnats) Resent-Date: Sun, 2 Jan 2011 13:20:05 GMT Resent-Message-Id: <201101021320.p02DK5lv005741@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, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BE1E1065674 for ; Sun, 2 Jan 2011 13:18:07 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id B4B448FC08 for ; Sun, 2 Jan 2011 13:18:06 +0000 (UTC) Received: by fxm16 with SMTP id 16so12517308fxm.13 for ; Sun, 02 Jan 2011 05:18:05 -0800 (PST) Received: by 10.223.83.133 with SMTP id f5mr6262815fal.101.1293974284447; Sun, 02 Jan 2011 05:18:04 -0800 (PST) Received: from localhost (narf.dsw2k3.info [195.71.226.87]) by mx.google.com with ESMTPS id b7sm1600208faa.18.2011.01.02.05.18.00 (version=SSLv3 cipher=RC4-MD5); Sun, 02 Jan 2011 05:18:03 -0800 (PST) Message-Id: <861v4v8mx6.fsf@gmail.com> Date: Sun, 02 Jan 2011 16:17:41 +0300 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/153622: [patch] sysutils/jfbterm: improve TERMCAP option 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, 02 Jan 2011 13:20:06 -0000 >Number: 153622 >Category: ports >Synopsis: [patch] sysutils/jfbterm: improve TERMCAP option >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 Jan 02 13:20:05 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: >Description: - remove automatically added termcap record upon deinstall - use %D instead of PREFIX in plist fixing `pkg_add -p' usage - hide behind !NOPORTDATA in post-install like it's done for plist - bump PORTREVISION to regen package >How-To-Repeat: $ make install $ pkg_create -xb jfbterm $ make deinstall $ pkg_add -f -p /blah jfbterm-0.6.1_2.tbz cat: /usr/local/share/jfbterm/termcap.jfbterm: No such file or directory >Fix: --- a.diff begins here --- Index: sysutils/jfbterm/Makefile =================================================================== RCS file: /a/.cvsup/ports/sysutils/jfbterm/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- sysutils/jfbterm/Makefile 22 Sep 2010 05:44:08 -0000 1.14 +++ sysutils/jfbterm/Makefile 2 Jan 2011 13:03:24 -0000 @@ -7,7 +7,7 @@ PORTNAME= jfbterm PORTVERSION= 0.6.1 DISTVERSIONPREFIX=${OPSYS}- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.ac.auone-net.jp/~baba/${PORTNAME}/ \ http://chirashi-no-ura.net/files/ @@ -24,7 +24,8 @@ ONLY_FOR_ARCHS_REASON= requires VESA sup MAKE_JOBS_SAFE= yes MAKEFILE= ${FILESDIR}/BSDmakefile MAKE_ENV+= VERSION=${PORTVERSION} GUNZIP=${GUNZIP_CMD:N-*} -PLIST_SUB+= TERMCAP_ADD_RECORD="@exec ${TERMCAP_ADD_RECORD}" +PLIST_SUB+= TERMCAP_ADD_RECORD="@exec ${TERMCAP_ADD_RECORD:S,^${PREFIX},%D,}" \ + TERMCAP_DEL_RECORD="@unexec ${TERMCAP_DEL_RECORD}" CAP_MKDB?= /usr/bin/cap_mkdb @@ -83,14 +84,27 @@ MAKE_ENV+= WITHOUT_PNG= .if !defined(WITHOUT_TERMCAP) TERMCAP_ADD_RECORD= \ if ${GREP} -q '^jfbterm|' ${TERMCAP_FILE}; then else \ + ${ECHO_CMD} '\# begin of jfbterm.termcap' \ + >>${TERMCAP_FILE}; \ ${CAT} ${PREFIX}/share/jfbterm/termcap.jfbterm \ >>${TERMCAP_FILE}; \ + ${ECHO_CMD} '\# end of jfbterm.termcap' \ + >>${TERMCAP_FILE}; \ + if [ -f ${TERMCAP_FILE}.db ]; then \ + ${CAP_MKDB} ${TERMCAP_FILE}; \ + fi \ + fi +TERMCAP_DEL_RECORD= \ + if ${GREP} -Fxq '\# begin of jfbterm.termcap' ${TERMCAP_FILE}; then \ + ${REINPLACE_CMD} '/^\# begin of jfbterm\.termcap/, \ + /^\# end of jfbterm\.termcap/d' ${TERMCAP_FILE}; \ if [ -f ${TERMCAP_FILE}.db ]; then \ ${CAP_MKDB} ${TERMCAP_FILE}; \ fi \ fi .else TERMCAP_ADD_RECORD= ${DO_NADA} +TERMCAP_DEL_RECORD= ${DO_NADA} .endif .if !defined(WITHOUT_UNIFONT) @@ -124,9 +138,9 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/termcap.jfbterm ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/terminfo.jfbterm ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/fonts/*.pcf.gz ${DATADIR}/fonts -.endif -.if !defined(WITHOUT_TERMCAP) +. if !defined(WITHOUT_TERMCAP) ${TERMCAP_ADD_RECORD} +. endif .endif .include Index: sysutils/jfbterm/pkg-plist =================================================================== RCS file: /a/.cvsup/ports/sysutils/jfbterm/pkg-plist,v retrieving revision 1.2 diff -u -p -r1.2 pkg-plist --- sysutils/jfbterm/pkg-plist 22 Sep 2010 05:40:20 -0000 1.2 +++ sysutils/jfbterm/pkg-plist 2 Jan 2011 12:13:43 -0000 @@ -8,3 +8,4 @@ etc/jfbterm.conf.sample %%PORTDATA%%@dirrm %%DATADIR%%/fonts %%PORTDATA%%@dirrm %%DATADIR%% %%PORTDATA%%%%TERMCAP_ADD_RECORD%% +%%PORTDATA%%%%TERMCAP_DEL_RECORD%% --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: