Date: Sun, 02 Dec 2012 16:11:02 +0100
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/174057: [PATCH] misc/cmatrix: OptionsNG, added license, mtx.pcf install into ${FONTDIR}, take maintainership
Message-ID: <20121202151106.D9F5FBE@hub.freebsd.org>
Resent-Message-ID: <201212021520.qB2FK0xA062950@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
+
+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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121202151106.D9F5FBE>