summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2012-03-12 13:29:20 +0000
committerfhajny <fhajny@pkgsrc.org>2012-03-12 13:29:20 +0000
commitbc74e5e0a358799cafb50359ae2f416f7327fd56 (patch)
tree9718b347caefec5e72760a6a7b799a24d677ae82
parent570242e543814034501adeb0942069ad8ccf6e9b (diff)
downloadpkgsrc-bc74e5e0a358799cafb50359ae2f416f7327fd56.tar.gz
Remove stale C++ conditionals to fix build on SunOS/GCC.
Add LICENSE information.
-rw-r--r--misc/figlet/Makefile3
-rw-r--r--misc/figlet/distinfo3
-rw-r--r--misc/figlet/patches/patch-utf8.h19
3 files changed, 23 insertions, 2 deletions
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index ca021357a5c..b6a7d9e6fb0 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/05/06 18:02:06 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2012/03/12 13:29:20 fhajny Exp $
DISTNAME= figlet-2.2.4
CATEGORIES= misc
@@ -7,6 +7,7 @@ MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/program/unix/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.figlet.org/
COMMENT= Print text banners in fancy ASCII art characters
+LICENSE= modified-bsd
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/misc/figlet/distinfo b/misc/figlet/distinfo
index 59347b150b9..abb2ff0a608 100644
--- a/misc/figlet/distinfo
+++ b/misc/figlet/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/05/06 18:02:06 drochner Exp $
+$NetBSD: distinfo,v 1.10 2012/03/12 13:29:20 fhajny Exp $
SHA1 (figlet-2.2.4.tar.gz) = 365f1fce8525c0ff23631661f96534f06822e423
RMD160 (figlet-2.2.4.tar.gz) = 158c833e7176f32b1f702482c4cb51dbfe2a4002
Size (figlet-2.2.4.tar.gz) = 229245 bytes
SHA1 (patch-aa) = 7ff721d16e0bbc61dae8d397944cb518e6330325
SHA1 (patch-ab) = e798522fd5842afb2686a5265973f94c4b5a366b
+SHA1 (patch-utf8.h) = 928db9ed97546cc7b2f31f2f196ccdf93187d53a
diff --git a/misc/figlet/patches/patch-utf8.h b/misc/figlet/patches/patch-utf8.h
new file mode 100644
index 00000000000..0534acc1d2f
--- /dev/null
+++ b/misc/figlet/patches/patch-utf8.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-utf8.h,v 1.1 2012/03/12 13:29:20 fhajny Exp $
+
+Remove stale C++ conditionals.
+--- utf8.h.orig 2011-01-26 10:36:21.000000000 +0000
++++ utf8.h
+@@ -27,13 +27,8 @@
+ #define UTF8_IGNORE_ERROR 0x01
+ #define UTF8_SKIP_BOM 0x02
+
+-__BEGIN_DECLS
+-
+ size_t utf8_to_wchar(const char *in, size_t insize, wchar_t *out,
+ size_t outsize, int flags);
+ size_t wchar_to_utf8(const wchar_t *in, size_t insize, char *out,
+ size_t outsize, int flags);
+-
+-__END_DECLS
+-
+ #endif /* !_UTF8_H_ */