summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorwiz <wiz>2011-08-26 08:13:44 +0000
committerwiz <wiz>2011-08-26 08:13:44 +0000
commit5ee86baed02179d35a63ed7fc2b0785996c4ece3 (patch)
treef2853aaf948c27b175e510a840bcbaa41428f01d /converters
parentfe1cac40f5062e275284f45a25c0ad65fdf57248 (diff)
downloadpkgsrc-5ee86baed02179d35a63ed7fc2b0785996c4ece3.tar.gz
Fix build with gcc-4.5+, from Joern Clausen in PR 45286.
While here, silence pkglint.
Diffstat (limited to 'converters')
-rw-r--r--converters/recode/Makefile5
-rw-r--r--converters/recode/distinfo5
-rw-r--r--converters/recode/patches/patch-aa5
-rw-r--r--converters/recode/patches/patch-src_recodext.h21
4 files changed, 31 insertions, 5 deletions
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index b105d63719e..2d29e187deb 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/04/22 13:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.29 2011/08/26 08:13:44 wiz Exp $
#
DISTNAME= recode-3.6
@@ -9,6 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=recode/}
MAINTAINER= kleink@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/recode/recode.html
COMMENT= Convert files between character sets and usages
+LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
@@ -17,7 +18,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
BROKEN_GETTEXT_DETECTION= yes
-INFO_FILES= # PLIST
+INFO_FILES= yes
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/recode/distinfo b/converters/recode/distinfo
index df0e051f8c0..050d7d874f3 100644
--- a/converters/recode/distinfo
+++ b/converters/recode/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2009/03/25 06:08:17 yyamano Exp $
+$NetBSD: distinfo,v 1.7 2011/08/26 08:13:44 wiz Exp $
SHA1 (recode-3.6.tar.gz) = 2de90cd2ba553bc07d75a29913ea4424dd9e616b
RMD160 (recode-3.6.tar.gz) = 97dcb2544472c9025689452a94bed98ea36374b5
Size (recode-3.6.tar.gz) = 1751886 bytes
-SHA1 (patch-aa) = a5150ed676e2776ca547f42f398968895aef7a3d
+SHA1 (patch-aa) = bc1fcbced4af16cb059beabbc34009e3dcd960d7
+SHA1 (patch-src_recodext.h) = f404830d5573e86ce5f9c9ce6477110f6c9dc1c0
diff --git a/converters/recode/patches/patch-aa b/converters/recode/patches/patch-aa
index 2173f55436b..cb4f7796553 100644
--- a/converters/recode/patches/patch-aa
+++ b/converters/recode/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2009/03/25 06:08:17 yyamano Exp $
+$NetBSD: patch-aa,v 1.3 2011/08/26 08:13:44 wiz Exp $
+
+date: 2009/03/04 08:44:13; author: yyamano; state: Exp;
+Make this build on Mac OS X.
--- lib/Makefile.in.orig 2001-01-22 10:14:14.000000000 -0800
+++ lib/Makefile.in
diff --git a/converters/recode/patches/patch-src_recodext.h b/converters/recode/patches/patch-src_recodext.h
new file mode 100644
index 00000000000..4391d752168
--- /dev/null
+++ b/converters/recode/patches/patch-src_recodext.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_recodext.h,v 1.1 2011/08/26 08:13:44 wiz Exp $
+
+Fix gcc-4.5 problem:
+In file included from common.h:140:0,
+ from charname.c:20:
+recodext.h:221:5: error: width of 'ignore' exceeds its type
+
+See also
+https://github.com/pinard/Recode/commit/a34dfd2257f412dff59f2ad7f714252fa200028e#src/recodext.h
+
+--- src/recodext.h.orig 2001-01-04 14:36:54.000000000 +0000
++++ src/recodext.h
+@@ -218,7 +218,7 @@ struct recode_symbol
+ enum recode_symbol_type type : 3;
+
+ /* Non zero if this one should be ignored. */
+- bool ignore : 2;
++ bool ignore : 1;
+ };
+
+ struct recode_surface_list