Commit b3a361d8 authored by tijl's avatar tijl
Browse files

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)
parent 237bc033
......@@ -10,6 +10,19 @@ in the release notes and/or placed into UPDATING.
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
......
......@@ -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}/devel/autoconf \
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
......
# $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
# $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
# $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
......@@ -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
......
......@@ -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=yes
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
......
......@@ -28,11 +28,8 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \
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 \
......
......@@ -15,11 +15,12 @@ LIB_DEPENDS= libmpd.so:${PORTSDIR}/audio/libmpd \
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>
......@@ -24,7 +24,7 @@ PLIST_FILES= libexec/gkrellm2/plugins/gkrellmms.so \
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 \
......
......@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/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"
......
......@@ -25,7 +25,7 @@ PLIST_FILES= libexec/gkrellm2/plugins/volume.so \
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
......
......@@ -12,7 +12,7 @@ COMMENT= Program for recording streams for KDE4
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
......
......@@ -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:${PORTSDIR}/devel/libglademm24 \
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>
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
......@@ -13,7 +13,7 @@ COMMENT= ncurses-based client for the Music Player Daemon
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
......
......@@ -15,12 +15,12 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
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
......
......@@ -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
......
......@@ -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>
--- 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@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment