From 97881fd69b40f5cae5d6683464da7905eedc9ed4 Mon Sep 17 00:00:00 2001
From: Johan van Selst <johans@FreeBSD.org>
Date: Mon, 30 Jan 2012 20:21:37 +0000
Subject: [PATCH] Update GNU cppi to version 1.16 - Add a patch to fix
 charset.alias location - Move PLIST to a separate file, including optional
 translation files

---
 devel/cppi/Makefile  |  8 ++++++--
 devel/cppi/distinfo  |  4 ++--
 devel/cppi/pkg-plist | 11 +++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 devel/cppi/pkg-plist

diff --git a/devel/cppi/Makefile b/devel/cppi/Makefile
index 377fae4ef742..7327050884f7 100644
--- a/devel/cppi/Makefile
+++ b/devel/cppi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cppi
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,13 +19,17 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_FILES=	bin/cppi
 MAN1=		cppi.1
 
 .ifndef	WITHOUT_NLS
 USE_GETTEXT=    yes                                                             
+PLIST_SUB+=	NLS=""
 .else                                                                           
 CONFIGURE_ARGS+=--disable-nls                                                   
+PLIST_SUB+=	NLS="@comment "
 .endif                                                                          
 
+post-patch:
+	@${REINPLACE_CMD} -e 's:(libdir)/lib:(libdir):' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/devel/cppi/distinfo b/devel/cppi/distinfo
index 5b5d6b220c1b..506ad084144e 100644
--- a/devel/cppi/distinfo
+++ b/devel/cppi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cppi-1.15.tar.xz) = 82bfe3d7ae7a5ca208c71c34cb9b2967ce6251c112b548649a3b9bced9e57cab
-SIZE (cppi-1.15.tar.xz) = 418936
+SHA256 (cppi-1.16.tar.xz) = a8529076461b533b9434d567930441c6cac7b28c2226d6130af754c50192249a
+SIZE (cppi-1.16.tar.xz) = 492184
diff --git a/devel/cppi/pkg-plist b/devel/cppi/pkg-plist
new file mode 100644
index 000000000000..984b5a6fcd97
--- /dev/null
+++ b/devel/cppi/pkg-plist
@@ -0,0 +1,11 @@
+bin/cppi
+%%NLS%%share/locale/eo/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/it/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/cppi.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/cppi.mo