From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 2 15:20:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE7C5165 for ; Sun, 2 Dec 2012 15:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5288FC14 for ; Sun, 2 Dec 2012 15:20:00 +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 qB2FK0Nd062951 for ; Sun, 2 Dec 2012 15:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qB2FK0xA062950; Sun, 2 Dec 2012 15:20:00 GMT (envelope-from gnats) Resent-Date: Sun, 2 Dec 2012 15:20:00 GMT Resent-Message-Id: <201212021520.qB2FK0xA062950@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, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9F5FBE for ; Sun, 2 Dec 2012 15:11:06 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id 48CFD8FC0C for ; Sun, 2 Dec 2012 15:11:05 +0000 (UTC) Received: (qmail invoked by alias); 02 Dec 2012 15:11:03 -0000 Received: from 226-42.104-92.cust.bluewin.ch (EHLO something.email.com) [92.104.42.226] by mail.gmx.net (mp033) with SMTP; 02 Dec 2012 16:11:03 +0100 Received: by something.email.com (sSMTP sendmail emulation); Sun, 02 Dec 2012 16:11:02 +0100 Message-Id: <20121202151106.D9F5FBE@hub.freebsd.org> Date: Sun, 02 Dec 2012 16:11:02 +0100 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/174057: [PATCH] misc/cmatrix: OptionsNG, added license, mtx.pcf install into ${FONTDIR}, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2012 15:20:00 -0000 >Number: 174057 >Category: ports >Synopsis: [PATCH] misc/cmatrix: OptionsNG, added license, mtx.pcf install into ${FONTDIR}, take maintainership >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 Dec 02 15:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: - Take maintainership Added file(s): - files/pkg-deinstall.in Makefile changed: +LICENSE= GPLv2 +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir +FONTDIR= ${PREFIX}/lib/X11/fonts/misc +PLIST_FILES= +PLIST_DIRS= ${FONTDIR} +.include +post-patch: +.if ${PORT_OPTIONS:MDOCS} Changed and refined: do-install: Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: portlint -A looks fine. port test: clean only because make a fonts.dir, and there is already one from before installed fonts ===> Extra files and directories check lib/X11/fonts/misc/fonts.dir >Fix: --- cmatrix-1.2a_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/misc/cmatrix/Makefile ./Makefile --- /usr/ports/misc/cmatrix/Makefile 2012-11-16 09:03:11.000000000 +0100 +++ ./Makefile 2012-12-02 15:31:28.000000000 +0100 @@ -7,28 +7,48 @@ PORTNAME= cmatrix PORTVERSION= 1.2a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@gmx.ch COMMENT= Show a scrolling 'Matrix' like screen -MAN1= cmatrix.1 +LICENSE= GPLv2 + +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir -USE_GMAKE= yes GNU_CONFIGURE= yes -PORTDOCS= ChangeLog README TODO -PLIST_FILES= bin/cmatrix +USE_GMAKE= yes + +FONTDIR= ${PREFIX}/lib/X11/fonts/misc + +SUB_FILES= pkg-deinstall + +PLIST_FILES= bin/cmatrix \ + ${FONTDIR}/mtx.pcf +PLIST_DIRS= ${FONTDIR} + +MAN1= cmatrix.1 + +PORTDOCS= AUTHORS ChangeLog NEWS README TODO + +.include + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/lib/X11/fonts/misc|${FONTDIR}|' \ + ${WRKSRC}/configure do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${MKDIR} ${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/mtx.pcf ${FONTDIR} + @(cd ${FONTDIR} ; mkfontdir) + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1 + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif .include diff -ruN --exclude=CVS /usr/ports/misc/cmatrix/files/pkg-deinstall.in ./files/pkg-deinstall.in --- /usr/ports/misc/cmatrix/files/pkg-deinstall.in 1970-01-01 01:00:00.000000000 +0100 +++ ./files/pkg-deinstall.in 2012-12-02 03:55:32.000000000 +0100 @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +if [ "$2" != "POST-DEINSTALL" ]; then + exit 0 +fi + +cd %%PREFIX%%/lib/X11/fonts/misc ; mkfontdir --- cmatrix-1.2a_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: