Attachment 148159 Details for Bug 194038 – patch3

[patch] patch3

gettext.patch (text/plain), 63.94 KB, created by Tijl Coosemans on 2014-10-10 10:28:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-10-10 10:28:01 UTC

Size: 63.94 KB

patch

obsolete

>Index: Mk/Uses/autoreconf.mk
>===================================================================
>--- Mk/Uses/autoreconf.mk	(revision 370567)
>+++ Mk/Uses/autoreconf.mk	(working copy)
>@@ -52,7 +52,7 @@
> 
> .if !defined(_INCLUDE_USES_AUTORECONF_MK)
> _INCLUDE_USES_AUTORECONF_MK=	yes
>-_USES_POST+=		autoreconf
>+_USES_POST+=	autoreconf
> 
> BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
> 		autoheader-2.69:${PORTSDIR}/devel/autoconf \
>@@ -60,10 +60,6 @@ BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR
> 		aclocal-1.14:${PORTSDIR}/devel/automake \
> 		automake-1.14:${PORTSDIR}/devel/automake
> 
>-.if ${USES:Mgettext} && empty(gettext_ARGS:Mrun)
>-BUILD_DEPENDS+=	autopoint:${PORTSDIR}/devel/gettext
>-.endif
>-
> .if ${USES:Mlibtool} && empty(libtool_ARGS:Mbuild)
> BUILD_DEPENDS+=	libtoolize:${PORTSDIR}/devel/libtool
> .endif
>Index: Mk/Uses/gettext-runtime.mk
>===================================================================
>--- Mk/Uses/gettext-runtime.mk	(revision 0)
>+++ Mk/Uses/gettext-runtime.mk	(working copy)
>@@ -0,0 +1,28 @@
>+# $FreeBSD$
>+#
>+# Handle dependency on the gettext-runtime (libintl) port
>+#
>+# Feature:	gettext-runtime
>+# Usage:	USES=gettext-runtime or USES=gettext-runtime:ARGS
>+# Valid ARGS:	lib (default), build, run
>+#
>+# MAINTAINER:	portmgr@FreeBSD.org
>+
>+.if !defined(_INCLUDE_USES_GETTEXT_RUNTIME_MK)
>+_INCLUDE_USES_GETTEXT_RUNTIME_MK=	yes
>+
>+.if empty(gettext-runtime_ARGS)
>+gettext-runtime_ARGS=	lib
>+.endif
>+
>+.if ${gettext-runtime_ARGS:Mlib}
>+LIB_DEPENDS+=	libintl.so:${PORTSDIR}/devel/gettext-runtime
>+.endif
>+.if ${gettext-runtime_ARGS:Mbuild}
>+BUILD_DEPENDS+=	gettext:${PORTSDIR}/devel/gettext-runtime
>+.endif
>+.if ${gettext-runtime_ARGS:Mrun}
>+RUN_DEPENDS+=	gettext:${PORTSDIR}/devel/gettext-runtime
>+.endif
>+
>+.endif
>
>Property changes on: Mk/Uses/gettext-runtime.mk
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Index: Mk/Uses/gettext-tools.mk
>===================================================================
>--- Mk/Uses/gettext-tools.mk	(revision 0)
>+++ Mk/Uses/gettext-tools.mk	(working copy)
>@@ -0,0 +1,25 @@
>+# $FreeBSD$
>+#
>+# Handle dependency on the gettext-tools port
>+#
>+# Feature:	gettext-tools
>+# Usage:	USES=gettext-tools or USES=gettext-tools:ARGS
>+# Valid ARGS:	build (default), run
>+#
>+# MAINTAINER:	portmgr@FreeBSD.org
>+
>+.if !defined(_INCLUDE_USES_GETTEXT_TOOLS_MK)
>+_INCLUDE_USES_GETTEXT_TOOLS_MK=	yes
>+
>+.if empty(gettext-tools_ARGS)
>+gettext-tools_ARGS=	build
>+.endif
>+
>+.if ${gettext-tools_ARGS:Mbuild}
>+BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext-tools
>+.endif
>+.if ${gettext-tools_ARGS:Mrun}
>+RUN_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext-tools
>+.endif
>+
>+.endif
>
>Property changes on: Mk/Uses/gettext-tools.mk
>___________________________________________________________________
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: Mk/Uses/gettext.mk
>===================================================================
>--- Mk/Uses/gettext.mk	(revision 370567)
>+++ Mk/Uses/gettext.mk	(working copy)
>@@ -1,30 +1,21 @@
> # $FreeBSD$
> #
>-# handle dependency on the gettext (libintl) port
>+# Sets a library dependency on gettext-runtime and a build dependency
>+# on gettext-tools.  Same as "USES=gettext-runtime gettext-tools".
> #
> # Feature:	gettext
>-# Usage:	USES=gettext or USES=gettext:ARGS
>-# Valid ARGS:	build, run, lib (default, implicit)
>+# Usage:	USES=gettext
> #
>-# MAINTAINER: portmgr@FreeBSD.org
>+# MAINTAINER:	portmgr@FreeBSD.org
> 
> .if !defined(_INCLUDE_USES_GETTEXT_MK)
> _INCLUDE_USES_GETTEXT_MK=	yes
> 
>-_GETTEXT_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
>-
>-.if empty(gettext_ARGS)
>-gettext_ARGS=	lib
>+.if !empty(gettext_ARGS)
>+IGNORE=		USES=gettext does not take arguments
> .endif
> 
>-.if ${gettext_ARGS} == "build"
>-BUILD_DEPENDS+=	${_GETTEXT_DEPENDS}
>-.elif ${gettext_ARGS} == "run"
>-RUN_DEPENDS+=	${_GETTEXT_DEPENDS}
>-.elif ${gettext_ARGS} == "lib"
>-LIB_DEPENDS+=	libintl.so:${PORTSDIR}/devel/gettext
>-.else
>-IGNORE=	USES=gettext - invalid args: [${gettext_ARGS}] specified
>-.endif
>+.include "${USESDIR}/gettext-runtime.mk"
>+.include "${USESDIR}/gettext-tools.mk"
> 
> .endif
>Index: archivers/gtar/Makefile
>===================================================================
>--- archivers/gtar/Makefile	(revision 370567)
>+++ archivers/gtar/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tar
> PORTVERSION=	1.28
>+PORTREVISION=	1
> CATEGORIES=	archivers sysutils
> MASTER_SITES=	GNU
> PKGNAMEPREFIX=	g
>@@ -28,7 +29,7 @@ CONFIGURE_ENV+=	gl_cv_func_mknod_works=y
> OPTIONS_DEFINE=	NLS STATIC
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext:${STATIC_ARGS}
>+NLS_USES=	gettext-runtime:${STATIC_ARGS}
> NLS_CONFIGURE_ENABLE=	nls
> 
> STATIC_LDFLAGS=	-static
>Index: converters/libiconv/Makefile
>===================================================================
>--- converters/libiconv/Makefile	(revision 370567)
>+++ converters/libiconv/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libiconv
> PORTVERSION=	1.14
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	converters devel
> MASTER_SITES=	GNU
> 
>@@ -18,7 +18,7 @@ CONFIGURE_ENV=	am_cv_func_iconv="yes" \
> 		am_cv_proto_iconv_arg1="const"
> INSTALL_TARGET=	install-strip
> MAKE_JOBS_UNSAFE=	yes
>-USES=		libtool:oldver
>+USES=		libtool
> USE_CSTD=	gnu89
> USE_LDCONFIG=	yes
> 
>@@ -48,6 +48,6 @@ post-patch:
> 		${WRKSRC}/preload/configure
> 
> post-install:
>-	${RM} ${STAGEDIR}${PREFIX}/lib/*.la
>+	${LN} -s libiconv.so.2 ${STAGEDIR}${PREFIX}/lib/libiconv.so.3
> 
> .include <bsd.port.mk>
>Index: converters/libiconv/files/patch-lib_Makefile.in
>===================================================================
>--- converters/libiconv/files/patch-lib_Makefile.in	(revision 370567)
>+++ converters/libiconv/files/patch-lib_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- lib/Makefile.in.orig	2011-08-07 19:48:03.000000000 +0200
>-+++ lib/Makefile.in	2011-10-23 22:03:44.000000000 +0200
>-@@ -50,7 +50,7 @@
>- 
>- # Before making a release, change this according to the libtool documentation,
>- # section "Library interface versions".
>--LIBICONV_VERSION_INFO = 7:1:5
>-+LIBICONV_VERSION_INFO = 3
>- 
>- PACKAGE_VERSION = @VERSION@
>- 
>Index: converters/libiconv/files/patch-src__Makefile.in
>===================================================================
>--- converters/libiconv/files/patch-src__Makefile.in	(revision 370567)
>+++ converters/libiconv/files/patch-src__Makefile.in	(working copy)
>@@ -8,11 +8,3 @@
>  
>  # This is the temporary iconv executable, without internationalization.
>  iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)
>-@@ -113,6 +112,7 @@
>- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
>- 	case "@host_os@" in \
>- 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
>-+	  freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
>- 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
>- 	esac
>- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
>Index: converters/libiconv/pkg-plist
>===================================================================
>--- converters/libiconv/pkg-plist	(revision 370567)
>+++ converters/libiconv/pkg-plist	(working copy)
>@@ -6,8 +6,11 @@ lib/charset.alias
> lib/libcharset.a
> lib/libcharset.so
> lib/libcharset.so.1
>+lib/libcharset.so.1.0.0
> lib/libiconv.a
> lib/libiconv.so
>+lib/libiconv.so.2
>+lib/libiconv.so.2.5.1
> lib/libiconv.so.3
> man/man1/iconv.1.gz
> man/man3/iconv.3.gz
>Index: databases/tarantool/Makefile
>===================================================================
>--- databases/tarantool/Makefile	(revision 370567)
>+++ databases/tarantool/Makefile	(working copy)
>@@ -14,7 +14,7 @@ LICENSE=	BSD
> 
> TR_REV=		102-g2857a4e
> MAKE_JOBS_UNSAFE=yes
>-USES=		cmake gettext:build gmake iconv perl5 compiler:c++11-lang
>+USES=		cmake gettext-tools gmake iconv perl5 compiler:c++11-lang
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	${PORTNAME}
> SUB_FILES=	pkg-message
>Index: devel/avr-libc/Makefile
>===================================================================
>--- devel/avr-libc/Makefile	(revision 370567)
>+++ devel/avr-libc/Makefile	(working copy)
>@@ -38,7 +38,7 @@ BUILD_DEPENDS+=	doxygen:${PORTSDIR}/deve
> 		dvips:${PORTSDIR}/print/tex-dvipsk
> .endif
> 
>-USES=		gettext:build tar:bzip2 gmake
>+USES=		gettext-tools tar:bzip2 gmake
> HAS_CONFIGURE=	yes
> 
> CONFIGURE_ENV=	CC=avr-gcc PREFIX=${PREFIX}
>Index: devel/gettext/Makefile
>===================================================================
>--- devel/gettext/Makefile	(revision 370567)
>+++ devel/gettext/Makefile	(working copy)
>@@ -1,49 +1,20 @@
>-# Created by: Yukihiro Nakai <Nakai@technologist.com>
> # $FreeBSD$
> 
>-PORTNAME=	gettext
>-PORTVERSION=	0.18.3.1
>-PORTREVISION=	1
>-CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_GNU}
>-MASTER_SITE_SUBDIR=	gettext
>-
>-# note: before committing to this port, contact portmgr to arrange for an
>+# NOTE: before committing to this port, contact portmgr to arrange for an
> # experimental ports run.  Untested commits may be backed out at portmgr's
> # discretion.
>-MAINTAINER=	autotools@FreeBSD.org
>-COMMENT=	GNU gettext package
>-
>-USES=		charsetfix iconv libtool:oldver
>-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 ${ICONV_CONFIGURE_ARG} \
>-		--without-emacs --without-git
>-USE_LDCONFIG=	yes
>-
>-INFO=		autosprintf gettext
> 
>-OPTIONS_DEFINE=	DOCS
>+PORTNAME=	gettext
>+PORTREVISION=	0
>+DISTFILES=
> 
>-.include <bsd.port.options.mk>
>+COMMENT=	GNU gettext meta package
> 
>-.if ! ${PORT_OPTIONS:MDOCS}
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-nodocs
>-.endif
>+.include "${.CURDIR}/../gettext/Makefile.common"
> 
>-post-patch:
>-.if ! ${PORT_OPTIONS:MDOCS}
>-.for dir in runtime tools
>-	@${REINPLACE_CMD} -e 's|^SUBDIRS = doc|SUBDIRS =|' \
>-		${WRKSRC}/gettext-${dir}/Makefile.in
>-.endfor
>-.endif
>+USES=		gettext-runtime:run gettext-tools:run
> 
>-post-install:
>-	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/gettext-tools/doc \
>-		${MAKE_ARGS} install-info-am
>+NO_BUILD=	yes
>+NO_INSTALL=	yes
> 
> .include <bsd.port.mk>
>Index: devel/gettext/Makefile.common
>===================================================================
>--- devel/gettext/Makefile.common	(revision 0)
>+++ devel/gettext/Makefile.common	(working copy)
>@@ -0,0 +1,18 @@
>+# $FreeBSD$
>+
>+# NOTE: before committing to this port, contact portmgr to arrange for an
>+# experimental ports run.  Untested commits may be backed out at portmgr's
>+# discretion.
>+
>+PORTVERSION=	0.19.2
>+PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
>+CATEGORIES=	devel
>+MASTER_SITES=	GNU/gettext
>+DISTNAME=	gettext-${PORTVERSION}
>+
>+MAINTAINER=	autotools@FreeBSD.org
>+
>+DISTINFO_FILE=	${.CURDIR}/../gettext/distinfo
>+
>+DATADIR=	${PREFIX}/share/gettext
>+DOCSDIR=	${PREFIX}/share/doc/gettext
>
>Property changes on: devel/gettext/Makefile.common
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext/distinfo
>===================================================================
>--- devel/gettext/distinfo	(revision 370567)
>+++ devel/gettext/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gettext-0.18.3.1.tar.gz) = 0d8f9a33531b77776b3dc473e7940019ca19bfca5b4c06db6e96065eeb07245d
>-SIZE (gettext-0.18.3.1.tar.gz) = 16341773
>+SHA256 (gettext-0.19.2.tar.xz) = b34e1baaf37e56b4f5d7104353a437a735b2e094a70588e7c5ae671eaa0819c3
>+SIZE (gettext-0.19.2.tar.xz) = 6622116
>Index: devel/gettext/files/extra-patch-nodocs
>===================================================================
>--- devel/gettext/files/extra-patch-nodocs	(revision 370567)
>+++ devel/gettext/files/extra-patch-nodocs	(working copy)
>@@ -1,55 +0,0 @@
>---- gettext-runtime/intl-java/Makefile.in.orig	Mon May 23 04:23:40 2005
>-+++ gettext-runtime/intl-java/Makefile.in	Tue Jan 30 20:02:41 2007
>-@@ -464,5 +464,5 @@
>- 
>--all-local: all-classes all-javadoc2
>--install-data-local: install-classes install-javadoc2
>--installdirs-local: installdirs-classes installdirs-javadoc2
>-+all-local: all-classes
>-+install-data-local: install-classes
>-+installdirs-local: installdirs-classes
>- uninstall-local: uninstall-classes uninstall-javadoc2
>-
>---- gettext-runtime/intl-csharp/Makefile.in.orig	Mon May 23 04:23:39 2005
>-+++ gettext-runtime/intl-csharp/Makefile.in	Tue Jan 30 20:11:08 2007
>-@@ -432,5 +432,5 @@
>- 
>--all-local: all-dll all-doc
>--install-data-local: install-dll install-doc
>--installdirs-local: installdirs-dll installdirs-doc
>-+all-local: all-dll
>-+install-data-local: install-dll
>-+installdirs-local: installdirs-dll
>- uninstall-local: uninstall-dll uninstall-doc
>-
>---- gettext-runtime/libasprintf/Makefile.in.orig	Mon May 23 04:23:55 2005
>-+++ gettext-runtime/libasprintf/Makefile.in	Tue Jan 30 20:24:01 2007
>-@@ -882,5 +882,5 @@
>- 
>--all-local: html-local
>--install-data-local: install-html
>--installdirs-local: installdirs-html
>-+all-local:
>-+install-data-local:
>-+installdirs-local:
>- uninstall-local: uninstall-html
>-
>---- gettext-tools/Makefile.in.orig	Mon Nov 27 09:34:56 2006
>-+++ gettext-tools/Makefile.in	Tue Jan 30 23:15:59 2007
>-@@ -944,3 +944,3 @@
>- 
>--install-data-am: install-examplesbuildauxDATA \
>-+install-data-am: \
>- 	install-gettextsrcSCRIPTS
>-
>---- gettext-tools/m4/Makefile.in.orig	Mon May 23 04:24:27 2005
>-+++ gettext-tools/m4/Makefile.in	Tue Jan 30 20:19:34 2007
>-@@ -530,3 +530,3 @@
>- installdirs:
>--	for dir in "$(DESTDIR)$(aclocaldir)" "$(DESTDIR)$(examplesbuildauxdir)"; do \
>-+	for dir in "$(DESTDIR)$(aclocaldir)" ; do \
>- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
>-@@ -575,3 +575,3 @@
>- 
>--install-data-am: install-aclocalDATA install-examplesbuildauxDATA
>-+install-data-am: install-aclocalDATA
>Index: devel/gettext/files/patch-gettext-runtime_man_Makefile.in
>===================================================================
>--- devel/gettext/files/patch-gettext-runtime_man_Makefile.in	(revision 370567)
>+++ devel/gettext/files/patch-gettext-runtime_man_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- gettext-runtime/man/Makefile.in.orig	Mon May 23 04:23:40 2005
>-+++ gettext-runtime/man/Makefile.in	Tue Jan 30 22:30:58 2007
>-@@ -576,5 +576,5 @@
>- 
>--all-local: html-local
>--install-data-local: install-html
>--installdirs-local: installdirs-html
>-+all-local:
>-+install-data-local:
>-+installdirs-local:
>- uninstall-local: uninstall-html
>Index: devel/gettext/files/patch-gettext-tools_Makefile.in
>===================================================================
>--- devel/gettext/files/patch-gettext-tools_Makefile.in	(revision 370567)
>+++ devel/gettext/files/patch-gettext-tools_Makefile.in	(working copy)
>@@ -1,7 +0,0 @@
>---- gettext-tools/Makefile.in.orig	2007-11-06 23:40:19.000000000 +0000
>-+++ gettext-tools/Makefile.in	2007-12-12 03:30:36.000000000 +0000
>-@@ -726,3 +726,3 @@
>- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
>--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
>-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4
>- 
>Index: devel/gettext/files/patch-gettext-tools_config.h.in
>===================================================================
>--- devel/gettext/files/patch-gettext-tools_config.h.in	(revision 370567)
>+++ devel/gettext/files/patch-gettext-tools_config.h.in	(working copy)
>@@ -1,8 +0,0 @@
>---- gettext-tools/config.h.in.orig	2013-03-05 08:43:50.000000000 +0000
>-+++ gettext-tools/config.h.in	2013-05-23 19:14:44.000000000 +0000
>-@@ -524,2 +524,5 @@
>- 
>-+/* Define to 1 if the expat library is bsdxml. */
>-+#undef HAVE_BSDXML
>-+
>- /* Define to 1 if you have the 'btowc' function. */
>Index: devel/gettext/files/patch-gettext-tools_configure
>===================================================================
>--- devel/gettext/files/patch-gettext-tools_configure	(revision 370567)
>+++ devel/gettext/files/patch-gettext-tools_configure	(working copy)
>@@ -1,16 +0,0 @@
>---- gettext-tools/configure.orig	Mon Nov 27 09:34:40 2006
>-+++ gettext-tools/configure	Sun Dec  3 17:54:35 2006
>-@@ -50083,2 +50071,13 @@
>- case "$host_os" in
>-+  freebsd*)
>-+
>-+cat >>confdefs.h <<\_ACEOF
>-+#define HAVE_BSDXML 1
>-+#define HAVE_LIBEXPAT 1
>-+_ACEOF
>-+
>-+    LIBEXPAT="-lbsdxml"
>-+    LTLIBEXPAT="-lbsdxml"
>-+
>-+    ;;
>-   linux*)
>Index: devel/gettext/files/patch-gettext-tools_man_Makefile.in
>===================================================================
>--- devel/gettext/files/patch-gettext-tools_man_Makefile.in	(revision 370567)
>+++ devel/gettext/files/patch-gettext-tools_man_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- gettext-tools/man/Makefile.in.orig	Mon May 23 04:24:28 2005
>-+++ gettext-tools/man/Makefile.in	Tue Jan 30 22:12:40 2007
>-@@ -576,5 +576,5 @@
>- 
>--all-local: html-local
>--install-data-local: install-html
>--installdirs-local: installdirs-html
>-+all-local:
>-+install-data-local:
>-+installdirs-local:
>- uninstall-local: uninstall-html
>Index: devel/gettext/files/patch-gettext-tools_src_x-glade.c
>===================================================================
>--- devel/gettext/files/patch-gettext-tools_src_x-glade.c	(revision 370567)
>+++ devel/gettext/files/patch-gettext-tools_src_x-glade.c	(working copy)
>@@ -1,15 +0,0 @@
>---- gettext-tools/src/x-glade.c.orig	Sat Aug 28 11:53:08 2004
>-+++ gettext-tools/src/x-glade.c	Sat Aug 28 11:53:48 2004
>-@@ -30,7 +30,11 @@
>- # include <dlfcn.h>
>- #else
>- # if HAVE_LIBEXPAT
>--#  include <expat.h>
>-+#  if HAVE_BSDXML
>-+#   include <bsdxml.h>
>-+#  else
>-+#   include <expat.h>
>-+#  endif
>- # endif
>- #endif
>- 
>Index: devel/gettext/pkg-descr
>===================================================================
>--- devel/gettext/pkg-descr	(revision 370567)
>+++ devel/gettext/pkg-descr	(working copy)
>@@ -1,7 +1,4 @@
>-This is the GNU gettext package.  It is interesting for authors or
>-maintainers of other packages or programs which they want to see
>-internationalized.  As one step the handling of messages in different
>-languages should be implemented.  For this task GNU gettext provides
>-the needed tools and library functions.
>+GNU gettext is a framework of libraries and tools for internationalisation 
>+and localisation of software.
> 
> WWW: http://www.gnu.org/software/gettext/
>Index: devel/gettext/pkg-plist
>===================================================================
>--- devel/gettext/pkg-plist	(revision 370567)
>+++ devel/gettext/pkg-plist	(working copy)
>@@ -1,370 +0,0 @@
>-bin/autopoint
>-bin/envsubst
>-bin/gettext
>-bin/gettext.sh
>-bin/gettextize
>-bin/msgattrib
>-bin/msgcat
>-bin/msgcmp
>-bin/msgcomm
>-bin/msgconv
>-bin/msgen
>-bin/msgexec
>-bin/msgfilter
>-bin/msgfmt
>-bin/msggrep
>-bin/msginit
>-bin/msgmerge
>-bin/msgunfmt
>-bin/msguniq
>-bin/ngettext
>-bin/recode-sr-latin
>-bin/xgettext
>-include/autosprintf.h
>-include/gettext-po.h
>-include/libintl.h
>-@exec /bin/mkdir -p %D/lib/gettext
>-lib/libasprintf.a
>-lib/libasprintf.la
>-lib/libasprintf.so
>-lib/libasprintf.so.0
>-lib/libgettextlib-0.18.3.so
>-lib/libgettextlib.la
>-lib/libgettextlib.so
>-lib/libgettextpo.a
>-lib/libgettextpo.la
>-lib/libgettextpo.so
>-lib/libgettextpo.so.5
>-lib/libgettextsrc.la
>-lib/libgettextsrc-0.18.3.so
>-lib/libgettextsrc.so
>-lib/libintl.a
>-lib/libintl.la
>-lib/libintl.so
>-lib/libintl.so.9
>-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
>-share/aclocal/glibc2.m4
>-share/aclocal/glibc21.m4
>-share/aclocal/iconv.m4
>-share/aclocal/intdiv0.m4
>-share/aclocal/intl.m4
>-share/aclocal/intldir.m4
>-share/aclocal/intlmacosx.m4
>-share/aclocal/intmax.m4
>-share/aclocal/inttypes-pri.m4
>-share/aclocal/inttypes_h.m4
>-share/aclocal/lcmessage.m4
>-share/aclocal/lib-ld.m4
>-share/aclocal/lib-link.m4
>-share/aclocal/lib-prefix.m4
>-share/aclocal/lock.m4
>-share/aclocal/longlong.m4
>-share/aclocal/nls.m4
>-share/aclocal/po.m4
>-share/aclocal/printf-posix.m4
>-share/aclocal/progtest.m4
>-share/aclocal/size_max.m4
>-share/aclocal/stdint_h.m4
>-share/aclocal/threadlib.m4
>-share/aclocal/uintmax_t.m4
>-share/aclocal/visibility.m4
>-share/aclocal/wchar_t.m4
>-share/aclocal/wint_t.m4
>-share/aclocal/xsize.m4
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceManager.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/GNU_Gettext_GettextResourceSet.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/begin.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/csharpdoc/namespaces.html
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpcomp.m4
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpcomp.sh.in
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec.m4
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec.sh.in
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/csharpexec-test.exe
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/gcj.m4
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javacomp.m4
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javacomp.sh.in
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javaexec.m4
>-%%PORTDOCS%%%%DOCSDIR%%/examples/build-aux/javaexec.sh.in
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_1.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_2.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_3.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_4.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_5.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_6.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_7.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_8.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_9.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_10.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_11.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_12.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_13.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_14.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_15.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_16.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_17.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_18.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_19.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_20.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_21.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_22.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_23.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_24.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_25.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_foot.html
>-%%PORTDOCS%%%%DOCSDIR%%/gettext_toc.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/allclasses-frame.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/deprecated-list.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/GettextResource.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-frame.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-summary.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/gnu/gettext/package-tree.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/help-doc.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index-all.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/overview-tree.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/package-list
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/packages.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/serialized-form.html
>-%%PORTDOCS%%%%DOCSDIR%%/javadoc2/stylesheet.css
>-%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
>-%%PORTDOCS%%share/doc/libasprintf/autosprintf_all.html
>-%%DATADIR%%/ABOUT-NLS
>-%%DATADIR%%/archive.dir.tar.xz
>-%%DATADIR%%/config.rpath
>-%%DATADIR%%/gettext.h
>-%%DATADIR%%/intl/COPYING.LIB
>-%%DATADIR%%/intl/ChangeLog
>-%%DATADIR%%/intl/Makefile.in
>-%%DATADIR%%/intl/VERSION
>-%%DATADIR%%/intl/bindtextdom.c
>-%%DATADIR%%/intl/config.charset
>-%%DATADIR%%/intl/dcgettext.c
>-%%DATADIR%%/intl/dcigettext.c
>-%%DATADIR%%/intl/dcngettext.c
>-%%DATADIR%%/intl/dgettext.c
>-%%DATADIR%%/intl/dngettext.c
>-%%DATADIR%%/intl/eval-plural.h
>-%%DATADIR%%/intl/explodename.c
>-%%DATADIR%%/intl/export.h
>-%%DATADIR%%/intl/finddomain.c
>-%%DATADIR%%/intl/gettext.c
>-%%DATADIR%%/intl/gettextP.h
>-%%DATADIR%%/intl/gmo.h
>-%%DATADIR%%/intl/hash-string.c
>-%%DATADIR%%/intl/hash-string.h
>-%%DATADIR%%/intl/intl-compat.c
>-%%DATADIR%%/intl/intl-exports.c
>-%%DATADIR%%/intl/l10nflist.c
>-%%DATADIR%%/intl/langprefs.c
>-%%DATADIR%%/intl/libgnuintl.in.h
>-%%DATADIR%%/intl/libintl.rc
>-%%DATADIR%%/intl/loadinfo.h
>-%%DATADIR%%/intl/loadmsgcat.c
>-%%DATADIR%%/intl/localcharset.c
>-%%DATADIR%%/intl/localcharset.h
>-%%DATADIR%%/intl/locale.alias
>-%%DATADIR%%/intl/localealias.c
>-%%DATADIR%%/intl/localename.c
>-%%DATADIR%%/intl/lock.c
>-%%DATADIR%%/intl/lock.h
>-%%DATADIR%%/intl/log.c
>-%%DATADIR%%/intl/ngettext.c
>-%%DATADIR%%/intl/os2compat.c
>-%%DATADIR%%/intl/os2compat.h
>-%%DATADIR%%/intl/osdep.c
>-%%DATADIR%%/intl/plural-exp.c
>-%%DATADIR%%/intl/plural-exp.h
>-%%DATADIR%%/intl/plural.c
>-%%DATADIR%%/intl/plural.y
>-%%DATADIR%%/intl/printf-args.c
>-%%DATADIR%%/intl/printf-args.h
>-%%DATADIR%%/intl/printf-parse.c
>-%%DATADIR%%/intl/printf-parse.h
>-%%DATADIR%%/intl/printf.c
>-%%DATADIR%%/intl/ref-add.sin
>-%%DATADIR%%/intl/ref-del.sin
>-%%DATADIR%%/intl/relocatable.c
>-%%DATADIR%%/intl/relocatable.h
>-%%DATADIR%%/intl/setlocale.c
>-%%DATADIR%%/intl/textdomain.c
>-%%DATADIR%%/intl/threadlib.c
>-%%DATADIR%%/intl/tsearch.c
>-%%DATADIR%%/intl/tsearch.h
>-%%DATADIR%%/intl/vasnprintf.c
>-%%DATADIR%%/intl/vasnprintf.h
>-%%DATADIR%%/intl/vasnwprintf.h
>-%%DATADIR%%/intl/verify.h
>-%%DATADIR%%/intl/version.c
>-%%DATADIR%%/intl/wprintf-parse.h
>-%%DATADIR%%/intl/xsize.c
>-%%DATADIR%%/intl/xsize.h
>-%%DATADIR%%/javaversion.class
>-%%DATADIR%%/msgunfmt.tcl
>-%%DATADIR%%/po/Makefile.in.in
>-%%DATADIR%%/po/Makevars.template
>-%%DATADIR%%/po/Rules-quot
>-%%DATADIR%%/po/boldquot.sed
>-%%DATADIR%%/po/en@boldquot.header
>-%%DATADIR%%/po/en@quot.header
>-%%DATADIR%%/po/insert-header.sin
>-%%DATADIR%%/po/quot.sed
>-%%DATADIR%%/po/remove-potcdate.sin
>-%%DATADIR%%/projects/GNOME/team-address
>-%%DATADIR%%/projects/GNOME/teams.html
>-%%DATADIR%%/projects/GNOME/teams.url
>-%%DATADIR%%/projects/GNOME/trigger
>-%%DATADIR%%/projects/KDE/team-address
>-%%DATADIR%%/projects/KDE/teams.html
>-%%DATADIR%%/projects/KDE/teams.url
>-%%DATADIR%%/projects/KDE/trigger
>-%%DATADIR%%/projects/TP/team-address
>-%%DATADIR%%/projects/TP/teams.html
>-%%DATADIR%%/projects/TP/teams.url
>-%%DATADIR%%/projects/TP/trigger
>-%%DATADIR%%/projects/index
>-%%DATADIR%%/projects/team-address
>-%%DATADIR%%/styles/po-default.css
>-%%DATADIR%%/styles/po-emacs-x.css
>-%%DATADIR%%/styles/po-emacs-xterm.css
>-%%DATADIR%%/styles/po-emacs-xterm16.css
>-%%DATADIR%%/styles/po-emacs-xterm256.css
>-%%DATADIR%%/styles/po-vim.css
>-share/locale/be/LC_MESSAGES/gettext-runtime.mo
>-share/locale/be/LC_MESSAGES/gettext-tools.mo
>-share/locale/bg/LC_MESSAGES/gettext-runtime.mo
>-share/locale/bg/LC_MESSAGES/gettext-tools.mo
>-share/locale/ca/LC_MESSAGES/gettext-runtime.mo
>-share/locale/ca/LC_MESSAGES/gettext-tools.mo
>-share/locale/cs/LC_MESSAGES/gettext-runtime.mo
>-share/locale/cs/LC_MESSAGES/gettext-tools.mo
>-share/locale/da/LC_MESSAGES/gettext-runtime.mo
>-share/locale/da/LC_MESSAGES/gettext-tools.mo
>-share/locale/de/LC_MESSAGES/gettext-runtime.mo
>-share/locale/de/LC_MESSAGES/gettext-tools.mo
>-share/locale/el/LC_MESSAGES/gettext-runtime.mo
>-share/locale/el/LC_MESSAGES/gettext-tools.mo
>-share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
>-share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
>-share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
>-share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
>-share/locale/eo/LC_MESSAGES/gettext-runtime.mo
>-share/locale/es/LC_MESSAGES/gettext-runtime.mo
>-share/locale/es/LC_MESSAGES/gettext-tools.mo
>-share/locale/et/LC_MESSAGES/gettext-runtime.mo
>-share/locale/et/LC_MESSAGES/gettext-tools.mo
>-share/locale/eu/LC_MESSAGES/gettext-tools.mo
>-share/locale/fi/LC_MESSAGES/gettext-runtime.mo
>-share/locale/fi/LC_MESSAGES/gettext-tools.mo
>-share/locale/fr/LC_MESSAGES/gettext-runtime.mo
>-share/locale/fr/LC_MESSAGES/gettext-tools.mo
>-share/locale/ga/LC_MESSAGES/gettext-runtime.mo
>-share/locale/gl/LC_MESSAGES/gettext-runtime.mo
>-share/locale/gl/LC_MESSAGES/gettext-tools.mo
>-share/locale/hr/LC_MESSAGES/gettext-runtime.mo
>-share/locale/id/LC_MESSAGES/gettext-runtime.mo
>-share/locale/id/LC_MESSAGES/gettext-tools.mo
>-share/locale/it/LC_MESSAGES/gettext-runtime.mo
>-share/locale/it/LC_MESSAGES/gettext-tools.mo
>-share/locale/ja/LC_MESSAGES/gettext-runtime.mo
>-share/locale/ja/LC_MESSAGES/gettext-tools.mo
>-share/locale/ko/LC_MESSAGES/gettext-runtime.mo
>-share/locale/ko/LC_MESSAGES/gettext-tools.mo
>-share/locale/locale.alias
>-share/locale/nb/LC_MESSAGES/gettext-runtime.mo
>-share/locale/nb/LC_MESSAGES/gettext-tools.mo
>-share/locale/nl/LC_MESSAGES/gettext-runtime.mo
>-share/locale/nl/LC_MESSAGES/gettext-tools.mo
>-share/locale/nn/LC_MESSAGES/gettext-runtime.mo
>-share/locale/nn/LC_MESSAGES/gettext-tools.mo
>-share/locale/pa/LC_MESSAGES/gettext-tools.mo
>-share/locale/pl/LC_MESSAGES/gettext-runtime.mo
>-share/locale/pl/LC_MESSAGES/gettext-tools.mo
>-share/locale/pt/LC_MESSAGES/gettext-runtime.mo
>-share/locale/pt/LC_MESSAGES/gettext-tools.mo
>-share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
>-share/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
>-share/locale/ro/LC_MESSAGES/gettext-runtime.mo
>-share/locale/ro/LC_MESSAGES/gettext-tools.mo
>-share/locale/ru/LC_MESSAGES/gettext-runtime.mo
>-share/locale/ru/LC_MESSAGES/gettext-tools.mo
>-share/locale/sk/LC_MESSAGES/gettext-runtime.mo
>-share/locale/sk/LC_MESSAGES/gettext-tools.mo
>-share/locale/sl/LC_MESSAGES/gettext-runtime.mo
>-share/locale/sl/LC_MESSAGES/gettext-tools.mo
>-share/locale/sr/LC_MESSAGES/gettext-runtime.mo
>-share/locale/sr/LC_MESSAGES/gettext-tools.mo
>-share/locale/sv/LC_MESSAGES/gettext-runtime.mo
>-share/locale/sv/LC_MESSAGES/gettext-tools.mo
>-share/locale/tr/LC_MESSAGES/gettext-runtime.mo
>-share/locale/tr/LC_MESSAGES/gettext-tools.mo
>-share/locale/uk/LC_MESSAGES/gettext-runtime.mo
>-share/locale/uk/LC_MESSAGES/gettext-tools.mo
>-share/locale/vi/LC_MESSAGES/gettext-runtime.mo
>-share/locale/vi/LC_MESSAGES/gettext-tools.mo
>-share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
>-share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
>-share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
>-share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
>-share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
>-@dirrm %%DATADIR%%/styles
>-@dirrm %%DATADIR%%/projects/TP
>-@dirrm %%DATADIR%%/projects/KDE
>-@dirrm %%DATADIR%%/projects/GNOME
>-@dirrm %%DATADIR%%/projects
>-@dirrm %%DATADIR%%/po
>-@dirrm %%DATADIR%%/intl
>-@dirrm %%DATADIR%%
>-%%PORTDOCS%%@dirrm share/doc/libasprintf
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu/gettext
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2/gnu
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadoc2
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/build-aux
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/csharpdoc
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm lib/gettext
>-@dirrmtry share/locale/en@boldquot/LC_MESSAGES
>-@dirrmtry share/locale/en@quot/LC_MESSAGES
>-@dirrmtry share/locale/zh_HK/LC_MESSAGES
>-@dirrmtry share/locale/en@boldquot
>-@dirrmtry share/locale/en@quot
>-@dirrmtry share/locale/zh_HK
>Index: devel/gettext-lint/Makefile
>===================================================================
>--- devel/gettext-lint/Makefile	(revision 370567)
>+++ devel/gettext-lint/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gettext-lint
> PORTVERSION=	0.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
> 
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> NO_BUILD=	yes
> 
>-USES=		gettext:run shebangfix
>+USES=		gettext-tools:run shebangfix
> SHEBANG_FILES=	src/POFileEquiv.in src/POFileGlossary.in
> USE_PYTHON_RUN=	yes
> 
>Index: devel/gettext-runtime/Makefile
>===================================================================
>--- devel/gettext-runtime/Makefile	(revision 0)
>+++ devel/gettext-runtime/Makefile	(working copy)
>@@ -0,0 +1,46 @@
>+# $FreeBSD$
>+
>+# NOTE: before committing to this port, contact portmgr to arrange for an
>+# experimental ports run.  Untested commits may be backed out at portmgr's
>+# discretion.
>+
>+PORTNAME=	gettext-runtime
>+PORTREVISION=	0
>+
>+COMMENT=	GNU gettext runtime libraries and programs
>+
>+LICENSE=	LGPL21 GPLv3
>+LICENSE_COMB=	multi
>+LICENSE_FILE_LGPL21=	${WRKSRC}/intl/COPYING.LIB
>+LICENSE_FILE_GPLv3=	${WRKSRC}/../COPYING
>+
>+.include "${.CURDIR}/../gettext/Makefile.common"
>+
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-csharp --disable-java --with-included-gettext \
>+		ac_cv_lib_rt_sched_yield=no
>+INSTALL_TARGET=	install-strip
>+USES=		charsetfix iconv libtool tar:xz
>+USE_LDCONFIG=	yes
>+WRKSRC_SUBDIR=	gettext-runtime
>+
>+INFO=		autosprintf
>+
>+post-patch:
>+# Do not install csharp and java documentation.
>+	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(intl-csharp|intl-java)//g' \
>+		${WRKSRC}/Makefile.in
>+# Do not install html copies of manpages.
>+	@${REINPLACE_CMD} \
>+		-e '/^all-local:/s/html-local//' \
>+		-e '/^install-data-local:/s/install-html//' \
>+		-e '/^installdirs-local:/s/installdirs-html//' \
>+		${WRKSRC}/libasprintf/Makefile.in ${WRKSRC}/man/Makefile.in
>+
>+post-install:
>+	${LN} -s libintl.so.8 ${STAGEDIR}${PREFIX}/lib/libintl.so.9
>+
>+regression-test: build
>+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/gettext-runtime/Makefile
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext-runtime/pkg-descr
>===================================================================
>--- devel/gettext-runtime/pkg-descr	(revision 0)
>+++ devel/gettext-runtime/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+GNU gettext is a framework of libraries and tools for internationalisation
>+and localisation of software.
>+
>+This package contains the runtime libraries and programs.
>+
>+WWW: http://www.gnu.org/software/gettext/
>
>Property changes on: devel/gettext-runtime/pkg-descr
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext-runtime/pkg-plist
>===================================================================
>--- devel/gettext-runtime/pkg-plist	(revision 0)
>+++ devel/gettext-runtime/pkg-plist	(working copy)
>@@ -0,0 +1,69 @@
>+bin/envsubst
>+bin/gettext
>+bin/gettext.sh
>+bin/ngettext
>+include/autosprintf.h
>+include/libintl.h
>+lib/libasprintf.a
>+lib/libasprintf.so
>+lib/libasprintf.so.0
>+lib/libasprintf.so.0.0.0
>+lib/libintl.a
>+lib/libintl.so
>+lib/libintl.so.8
>+lib/libintl.so.8.1.2
>+lib/libintl.so.9
>+man/man1/envsubst.1.gz
>+man/man1/gettext.1.gz
>+man/man1/ngettext.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
>+%%DATADIR%%/ABOUT-NLS
>+share/locale/be/LC_MESSAGES/gettext-runtime.mo
>+share/locale/bg/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ca/LC_MESSAGES/gettext-runtime.mo
>+share/locale/cs/LC_MESSAGES/gettext-runtime.mo
>+share/locale/da/LC_MESSAGES/gettext-runtime.mo
>+share/locale/de/LC_MESSAGES/gettext-runtime.mo
>+share/locale/el/LC_MESSAGES/gettext-runtime.mo
>+share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
>+share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
>+share/locale/eo/LC_MESSAGES/gettext-runtime.mo
>+share/locale/es/LC_MESSAGES/gettext-runtime.mo
>+share/locale/et/LC_MESSAGES/gettext-runtime.mo
>+share/locale/fi/LC_MESSAGES/gettext-runtime.mo
>+share/locale/fr/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ga/LC_MESSAGES/gettext-runtime.mo
>+share/locale/gl/LC_MESSAGES/gettext-runtime.mo
>+share/locale/hr/LC_MESSAGES/gettext-runtime.mo
>+share/locale/hu/LC_MESSAGES/gettext-runtime.mo
>+share/locale/id/LC_MESSAGES/gettext-runtime.mo
>+share/locale/it/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ja/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ko/LC_MESSAGES/gettext-runtime.mo
>+share/locale/locale.alias
>+share/locale/nb/LC_MESSAGES/gettext-runtime.mo
>+share/locale/nl/LC_MESSAGES/gettext-runtime.mo
>+share/locale/nn/LC_MESSAGES/gettext-runtime.mo
>+share/locale/pl/LC_MESSAGES/gettext-runtime.mo
>+share/locale/pt/LC_MESSAGES/gettext-runtime.mo
>+share/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ro/LC_MESSAGES/gettext-runtime.mo
>+share/locale/ru/LC_MESSAGES/gettext-runtime.mo
>+share/locale/sk/LC_MESSAGES/gettext-runtime.mo
>+share/locale/sl/LC_MESSAGES/gettext-runtime.mo
>+share/locale/sr/LC_MESSAGES/gettext-runtime.mo
>+share/locale/sv/LC_MESSAGES/gettext-runtime.mo
>+share/locale/tr/LC_MESSAGES/gettext-runtime.mo
>+share/locale/uk/LC_MESSAGES/gettext-runtime.mo
>+share/locale/vi/LC_MESSAGES/gettext-runtime.mo
>+share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
>+share/locale/zh_HK/LC_MESSAGES/gettext-runtime.mo
>+share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
>
>Property changes on: devel/gettext-runtime/pkg-plist
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext-tools/Makefile
>===================================================================
>--- devel/gettext-tools/Makefile	(revision 0)
>+++ devel/gettext-tools/Makefile	(working copy)
>@@ -0,0 +1,68 @@
>+# $FreeBSD$
>+
>+# NOTE: before committing to this port, contact portmgr to arrange for an
>+# experimental ports run.  Untested commits may be backed out at portmgr's
>+# discretion.
>+
>+PORTNAME=	gettext-tools
>+PORTREVISION=	0
>+
>+COMMENT=	GNU gettext development and translation tools
>+
>+LICENSE=	GPLv3
>+LICENSE_FILE=	${WRKSRC}/../COPYING    
>+
>+.include "${.CURDIR}/../gettext/Makefile.common"
>+
>+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
>+
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-csharp --disable-java --disable-openmp \
>+		--with-included-glib --with-included-libcroco \
>+		--with-included-libunistring --with-included-libxml \
>+		--without-emacs --without-git ac_cv_lib_rt_sched_yield=no
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
>+INSTALL_TARGET=	install-strip
>+USES=		charsetfix gettext-runtime iconv libtool tar:xz
>+USE_LDCONFIG=	yes
>+WRKSRC_SUBDIR=	gettext-tools
>+
>+OPTIONS_DEFINE=	DOCS
>+
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+INFO+=		gettext
>+.endif
>+
>+post-patch:
>+.if ! ${PORT_OPTIONS:MDOCS}
>+	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' ${WRKSRC}/Makefile.in
>+.endif
>+# Exclude examples and gnulib-tests.
>+	@${REINPLACE_CMD} -E '/^SUBDIRS =/s/(examples|gnulib-tests)//g' \
>+		${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} \
>+		'/^install-data-am:/s/install-examplesbuildauxDATA//' \
>+		${WRKSRC}/Makefile.in ${WRKSRC}/m4/Makefile.in
>+# Do not install html copies of manpages.
>+	@${REINPLACE_CMD} \
>+		-e '/^all-local:/s/html-local//' \
>+		-e '/^install-data-local:/s/install-html//' \
>+		-e '/^installdirs-local:/s/installdirs-html//' \
>+		${WRKSRC}/man/Makefile.in
>+# Do not patch system float.h.
>+	@${REINPLACE_CMD} 's/FLOAT_H=float\.h//' \
>+		${WRKSRC}/configure
>+# Use libintl installed by gettext-runtime.
>+	@${REINPLACE_CMD} '/^LDADD_no =/s,\.\./intl/libgnuintl.la,,' \
>+		${WRKSRC}/tests/Makefile.in
>+# Use libasprintf installed by gettext-runtime.
>+	@${REINPLACE_CMD} 's,[^ ]*libasprintf.la,-lasprintf,' \
>+		${WRKSRC}/tests/lang-c++
>+
>+regression-test: build
>+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
>+
>+.include <bsd.port.mk>
>
>Property changes on: devel/gettext-tools/Makefile
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext-tools/files/patch-configure
>===================================================================
>--- devel/gettext-tools/files/patch-configure	(revision 0)
>+++ devel/gettext-tools/files/patch-configure	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.orig
>++++ configure
>+@@ -21679,7 +21679,7 @@
>+                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
>+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
>+                 && test "$PACKAGE" != gettext-runtime \
>+-                && test "$PACKAGE" != gettext-tools; }; then
>++                ; }; then
>+           gt_use_preinstalled_gnugettext=yes
>+         else
>+                     LIBINTL= 
>
>Property changes on: devel/gettext-tools/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/gettext-tools/pkg-descr
>===================================================================
>--- devel/gettext-tools/pkg-descr	(revision 0)
>+++ devel/gettext-tools/pkg-descr	(working copy)
>@@ -0,0 +1,6 @@
>+GNU gettext is a framework of libraries and tools for internationalisation 
>+and localisation of software.
>+
>+This package contains development and translation tools.
>+
>+WWW: http://www.gnu.org/software/gettext/
>
>Property changes on: devel/gettext-tools/pkg-descr
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/gettext-tools/pkg-plist
>===================================================================
>--- devel/gettext-tools/pkg-plist	(revision 0)
>+++ devel/gettext-tools/pkg-plist	(working copy)
>@@ -0,0 +1,246 @@
>+bin/autopoint
>+bin/gettextize
>+bin/msgattrib
>+bin/msgcat
>+bin/msgcmp
>+bin/msgcomm
>+bin/msgconv
>+bin/msgen
>+bin/msgexec
>+bin/msgfilter
>+bin/msgfmt
>+bin/msggrep
>+bin/msginit
>+bin/msgmerge
>+bin/msgunfmt
>+bin/msguniq
>+bin/recode-sr-latin
>+bin/xgettext
>+include/gettext-po.h
>+lib/libgettextlib-0.19.2.so
>+lib/libgettextlib.so
>+lib/libgettextpo.a
>+lib/libgettextpo.so
>+lib/libgettextpo.so.0
>+lib/libgettextpo.so.0.5.2
>+lib/libgettextsrc-0.19.2.so
>+lib/libgettextsrc.so
>+lib/gettext/hostname
>+lib/gettext/project-id
>+lib/gettext/urlget
>+lib/gettext/user-email
>+man/man1/autopoint.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/recode-sr-latin.1.gz
>+man/man1/xgettext.1.gz
>+share/aclocal/codeset.m4
>+share/aclocal/extern-inline.m4
>+share/aclocal/gettext.m4
>+share/aclocal/fcntl-o.m4
>+share/aclocal/glibc2.m4
>+share/aclocal/glibc21.m4
>+share/aclocal/iconv.m4
>+share/aclocal/intdiv0.m4
>+share/aclocal/intl.m4
>+share/aclocal/intldir.m4
>+share/aclocal/intlmacosx.m4
>+share/aclocal/intmax.m4
>+share/aclocal/inttypes-pri.m4
>+share/aclocal/inttypes_h.m4
>+share/aclocal/lcmessage.m4
>+share/aclocal/lib-ld.m4
>+share/aclocal/lib-link.m4
>+share/aclocal/lib-prefix.m4
>+share/aclocal/lock.m4
>+share/aclocal/longlong.m4
>+share/aclocal/nls.m4
>+share/aclocal/po.m4
>+share/aclocal/printf-posix.m4
>+share/aclocal/progtest.m4
>+share/aclocal/size_max.m4
>+share/aclocal/stdint_h.m4
>+share/aclocal/threadlib.m4
>+share/aclocal/uintmax_t.m4
>+share/aclocal/visibility.m4
>+share/aclocal/wchar_t.m4
>+share/aclocal/wint_t.m4
>+share/aclocal/xsize.m4
>+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_1.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_2.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_3.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_4.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_5.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_6.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_7.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_8.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_9.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_10.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_11.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_12.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_13.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_14.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_15.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_16.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_17.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_18.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_19.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_20.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_21.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_22.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_23.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_24.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_25.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_foot.html
>+%%PORTDOCS%%%%DOCSDIR%%/gettext_toc.html
>+%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
>+%%DATADIR%%/archive.dir.tar.xz
>+%%DATADIR%%/config.rpath
>+%%DATADIR%%/gettext.h
>+%%DATADIR%%/intl/COPYING.LIB
>+%%DATADIR%%/intl/Makefile.in
>+%%DATADIR%%/intl/VERSION
>+%%DATADIR%%/intl/bindtextdom.c
>+%%DATADIR%%/intl/config.charset
>+%%DATADIR%%/intl/dcgettext.c
>+%%DATADIR%%/intl/dcigettext.c
>+%%DATADIR%%/intl/dcngettext.c
>+%%DATADIR%%/intl/dgettext.c
>+%%DATADIR%%/intl/dngettext.c
>+%%DATADIR%%/intl/eval-plural.h
>+%%DATADIR%%/intl/explodename.c
>+%%DATADIR%%/intl/export.h
>+%%DATADIR%%/intl/finddomain.c
>+%%DATADIR%%/intl/gettext.c
>+%%DATADIR%%/intl/gettextP.h
>+%%DATADIR%%/intl/gmo.h
>+%%DATADIR%%/intl/hash-string.c
>+%%DATADIR%%/intl/hash-string.h
>+%%DATADIR%%/intl/intl-compat.c
>+%%DATADIR%%/intl/intl-exports.c
>+%%DATADIR%%/intl/l10nflist.c
>+%%DATADIR%%/intl/langprefs.c
>+%%DATADIR%%/intl/libgnuintl.in.h
>+%%DATADIR%%/intl/libintl.rc
>+%%DATADIR%%/intl/loadinfo.h
>+%%DATADIR%%/intl/loadmsgcat.c
>+%%DATADIR%%/intl/localcharset.c
>+%%DATADIR%%/intl/localcharset.h
>+%%DATADIR%%/intl/locale.alias
>+%%DATADIR%%/intl/localealias.c
>+%%DATADIR%%/intl/localename.c
>+%%DATADIR%%/intl/lock.c
>+%%DATADIR%%/intl/lock.h
>+%%DATADIR%%/intl/log.c
>+%%DATADIR%%/intl/ngettext.c
>+%%DATADIR%%/intl/os2compat.c
>+%%DATADIR%%/intl/os2compat.h
>+%%DATADIR%%/intl/osdep.c
>+%%DATADIR%%/intl/plural-exp.c
>+%%DATADIR%%/intl/plural-exp.h
>+%%DATADIR%%/intl/plural.c
>+%%DATADIR%%/intl/plural.y
>+%%DATADIR%%/intl/printf-args.c
>+%%DATADIR%%/intl/printf-args.h
>+%%DATADIR%%/intl/printf-parse.c
>+%%DATADIR%%/intl/printf-parse.h
>+%%DATADIR%%/intl/printf.c
>+%%DATADIR%%/intl/ref-add.sin
>+%%DATADIR%%/intl/ref-del.sin
>+%%DATADIR%%/intl/relocatable.c
>+%%DATADIR%%/intl/relocatable.h
>+%%DATADIR%%/intl/setlocale.c
>+%%DATADIR%%/intl/textdomain.c
>+%%DATADIR%%/intl/threadlib.c
>+%%DATADIR%%/intl/tsearch.c
>+%%DATADIR%%/intl/tsearch.h
>+%%DATADIR%%/intl/vasnprintf.c
>+%%DATADIR%%/intl/vasnprintf.h
>+%%DATADIR%%/intl/vasnwprintf.h
>+%%DATADIR%%/intl/verify.h
>+%%DATADIR%%/intl/version.c
>+%%DATADIR%%/intl/wprintf-parse.h
>+%%DATADIR%%/intl/xsize.c
>+%%DATADIR%%/intl/xsize.h
>+%%DATADIR%%/javaversion.class
>+%%DATADIR%%/msgunfmt.tcl
>+%%DATADIR%%/po/Makefile.in.in
>+%%DATADIR%%/po/Makevars.template
>+%%DATADIR%%/po/Rules-quot
>+%%DATADIR%%/po/boldquot.sed
>+%%DATADIR%%/po/en@boldquot.header
>+%%DATADIR%%/po/en@quot.header
>+%%DATADIR%%/po/insert-header.sin
>+%%DATADIR%%/po/quot.sed
>+%%DATADIR%%/po/remove-potcdate.sin
>+%%DATADIR%%/projects/GNOME/team-address
>+%%DATADIR%%/projects/GNOME/teams.html
>+%%DATADIR%%/projects/GNOME/teams.url
>+%%DATADIR%%/projects/GNOME/trigger
>+%%DATADIR%%/projects/KDE/team-address
>+%%DATADIR%%/projects/KDE/teams.html
>+%%DATADIR%%/projects/KDE/teams.url
>+%%DATADIR%%/projects/KDE/trigger
>+%%DATADIR%%/projects/TP/team-address
>+%%DATADIR%%/projects/TP/teams.html
>+%%DATADIR%%/projects/TP/teams.url
>+%%DATADIR%%/projects/TP/trigger
>+%%DATADIR%%/projects/index
>+%%DATADIR%%/projects/team-address
>+%%DATADIR%%/styles/po-default.css
>+%%DATADIR%%/styles/po-emacs-x.css
>+%%DATADIR%%/styles/po-emacs-xterm.css
>+%%DATADIR%%/styles/po-emacs-xterm16.css
>+%%DATADIR%%/styles/po-emacs-xterm256.css
>+%%DATADIR%%/styles/po-vim.css
>+share/locale/be/LC_MESSAGES/gettext-tools.mo
>+share/locale/bg/LC_MESSAGES/gettext-tools.mo
>+share/locale/ca/LC_MESSAGES/gettext-tools.mo
>+share/locale/cs/LC_MESSAGES/gettext-tools.mo
>+share/locale/da/LC_MESSAGES/gettext-tools.mo
>+share/locale/de/LC_MESSAGES/gettext-tools.mo
>+share/locale/el/LC_MESSAGES/gettext-tools.mo
>+share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
>+share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
>+share/locale/es/LC_MESSAGES/gettext-tools.mo
>+share/locale/et/LC_MESSAGES/gettext-tools.mo
>+share/locale/eu/LC_MESSAGES/gettext-tools.mo
>+share/locale/fi/LC_MESSAGES/gettext-tools.mo
>+share/locale/fr/LC_MESSAGES/gettext-tools.mo
>+share/locale/gl/LC_MESSAGES/gettext-tools.mo
>+share/locale/id/LC_MESSAGES/gettext-tools.mo
>+share/locale/it/LC_MESSAGES/gettext-tools.mo
>+share/locale/ja/LC_MESSAGES/gettext-tools.mo
>+share/locale/ko/LC_MESSAGES/gettext-tools.mo
>+share/locale/nb/LC_MESSAGES/gettext-tools.mo
>+share/locale/nl/LC_MESSAGES/gettext-tools.mo
>+share/locale/nn/LC_MESSAGES/gettext-tools.mo
>+share/locale/pa/LC_MESSAGES/gettext-tools.mo
>+share/locale/pl/LC_MESSAGES/gettext-tools.mo
>+share/locale/pt/LC_MESSAGES/gettext-tools.mo
>+share/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
>+share/locale/ro/LC_MESSAGES/gettext-tools.mo
>+share/locale/ru/LC_MESSAGES/gettext-tools.mo
>+share/locale/sk/LC_MESSAGES/gettext-tools.mo
>+share/locale/sl/LC_MESSAGES/gettext-tools.mo
>+share/locale/sr/LC_MESSAGES/gettext-tools.mo
>+share/locale/sv/LC_MESSAGES/gettext-tools.mo
>+share/locale/tr/LC_MESSAGES/gettext-tools.mo
>+share/locale/uk/LC_MESSAGES/gettext-tools.mo
>+share/locale/vi/LC_MESSAGES/gettext-tools.mo
>+share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
>+share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
>
>Property changes on: devel/gettext-tools/pkg-plist
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/subversion/Makefile
>===================================================================
>--- devel/subversion/Makefile	(revision 370567)
>+++ devel/subversion/Makefile	(working copy)
>@@ -68,7 +68,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sql
> 
> .if ${PORT_OPTIONS:MSTATIC}
> .  if ${PORT_OPTIONS:MNLS}
>-USES+=			gettext:build
>+USES+=			gettext-tools
> .  endif
> .  if ${PORT_OPTIONS:MBDB}
> BDB_BUILD_DEPENDS=	yes
>Index: devel/subversion17/Makefile
>===================================================================
>--- devel/subversion17/Makefile	(revision 370567)
>+++ devel/subversion17/Makefile	(working copy)
>@@ -90,7 +90,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sql
> 
> .if ${PORT_OPTIONS:MSTATIC}
> .  if ${PORT_OPTIONS:MNLS}
>-USES+=			gettext:build
>+USES+=			gettext-tools
> .  endif
> .  if ${PORT_OPTIONS:MBDB}
> BDB_BUILD_DEPENDS=	yes
>Index: games/anki/Makefile
>===================================================================
>--- games/anki/Makefile	(revision 370567)
>+++ games/anki/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	anki
> PORTVERSION=	2.0.28
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	games python
> MASTER_SITES=	http://ankisrs.net/download/mirror/
> DIST_SUBDIR=	python
>@@ -32,7 +32,7 @@ USE_QT4=	network_run webkit_run
> OPTIONS_DEFINE=	NLS
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext:run
>+NLS_USES=	gettext-runtime:run
> 
> .include <bsd.port.options.mk>
> 
>Index: games/cuyo/Makefile
>===================================================================
>--- games/cuyo/Makefile	(revision 370567)
>+++ games/cuyo/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cuyo
> PORTVERSION=	2.0.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	games
> MASTER_SITES=	SAVANNAH
>@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
> 
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_USES=	gettext:run
>+NLS_USES=	gettext-runtime:run
> 
> # Do not use older versions
> PORTSCOUT=	skipv:2.~-1.2~beta1
>Index: games/gnomebreakout/Makefile
>===================================================================
>--- games/gnomebreakout/Makefile	(revision 370567)
>+++ games/gnomebreakout/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gnomebreakout
> PORTVERSION=	0.5.3
>-PORTREVISION=	13
>+PORTREVISION=	14
> CATEGORIES=	games gnome
> MASTER_SITES=	SF/${PORTNAME:S/eb/e-b/}/${PORTNAME:S/eb/e-b/}/${PORTVERSION}/ \
> 		http://www.users.on.net/~mipearson/
>@@ -29,7 +29,7 @@ PORTDOCS=	AUTHORS ChangeLog NEWS README
> OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext:run
>+NLS_USES=	gettext-runtime:run
> 
> .include <bsd.port.options.mk>
> 
>Index: games/live-f1/Makefile
>===================================================================
>--- games/live-f1/Makefile	(revision 370567)
>+++ games/live-f1/Makefile	(working copy)
>@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVER
> 
> OPTIONS_DEFINE=	NLS
> 
>-USES=		pkgconfig gettext:build iconv gmake tar:tgz
>+USES=		pkgconfig gettext-tools iconv gmake tar:tgz
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
> LDFLAGS+=	-L${LOCALBASE}/lib
>Index: games/pythonsudoku/Makefile
>===================================================================
>--- games/pythonsudoku/Makefile	(revision 370567)
>+++ games/pythonsudoku/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	pythonsudoku
> PORTVERSION=	0.13
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	games python
> MASTER_SITES=	SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \
> 		SF/nemysisfreebsdp/games/:icons
>@@ -42,7 +42,7 @@ DESKTOP_ENTRIES="Python Sudoku" "" "${PO
> OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext:run
>+NLS_USES=	gettext-runtime:run
> 
> .include <bsd.port.options.mk>
> 
>Index: games/unknown-horizons/Makefile
>===================================================================
>--- games/unknown-horizons/Makefile	(revision 370567)
>+++ games/unknown-horizons/Makefile	(working copy)
>@@ -25,7 +25,7 @@ GH_ACCOUNT=	${PORTNAME}
> GH_COMMIT=	ac7af43
> 
> USE_GNOME=	intltool
>-USES=		gettext:build python:2 tar:xz
>+USES=		gettext-tools python:2 tar:xz
> USE_PYTHON=	distutils
> PYDISTUTILS_PKGNAME=	UnknownHorizons
> 
>Index: graphics/digikam-kde4-l10n/Makefile
>===================================================================
>--- graphics/digikam-kde4-l10n/Makefile	(revision 370567)
>+++ graphics/digikam-kde4-l10n/Makefile	(working copy)
>@@ -10,7 +10,7 @@ COMMENT=	l10n for digiKam, showFoto, and
> 
> CONFLICTS_INSTALL=	digikam-2.* kipi-plugins-2.* libkgeomap-2.*
> 
>-USES=		gettext:build
>+USES=		gettext-tools
> WRKSRC=		${WRKDIR}/${DISTNAME}/po
> 
> pre-configure:
>Index: graphics/dri/Makefile
>===================================================================
>--- graphics/dri/Makefile	(revision 370567)
>+++ graphics/dri/Makefile	(working copy)
>@@ -12,7 +12,7 @@ COMMENT=	OpenGL hardware acceleration dr
> LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
> 		libexpat.so:${PORTSDIR}/textproc/expat2
> 
>-USES+=		gettext:build
>+USES+=		gettext-tools
> USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
> 
> .include <bsd.port.options.mk>
>Index: japanese/mecab/Makefile
>===================================================================
>--- japanese/mecab/Makefile	(revision 370567)
>+++ japanese/mecab/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	mecab
> PORTVERSION=	0.996
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	japanese textproc
> MASTER_SITES=	GOOGLE_CODE
> 
>@@ -16,9 +16,7 @@ LICENSE_COMB=	multi
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	ac_cv_lib_stdcpp_main=no
> INSTALL_TARGET=	install-strip
>-USES=		iconv gettext:build libtool perl5
>-USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtoolize
>-AUTOMAKE_ARGS=	--add-missing --copy --force
>+USES=		autoreconf iconv libtool perl5
> USE_PERL5=	build
> USE_LDCONFIG=	yes
> 
>@@ -30,18 +28,18 @@ PORTDOCS=	AUTHORS README *.html
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}.in
>-	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.dist/' ${WRKSRC}/Makefile.am
>-
>-post-configure:
>-	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist
>-
>-pre-install:
>-	${CHMOD} a+x ${WRKSRC}/install-sh
>+	@${REINPLACE_CMD} '/^libmecab_la_LIBADD =/s/$$/ $$(LTLIBICONV)/' \
>+		${WRKSRC}/src/Makefile.in
>+	@${REINPLACE_CMD} \
>+		-e '/CFLAGS/s|-O3|${CFLAGS}|' \
>+		-e '/CXXFLAGS/s|-O3|${CXXFLAGS}|' \
>+		${WRKSRC}/configure
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
>+	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
>+		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
> 
> .include <bsd.port.mk>
>Index: japanese/mecab/pkg-plist
>===================================================================
>--- japanese/mecab/pkg-plist	(revision 370567)
>+++ japanese/mecab/pkg-plist	(working copy)
>@@ -1,5 +1,6 @@
> bin/mecab
> bin/mecab-config
>+@sample etc/mecabrc.sample
> include/mecab.h
> lib/libmecab.a
> lib/libmecab.so
>@@ -11,7 +12,3 @@ libexec/mecab/mecab-dict-index
> libexec/mecab/mecab-system-eval
> libexec/mecab/mecab-test-gen
> man/man1/mecab.1.gz
>-@dirrm libexec/mecab
>-@unexec if cmp -s %D/etc/mecabrc.dist %D/etc/mecabrc; then rm -f %D/etc/mecabrc; else true; fi
>-etc/mecabrc.dist
>-@exec if [ ! -f %D/etc/mecabrc ]; then cp -p %D/%F %B/mecabrc; fi
>Index: lang/gcc-aux/Makefile
>===================================================================
>--- lang/gcc-aux/Makefile	(revision 370567)
>+++ lang/gcc-aux/Makefile	(working copy)
>@@ -139,7 +139,7 @@ APPLY_DIFFS+=	gcc-testsuite
> .endif
> 
> .if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
>-USES+=	gettext:build
>+USES+=		gettext-tools
> EXTRA_CONFIG+=	--enable-nls
> .else
> EXTRA_CONFIG+=	--disable-nls
>Index: lang/gcc47-aux/Makefile
>===================================================================
>--- lang/gcc47-aux/Makefile	(revision 370567)
>+++ lang/gcc47-aux/Makefile	(working copy)
>@@ -165,7 +165,7 @@ APPLY_DIFFS+=	gcc-testsuite
> #################################
> 
> .if ${PORT_OPTIONS:MNLS}
>-USES+=	gettext:build
>+USES+=		gettext-tools
> EXTRA_CONFIG+=	--enable-nls
> .else
> EXTRA_CONFIG+=	--disable-nls
>Index: misc/gimp-help-en/Makefile
>===================================================================
>--- misc/gimp-help-en/Makefile	(revision 370567)
>+++ misc/gimp-help-en/Makefile	(working copy)
>@@ -22,7 +22,7 @@ LICENSE=	GFDL
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
> 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
> 
>-USES=		gettext:build gmake perl5 pkgconfig shebangfix tar:bzip2
>+USES=		gettext-tools gmake perl5 pkgconfig shebangfix tar:bzip2
> USE_GNOME=	libxslt:build
> USE_PERL5=	build
> USE_PYTHON=	yes
>Index: misc/pinfo/Makefile
>===================================================================
>--- misc/pinfo/Makefile	(revision 370567)
>+++ misc/pinfo/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	pinfo
> PORTVERSION=	0.6.10
>+PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	GENTOO/distfiles \
> 		http://alioth.debian.org/frs/download.php/file/3351/
>@@ -13,7 +14,7 @@ COMMENT=	Ncurses based, lynx style info 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		autoreconf libtool makeinfo ncurses tar:bzip2
>+USES=		autoreconf gettext-tools libtool makeinfo ncurses tar:bzip2
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
>@@ -29,12 +30,11 @@ READLINE_CONFIGURE_WITH=	readline
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>+USES+=		gettext-runtime
> .for lang in cs de eu ja nl pl pt_BR ro ru sv vi
> PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/pinfo.mo
> .endfor
> .else
>-USES+=		gettext:build
> CONFIGURE_ARGS+=--disable-nls
> .endif
> 
>Index: net-mgmt/monitoring-plugins/Makefile
>===================================================================
>--- net-mgmt/monitoring-plugins/Makefile	(revision 370567)
>+++ net-mgmt/monitoring-plugins/Makefile	(working copy)
>@@ -106,7 +106,6 @@ LDAP_CONFIGURE_WITH=	ldap
> 
> NLS_USES=	gettext
> NLS_CONFIGURE_ENABLE=	nls
>-NLS_USES_OFF=	gettext:build
> 
> DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
> DBI_CONFIGURE_WITH=	dbi
>Index: net-mgmt/nagios-plugins/Makefile
>===================================================================
>--- net-mgmt/nagios-plugins/Makefile	(revision 370567)
>+++ net-mgmt/nagios-plugins/Makefile	(working copy)
>@@ -111,7 +111,6 @@ LDAP_USE=	openldap=yes
> LDAP_CONFIGURE_WITH=	ldap
> 
> NLS_USES=	gettext
>-NLS_USES_OFF=	gettext:build
> NLS_CONFIGURE_ENABLE=	nls
> 
> DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
>Index: security/clamtk/Makefile
>===================================================================
>--- security/clamtk/Makefile	(revision 370567)
>+++ security/clamtk/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	clamtk
> PORTVERSION=	4.45
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	SF/${PORTNAME}/ClamTk/${PORTVERSION}
> 
>@@ -23,7 +24,7 @@ RUN_DEPENDS=	p5-Config-Tiny>=2.12:${PORT
> 		p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2
> 
> NO_BUILD=	yes
>-USES=		gettext:run perl5
>+USES=		gettext-runtime:run perl5
> USE_PERL5=	run
> 
> MAN1=		${PORTNAME}.1
>Index: sysutils/froxlor/Makefile
>===================================================================
>--- sysutils/froxlor/Makefile	(revision 370567)
>+++ sysutils/froxlor/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	froxlor
> PORTVERSION=	0.9.32
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	sysutils www
> MASTER_SITES=	http://files.froxlor.org/releases/
> 
>@@ -105,7 +105,7 @@ MYSQLS_USE=	MYSQL=server
> 
> PCNTL_USE=	PHP=pcntl
> 
>-NLS_USES=	gettext:run
>+NLS_USES=	gettext-runtime:run
> NLS_USE=	PHP=gettext
> 
> .include <bsd.port.options.mk>
>Index: www/gecko-mediaplayer/Makefile
>===================================================================
>--- www/gecko-mediaplayer/Makefile	(revision 370567)
>+++ www/gecko-mediaplayer/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gecko-mediaplayer
> DISTVERSION=	1.0.9a
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www multimedia gnome
> MASTER_SITES=	GOOGLE_CODE
> 
>@@ -23,7 +23,8 @@ OPTIONS_DEFAULT=CACHE
> CACHE_DESC=	Enable caching of remote media to local storage
> 
> GNU_CONFIGURE=	yes
>-USES=		compiler:c++11-lang pkgconfig gecko webplugin:native
>+USES=		compiler:c++11-lang gettext-tools gecko pkgconfig \
>+		webplugin:native
> USE_GNOME=	glib20
> 
> WEBPLUGIN_FILES=	${PORTNAME}.so
>@@ -46,10 +47,9 @@ CONFIGURE_ARGS+=	--disable-caching
> .endif
> 
> .if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>+USES+=		gettext-runtime
> PLIST_SUB=	NLS=""
> .else
>-USES+=		gettext:build
> PLIST_SUB=	NLS="@comment "
> .endif
> 
>Index: www/py-formencode/Makefile
>===================================================================
>--- www/py-formencode/Makefile	(revision 370567)
>+++ www/py-formencode/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	formencode
> PORTVERSION=	1.2.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,7 +16,7 @@ LICENSE=	PSFL
> 
> OPTIONS_DEFINE=	DOCS
> 
>-USES=		gettext:run python:2 zip
>+USES=		gettext-runtime:run python:2 zip
> USE_PYTHON=	distutils autoplist
> 
> DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
>Index: x11/xkeyboard-config/Makefile
>===================================================================
>--- x11/xkeyboard-config/Makefile	(revision 370567)
>+++ x11/xkeyboard-config/Makefile	(working copy)
>@@ -34,7 +34,7 @@ ETERSOFT_EXTRA_PATCHES=	${FILESDIR}/eter
> 
> # !nls case doesn't work correctly, comment it out.
> #.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext:build iconv
>+USES+=		gettext-tools iconv
> PLIST_SUB+=	NLS=""
> #.else
> #CONFIGURE_ARGS+=--disable-nls

Actions: View | Diff

Attachments on bug 194038: 147839 | 148158 | 148159 | 148271 | 148280 | 149748 | 149825 | 149851 | 149912 | 149933 | 149987