diff options
author | abs <abs> | 2009-12-10 21:13:07 +0000 |
---|---|---|
committer | abs <abs> | 2009-12-10 21:13:07 +0000 |
commit | 22ae331733d10e3518d0499a0c6b6ffffa724fc8 (patch) | |
tree | 2ffc793ca880f6bf045829391a95fedc1e2d738d /misc/figlet | |
parent | 80e9491266a07dd39a7d9964278712d4d2484bdf (diff) | |
download | pkgsrc-22ae331733d10e3518d0499a0c6b6ffffa724fc8.tar.gz |
Add PKG_DESTDIR_SUPPORT.
The package's Makefile was using 'DESTDIR' as "directory into which
to install binaries", which was a little unconventional. Use BINDIR
instead and treat DESTDIR like the rest of the world.
Diffstat (limited to 'misc/figlet')
-rw-r--r-- | misc/figlet/Makefile | 4 | ||||
-rw-r--r-- | misc/figlet/distinfo | 4 | ||||
-rw-r--r-- | misc/figlet/patches/patch-aa | 32 |
3 files changed, 25 insertions, 15 deletions
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile index 54aed1f8c71..ab0533ec1fd 100644 --- a/misc/figlet/Makefile +++ b/misc/figlet/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2006/10/25 14:36:09 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2009/12/10 21:13:07 abs Exp $ DISTNAME= figlet222 PKGNAME= figlet-2.2.2 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/program/unix/ @@ -10,6 +11,7 @@ HOMEPAGE= http://www.figlet.org/ COMMENT= Print text banners in fancy ASCII art characters PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man6 diff --git a/misc/figlet/distinfo b/misc/figlet/distinfo index f98eec781fa..1d976910caa 100644 --- a/misc/figlet/distinfo +++ b/misc/figlet/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/10/15 22:16:05 tonio Exp $ +$NetBSD: distinfo,v 1.8 2009/12/10 21:13:07 abs Exp $ SHA1 (figlet222.tar.gz) = 138aa027f90c0d68429c7b71af4e51c176bab92b RMD160 (figlet222.tar.gz) = fc39809b1f5d5e498d722d49ae88132528633d9f Size (figlet222.tar.gz) = 166727 bytes -SHA1 (patch-aa) = 879fceade48291a5e18dcd22606883df80e5ccec +SHA1 (patch-aa) = a12ec7c8374eff78a12340cfea2664bfd3ecd262 diff --git a/misc/figlet/patches/patch-aa b/misc/figlet/patches/patch-aa index a334fef1bfa..da213fed80f 100644 --- a/misc/figlet/patches/patch-aa +++ b/misc/figlet/patches/patch-aa @@ -1,8 +1,16 @@ -$NetBSD: patch-aa,v 1.6 2005/10/15 22:16:05 tonio Exp $ +$NetBSD: patch-aa,v 1.7 2009/12/10 21:13:07 abs Exp $ ---- Makefile.orig 2005-07-05 11:57:46.000000000 +0200 +--- Makefile.orig 2005-07-05 09:57:46.000000000 +0000 +++ Makefile -@@ -11,19 +11,19 @@ +@@ -4,26 +4,26 @@ + # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan + # Copyright 2002 Christiaan Keet + +-# Please make sure DESTDIR, MANDIR, DEFAULTFONTDIR and ++# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and + # DEFAULTFONTFILE are defined to reflect the situation + # on your computer. See README for details. + # Don't change this even if your shell is different. The only reason # for changing this is if sh is not in the same place. SHELL = /bin/sh @@ -13,7 +21,7 @@ $NetBSD: patch-aa,v 1.6 2005/10/15 22:16:05 tonio Exp $ # Where the executables should be put -DESTDIR = /usr/local/bin -+DESTDIR = ${PREFIX}/bin ++BINDIR = ${PREFIX}/bin # Where the man page should be put -MANDIR = /usr/local/man/man6 @@ -40,11 +48,11 @@ $NetBSD: patch-aa,v 1.6 2005/10/15 22:16:05 tonio Exp $ - cp showfigfonts $(DESTDIR) - cp fonts/*.flf $(DEFAULTFONTDIR) - cp fonts/*.flc $(DEFAULTFONTDIR) -+ ${BSD_INSTALL_DATA_DIR} $(DEFAULTFONTDIR) -+ ${BSD_INSTALL_PROGRAM} figlet $(DESTDIR) -+ ${BSD_INSTALL_DATA} figlet.6 $(MANDIR) -+ ${BSD_INSTALL_PROGRAM} chkfont $(DESTDIR) -+ ${BSD_INSTALL_SCRIPT} figlist $(DESTDIR) -+ ${BSD_INSTALL_SCRIPT} showfigfonts $(DESTDIR) -+ ${BSD_INSTALL_DATA} fonts/*.flf $(DEFAULTFONTDIR) -+ ${BSD_INSTALL_DATA} fonts/*.flc $(DEFAULTFONTDIR) ++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(DEFAULTFONTDIR) ++ ${BSD_INSTALL_PROGRAM} figlet $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_DATA} figlet.6 $(DESTDIR)$(MANDIR) ++ ${BSD_INSTALL_PROGRAM} chkfont $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_SCRIPT} figlist $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_SCRIPT} showfigfonts $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_DATA} fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR) ++ ${BSD_INSTALL_DATA} fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR) |