Attachment 117027 Details for Bug 159079 – figlet-2.2.4.patch

[patch] figlet-2.2.4.patch

figlet-2.2.4.patch (text/plain), 7.21 KB, created by Po-Chuan Hsieh on 2011-07-21 10:20:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2011-07-21 10:20:12 UTC

Size: 7.21 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/misc/figlet/Makefile,v
>retrieving revision 1.26
>diff -u -u -r1.26 Makefile
>--- Makefile	28 Feb 2008 17:36:27 -0000	1.26
>+++ Makefile	21 Jul 2011 09:15:48 -0000
>@@ -1,35 +1,35 @@
>-# ex:ts=8
> # Ports collection makefile for:  figlet
> # Date created:			  Sat July 20, 1996
> # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
> #
> # $FreeBSD: ports/misc/figlet/Makefile,v 1.26 2008/02/28 17:36:27 obrien Exp $
> #
>-#	NOTE that the figlet port is purposefully not upgraded to the 2.2.2
>-#	version until we can determine if the 'Academic Free License 2.1'
>-#	vs. the Artistic License is better for us.
> 
> PORTNAME=	figlet
>-PORTVERSION=	2.2.1
>+PORTVERSION=	2.2.4
> CATEGORIES=	misc
> MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/ \
> 		${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	obrien
>-DISTNAME=	figlet221
> 
> MAINTAINER=	obrien@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
> 
> do-install:
>-	@ ${MKDIR} ${PREFIX}/share/figlet
>-	@ ${INSTALL_PROGRAM} ${WRKSRC}/figlet ${PREFIX}/bin
>+	@ ${MKDIR} ${DATADIR}
> 	@ ${INSTALL_PROGRAM} ${WRKSRC}/chkfont ${PREFIX}/bin
>+	@ ${INSTALL_PROGRAM} ${WRKSRC}/figlet ${PREFIX}/bin
> 	@ ${INSTALL_SCRIPT} ${WRKSRC}/figlist ${PREFIX}/bin
> 	@ ${INSTALL_SCRIPT} ${WRKSRC}/showfigfonts ${PREFIX}/bin
>-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${PREFIX}/share/figlet
>-	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${PREFIX}/share/figlet
>+	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flc ${DATADIR}
>+	@ ${INSTALL_DATA} ${WRKSRC}/fonts/*.flf ${DATADIR}
> 	@ ${INSTALL_MAN} ${WRKSRC}/figlet.6 ${PREFIX}/man/man6
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/misc/figlet/distinfo,v
>retrieving revision 1.7
>diff -u -u -r1.7 distinfo
>--- distinfo	19 Mar 2011 12:30:54 -0000	1.7
>+++ distinfo	21 Jul 2011 09:15:48 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (figlet221.tar.gz) = 8793b2a090924591d119f6dbd6c10f829dbc1fe7edef76e321b0664956b25a2e
>-SIZE (figlet221.tar.gz) = 172219
>+SHA256 (figlet-2.2.4.tar.gz) = 6e1801b3fd32ea33a470a92b5d04955fba5c7992feae777ee0e8b8ca52ad0ca7
>+SIZE (figlet-2.2.4.tar.gz) = 229245
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/misc/figlet/pkg-plist,v
>retrieving revision 1.7
>diff -u -u -r1.7 pkg-plist
>--- pkg-plist	11 Jan 2009 04:27:57 -0000	1.7
>+++ pkg-plist	21 Jul 2011 09:15:48 -0000
>@@ -1,65 +1,65 @@
> @comment $FreeBSD: ports/misc/figlet/pkg-plist,v 1.7 2009/01/11 04:27:57 obrien Exp $
>-bin/figlet
> bin/chkfont
>+bin/figlet
> bin/figlist
> bin/showfigfonts
>-share/figlet/646-ca.flc
>-share/figlet/646-ca2.flc
>-share/figlet/646-cn.flc
>-share/figlet/646-cu.flc
>-share/figlet/646-de.flc
>-share/figlet/646-dk.flc
>-share/figlet/646-es.flc
>-share/figlet/646-es2.flc
>-share/figlet/646-fr.flc
>-share/figlet/646-gb.flc
>-share/figlet/646-hu.flc
>-share/figlet/646-irv.flc
>-share/figlet/646-it.flc
>-share/figlet/646-jp.flc
>-share/figlet/646-kr.flc
>-share/figlet/646-no.flc
>-share/figlet/646-no2.flc
>-share/figlet/646-pt.flc
>-share/figlet/646-pt2.flc
>-share/figlet/646-se.flc
>-share/figlet/646-se2.flc
>-share/figlet/646-yu.flc
>-share/figlet/8859-2.flc
>-share/figlet/8859-3.flc
>-share/figlet/8859-4.flc
>-share/figlet/8859-5.flc
>-share/figlet/8859-7.flc
>-share/figlet/8859-8.flc
>-share/figlet/8859-9.flc
>-share/figlet/banner.flf
>-share/figlet/big.flf
>-share/figlet/block.flf
>-share/figlet/bubble.flf
>-share/figlet/digital.flf
>-share/figlet/frango.flc
>-share/figlet/hz.flc
>-share/figlet/ilhebrew.flc
>-share/figlet/ivrit.flf
>-share/figlet/jis0201.flc
>-share/figlet/koi8r.flc
>-share/figlet/lean.flf
>-share/figlet/mini.flf
>-share/figlet/mnemonic.flf
>-share/figlet/moscow.flc
>-share/figlet/script.flf
>-share/figlet/shadow.flf
>-share/figlet/slant.flf
>-share/figlet/small.flf
>-share/figlet/smscript.flf
>-share/figlet/smshadow.flf
>-share/figlet/smslant.flf
>-share/figlet/standard.flf
>-share/figlet/term.flf
>-share/figlet/upper.flc
>-share/figlet/ushebrew.flc
>-share/figlet/uskata.flc
>-share/figlet/utf8.flc
>-@dirrm share/figlet
>+%%DATADIR%%/646-ca.flc
>+%%DATADIR%%/646-ca2.flc
>+%%DATADIR%%/646-cn.flc
>+%%DATADIR%%/646-cu.flc
>+%%DATADIR%%/646-de.flc
>+%%DATADIR%%/646-dk.flc
>+%%DATADIR%%/646-es.flc
>+%%DATADIR%%/646-es2.flc
>+%%DATADIR%%/646-fr.flc
>+%%DATADIR%%/646-gb.flc
>+%%DATADIR%%/646-hu.flc
>+%%DATADIR%%/646-irv.flc
>+%%DATADIR%%/646-it.flc
>+%%DATADIR%%/646-jp.flc
>+%%DATADIR%%/646-kr.flc
>+%%DATADIR%%/646-no.flc
>+%%DATADIR%%/646-no2.flc
>+%%DATADIR%%/646-pt.flc
>+%%DATADIR%%/646-pt2.flc
>+%%DATADIR%%/646-se.flc
>+%%DATADIR%%/646-se2.flc
>+%%DATADIR%%/646-yu.flc
>+%%DATADIR%%/8859-2.flc
>+%%DATADIR%%/8859-3.flc
>+%%DATADIR%%/8859-4.flc
>+%%DATADIR%%/8859-5.flc
>+%%DATADIR%%/8859-7.flc
>+%%DATADIR%%/8859-8.flc
>+%%DATADIR%%/8859-9.flc
>+%%DATADIR%%/banner.flf
>+%%DATADIR%%/big.flf
>+%%DATADIR%%/block.flf
>+%%DATADIR%%/bubble.flf
>+%%DATADIR%%/digital.flf
>+%%DATADIR%%/frango.flc
>+%%DATADIR%%/hz.flc
>+%%DATADIR%%/ilhebrew.flc
>+%%DATADIR%%/ivrit.flf
>+%%DATADIR%%/jis0201.flc
>+%%DATADIR%%/koi8r.flc
>+%%DATADIR%%/lean.flf
>+%%DATADIR%%/mini.flf
>+%%DATADIR%%/mnemonic.flf
>+%%DATADIR%%/moscow.flc
>+%%DATADIR%%/script.flf
>+%%DATADIR%%/shadow.flf
>+%%DATADIR%%/slant.flf
>+%%DATADIR%%/small.flf
>+%%DATADIR%%/smscript.flf
>+%%DATADIR%%/smshadow.flf
>+%%DATADIR%%/smslant.flf
>+%%DATADIR%%/standard.flf
>+%%DATADIR%%/term.flf
>+%%DATADIR%%/upper.flc
>+%%DATADIR%%/ushebrew.flc
>+%%DATADIR%%/uskata.flc
>+%%DATADIR%%/utf8.flc
>+@dirrm %%DATADIR%%
> %%PORTDOCS%%%%DOCSDIR%%/figfont.txt
>-%%PORTDOCS%%@dirrm share/doc/figlet
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: files/patch-aa
>===================================================================
>RCS file: /home/ncvs/ports/misc/figlet/files/patch-aa,v
>retrieving revision 1.6
>diff -u -u -r1.6 patch-aa
>--- files/patch-aa	7 Oct 2002 18:13:07 -0000	1.6
>+++ files/patch-aa	21 Jul 2011 09:15:48 -0000
>@@ -1,24 +1,31 @@
>---- Makefile.orig	Sat Jul 13 03:24:16 2002
>-+++ Makefile	Mon Oct  7 11:10:48 2002
>-@@ -13,15 +13,15 @@
>+--- 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
>--CC = gcc
>--CFLAGS = -g
>-+#CC = gcc
>-+#CFLAGS = -g
>  
>- # Where the executables should be put
>--DESTDIR = /usr/local/bin
>-+DESTDIR = $(PREFIX)/bin
>+ # 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 the man page should be put
>--MANDIR = /usr/local/man/man6
>-+MANDIR = $(PREFIX)/man/man6
>+ # 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 = /usr/local/share/figlet
>-+DEFAULTFONTDIR = $(PREFIX)/share/figlet
>- # Use this definition if you can't put things in /usr/local/share/figlet
>--DEFAULTFONTDIR = fonts
>-+#DEFAULTFONTDIR = fonts
>+-DEFAULTFONTDIR = $(prefix)/share/figlet
>++DEFAULTFONTDIR = $(datadir)
>+ # Use this definition if you can't put things in $(prefix)/share/figlet
>+ #DEFAULTFONTDIR = fonts

Actions: View | Diff

Attachments on bug 159079: 117027