Date: Sat, 29 Nov 2014 18:22:33 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373636 - in head: . Mk/Uses archivers/gtar audio/clementine-player audio/gbemol audio/gkrellmms2 audio/gkrellmss2 audio/gkrellmvolume2 audio/kstreamripper audio/pavucontrol audio/pms a... Message-ID: <201411291822.sATIMXqv034069@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sat Nov 29 18:22:32 2014 New Revision: 373636 URL: https://svnweb.freebsd.org/changeset/ports/373636 QAT: https://qat.redports.org/buildarchive/r373636/ Log: Split devel/gettext in devel/gettext-runtime and devel/gettext-tools. The first contains runtime libraries such as libintl and the latter contains developer tools such as msgfmt. Ports that use gettext will usually need a LIB_DEPENDS on gettext-runtime and a BUILD_DEPENDS on gettext-tools. USES=gettext-runtime can be used to set a LIB/BUILD/RUN_DEPENDS on devel/gettext-runtime and USES=gettext-tools can be used to set a BUILD/RUN_DEPENDS on devel/gettext-tools. USES=gettext is now the same as "USES=gettext-runtime gettext-tools" meaning a LIB_DEPENDS on devel/gettext-runtime and a BUILD_DEPENDS on devel/gettext-tools. Update gettext to 0.19.3. Remove :oldver from converters/libiconv and devel/gettext-runtime. Leave symlinks with the old library versions to avoid the need to bump PORTREVISION on a large number of dependent ports. When most of the dependent ports have had normal version updates, PORTREVISION can be bumped on the remaining ones (low number) and the links can be removed. Fix some ports that installed files in lib/locale instead of share/locale. PR: 194038 Reviewed by: bapt Exp-run: antoine Approved by: portmgr (antoine) Added: head/Mk/Uses/gettext-runtime.mk (contents, props changed) head/Mk/Uses/gettext-tools.mk (contents, props changed) head/devel/gettext-runtime/ head/devel/gettext-runtime/Makefile (contents, props changed) head/devel/gettext-runtime/files/ head/devel/gettext-runtime/files/patch-configure (contents, props changed) head/devel/gettext-runtime/files/patch-intl-threadlib.c (contents, props changed) head/devel/gettext-runtime/pkg-descr (contents, props changed) head/devel/gettext-runtime/pkg-plist (contents, props changed) head/devel/gettext-tools/ head/devel/gettext-tools/Makefile (contents, props changed) head/devel/gettext-tools/files/ head/devel/gettext-tools/files/patch-configure (contents, props changed) head/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c (contents, props changed) head/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c (contents, props changed) head/devel/gettext-tools/pkg-descr (contents, props changed) head/devel/gettext-tools/pkg-plist (contents, props changed) head/devel/gettext/Makefile.common (contents, props changed) Deleted: head/converters/libiconv/files/patch-lib_Makefile.in head/devel/gettext/files/ head/devel/gettext/pkg-plist head/games/bygfoot/files/ head/japanese/mecab/files/ head/textproc/libtranslate/files/patch-configure head/textproc/openjade/files/patch-Makefile.comm.in Modified: head/CHANGES head/Mk/Uses/autoreconf.mk head/Mk/Uses/gettext.mk head/UPDATING head/archivers/gtar/Makefile head/audio/clementine-player/Makefile head/audio/gbemol/Makefile head/audio/gkrellmms2/Makefile head/audio/gkrellmss2/Makefile head/audio/gkrellmvolume2/Makefile head/audio/kstreamripper/Makefile head/audio/pavucontrol/Makefile head/audio/pavucontrol/pkg-plist head/audio/pms/Makefile head/audio/streamtuner/Makefile head/comms/xnec2c/Makefile head/converters/libiconv/Makefile head/converters/libiconv/files/patch-src__Makefile.in head/converters/libiconv/pkg-plist head/databases/tarantool/Makefile head/deskutils/basket/Makefile head/deskutils/fusenshi/Makefile head/deskutils/homerun/Makefile head/deskutils/kchmviewer-kde4/Makefile head/deskutils/kdeconnect/Makefile head/deskutils/logjam/Makefile head/devel/appdata-tools/Makefile head/devel/appdata-tools/pkg-plist head/devel/appstream-glib/Makefile head/devel/appstream-glib/pkg-plist head/devel/avr-libc/Makefile head/devel/geany-plugins/files/Makefile.common head/devel/gettext-lint/Makefile head/devel/gettext/Makefile head/devel/gettext/distinfo head/devel/gettext/pkg-descr head/devel/libvirt-glib/Makefile head/devel/poxml/Makefile head/devel/py-itools/Makefile head/devel/subversion/Makefile head/devel/subversion17/Makefile head/editors/gwrite/Makefile head/editors/kile-kde4/Makefile head/editors/klat4/Makefile head/finance/homebank/Makefile head/finance/moneymanagerex/Makefile head/ftp/wzdftpd/Makefile head/games/aisleriot/Makefile head/games/anki/Makefile head/games/bygfoot/Makefile head/games/cuyo/Makefile head/games/gbottler/Makefile head/games/ggz-sdl-games/Makefile head/games/gnomebreakout/Makefile head/games/live-f1/Makefile head/games/pythonsudoku/Makefile head/games/scourge/Makefile head/games/unknown-horizons/Makefile head/games/xboard-devel/Makefile head/graphics/digikam-kde4-l10n/Makefile head/graphics/gtkam/Makefile head/graphics/kcoloredit/Makefile head/graphics/kiconedit/Makefile head/graphics/libGL/bsd.mesalib.mk head/graphics/skanlite/Makefile head/japanese/im-ja/Makefile head/japanese/mecab/Makefile head/japanese/mecab/pkg-plist head/japanese/mozc-server/Makefile head/korean/gtkcomm/Makefile head/lang/gcc-aux/Makefile head/lang/gcc47-aux/Makefile head/mail/faces/Makefile head/mail/milter-manager/Makefile head/math/galculator/Makefile head/misc/gimp-help-en/Makefile head/misc/gnome-devel-docs/Makefile head/misc/gnome-icon-theme/Makefile head/misc/gnome-user-docs/Makefile head/misc/pinfo/Makefile head/multimedia/audiopreview/Makefile head/multimedia/bombono/Makefile head/multimedia/handbrake/Makefile head/multimedia/kmplayer-kde4/Makefile head/multimedia/pitivi/Makefile head/multimedia/xbmc/Makefile head/net-im/libpurple/Makefile head/net-im/libpurple/pkg-plist head/net-im/licq-osd/Makefile head/net-im/pidgin/Makefile head/net-im/telepathy-logger/Makefile head/net-mgmt/monitoring-plugins/Makefile head/net-mgmt/nagios-plugins/Makefile head/net-p2p/linuxdcpp/Makefile head/net/grilo-plugins/Makefile head/net/knemo-kde4/Makefile head/net/kwooty/Makefile head/net/libzapojit/Makefile head/net/liferea/Makefile head/net/minidlna/Makefile head/net/remmina-plugin-i18n/Makefile head/net/remmina-plugins/bsd.plugin.mk head/science/chemical-mime-data/Makefile head/science/chemical-mime-data/pkg-plist head/security/clamtk/Makefile head/security/gringotts/Makefile head/security/gtkpasman/Makefile head/security/openvpn-admin/Makefile head/sysutils/froxlor/Makefile head/sysutils/k3b-kde4/Makefile head/sysutils/kdirstat/Makefile head/sysutils/krename-kde4/Makefile head/sysutils/kshutdown-kde4/Makefile head/sysutils/libgksu/Makefile head/sysutils/plasma-applet-apcups/Makefile head/sysutils/policykit/Makefile head/sysutils/system-tools-backends/Makefile head/textproc/gnome-doc-utils/Makefile head/textproc/gtk-doc/Makefile head/textproc/libtranslate/Makefile head/textproc/libtranslate/pkg-plist head/textproc/openjade/Makefile head/textproc/uim-el/Makefile head/www/cssed/Makefile head/www/py-formencode/Makefile head/www/rekonq/Makefile head/www/sarg/Makefile head/x11-fm/rox-session/Makefile head/x11-themes/adwaita-icon-theme/Makefile head/x11-themes/gnome-themes-standard/Makefile head/x11-themes/gtk-murrine-engine/Makefile head/x11-themes/icons-tango/Makefile head/x11-themes/kde-gtk-config/Makefile head/x11-themes/kde4-style-polyester/Makefile head/x11-themes/nimbus/Makefile head/x11-themes/qtcurve-kde4/Makefile head/x11-toolkits/wxgtk28/Makefile head/x11-wm/libcompizconfig/Makefile head/x11/wdm/Makefile head/x11/xkeyboard-config/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Sat Nov 29 16:53:39 2014 (r373635) +++ head/CHANGES Sat Nov 29 18:22:32 2014 (r373636) @@ -10,6 +10,19 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20141130: +AUTHOR: tijl@FreeBSD.org + + The devel/gettext port has been split up in devel/gettext-runtime which + contains runtime libraries such as libintl, and devel/gettext-tools which + contains build tools such as msgfmt. You can use USES=gettext-runtime to + set a LIB/BUILD/RUN_DEPENDS on devel/gettext-runtime and USES=gettext-tools + to set a BUILD/RUN_DEPENDS on devel/gettext-tools. + + USES=gettext is now the same as "USES=gettext-runtime gettext-tools", + meaning a LIB_DEPENDS on devel/gettext-runtime and a BUILD_DEPENDS on + devel/gettext-tools. + 20141126: AUTHOR: mat@FreeBSD.org Modified: head/Mk/Uses/autoreconf.mk ============================================================================== --- head/Mk/Uses/autoreconf.mk Sat Nov 29 16:53:39 2014 (r373635) +++ head/Mk/Uses/autoreconf.mk Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Added: head/Mk/Uses/gettext-runtime.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/gettext-runtime.mk Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Added: head/Mk/Uses/gettext-tools.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/gettext-tools.mk Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Modified: head/Mk/Uses/gettext.mk ============================================================================== --- head/Mk/Uses/gettext.mk Sat Nov 29 16:53:39 2014 (r373635) +++ head/Mk/Uses/gettext.mk Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Nov 29 16:53:39 2014 (r373635) +++ head/UPDATING Sat Nov 29 18:22:32 2014 (r373636) @@ -5,6 +5,26 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20141130: + AFFECTS: users of devel/gettext (close to everyone) + AUTHOR: tijl@FreeBSD.org + + The devel/gettext port has been split up in devel/gettext-runtime, a + lightweight package containing runtime libraries, and devel/gettext-tools, + a package containing developer tools. The devel/gettext port still exists + as a metaport. + + You must first delete the existing installation of gettext and then + reinstall it: + + # pkg delete -f gettext + # portmaster devel/gettext + + Or for portupgrade users: + + # pkg delete -f gettext + # portinstall devel/gettext + 20141127: AFFECTS: users of lang/perl5.* AUTHOR: mat@FreeBSD.org Modified: head/archivers/gtar/Makefile ============================================================================== --- head/archivers/gtar/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/archivers/gtar/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Modified: head/audio/clementine-player/Makefile ============================================================================== --- head/audio/clementine-player/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/clementine-player/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -28,11 +28,8 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -# avoid clash with x11-wm/clementine -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} -PROJECTHOST= ${PORTNAME}${PKGNAMESUFFIX} - -USES= compiler:c++11-lib cmake pkgconfig desktop-file-utils execinfo +USES= compiler:c++11-lib cmake desktop-file-utils execinfo \ + gettext-tools pkgconfig USE_GL= glew USE_QT4= dbus gui xml qmake_build uic_build moc_build rcc_build \ linguist_build network sql opengl qtestlib corelib webkit \ Modified: head/audio/gbemol/Makefile ============================================================================== --- head/audio/gbemol/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/gbemol/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -15,11 +15,12 @@ LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio libxml2.so:${PORTSDIR}/textproc/libxml2 GNU_CONFIGURE= yes -USES= gmake pkgconfig +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake pkgconfig USE_GNOME= gtk20 post-patch: @${CHMOD} a+x ${WRKSRC}/install-sh - @${REINPLACE_CMD} -e 's,$$(DATADIRNAME)/locale,share/locale,' ${WRKSRC}/po/Makefile.in.in .include <bsd.port.mk> Modified: head/audio/gkrellmms2/Makefile ============================================================================== --- head/audio/gkrellmms2/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/gkrellmms2/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -24,7 +24,7 @@ PLIST_FILES= libexec/gkrellm2/plugins/gk share/locale/nl/LC_MESSAGES/gkrellmms.mo \ share/locale/ru/LC_MESSAGES/gkrellmms.mo -USES= gmake pkgconfig +USES= gettext gmake pkgconfig MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins \ LOCALEDIR=${PREFIX}/share/locale \ Modified: head/audio/gkrellmss2/Makefile ============================================================================== --- head/audio/gkrellmss2/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/gkrellmss2/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gkre LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -USES= gmake +USES= gettext gmake USE_XORG= x11 USE_GNOME= esound gtk20 MAKE_ENV= LOCALEDIR="${PREFIX}/share/locale" Modified: head/audio/gkrellmvolume2/Makefile ============================================================================== --- head/audio/gkrellmvolume2/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/gkrellmvolume2/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -25,7 +25,7 @@ PLIST_FILES= libexec/gkrellm2/plugins/vo share/locale/pl/LC_MESSAGES/gkrellm-volume.mo \ share/locale/ru/LC_MESSAGES/gkrellm-volume.mo -USES= gmake pkgconfig +USES= gettext gmake pkgconfig PLUGIN_DIR= ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins Modified: head/audio/kstreamripper/Makefile ============================================================================== --- head/audio/kstreamripper/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/kstreamripper/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -12,7 +12,7 @@ COMMENT= Program for recording streams f RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper -USES= cmake tar:bzip2 +USES= cmake gettext-tools tar:bzip2 USE_KDE4= kdelibs kdehier kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build Modified: head/audio/pavucontrol/Makefile ============================================================================== --- head/audio/pavucontrol/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/pavucontrol/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -3,7 +3,7 @@ PORTNAME= pavucontrol PORTVERSION= 0.9.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -15,9 +15,11 @@ LIB_DEPENDS= libglademm-2.4.so:${PORTSDI libcanberra.so:${PORTSDIR}/audio/libcanberra GNU_CONFIGURE= yes -USES= gmake pkgconfig +USES= gettext gmake pkgconfig USE_GNOME= intltool CONFIGURE_ARGS= --disable-lynx +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> Modified: head/audio/pavucontrol/pkg-plist ============================================================================== --- head/audio/pavucontrol/pkg-plist Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/pavucontrol/pkg-plist Sat Nov 29 18:22:32 2014 (r373636) @@ -1,41 +1,41 @@ bin/pavucontrol -lib/locale/as/LC_MESSAGES/pavucontrol.mo -lib/locale/bn_IN/LC_MESSAGES/pavucontrol.mo -lib/locale/ca/LC_MESSAGES/pavucontrol.mo -lib/locale/cs/LC_MESSAGES/pavucontrol.mo -lib/locale/da/LC_MESSAGES/pavucontrol.mo -lib/locale/de/LC_MESSAGES/pavucontrol.mo -lib/locale/el/LC_MESSAGES/pavucontrol.mo -lib/locale/es/LC_MESSAGES/pavucontrol.mo -lib/locale/fi/LC_MESSAGES/pavucontrol.mo -lib/locale/fr/LC_MESSAGES/pavucontrol.mo -lib/locale/gu/LC_MESSAGES/pavucontrol.mo -lib/locale/hi/LC_MESSAGES/pavucontrol.mo -lib/locale/hu/LC_MESSAGES/pavucontrol.mo -lib/locale/it/LC_MESSAGES/pavucontrol.mo -lib/locale/ja/LC_MESSAGES/pavucontrol.mo -lib/locale/kn/LC_MESSAGES/pavucontrol.mo -lib/locale/ml/LC_MESSAGES/pavucontrol.mo -lib/locale/mr/LC_MESSAGES/pavucontrol.mo -lib/locale/nl/LC_MESSAGES/pavucontrol.mo -lib/locale/or/LC_MESSAGES/pavucontrol.mo -lib/locale/pa/LC_MESSAGES/pavucontrol.mo -lib/locale/pl/LC_MESSAGES/pavucontrol.mo -lib/locale/pt/LC_MESSAGES/pavucontrol.mo -lib/locale/pt_BR/LC_MESSAGES/pavucontrol.mo -lib/locale/ru/LC_MESSAGES/pavucontrol.mo -lib/locale/sk/LC_MESSAGES/pavucontrol.mo -lib/locale/sr/LC_MESSAGES/pavucontrol.mo -lib/locale/sr@latin/LC_MESSAGES/pavucontrol.mo -lib/locale/sv/LC_MESSAGES/pavucontrol.mo -lib/locale/ta/LC_MESSAGES/pavucontrol.mo -lib/locale/te/LC_MESSAGES/pavucontrol.mo -lib/locale/th/LC_MESSAGES/pavucontrol.mo -lib/locale/tr/LC_MESSAGES/pavucontrol.mo -lib/locale/uk/LC_MESSAGES/pavucontrol.mo -lib/locale/zh_CN/LC_MESSAGES/pavucontrol.mo share/applications/pavucontrol.desktop share/doc/pavucontrol/README share/doc/pavucontrol/README.html share/doc/pavucontrol/style.css +share/locale/as/LC_MESSAGES/pavucontrol.mo +share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo +share/locale/ca/LC_MESSAGES/pavucontrol.mo +share/locale/cs/LC_MESSAGES/pavucontrol.mo +share/locale/da/LC_MESSAGES/pavucontrol.mo +share/locale/de/LC_MESSAGES/pavucontrol.mo +share/locale/el/LC_MESSAGES/pavucontrol.mo +share/locale/es/LC_MESSAGES/pavucontrol.mo +share/locale/fi/LC_MESSAGES/pavucontrol.mo +share/locale/fr/LC_MESSAGES/pavucontrol.mo +share/locale/gu/LC_MESSAGES/pavucontrol.mo +share/locale/hi/LC_MESSAGES/pavucontrol.mo +share/locale/hu/LC_MESSAGES/pavucontrol.mo +share/locale/it/LC_MESSAGES/pavucontrol.mo +share/locale/ja/LC_MESSAGES/pavucontrol.mo +share/locale/kn/LC_MESSAGES/pavucontrol.mo +share/locale/ml/LC_MESSAGES/pavucontrol.mo +share/locale/mr/LC_MESSAGES/pavucontrol.mo +share/locale/nl/LC_MESSAGES/pavucontrol.mo +share/locale/or/LC_MESSAGES/pavucontrol.mo +share/locale/pa/LC_MESSAGES/pavucontrol.mo +share/locale/pl/LC_MESSAGES/pavucontrol.mo +share/locale/pt/LC_MESSAGES/pavucontrol.mo +share/locale/pt_BR/LC_MESSAGES/pavucontrol.mo +share/locale/ru/LC_MESSAGES/pavucontrol.mo +share/locale/sk/LC_MESSAGES/pavucontrol.mo +share/locale/sr/LC_MESSAGES/pavucontrol.mo +share/locale/sr@latin/LC_MESSAGES/pavucontrol.mo +share/locale/sv/LC_MESSAGES/pavucontrol.mo +share/locale/ta/LC_MESSAGES/pavucontrol.mo +share/locale/te/LC_MESSAGES/pavucontrol.mo +share/locale/th/LC_MESSAGES/pavucontrol.mo +share/locale/tr/LC_MESSAGES/pavucontrol.mo +share/locale/uk/LC_MESSAGES/pavucontrol.mo +share/locale/zh_CN/LC_MESSAGES/pavucontrol.mo %%DATADIR%%/pavucontrol.glade Modified: head/audio/pms/Makefile ============================================================================== --- head/audio/pms/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/pms/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -13,7 +13,7 @@ COMMENT= ncurses-based client for the Mu LICENSE= GPLv3 -USES= pkgconfig tar:bzip2 +USES= gettext pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 @@ -21,7 +21,7 @@ PLIST_FILES= bin/${PORTNAME} \ man/man1/pms.1.gz CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= REGEX Modified: head/audio/streamtuner/Makefile ============================================================================== --- head/audio/streamtuner/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/audio/streamtuner/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -15,12 +15,12 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSD LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme -USES= gmake pathfix pkgconfig +USES= gettext gmake libtool pathfix pkgconfig USE_GNOME= gtk20 gnomeprefix INSTALLS_OMF= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA PYTHON OPTIONS_DEFAULT= SHOUTCAST LIVE365 XIPH LOCAL LOCAL_METADATA @@ -52,7 +52,6 @@ PLIST_SUB+= LOCAL="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|[(]datadir[)]/help|(datadir)/gnome/help|g' \ ${WRKSRC}/help/C/Makefile.in Modified: head/comms/xnec2c/Makefile ============================================================================== --- head/comms/xnec2c/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/comms/xnec2c/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -16,7 +16,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libccm.so:${PORTSDIR}/math/ccmath GNU_CONFIGURE= yes -USES= tar:bzip2 pkgconfig gmake +USES= gettext gmake pkgconfig tar:bzip2 USE_GNOME= gtk20 OPTIONS_DEFINE= DOCS Modified: head/converters/libiconv/Makefile ============================================================================== --- head/converters/libiconv/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/converters/libiconv/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -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> Modified: head/converters/libiconv/files/patch-src__Makefile.in ============================================================================== --- head/converters/libiconv/files/patch-src__Makefile.in Sat Nov 29 16:53:39 2014 (r373635) +++ head/converters/libiconv/files/patch-src__Makefile.in Sat Nov 29 18:22:32 2014 (r373636) @@ -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) Modified: head/converters/libiconv/pkg-plist ============================================================================== --- head/converters/libiconv/pkg-plist Sat Nov 29 16:53:39 2014 (r373635) +++ head/converters/libiconv/pkg-plist Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/databases/tarantool/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -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 gmake iconv perl5 compiler:c++11-lang USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-message Modified: head/deskutils/basket/Makefile ============================================================================== --- head/deskutils/basket/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/basket/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -14,10 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme +USES= cmake gettext-tools tar:bzip2 USE_XORG= xft xpm USE_KDE4= automoc4 kdeprefix pimlibs qimageblitz USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake tar:bzip2 USE_LDCONFIG= yes .include <bsd.port.mk> Modified: head/deskutils/fusenshi/Makefile ============================================================================== --- head/deskutils/fusenshi/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/fusenshi/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.ongs.co.jp/proj MAINTAINER= ozawa@ongs.co.jp COMMENT= Post-it(R) like application with network support -USES= pkgconfig tar:tgz +USES= gettext pkgconfig tar:tgz USE_GNOME= gtkmm24 gtksourceview libxml2 USE_XORG= x11 MAKE_JOBS_UNSAFE= yes Modified: head/deskutils/homerun/Makefile ============================================================================== --- head/deskutils/homerun/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/homerun/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -8,7 +8,7 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/s MAINTAINER= yurkis@gmail.com COMMENT= Fullscreen launcher with content organized in tabs -USES= cmake compiler:c++0x tar:bzip2 +USES= cmake compiler:c++0x gettext tar:bzip2 USE_KDE4= kdelibs kdeprefix automoc4 workspace USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui USE_XORG= x11 Modified: head/deskutils/kchmviewer-kde4/Makefile ============================================================================== --- head/deskutils/kchmviewer-kde4/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/kchmviewer-kde4/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -12,7 +12,7 @@ COMMENT= KDE viewer for CHM files LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib \ libzip.so:${PORTSDIR}/archivers/libzip -USES= cmake:outsource +USES= cmake:outsource gettext-tools USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= webkit qmake_build moc_build rcc_build uic_build Modified: head/deskutils/kdeconnect/Makefile ============================================================================== --- head/deskutils/kdeconnect/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/kdeconnect/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -8,7 +8,7 @@ MASTER_SITES= KDE/unstable/kdeconnect/${ MAINTAINER= yurkis@gmail.com COMMENT= Support for KDE to interface between your phone and your computer -USES= cmake compiler:c++0x tar:xz +USES= cmake compiler:c++0x gettext tar:xz USE_KDE4= kdelibs automoc4 workspace runtime USE_QT4= corelib gui moc_build qmake_build uic_build rcc_build USE_LDCONFIG= yes Modified: head/deskutils/logjam/Makefile ============================================================================== --- head/deskutils/logjam/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/deskutils/logjam/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -13,7 +13,7 @@ COMMENT= GTK2 interface to livejournals, LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -USES= pkgconfig gmake pathfix tar:bzip2 +USES= gettext gmake pathfix pkgconfig tar:bzip2 WANT_GNOME= yes GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gtk20 libxml2 intlhack Modified: head/devel/appdata-tools/Makefile ============================================================================== --- head/devel/appdata-tools/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/appdata-tools/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -4,6 +4,7 @@ PORTNAME= appdata-tools PORTVERSION= 0.1.8 +PORTREVISION= 1 CATEGORIES= devel DIST_SUBDIR= gnome3 @@ -24,8 +25,8 @@ GNU_CONFIGURE= yes PATHFIX_MAKEFILEIN= Makefile.am #CONFIGURE_ARGS= --enable-introspection=yes USE_GITHUB= yes -USES= autoreconf:build gmake libtool pathfix pkgconfig -USE_GNOME= gdkpixbuf2 glib20 intlhack introspection:build +USES= autoreconf:build gettext gmake libtool pathfix pkgconfig +USE_GNOME= gdkpixbuf2 glib20 intltool introspection:build USE_LDCONFIG= yes post-patch: @@ -37,6 +38,8 @@ post-patch: ${WRKSRC}/configure.ac pre-configure: - cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh + (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh) + ${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/devel/appdata-tools/pkg-plist ============================================================================== --- head/devel/appdata-tools/pkg-plist Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/appdata-tools/pkg-plist Sat Nov 29 18:22:32 2014 (r373636) @@ -1,7 +1,7 @@ bin/appdata-validate -lib/locale/en_GB/LC_MESSAGES/appdata-tools.mo share/aclocal/appdata-xml.m4 share/appdata/schema/appdata.rnc share/appdata/schema/appdata.xsd share/appdata/schema/schema-locating-rules.xml share/emacs/site-lisp/site-start.d/appdata-rng-init.el +share/locale/en_GB/LC_MESSAGES/appdata-tools.mo Modified: head/devel/appstream-glib/Makefile ============================================================================== --- head/devel/appstream-glib/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/appstream-glib/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -4,6 +4,7 @@ PORTNAME= appstream-glib PORTVERSION= 0.2.6 +PORTREVISION= 1 CATEGORIES= devel DIST_SUBDIR= gnome3 @@ -20,8 +21,8 @@ GH_PROJECT= appstream-glib GH_COMMIT= f4f3230 GH_TAGNAME= ${GH_COMMIT} -USES= autoreconf:build gmake libtool pathfix pkgconfig -USE_GNOME= gdkpixbuf2 glib20 gtk30 intlhack +USES= autoreconf:build gettext gmake libtool pathfix pkgconfig +USE_GNOME= gdkpixbuf2 glib20 gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GITHUB= yes @@ -42,6 +43,8 @@ post-patch: ${WRKSRC}/configure.ac pre-configure: - cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh + (cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh) + ${REINPLACE_CMD} 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + ${WRKSRC}/configure .include <bsd.port.mk> Modified: head/devel/appstream-glib/pkg-plist ============================================================================== --- head/devel/appstream-glib/pkg-plist Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/appstream-glib/pkg-plist Sat Nov 29 18:22:32 2014 (r373636) @@ -59,7 +59,6 @@ lib/libappstream-glib.a lib/libappstream-glib.so lib/libappstream-glib.so.1 lib/libappstream-glib.so.1.5.6 -lib/locale/ru/LC_MESSAGES/appstream-glib.mo libdata/pkgconfig/appstream-builder.pc libdata/pkgconfig/appstream-glib.pc share/aclocal/appstream-xml.m4 @@ -69,3 +68,4 @@ share/gir-1.0/AppStreamBuilder-1.0.gir share/gir-1.0/AppStreamGlib-1.0.gir share/installed-tests/appstream-glib/appdata-validate.test share/installed-tests/appstream-glib/destdir-check.test +share/locale/ru/LC_MESSAGES/appstream-glib.mo Modified: head/devel/avr-libc/Makefile ============================================================================== --- head/devel/avr-libc/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/avr-libc/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -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} Modified: head/devel/geany-plugins/files/Makefile.common ============================================================================== --- head/devel/geany-plugins/files/Makefile.common Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/geany-plugins/files/Makefile.common Sat Nov 29 18:22:32 2014 (r373636) @@ -24,6 +24,7 @@ NLS_DIR= po NLS_SWITCH= --enable-nls CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib +USES+= gettext .endif GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,} Modified: head/devel/gettext-lint/Makefile ============================================================================== --- head/devel/gettext-lint/Makefile Sat Nov 29 16:53:39 2014 (r373635) +++ head/devel/gettext-lint/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -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 python:run shebangfix +USES= gettext-tools:run python:run shebangfix SHEBANG_FILES= src/POFileEquiv.in src/POFileGlossary.in post-patch: Added: head/devel/gettext-runtime/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-runtime/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,52 @@ +# $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 + +.include <bsd.port.options.mk> + +.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506) +CONFIGURE_ARGS+=--disable-threads +.endif + +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> Added: head/devel/gettext-runtime/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-runtime/files/patch-configure Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,11 @@ +--- configure.orig 2014-07-14 07:30:12 UTC ++++ configure +@@ -16277,7 +16277,7 @@ + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + case "$host_os" in +- solaris* | hpux*) ++ solaris* | hpux* | freebsd*) + + $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h + Added: head/devel/gettext-runtime/files/patch-intl-threadlib.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-runtime/files/patch-intl-threadlib.c Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,39 @@ +--- intl/threadlib.c.orig 2013-03-07 08:44:37 UTC ++++ intl/threadlib.c +@@ -29,11 +29,10 @@ + + # if PTHREAD_IN_USE_DETECTION_HARD + +-/* The function to be executed by a dummy thread. */ +-static void * +-dummy_thread_func (void *arg) ++static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT; ++static void ++dummy_once_func (void) + { +- return arg; + } + + int +@@ -44,19 +43,10 @@ glthread_in_use (void) + + if (!tested) + { +- pthread_t thread; +- +- if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) +- /* Thread creation failed. */ ++ if (pthread_once (&dummy_once_control, dummy_once_func) != 0) + result = 0; + else +- { +- /* Thread creation works. */ +- void *retval; +- if (pthread_join (thread, &retval) != 0) +- abort (); +- result = 1; +- } ++ result = 1; + tested = 1; + } + return result; Added: head/devel/gettext-runtime/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-runtime/pkg-descr Sat Nov 29 18:22:32 2014 (r373636) @@ -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/ Added: head/devel/gettext-runtime/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-runtime/pkg-plist Sat Nov 29 18:22:32 2014 (r373636) @@ -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 Added: head/devel/gettext-tools/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-tools/Makefile Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,72 @@ +# $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 + +.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 900506) +CONFIGURE_ARGS+=--disable-threads +.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> Added: head/devel/gettext-tools/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-tools/files/patch-configure Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,20 @@ +--- configure.orig 2014-07-14 07:30:23 UTC ++++ configure +@@ -18293,7 +18293,7 @@ + # thread: pthread_create from libc will fail, whereas + # pthread_create will actually create a thread. + case "$host_os" in +- solaris* | hpux*) ++ solaris* | hpux* | freebsd*) + + $as_echo "#define PTHREAD_IN_USE_DETECTION_HARD 1" >>confdefs.h + +@@ -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= Added: head/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c Sat Nov 29 18:22:32 2014 (r373636) @@ -0,0 +1,39 @@ +--- gnulib-lib/glthread/threadlib.c.orig 2014-07-14 07:28:34 UTC ++++ gnulib-lib/glthread/threadlib.c +@@ -29,11 +29,10 @@ + + # if PTHREAD_IN_USE_DETECTION_HARD + +-/* The function to be executed by a dummy thread. */ +-static void * +-dummy_thread_func (void *arg) ++static pthread_once_t dummy_once_control = PTHREAD_ONCE_INIT; ++static void ++dummy_once_func (void) + { +- return arg; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411291822.sATIMXqv034069>