From 723cbd3b9d0bbe044741da8921368e6e3f3f6ecd Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Wed, 29 Jan 2014 20:24:49 +0000
Subject: - Add two new arguments to USES=iconv so ports can indicate they use
 GNU   iconv extensions that the base system iconv doesn't support yet:   *
 wchar_t: port uses the special WCHAR_T character conversion.   * translit:
 port uses //TRANSLIT or //IGNORE conversion options.   Adding one or both of
 these arguments makes the port depend on   converters/libiconv for now. -
 Allow installation of converters/libiconv on FreeBSD 10+. - Use
 ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS   and
 LDFLAGS to fix compilation with libiconv installed. - Stage
 converters/libiconv and devel/gettext.

Approved by:	bapt (on trust)
---
 devel/gettext/Makefile  | 16 +++-------------
 devel/gettext/pkg-plist | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'devel')

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index f9b14c5f754..1f1da15524c 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -14,29 +14,19 @@ MAINTAINER=	autotools@FreeBSD.org
 COMMENT=	GNU gettext package
 
 USES=		charsetfix iconv
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-csharp --disable-java \
 		--disable-openmp --disable-threads \
 		--with-included-gettext --with-included-glib \
 		--with-included-libcroco --with-included-libunistring \
-		--with-included-libxml \
+		--with-included-libxml ${ICONV_CONFIGURE_ARG} \
 		--without-emacs --without-git
 USE_LDCONFIG=	yes
 
-MAN1=		autopoint.1 envsubst.1 gettext.1 gettextize.1 msgattrib.1 \
-		msgcat.1 msgcmp.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 \
-		msgfilter.1 msgfmt.1 msggrep.1 msginit.1 msgmerge.1 \
-		msgunfmt.1 msguniq.1 ngettext.1 recode-sr-latin.1 xgettext.1
-MAN3=		bind_textdomain_codeset.3 bindtextdomain.3 dcgettext.3 \
-		dcngettext.3 dgettext.3 dngettext.3 gettext.3 ngettext.3 \
-		textdomain.3
 INFO=		autosprintf gettext
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
@@ -52,7 +42,7 @@ post-patch:
 .endif
 
 post-install:
-	@${MKDIR} ${LOCALBASE}/share/locale
-	@cd ${WRKSRC}/gettext-tools/doc && make install-info-am
+	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/gettext-tools/doc \
+		${MAKE_ARGS} install-info-am
 
 .include <bsd.port.mk>
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 6d9b31b73ea..368e5d5cc51 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -46,6 +46,36 @@ lib/gettext/hostname
 lib/gettext/project-id
 lib/gettext/urlget
 lib/gettext/user-email
+man/man1/autopoint.1.gz
+man/man1/envsubst.1.gz 
+man/man1/gettext.1.gz 
+man/man1/gettextize.1.gz 
+man/man1/msgattrib.1.gz 
+man/man1/msgcat.1.gz 
+man/man1/msgcmp.1.gz 
+man/man1/msgcomm.1.gz 
+man/man1/msgconv.1.gz 
+man/man1/msgen.1.gz 
+man/man1/msgexec.1.gz 
+man/man1/msgfilter.1.gz 
+man/man1/msgfmt.1.gz 
+man/man1/msggrep.1.gz 
+man/man1/msginit.1.gz 
+man/man1/msgmerge.1.gz 
+man/man1/msgunfmt.1.gz 
+man/man1/msguniq.1.gz 
+man/man1/ngettext.1.gz 
+man/man1/recode-sr-latin.1.gz 
+man/man1/xgettext.1.gz 
+man/man3/bind_textdomain_codeset.3.gz
+man/man3/bindtextdomain.3.gz
+man/man3/dcgettext.3.gz
+man/man3/dcngettext.3.gz
+man/man3/dgettext.3.gz
+man/man3/dngettext.3.gz
+man/man3/gettext.3.gz
+man/man3/ngettext.3.gz
+man/man3/textdomain.3.gz
 share/aclocal/codeset.m4
 share/aclocal/gettext.m4
 share/aclocal/fcntl-o.m4
-- 
cgit