ports/174064: [PATCH] misc/figlet: update to 2.2.5, OptionsNG, added options for fonts, Makefile.man

Sun Dec 2 21:30:00 UTC 2012

>Number:         174064
>Category:       ports
>Synopsis:       [PATCH] misc/figlet: update to 2.2.5, OptionsNG, added options for fonts, Makefile.man
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 02 21:30: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:
- Update to 2.2.5

Added file(s):
- Makefile.man

Removed file(s):
- files/patch-aa
- files/patch-ab

Makefile changed:
+DIST_SUBDIR=	${PORTNAME}
+PORTDOCS=	CHANGES FAQ README figfont.txt
+OPTIONS_DEFINE=	FONTS
+OPTIONS_DEFAULT=	FONTS
+FONTS_DESC=	Install additional fonts for FIGlet
+.include "Makefile.man"
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MFONTS}
+post-patch:
+post-install:
+.if ${PORT_OPTIONS:MDOCS}

Changed and refined:
 do-install:
 pkg-descr
 pkg-plist

I can take maintainership if the maintainer approve.

Port maintainer (obrien at FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- figlet-2.2.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/misc/figlet/Makefile ./Makefile
--- /usr/ports/misc/figlet/Makefile	2012-11-16 09:03:11.000000000 +0100
+++ ./Makefile	2012-12-02 22:08:38.000000000 +0100
@@ -7,34 +7,56 @@
 #
 
 PORTNAME=	figlet
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	obrien at FreeBSD.org
 COMMENT=	SysV banner-like program prints strings in large fancy ASCII art
 
 LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ENV=	datadir=${DATADIR} prefix=${PREFIX}
 
-MAN6=		figlet.6
+PORTDOCS=	CHANGES FAQ README figfont.txt
+
+OPTIONS_DEFINE=	FONTS
+OPTIONS_DEFAULT=	FONTS
+FONTS_DESC=	Install additional fonts for FIGlet
+
+.include "Makefile.man"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFONTS}
+RUN_DEPENDS+=	1943____.flf:${PORTSDIR}/misc/figlet-fonts
+.endif
+
+post-patch:
+	${REINPLACE_CMD} \
+	-e 's|CC	= gcc|CC	?= gcc|' \
+	-e 's|^CFLAGS.*|CFLAGS	?=|' \
+	-e 's|prefix	= /usr/local|PREFIX	=${PREFIX}|' \
+	-e 's|^DEFAULTFONTDIR.*|DEFAULTFONTDIR	=${DATADIR}|' \
+		${WRKSRC}/Makefile
 
 do-install:
-	@ ${MKDIR} ${DATADIR}
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/figlet ${PREFIX}/bin
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/figlist ${PREFIX}/bin
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${DATADIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${DATADIR}
-	@ ${INSTALL_MAN} ${WRKSRC}/figlet.6 ${PREFIX}/man/man6
-.if !defined(NOPORTDOCS)
+.for f in chkfont figlet figlist showfigfonts
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/bin
+.endfor
+
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/* ${DATADIR}
+
+post-install:
+	@cd ${WRKSRC} && \
+		${FIND} . -type f -and -name "*.6" -exec ${INSTALL_MAN} {} ${PREFIX}/man/man6/{} \;
+
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/figfont.txt ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/misc/figlet/Makefile.man ./Makefile.man
--- /usr/ports/misc/figlet/Makefile.man	1970-01-01 01:00:00.000000000 +0100
+++ ./Makefile.man	2012-12-02 17:56:45.000000000 +0100
@@ -0,0 +1,4 @@
+MAN6=	chkfont.6 \
+figlet.6 \
+figlist.6 \
+showfigfonts.6
diff -ruN --exclude=CVS /usr/ports/misc/figlet/distinfo ./distinfo
--- /usr/ports/misc/figlet/distinfo	2012-11-16 09:03:11.000000000 +0100
+++ ./distinfo	2012-12-02 18:00:23.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (figlet-2.2.4.tar.gz) = 6e1801b3fd32ea33a470a92b5d04955fba5c7992feae777ee0e8b8ca52ad0ca7
-SIZE (figlet-2.2.4.tar.gz) = 229245
+SHA256 (figlet/figlet-2.2.5.tar.gz) = bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d
+SIZE (figlet/figlet-2.2.5.tar.gz) = 233201
diff -ruN --exclude=CVS /usr/ports/misc/figlet/files/patch-aa ./files/patch-aa
--- /usr/ports/misc/figlet/files/patch-aa	2012-11-16 09:03:11.000000000 +0100
+++ ./files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
---- Makefile.orig	2011-01-26 18:36:21.000000000 +0800
-+++ Makefile	2011-07-21 09:58:28.753010869 +0800
-@@ -19,8 +19,8 @@
- SHELL = /bin/sh
- 
- # The C compiler and linker to use
--CC	= gcc
--CFLAGS	= -g -O2 -Wall
-+#CC	= gcc
-+#CFLAGS	= -g -O2 -Wall
- LD	= gcc
- LDFLAGS =
- 
-@@ -29,7 +29,7 @@
- XCFLAGS	= -DTLF_FONTS
- 
- # Where to install files
--prefix	= /usr/local
-+#prefix	= /usr/local
- 
- # Where the executables should be put
- BINDIR	= $(prefix)/bin
-@@ -38,7 +38,7 @@
- MANDIR	= $(prefix)/man
- 
- # Where figlet will search first for fonts (the ".flf" files).
--DEFAULTFONTDIR = $(prefix)/share/figlet
-+DEFAULTFONTDIR = $(datadir)
- # Use this definition if you can't put things in $(prefix)/share/figlet
- #DEFAULTFONTDIR = fonts
- 
diff -ruN --exclude=CVS /usr/ports/misc/figlet/files/patch-ab ./files/patch-ab
--- /usr/ports/misc/figlet/files/patch-ab	2012-11-16 09:03:11.000000000 +0100
+++ ./files/patch-ab	1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
---- figlet.6.orig	Tue Feb 18 15:02:28 1997
-+++ figlet.6	Sat Jan 17 16:03:56 1998
-@@ -50,7 +50,27 @@
- [
- .I message
- ]
--
-+.br
-+.B chkfont
-+.I fontfile
-+[
-+.I ...
-+]
-+.br
-+.B figlist
-+[
-+.B \-d
-+.I font_directory
-+]
-+.br
-+.B showfigfonts
-+[
-+.B \-d
-+.I font_directory
-+]
-+[
-+sample_word
-+]
- .SH DESCRIPTION
- .B FIGlet
- prints its input using large characters
-@@ -94,6 +114,23 @@
- in compressed form.
- See
- .BR "COMPRESSED FONTS" .
-+
-+.B chkfont
-+checks
-+.B FIGlet
-+fonts for formatting errors.
-+.B chkfont
-+is useful for those wishing to design or edit their own fonts.
-+
-+.B figlist
-+lists all the available fonts and control files.
-+
-+.B showfigfonts
-+displays a sample of each avaiable font in 
-+.I font_directory
-+using the name of the font as the sample text, unless
-+.I sample_word
-+is specified.
- 
- .SH USAGE
- Just start up
diff -ruN --exclude=CVS /usr/ports/misc/figlet/pkg-descr ./pkg-descr
--- /usr/ports/misc/figlet/pkg-descr	2012-11-16 09:03:11.000000000 +0100
+++ ./pkg-descr	2012-12-02 22:09:45.000000000 +0100
@@ -15,4 +15,3 @@
 There is also a "Figlet Home Page" on the Worldwide Web.
 
 WWW: http://www.figlet.org/
-     http://www.surfplaza.com/figlet/
diff -ruN --exclude=CVS /usr/ports/misc/figlet/pkg-plist ./pkg-plist
--- /usr/ports/misc/figlet/pkg-plist	2012-11-16 09:03:11.000000000 +0100
+++ ./pkg-plist	2012-12-02 18:01:56.000000000 +0100
@@ -61,5 +61,3 @@
 %%DATADIR%%/uskata.flc
 %%DATADIR%%/utf8.flc
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/figfont.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- figlet-2.2.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:
