diff options
166 files changed, 758 insertions, 816 deletions
@@ -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 diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk index ecd3c9ddd90a..849197fdeb90 100644 --- a/Mk/Uses/autoreconf.mk +++ b/Mk/Uses/autoreconf.mk @@ -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 diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk new file mode 100644 index 000000000000..5c0dc02f9b2a --- /dev/null +++ b/Mk/Uses/gettext-runtime.mk @@ -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 diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk new file mode 100644 index 000000000000..67f9546cb160 --- /dev/null +++ b/Mk/Uses/gettext-tools.mk @@ -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 diff --git a/Mk/Uses/gettext.mk b/Mk/Uses/gettext.mk index 383c530f2ca0..9f758dde0499 100644 --- a/Mk/Uses/gettext.mk +++ b/Mk/Uses/gettext.mk @@ -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 @@ -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 diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index 40dd81ebc35c..c6037a7f72c9 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -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 diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index 03b762a6c1c1..ad3d21dd5434 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -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 \ diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile index cccd557ab27f..80cac9477345 100644 --- a/audio/gbemol/Makefile +++ b/audio/gbemol/Makefile @@ -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> diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile index 15546e707ccf..297b9471f80b 100644 --- a/audio/gkrellmms2/Makefile +++ b/audio/gkrellmms2/Makefile @@ -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 \ diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile index d484b2d77885..a12939728e72 100644 --- a/audio/gkrellmss2/Makefile +++ b/audio/gkrellmss2/Makefile @@ -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" diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index a99ced032e1e..89890ec04760 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -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 diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile index a9c8125d6f41..e501fd626d90 100644 --- a/audio/kstreamripper/Makefile +++ b/audio/kstreamripper/Makefile @@ -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 diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile index 89c6bfed4e22..9119d45e2cc7 100644 --- a/audio/pavucontrol/Makefile +++ b/audio/pavucontrol/Makefile @@ -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> diff --git a/audio/pavucontrol/pkg-plist b/audio/pavucontrol/pkg-plist index 6a43a0cfe473..0cb905e20c66 100644 --- a/audio/pavucontrol/pkg-plist +++ b/audio/pavucontrol/pkg-plist @@ -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 diff --git a/audio/pms/Makefile b/audio/pms/Makefile index 2cdc93a0c651..70e6e7ac1b6e 100644 --- a/audio/pms/Makefile +++ b/audio/pms/Makefile @@ -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 diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile index 46feb90d289c..46f46d88f4ee 100644 --- a/audio/streamtuner/Makefile +++ b/audio/streamtuner/Makefile @@ -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 diff --git a/comms/xnec2c/Makefile b/comms/xnec2c/Makefile index 281d2228d62e..c8785625007b 100644 --- a/comms/xnec2c/Makefile +++ b/comms/xnec2c/Makefile @@ -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 diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 65c05895a1f1..292acf872c26 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -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> diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in deleted file mode 100644 index 0b8c2ab636b0..000000000000 --- a/converters/libiconv/files/patch-lib_Makefile.in +++ /dev/null @@ -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@ - diff --git a/converters/libiconv/files/patch-src__Makefile.in b/converters/libiconv/files/patch-src__Makefile.in index fc5bbd58b95d..1cbeaed8769a 100644 --- a/converters/libiconv/files/patch-src__Makefile.in +++ b/converters/libiconv/files/patch-src__Makefile.in @@ -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) diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index ebed4ef7bb06..0710aabdaac3 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -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 diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index 3806508d9a6a..c602ae79a1c1 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -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 diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index 863554cbf7a8..b026ab6d407f 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -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> diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile index fbd65a08e6ce..c484a40a3d85 100644 --- a/deskutils/fusenshi/Makefile +++ b/deskutils/fusenshi/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://www.ongs.co.jp/projects/fusenshi/ 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 diff --git a/deskutils/homerun/Makefile b/deskutils/homerun/Makefile index 1f1e407f7a2d..e550ec7a89b0 100644 --- a/deskutils/homerun/Makefile +++ b/deskutils/homerun/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/src/ 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 diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile index 1940f311eb06..bb281c2d5821 100644 --- a/deskutils/kchmviewer-kde4/Makefile +++ b/deskutils/kchmviewer-kde4/Makefile @@ -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 diff --git a/deskutils/kdeconnect/Makefile b/deskutils/kdeconnect/Makefile index 2d4a20e364ce..32d6778ad3a5 100644 --- a/deskutils/kdeconnect/Makefile +++ b/deskutils/kdeconnect/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= KDE/unstable/kdeconnect/${PORTVERSION}/src/ 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 diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile index b31c7fd8c01d..09c922bfd07b 100644 --- a/deskutils/logjam/Makefile +++ b/deskutils/logjam/Makefile @@ -13,7 +13,7 @@ COMMENT= GTK2 interface to livejournals, ie www.livejournal.com 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 diff --git a/devel/appdata-tools/Makefile b/devel/appdata-tools/Makefile index e1087d95f2be..8dbda5f4601a 100644 --- a/devel/appdata-tools/Makefile +++ b/devel/appdata-tools/Makefile @@ -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> diff --git a/devel/appdata-tools/pkg-plist b/devel/appdata-tools/pkg-plist index a472e86a4e2c..85be8b92e00d 100644 --- a/devel/appdata-tools/pkg-plist +++ b/devel/appdata-tools/pkg-plist @@ -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 diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile index 62500eb64bf5..ecdc228607c3 100644 --- a/devel/appstream-glib/Makefile +++ b/devel/appstream-glib/Makefile @@ -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> diff --git a/devel/appstream-glib/pkg-plist b/devel/appstream-glib/pkg-plist index 9a9ffe90ab82..8bc0d2508ff8 100644 --- a/devel/appstream-glib/pkg-plist +++ b/devel/appstream-glib/pkg-plist @@ -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 diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile index 055113d51703..0da5527f37b2 100644 --- a/devel/avr-libc/Makefile +++ b/devel/avr-libc/Makefile @@ -38,7 +38,7 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ 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} diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common index 4253bf0bc851..3608ecf1a8be 100644 --- a/devel/geany-plugins/files/Makefile.common +++ b/devel/geany-plugins/files/Makefile.common @@ -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-,,} diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile index da3753c88d1e..079925fd0cae 100644 --- a/devel/gettext-lint/Makefile +++ b/devel/gettext-lint/Makefile @@ -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: diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile new file mode 100644 index 000000000000..6535480433df --- /dev/null +++ b/devel/gettext-runtime/Makefile @@ -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> diff --git a/devel/gettext-runtime/files/patch-configure b/devel/gettext-runtime/files/patch-configure new file mode 100644 index 000000000000..d7c3b9c960e1 --- /dev/null +++ b/devel/gettext-runtime/files/patch-configure @@ -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 + diff --git a/devel/gettext-runtime/files/patch-intl-threadlib.c b/devel/gettext-runtime/files/patch-intl-threadlib.c new file mode 100644 index 000000000000..8de65d9244f0 --- /dev/null +++ b/devel/gettext-runtime/files/patch-intl-threadlib.c @@ -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; diff --git a/devel/gettext-runtime/pkg-descr b/devel/gettext-runtime/pkg-descr new file mode 100644 index 000000000000..ac084016ae59 --- /dev/null +++ b/devel/gettext-runtime/pkg-descr @@ -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/ diff --git a/devel/gettext-runtime/pkg-plist b/devel/gettext-runtime/pkg-plist new file mode 100644 index 000000000000..6cb2b44697f5 --- /dev/null +++ b/devel/gettext-runtime/pkg-plist @@ -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 diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile new file mode 100644 index 000000000000..ce80cb0e9e08 --- /dev/null +++ b/devel/gettext-tools/Makefile @@ -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> diff --git a/devel/gettext-tools/files/patch-configure b/devel/gettext-tools/files/patch-configure new file mode 100644 index 000000000000..aae0d524d9f9 --- /dev/null +++ b/devel/gettext-tools/files/patch-configure @@ -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= diff --git a/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c b/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c new file mode 100644 index 000000000000..c8a29d7ab5ac --- /dev/null +++ b/devel/gettext-tools/files/patch-gnulib-lib_glthread_threadlib.c @@ -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; + } + + 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; diff --git a/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c b/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c new file mode 100644 index 000000000000..ac8184e478c3 --- /dev/null +++ b/devel/gettext-tools/files/patch-libgettextpo_glthread_threadlib.c @@ -0,0 +1,39 @@ +--- libgettextpo/glthread/threadlib.c.orig 2014-07-14 07:29:10 UTC ++++ libgettextpo/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; + } + + 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; diff --git a/devel/gettext-tools/pkg-descr b/devel/gettext-tools/pkg-descr new file mode 100644 index 000000000000..c8d3f39b8e11 --- /dev/null +++ b/devel/gettext-tools/pkg-descr @@ -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/ diff --git a/devel/gettext/pkg-plist b/devel/gettext-tools/pkg-plist index 86ad58294453..23043d9bc218 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext-tools/pkg-plist @@ -1,7 +1,4 @@ bin/autopoint -bin/envsubst -bin/gettext -bin/gettext.sh bin/gettextize bin/msgattrib bin/msgcat @@ -17,37 +14,22 @@ 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 -lib/libasprintf.a -lib/libasprintf.la -lib/libasprintf.so -lib/libasprintf.so.0 -lib/libgettextlib-0.18.3.so -lib/libgettextlib.la +lib/libgettextlib-0.19.3.so 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/libgettextpo.so.0 +lib/libgettextpo.so.0.5.2 +lib/libgettextsrc-0.19.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 @@ -63,19 +45,10 @@ 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/extern-inline.m4 share/aclocal/gettext.m4 share/aclocal/fcntl-o.m4 share/aclocal/glibc2.m4 @@ -107,22 +80,6 @@ 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 @@ -150,28 +107,11 @@ share/aclocal/xsize.m4 %%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 @@ -267,80 +207,40 @@ share/aclocal/xsize.m4 %%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 diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 728ef30f7612..c387cdb74ded 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,50 +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 -INSTALL_TARGET= install-strip -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> diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common new file mode 100644 index 000000000000..ad0c17a7a12b --- /dev/null +++ b/devel/gettext/Makefile.common @@ -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.3 +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 diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index efe7b1da6a33..70c42117363f 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -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.3.tar.xz) = f6fdb29c9ee8ce85c7e574f60ff64fa91cf0f4f018437dfe800227d15595db46 +SIZE (gettext-0.19.3.tar.xz) = 6628460 diff --git a/devel/gettext/files/extra-patch-nodocs b/devel/gettext/files/extra-patch-nodocs deleted file mode 100644 index 58acc18a9f6e..000000000000 --- a/devel/gettext/files/extra-patch-nodocs +++ /dev/null @@ -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 diff --git a/devel/gettext/files/patch-gettext-runtime_man_Makefile.in b/devel/gettext/files/patch-gettext-runtime_man_Makefile.in deleted file mode 100644 index 22be4429b9c8..000000000000 --- a/devel/gettext/files/patch-gettext-runtime_man_Makefile.in +++ /dev/null @@ -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 diff --git a/devel/gettext/files/patch-gettext-tools_Makefile.in b/devel/gettext/files/patch-gettext-tools_Makefile.in deleted file mode 100644 index 73174661ba6f..000000000000 --- a/devel/gettext/files/patch-gettext-tools_Makefile.in +++ /dev/null @@ -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 - diff --git a/devel/gettext/files/patch-gettext-tools_config.h.in b/devel/gettext/files/patch-gettext-tools_config.h.in deleted file mode 100644 index 88d513ca7e14..000000000000 --- a/devel/gettext/files/patch-gettext-tools_config.h.in +++ /dev/null @@ -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. */ diff --git a/devel/gettext/files/patch-gettext-tools_configure b/devel/gettext/files/patch-gettext-tools_configure deleted file mode 100644 index 811a93225422..000000000000 --- a/devel/gettext/files/patch-gettext-tools_configure +++ /dev/null @@ -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*) diff --git a/devel/gettext/files/patch-gettext-tools_man_Makefile.in b/devel/gettext/files/patch-gettext-tools_man_Makefile.in deleted file mode 100644 index a9dfe1734871..000000000000 --- a/devel/gettext/files/patch-gettext-tools_man_Makefile.in +++ /dev/null @@ -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 diff --git a/devel/gettext/files/patch-gettext-tools_src_x-glade.c b/devel/gettext/files/patch-gettext-tools_src_x-glade.c deleted file mode 100644 index a482cd98d36d..000000000000 --- a/devel/gettext/files/patch-gettext-tools_src_x-glade.c +++ /dev/null @@ -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 - diff --git a/devel/gettext/pkg-descr b/devel/gettext/pkg-descr index 38165c0868e7..c2f69ee3903c 100644 --- a/devel/gettext/pkg-descr +++ b/devel/gettext/pkg-descr @@ -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/ diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile index 5736a39f331c..928b79478503 100644 --- a/devel/libvirt-glib/Makefile +++ b/devel/libvirt-glib/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-introspection -USES= gmake libtool pathfix pkgconfig python:2 +USES= gettext gmake libtool pathfix pkgconfig python:2 USE_LDCONFIG= yes USE_GNOME= intlhack introspection CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile index eeb992c1d016..150e7b37e0ca 100644 --- a/devel/poxml/Makefile +++ b/devel/poxml/Makefile @@ -2,6 +2,7 @@ PORTNAME= poxml PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} @@ -12,7 +13,7 @@ COMMENT= Tools to translate Docbook XML using gettext BUILD_DEPENDS= ${LOCALBASE}/lib/libantlr.a:${PORTSDIR}/devel/antlr USE_KDE4= kdelibs kdeprefix automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource gettext-tools:build,run tar:xz USE_QT4= moc_build qmake_build rcc_build uic_build \ corelib xml diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile index 13d085e41c9a..926e18d49eac 100644 --- a/devel/py-itools/Makefile +++ b/devel/py-itools/Makefile @@ -3,7 +3,7 @@ PORTNAME= itools PORTVERSION= 0.75.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +20,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/p ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \ - gettext:${PORTSDIR}/devel/gettext \ python:${PORTSDIR}/lang/python RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 \ @@ -30,7 +29,7 @@ LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 \ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/poppler LDFLAGS+= -L${LOCALBASE}/lib -USES= pkgconfig python:2.7+ +USES= gettext-tools:run pkgconfig python:2.7+ USE_PYTHON= autoplist distutils OPTIONS_DEFINE= DOCS diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 46d5f924bdb2..247342f6a2c4 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -68,7 +68,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} -USES+= gettext:build +USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes diff --git a/devel/subversion17/Makefile b/devel/subversion17/Makefile index 5af550ee8797..4de91d548e41 100644 --- a/devel/subversion17/Makefile +++ b/devel/subversion17/Makefile @@ -90,7 +90,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} -USES+= gettext:build +USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile index 592b719a977f..002e8a5e0acf 100644 --- a/editors/gwrite/Makefile +++ b/editors/gwrite/Makefile @@ -14,7 +14,6 @@ LICENSE= LGPL3 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distutils-extra>=2.15:${PORTSDIR}/devel/py-distutils-extra \ - intltool-update:${PORTSDIR}/textproc/intltool \ ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ @@ -22,7 +21,7 @@ RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:${PORTSDIR}/www/py-jswebkit \ ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk -USES= desktop-file-utils python +USES= desktop-file-utils gettext-tools python USE_GNOME= pygtk2 USE_PYTHON= distutils diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index caf6c996930e..87541c94b505 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -12,7 +12,7 @@ COMMENT= LaTeX source editor for KDE RUN_DEPENDS= identify:${PORTSDIR}/graphics/ImageMagick -USES= cmake shared-mime-info tar:bzip2 +USES= cmake gettext-tools shared-mime-info tar:bzip2 USE_QT4= qmake_build moc_build rcc_build uic_build USE_KDE4= kdeprefix kdelibs automoc4 kate_run USE_TEX= latex diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile index ca7afcfb1cc0..27fdcf818519 100644 --- a/editors/klat4/Makefile +++ b/editors/klat4/Makefile @@ -12,7 +12,7 @@ COMMENT= LaTeX source editor for KDE4 LICENSE= GPLv2 # (or later) -USES= cmake tar:bzip2 +USES= cmake gettext-tools tar:bzip2 USE_KDE4= automoc4 kate kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index c94c665847ee..f080ccc928a9 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv2 LIB_DEPENDS= libosp.so:${PORTSDIR}/textproc/opensp GNU_CONFIGURE= yes -USES= desktop-file-utils gmake pkgconfig shared-mime-info +USES= desktop-file-utils gettext gmake pkgconfig shared-mime-info USE_GNOME= gnomehier gtk20 INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -pthread +LIBS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS ChangeLog NEWS README diff --git a/finance/moneymanagerex/Makefile b/finance/moneymanagerex/Makefile index ff4ac21b79b1..a366be28b5b0 100644 --- a/finance/moneymanagerex/Makefile +++ b/finance/moneymanagerex/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs -USES= tar:bzip2 +USES= gettext-tools tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} USE_WX= 2.8+ diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index d72c84e4c707..da1a1ca1bcc5 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -21,17 +21,15 @@ HOWL_DESC= Zeroconf support via Howl OPTIONS_SUB= yes -USES= pkgconfig libtool -USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf -ACLOCAL_ARGS= -I m4 -I ac-helpers -AUTOMAKE_ARGS= --add-missing --copy +GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${ETCDIR} --without-pam --disable-bonjour +USES= autoreconf gettext-tools libtool pkgconfig USE_LDCONFIG= yes USE_RC_SUBR= wzdftpd CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --disable-utf8 @@ -78,15 +76,9 @@ PLIST_SUB+= ZEROCONF="" PLIST_SUB+= ZEROCONF="@comment " .endif -post-extract: - @${RM} -f ${WRKSRC}/m4/libtool.m4 - @${RM} -f ${WRKSRC}/m4/lib-*.m4 - @${ECHO_CMD} -n > ${WRKSRC}/config.rpath - post-patch: - @${REINPLACE_CMD} -e \ - '/Libs:/s|@PTHREAD_CFLAGS@|@LTLIBICONV@|' \ - ${WRKSRC}/wzdftpd.pc.in + @${TOUCH} ${WRKSRC}/config.rpath + @${ECHO_CMD} "ACLOCAL_AMFLAGS= -I ac-helpers" >> ${WRKSRC}/Makefile.am @${REINPLACE_CMD} -e \ '/LDFLAGS/s|@PTHREAD_CFLAGS@|@LTLIBICONV@|' \ ${WRKSRC}/libwzd-core/Makefile.am diff --git a/games/aisleriot/Makefile b/games/aisleriot/Makefile index 8d7bc1478514..e464b49119c5 100644 --- a/games/aisleriot/Makefile +++ b/games/aisleriot/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libguile-2.0.so:${PORTSDIR}/lang/guile2 \ CONFLICTS= sol-* -USES= desktop-file-utils gmake pathfix pkgconfig tar:xz +USES= desktop-file-utils gettext gmake pathfix pkgconfig tar:xz USE_GNOME= gconf2 gtk30 intlhack librsvg2 libxml2:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-card-theme-formats=svg \ diff --git a/games/anki/Makefile b/games/anki/Makefile index e71db6fb41e4..54c9b57deb90 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -3,6 +3,7 @@ PORTNAME= anki PORTVERSION= 2.0.31 +PORTREVISION= 1 CATEGORIES= games python MASTER_SITES= http://ankisrs.net/download/mirror/ DIST_SUBDIR= python @@ -31,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> diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile index f50f42e4cc6f..ba71f6bd39a6 100644 --- a/games/bygfoot/Makefile +++ b/games/bygfoot/Makefile @@ -18,10 +18,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -USES= pkgconfig tar:bzip2 +USES= gettext pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gtk20 CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm +LIBS+= -L${LOCALBASE}/lib -lm .include <bsd.port.mk> diff --git a/games/bygfoot/files/patch-po-Makefile.in.in b/games/bygfoot/files/patch-po-Makefile.in.in deleted file mode 100644 index 452490ff9067..000000000000 --- a/games/bygfoot/files/patch-po-Makefile.in.in +++ /dev/null @@ -1,10 +0,0 @@ ---- po/Makefile.in.in.orig 2008-03-02 17:23:22.000000000 +0100 -+++ po/Makefile.in.in 2008-03-14 14:12:46.000000000 +0100 -@@ -21,6 +21,7 @@ - - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ -+top_builddir = $(top_srcdir) - VPATH = @srcdir@ - - prefix = @prefix@ diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile index 568357e60518..de1014bff78a 100644 --- a/games/cuyo/Makefile +++ b/games/cuyo/Makefile @@ -3,7 +3,7 @@ PORTNAME= cuyo PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SAVANNAH @@ -29,7 +29,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 diff --git a/games/gbottler/Makefile b/games/gbottler/Makefile index a6f5c203b9ec..ab0c48a7d880 100644 --- a/games/gbottler/Makefile +++ b/games/gbottler/Makefile @@ -13,8 +13,8 @@ COMMENT= SSTP Bottle client RUN_DEPENDS= ${PYXML} +USES= gettext-tools gmake python USE_GNOME= pygtk2 -USES= gmake python PLIST_SUB= VERSION=${PORTVERSION} .include <bsd.port.mk> diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile index 8a34007d4ec2..f59d7cc9a412 100644 --- a/games/ggz-sdl-games/Makefile +++ b/games/ggz-sdl-games/Makefile @@ -9,21 +9,23 @@ CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= The GGZ Gaming Zone - SDL-based games -USE_GL= gl -USE_SDL= image mixer sdl ttf GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug +USES= gettext USE_GGZ= client +USE_GL= gl +USE_SDL= image mixer sdl ttf +USE_XORG= xcursor INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -pthread -lexpat +LIBS+= -L${LOCALBASE}/lib -lexpat post-patch: - @${REINPLACE_CMD} -e 's|_LDADD =|_LDADD = -lggzcore -lggz|' \ + @${REINPLACE_CMD} -e '/^ggz_ttt3d_LDADD =/s/$$/ -lggzcore -lggz/' \ ${WRKSRC}/ttt3d/Makefile.in - @${REINPLACE_CMD} -e 's|_LDADD =|_LDADD = -lggzcore|' \ + @${REINPLACE_CMD} -e '/^geekgame_LDADD =/s/$$/ -lggzcore -lX11/' \ ${WRKSRC}/geekgame/Makefile.in post-install: diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile index 96ad75673e0d..75b8b80be283 100644 --- a/games/gnomebreakout/Makefile +++ b/games/gnomebreakout/Makefile @@ -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> diff --git a/games/live-f1/Makefile b/games/live-f1/Makefile index d93eef7b17df..f2d0e75c43d3 100644 --- a/games/live-f1/Makefile +++ b/games/live-f1/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} 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 diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile index 6ca2e43b6f75..8c2880b4dc3b 100644 --- a/games/pythonsudoku/Makefile +++ b/games/pythonsudoku/Makefile @@ -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 @@ -36,7 +36,7 @@ DESKTOP_ENTRIES="Python Sudoku" "" "${PORTNAME}" \ OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -NLS_USES= gettext:run +NLS_USES= gettext-runtime:run .include <bsd.port.options.mk> diff --git a/games/scourge/Makefile b/games/scourge/Makefile index b319634aa178..70f3e45a24a3 100644 --- a/games/scourge/Makefile +++ b/games/scourge/Makefile @@ -15,13 +15,12 @@ COMMENT= Rogue-like game LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data -USE_AUTOTOOLS= autoconf:env automake:env +USES= autoreconf gettext gmake USE_GL= gl USE_SDL= sdl image mixer net ttf -USES= gmake GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS} -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-data-dir=${DATADIR} @@ -35,9 +34,6 @@ DEBUG_CONFIGURE_ENABLE= debug post-patch: @${REINPLACE_CMD} -e 's|GLvoid|void|g' ${WRKSRC}/src/sdlhandler.cpp ${WRKSRC}/src/sdlhandler.h -pre-configure: - @cd ${WRKSRC} && ${AUTORECONF} -i - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile index 164243ba2cc1..bee8a8a64201 100644 --- a/games/unknown-horizons/Makefile +++ b/games/unknown-horizons/Makefile @@ -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 diff --git a/games/xboard-devel/Makefile b/games/xboard-devel/Makefile index 4c08b14bbe0c..613e615c1125 100644 --- a/games/xboard-devel/Makefile +++ b/games/xboard-devel/Makefile @@ -26,15 +26,14 @@ DATADIR= ${PREFIX}/share/games/xboard DOCSDIR= ${PREFIX}/share/doc/xboard XBOARDCONF= ${WRKSRC}/xboard.conf.in -USES= gmake shebangfix +USES= autoreconf gettext-tools gmake shebangfix SHEBANG_FILES= texi2man -USE_AUTOTOOLS= automake aclocal INSTALL_TARGET= install-strip pre-configure: + ${RM} ${WRKSRC}/m4/*.m4 ${REINPLACE_CMD} -e "s|\(GITVERSION=\).*|\1${COMMIT_HASH}|" ${WRKSRC}/Makefile.am ${REINPLACE_CMD} -E "s|(AC_INIT\(\[xboard\],\[master-[^]]+)(\].+\))|\1-git:${COMMIT_HASH}\2|" ${WRKSRC}/configure.ac - @cd ${WRKSRC} && ./autogen.sh .include "${MASTERDIR}/Makefile" diff --git a/graphics/digikam-kde4-l10n/Makefile b/graphics/digikam-kde4-l10n/Makefile index 10e35d220290..506f6442eaad 100644 --- a/graphics/digikam-kde4-l10n/Makefile +++ b/graphics/digikam-kde4-l10n/Makefile @@ -10,7 +10,7 @@ COMMENT= l10n for digiKam, showFoto, and Kipi-plugins CONFLICTS_INSTALL= digikam-2.* kipi-plugins-2.* libkgeomap-2.* -USES= gettext:build +USES= gettext-tools WRKSRC= ${WRKDIR}/${DISTNAME}/po pre-configure: diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index a3034bcb966e..81a0ff3fca89 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -15,13 +15,12 @@ LICENSE= GPLv2 # (or later) LIB_DEPENDS= libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 -USES= gmake pathfix pkgconfig +USES= gettext gmake pathfix pkgconfig USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= `pkg-config --libs gtk+-x11-2.0` +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS GIMP GNOME OPTIONS_SUB= yes @@ -44,6 +43,8 @@ post-patch: @${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \ s|images/gtkam|gtkam/images|g ; \ s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure + @${REINPLACE_CMD} 's/$$(GNOME_LIBS)/& $$(GTK_LIBS)/' \ + ${WRKSRC}/src/Makefile.in @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|images/gtkam|gtkam/images|g ; \ s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g' diff --git a/graphics/kcoloredit/Makefile b/graphics/kcoloredit/Makefile index c68cf6409d6c..97a46054a0e0 100644 --- a/graphics/kcoloredit/Makefile +++ b/graphics/kcoloredit/Makefile @@ -13,7 +13,7 @@ COMMENT= Palette files editor for KDE USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake tar:bzip2 +USES= cmake gettext tar:bzip2 APP_VER= 2.0.0 EXTRA_VER= 4.4.0 diff --git a/graphics/kiconedit/Makefile b/graphics/kiconedit/Makefile index 336afbb2b347..454fbd04653f 100644 --- a/graphics/kiconedit/Makefile +++ b/graphics/kiconedit/Makefile @@ -12,7 +12,7 @@ COMMENT= KDE icon editor USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT4= corelib qmake_build moc_build rcc_build uic_build -USES= cmake tar:bzip2 +USES= cmake gettext tar:bzip2 EXTRA_VER= 4.4.0 diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index bfffeb0143c3..ae54b1453baf 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -58,7 +58,7 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ LIB_DEPENDS+= libdevq.so:${PORTSDIR}/devel/libdevq -USES+= bison gettext:build gmake libtool pathfix pkgconfig \ +USES+= bison gettext-tools gmake libtool pathfix pkgconfig \ python:2,build shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile index d1585110fdab..712a9f2f73ad 100644 --- a/graphics/skanlite/Makefile +++ b/graphics/skanlite/Makefile @@ -14,6 +14,6 @@ LIB_DEPENDS= libksane.so:${PORTSDIR}/graphics/libksane USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake:outsource tar:xz +USES= cmake:outsource gettext tar:xz .include <bsd.port.mk> diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile index 8294731b9b16..d05473fe2a00 100644 --- a/japanese/im-ja/Makefile +++ b/japanese/im-ja/Makefile @@ -16,7 +16,7 @@ ANTHY_DESC= Use Anthy CANNA_DESC= Use Canna WNN_DESC= Use FreeWnn -USES= gmake libtool pathfix perl5 pkgconfig +USES= gettext gmake libtool pathfix perl5 pkgconfig USE_GNOME= gconf2 gnomeprefix intlhack libglade2 USE_PERL5= build GNU_CONFIGURE= yes diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile index 320da5506ece..abd432c6f869 100644 --- a/japanese/mecab/Makefile +++ b/japanese/mecab/Makefile @@ -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= gettext-tools 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.sample/' ${WRKSRC}/Makefile.am - -post-configure: - ${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.sample - -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> diff --git a/japanese/mecab/files/patch-src_Makefile.am b/japanese/mecab/files/patch-src_Makefile.am deleted file mode 100644 index ef6af96278ea..000000000000 --- a/japanese/mecab/files/patch-src_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Makefile.am.orig 2013-01-24 14:35:35.000000000 +0900 -+++ src/Makefile.am 2013-04-07 21:39:46.000000000 +0900 -@@ -17,6 +17,7 @@ - feature_index.cpp feature_index.h lbfgs.cpp \ - lbfgs.h learner_tagger.cpp learner_tagger.h learner.cpp \ - learner_node.h libmecab.cpp -+libmecab_la_LIBADD = $(LTLIBICONV) - - include_HEADERS = mecab.h - bin_PROGRAMS = mecab diff --git a/japanese/mecab/pkg-plist b/japanese/mecab/pkg-plist index a7e881113ede..070ad8640b23 100644 --- a/japanese/mecab/pkg-plist +++ b/japanese/mecab/pkg-plist @@ -1,5 +1,6 @@ bin/mecab bin/mecab-config +@sample etc/mecabrc.sample include/mecab.h lib/libmecab.a lib/libmecab.so @@ -11,4 +12,3 @@ libexec/mecab/mecab-dict-index libexec/mecab/mecab-system-eval libexec/mecab/mecab-test-gen man/man1/mecab.1.gz -@sample etc/mecabrc.sample diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 497cc0989b69..8af49aceb448 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -47,6 +47,8 @@ USE_XORG= xcb USE_GNOME= glib20 gtk20 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" USE_EMACS= yes +.elif ${BUILD_MOZC_LIST:Mfcitx_mozc} +USES+= gettext-tools .endif # Use GCC only when the stock clang does not have libc++.so. diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile index 23f7936e7a64..3ba279dd406d 100644 --- a/korean/gtkcomm/Makefile +++ b/korean/gtkcomm/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf -USES= pathfix perl5 pkgconfig +USES= gettext pathfix perl5 pkgconfig PATHFIX_MAKEFILEIN= Makefile*in USE_PERL5= build USE_GNOME= glib20 gtk20 diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile index 353a1a88386d..7004be00e203 100644 --- a/lang/gcc-aux/Makefile +++ b/lang/gcc-aux/Makefile @@ -136,7 +136,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 diff --git a/lang/gcc47-aux/Makefile b/lang/gcc47-aux/Makefile index ec886ce0f64b..3310d12c65e8 100644 --- a/lang/gcc47-aux/Makefile +++ b/lang/gcc47-aux/Makefile @@ -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 diff --git a/mail/faces/Makefile b/mail/faces/Makefile index f282aee4c374..068e6a524f81 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -16,12 +16,14 @@ X11_DESC= X11/GTK support RPLAY_DESC= rplay audio support SOX_DESC= Sox audio support -WANT_GNOME= yes +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls + USE_LDCONFIG= yes PORTDOCS= README -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MX11} PLIST_SUB+= X11="@comment " @@ -37,10 +39,6 @@ CONFIGURE_ARGS= --enable-imap --enable-pop \ --with-facedir=${DATADIR} .endif -.if ! ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+=--disable-nls -.endif - .ifdef WITH_NAS CONFIGURE_ARGS+= --enable-audio --with-audio-cmd=${LOCALBASE}/bin/auplay RUN_DEPENDS= auplay:${PORTSDIR}/audio/nas @@ -98,4 +96,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile index f4e3f87d808e..6f17bfef557b 100644 --- a/mail/milter-manager/Makefile +++ b/mail/milter-manager/Makefile @@ -18,12 +18,11 @@ RUN_DEPENDS= rubygem-glib2>0:${PORTSDIR}/devel/rubygem-glib2 USE_RC_SUBR= milter-manager GNU_CONFIGURE= yes -MAKE_ARGS+= pkgconfigdir=${PREFIX}/libdata/pkgconfig -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ - --with-libev \ - --with-package-platform=freebsd \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" -USES= gmake pkgconfig libtool +CONFIGURE_ARGS= --with-libev \ + --with-package-platform=freebsd +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= gettext gmake libtool pathfix pkgconfig USE_GNOME= glib20 intltool USE_LDCONFIG= yes USE_RUBY= yes @@ -31,12 +30,11 @@ INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.options.mk> - -MANLANG= "" ja PORTDOCS= * PORTEXAMPLES= * +.include <bsd.port.options.mk> + .if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+=--with-html-dir=${DOCSDIR} .else diff --git a/math/galculator/Makefile b/math/galculator/Makefile index 3cef33ea7fdf..236ae0351d10 100644 --- a/math/galculator/Makefile +++ b/math/galculator/Makefile @@ -8,11 +8,11 @@ MASTER_SITES= SF MAINTAINER= naddy@FreeBSD.org COMMENT= GTK-based scientific calculator -USES= gmake pkgconfig tar:bzip2 +USES= gettext gmake pkgconfig tar:bzip2 USE_GNOME= gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-gtk3 .include <bsd.port.mk> diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile index ee8f60f9e340..4ecb8abe06ca 100644 --- a/misc/gimp-help-en/Makefile +++ b/misc/gimp-help-en/Makefile @@ -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 python shebangfix tar:bzip2 +USES= gettext-tools gmake perl5 pkgconfig python shebangfix tar:bzip2 USE_GNOME= libxslt:build USE_PERL5= build GNU_CONFIGURE= yes diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile index efbf9f713231..7ccf8cd6f540 100644 --- a/misc/gnome-devel-docs/Makefile +++ b/misc/gnome-devel-docs/Makefile @@ -14,7 +14,7 @@ COMMENT= Documents targeted for GNOME developers BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool #RUN_DEPENDS= gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils -USES= gmake pkgconfig tar:xz +USES= gettext-tools gmake pkgconfig tar:xz GNU_CONFIGURE= yes .include <bsd.port.mk> diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 8e621f6d374c..0616ca3657b2 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic GNU_CONFIGURE= yes -USES= gmake pathfix pkgconfig tar:xz +USES= gettext-tools gmake pathfix pkgconfig tar:xz USE_GNOME= intlhack INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-icon-mapping diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index d6eb3eaa7603..b06d5845e771 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -14,7 +14,7 @@ COMMENT= GNOME 3 users guide BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool GNU_CONFIGURE= yes -USES= gettext:build gmake pathfix tar:xz +USES= gettext-tools gmake pathfix tar:xz USE_GNOME= gnomeprefix libxml2:build .include <bsd.port.mk> diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index daf7be05b739..e513fd250b9f 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -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 documentation browser 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 diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile index 8034bf64cb96..5d93e1085850 100644 --- a/multimedia/audiopreview/Makefile +++ b/multimedia/audiopreview/Makefile @@ -10,12 +10,12 @@ MASTER_SITES= http://audiopreview.codealpha.net/files/ MAINTAINER= kevlo@FreeBSD.org COMMENT= Command-line tool to play previews of audio and video files -USES= gmake pkgconfig +USES= gettext gmake pkgconfig USE_GSTREAMER= core USE_GNOME= intltool GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib PLIST_FILES= bin/audiopreview man/man1/audiopreview.1.gz diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 813101521f80..a9a7887ad448 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= gm:${PORTSDIR}/graphics/GraphicsMagick \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ toolame:${PORTSDIR}/audio/toolame -USES= pkgconfig scons tar:bzip2 +USES= gettext pkgconfig scons tar:bzip2 USE_GCC= any INSTALLS_ICONS= yes diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 15a97f501891..bcbccbdef182 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -46,8 +46,7 @@ LIB_DEPENDS+= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss .endif GNU_CONFIGURE= yes -USES= gmake iconv libtool:build pkgconfig python:build -USE_AUTOTOOLS= autoconf:env automake:env +USES= autoreconf:build gmake iconv libtool:build pkgconfig python:build WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI @@ -79,8 +78,11 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libnotify.so:${PORTSDIR}/devel/libnotify +USES+= gettext USE_GNOME+= gtk20 PLIST_FILES+= bin/HandBrake .else diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile index 5996771ee270..f56c06ab53e5 100644 --- a/multimedia/kmplayer-kde4/Makefile +++ b/multimedia/kmplayer-kde4/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libcairo.so:${PORTSDIR}/graphics/cairo RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -USES= cmake pkgconfig tar:bzip2 +USES= cmake gettext pkgconfig tar:bzip2 USE_GNOME= gtk20 USE_QT4= corelib moc_build qmake_build rcc_build uic_build USE_KDE4= automoc4 kdelibs kdeprefix diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index b9346b5ebb54..98528787477b 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -14,13 +14,13 @@ COMMENT= Gstreamer based non-linear audio/video editor RUN_DEPENDS= py*-zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \ ${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas -USES= gmake pkgconfig python tar:bzip2 +USES= gettext gmake pkgconfig python tar:bzip2 USE_GNOME= pygtk2 USE_GSTREAMER= gnonlin python good INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBAES}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --localstatedir=/var USE_LDCONFIG= yes diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 4a60d56e3f01..3818c939c572 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -52,7 +52,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ xdpyinfo:${PORTSDIR}/x11/xdpyinfo -USES= gmake iconv:wchar_t libtool:build pkgconfig python:2 +USES= gettext gmake iconv:wchar_t libtool:build pkgconfig python:2 USE_AUTOTOOLS= autoconf:env automake:env GNU_CONFIGURE= yes USE_XORG= xt xmu xtst diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 5f9209c09376..25e3b857a22a 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -3,7 +3,7 @@ PORTNAME?= libpurple PORTVERSION= 2.10.10 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= net-im MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION} DISTNAME= pidgin-${PORTVERSION} @@ -11,8 +11,8 @@ DISTNAME= pidgin-${PORTVERSION} MAINTAINER?= marcus@FreeBSD.org COMMENT?= Backend library for the Pidgin multi-protocol messaging client -USES= cpe gmake libtool pathfix pkgconfig tar:bzip2 -USE_GNOME?= gnomeprefix intlhack glib20 libxml2 +USES= cpe gettext gmake libtool pathfix pkgconfig tar:bzip2 +USE_GNOME?= gnomeprefix intltool glib20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-gtkui \ --disable-consoleui \ @@ -26,7 +26,7 @@ INSTALL_TARGET= install-strip .if !defined(PIDGIN_SLAVE) # Pidgin slave ports that require the following functionality, must explicitly # set these macros themselves. -USES+= gettext iconv python +USES+= iconv python USE_LDCONFIG= yes WANT_GNOME= yes diff --git a/net-im/libpurple/pkg-plist b/net-im/libpurple/pkg-plist index eadae40a48ec..c1691108fbb2 100644 --- a/net-im/libpurple/pkg-plist +++ b/net-im/libpurple/pkg-plist @@ -278,47 +278,3 @@ share/sounds/purple/login.wav share/sounds/purple/logout.wav share/sounds/purple/receive.wav share/sounds/purple/send.wav -@dir share/sounds/purple -@dir share/purple/ca-certs -@dir share/purple -@dir share/locale/zh_HK/LC_MESSAGES -@dir share/locale/zh_HK -@dir share/locale/xh/LC_MESSAGES -@dir share/locale/xh -@dir share/locale/ur/LC_MESSAGES -@dir share/locale/ur -@dir share/locale/te/LC_MESSAGES -@dir share/locale/te -@dir share/locale/sw/LC_MESSAGES -@dir share/locale/sw -@dir share/locale/sr@latin/LC_MESSAGES -@dir share/locale/sr@latin -@dir share/locale/si/LC_MESSAGES -@dir share/locale/si -@dir share/locale/ps/LC_MESSAGES -@dir share/locale/ps -@dir share/locale/oc/LC_MESSAGES -@dir share/locale/oc -@dir share/locale/my_MM/LC_MESSAGES -@dir share/locale/my_MM -@dir share/locale/mr/LC_MESSAGES -@dir share/locale/mr -@dir share/locale/mhr/LC_MESSAGES -@dir share/locale/mhr -@dir share/locale/mai/LC_MESSAGES -@dir share/locale/mai -@dir share/locale/ku/LC_MESSAGES -@dir share/locale/ku -@dir share/locale/km/LC_MESSAGES -@dir share/locale/km -@dir share/locale/dz/LC_MESSAGES -@dir share/locale/dz -@dir share/locale/ca@valencia/LC_MESSAGES -@dir share/locale/ca@valencia -@dir share/locale/bn_IN/LC_MESSAGES -@dir share/locale/bn_IN -@dir share/locale/be@latin/LC_MESSAGES -@dir share/locale/be@latin -@dir lib/purple-2 -@dir include/libpurple/media -@dir include/libpurple diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile index 6b4dd2a9850c..239dea4c3d42 100644 --- a/net-im/licq-osd/Makefile +++ b/net-im/licq-osd/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/licq/licq_qt4-gui.so:${PORTSDIR}/${LICQ_PORT}-qt-g # plugin (gtk+) and wish run osd with it. i've not tested with # plugins other than qt-gui -USES= cmake +USES= cmake gettext-tools LOCALES= be de cs es fr pt pt_BR ro ru sv sk PLIST_FILES= lib/licq/licq_osd.so \ diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile index 1fd92abefad3..677ee7376a73 100644 --- a/net-im/pidgin/Makefile +++ b/net-im/pidgin/Makefile @@ -21,7 +21,7 @@ PIDGIN_SLAVE= yes WITH_GTKUI= yes USE_LDCONFIG= yes -USE_GNOME= gnomeprefix intlhack gtk20 +USE_GNOME= gnomeprefix gtk20 USE_XORG= xscrnsaver sm WANT_GNOME= yes CONFIGURE_ARGS= --disable-consoleui \ diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile index 4c4ae3bf2108..22f3da7698a6 100644 --- a/net-im/telepathy-logger/Makefile +++ b/net-im/telepathy-logger/Makefile @@ -15,7 +15,8 @@ LICENSE= LGPL21 LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib -USES= gmake libtool pathfix pkgconfig python:build tar:bzip2 +USES= gettext-tools gmake libtool pathfix pkgconfig python:build \ + tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= glib20 gnomedocutils intltool libxml2 \ diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile index 1b7a9850870d..954b35cf72b0 100644 --- a/net-mgmt/monitoring-plugins/Makefile +++ b/net-mgmt/monitoring-plugins/Makefile @@ -107,7 +107,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 diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index 269c6f855879..98bbc6e714b8 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -112,7 +112,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 diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile index adf018f03370..103ca7d3db90 100644 --- a/net-p2p/linuxdcpp/Makefile +++ b/net-p2p/linuxdcpp/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/License.txt BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs +USES= gettext iconv pkgconfig scons tar:bzip2 USE_GNOME= libglade2 -USES= iconv pkgconfig scons tar:bzip2 USE_OPENSSL= yes PORTDOCS= * DESTDIRNAME= FAKE_ROOT diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile index 683c5c03481f..7288723dbd4b 100644 --- a/net/grilo-plugins/Makefile +++ b/net/grilo-plugins/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libgrilo-0.2.so:${PORTSDIR}/net/grilo \ libavahi-gobject.so:${PORTSDIR}/net/avahi-app \ libgdata.so:${PORTSDIR}/devel/libgdata -USES= gmake libtool pathfix pkgconfig tar:xz +USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes USE_GNOME= glib20 intlhack libxml2 GNU_CONFIGURE= yes diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile index 27002b62e13b..b442c0b3696e 100644 --- a/net/knemo-kde4/Makefile +++ b/net/knemo-kde4/Makefile @@ -10,7 +10,7 @@ DISTNAME= 12956-${PORTNAME}-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= KDE network monitor -USES= cmake tar:bzip2 +USES= cmake gettext tar:bzip2 USE_QT4= qmake_build moc_build uic_build rcc_build USE_KDE4= kdeprefix kdelibs workspace automoc4 diff --git a/net/kwooty/Makefile b/net/kwooty/Makefile index c0ce31322838..49f984ab660c 100644 --- a/net/kwooty/Makefile +++ b/net/kwooty/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar \ USE_KDE4= kdelibs kdehier kdeprefix automoc4 workspace USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake +USES= cmake gettext USE_LDCONFIG= yes post-patch: diff --git a/net/libzapojit/Makefile b/net/libzapojit/Makefile index b059cd2e9037..0f491b7faf2b 100644 --- a/net/libzapojit/Makefile +++ b/net/libzapojit/Makefile @@ -17,12 +17,12 @@ LIB_DEPENDS= libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ librest-0.7.so:${PORTSDIR}/devel/librest -USES= gmake libtool pathfix pkgconfig tar:xz -USE_GNOME= gnomeprefix intlhack +USES= gettext gmake libtool pathfix pkgconfig tar:xz +USE_GNOME= gnomeprefix intltool GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/net/liferea/Makefile b/net/liferea/Makefile index 3bd87ab96e26..26323ecf9a09 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -19,13 +19,13 @@ LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas -USES= desktop-file-utils gmake libtool pathfix pkgconfig \ +USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \ tar:bzip2 USE_GNOME= gnomeprefix gtk30 introspection:build libxslt:build libxml2 USE_SQLITE= 3 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-libnotify --disable-libindicate diff --git a/net/minidlna/Makefile b/net/minidlna/Makefile index b0d9e5b01970..c9a53dc0b8c4 100644 --- a/net/minidlna/Makefile +++ b/net/minidlna/Makefile @@ -22,11 +22,9 @@ LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-db-path=/var/db/minidlna \ --with-os-url="http://www.FreeBSD.org" -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -USES= iconv -USE_AUTOTOOLS= autoconf aclocal automake -AUTOMAKE_ARGS= --add-missing +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib +USES= autoreconf gettext-tools iconv PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message @@ -42,7 +40,7 @@ OPTIONS_SUB= yes DEBUG_CFLAGS= -DDEBUG KQUEUE_DESC= Experimental patch for automatic rescan using kqueue(2) -NLS_USES= gettext +NLS_USES= gettext-runtime .include <bsd.port.options.mk> diff --git a/net/remmina-plugin-i18n/Makefile b/net/remmina-plugin-i18n/Makefile index d459aadde2cc..a818d3470e70 100644 --- a/net/remmina-plugin-i18n/Makefile +++ b/net/remmina-plugin-i18n/Makefile @@ -7,6 +7,6 @@ COMMENT= Localized messages for Remmina plugins MASTERDIR= ${.CURDIR}/../remmina-plugins -USES+= gettext +USES= gettext-tools .include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk index c88328931500..45fbc0247f22 100644 --- a/net/remmina-plugins/bsd.plugin.mk +++ b/net/remmina-plugins/bsd.plugin.mk @@ -8,7 +8,7 @@ LICENSE= GPLv2 BUILD_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina RUN_DEPENDS+= remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina -USES= cmake gmake pkgconfig +USES+= cmake gmake pkgconfig USE_GNOME= atk desktopfileutils gdkpixbuf2 glib20 gtk20 pango INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile index e262a5545692..2f894cf2864d 100644 --- a/science/chemical-mime-data/Makefile +++ b/science/chemical-mime-data/Makefile @@ -3,7 +3,7 @@ PORTNAME= chemical-mime-data PORTVERSION= 0.1.94 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= science MASTER_SITES= SF/chemical-mime/${PORTNAME}/${PORTVERSION} @@ -12,11 +12,12 @@ COMMENT= Collection of chemical MIME types for UNIX desktops BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2 -USES= gmake pkgconfig tar:bzip2 shared-mime-info -USE_GNOME= gnomemimedata intltool libxslt:build +USES= gettext-tools gmake pkgconfig tar:bzip2 shared-mime-info +USE_GNOME= gnomemimedata intlhack libxslt:build GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-update-database CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LDFLAGS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes post-patch: diff --git a/science/chemical-mime-data/pkg-plist b/science/chemical-mime-data/pkg-plist index e6400fdb4dd4..c22391dc17c7 100644 --- a/science/chemical-mime-data/pkg-plist +++ b/science/chemical-mime-data/pkg-plist @@ -19,50 +19,6 @@ share/locale/fr/LC_MESSAGES/chemical-mime-data.mo share/pixmaps/chemistry.png share/pixmaps/gnome-mime-chemical.png share/mime/packages/chemical-mime-data.xml -share/mime/chemical/x-alchemy.xml -share/mime/chemical/x-cactvs-ascii.xml -share/mime/chemical/x-cactvs-binary.xml -share/mime/chemical/x-cactvs-table.xml -share/mime/chemical/x-cache.xml -share/mime/chemical/x-cdxml.xml -share/mime/chemical/x-cdx.xml -share/mime/chemical/x-chem3d.xml -share/mime/chemical/x-cif.xml -share/mime/chemical/x-cml.xml -share/mime/chemical/x-daylight-smiles.xml -share/mime/chemical/x-dmol.xml -share/mime/chemical/x-gamess-input.xml -share/mime/chemical/x-gamess-output.xml -share/mime/chemical/x-gaussian-input.xml -share/mime/chemical/x-gaussian-log.xml -share/mime/chemical/x-genbank.xml -share/mime/chemical/x-gulp.xml -share/mime/chemical/x-hin.xml -share/mime/chemical/x-inchi.xml -share/mime/chemical/x-inchi-xml.xml -share/mime/chemical/x-jcamp-dx.xml -share/mime/chemical/x-macromodel-input.xml -share/mime/chemical/x-mdl-molfile.xml -share/mime/chemical/x-mdl-rdfile.xml -share/mime/chemical/x-mdl-rxnfile.xml -share/mime/chemical/x-mdl-sdfile.xml -share/mime/chemical/x-mdl-tgf.xml -share/mime/chemical/x-mmcif.xml -share/mime/chemical/x-mol2.xml -share/mime/chemical/x-mopac-graph.xml -share/mime/chemical/x-mopac-input.xml -share/mime/chemical/x-mopac-out.xml -share/mime/chemical/x-msi-car.xml -share/mime/chemical/x-msi-hessian.xml -share/mime/chemical/x-msi-mdf.xml -share/mime/chemical/x-msi-msi.xml -share/mime/chemical/x-ncbi-asn1.xml -share/mime/chemical/x-ncbi-asn1-binary.xml -share/mime/chemical/x-ncbi-asn1-xml.xml -share/mime/chemical/x-pdb.xml -share/mime/chemical/x-shelx.xml -share/mime/chemical/x-vmd.xml -share/mime/chemical/x-xyz.xml share/mime-info/chemical-mime-data.keys share/mime-info/chemical-mime-data.mime share/mimelnk/chemical/x-alchemy.desktop diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile index 425a0038ebd1..1ed2af4f54bb 100644 --- a/security/clamtk/Makefile +++ b/security/clamtk/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamtk PORTVERSION= 4.45 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/ClamTk/${PORTVERSION} @@ -24,7 +24,7 @@ RUN_DEPENDS= p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \ p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2 NO_BUILD= yes -USES= gettext:run perl5 shebangfix +USES= gettext-runtime:run perl5 shebangfix USE_PERL5= run SHEBANG_FILES= clamtk diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile index ffcee6cf59a0..4e3eed9b751b 100644 --- a/security/gringotts/Makefile +++ b/security/gringotts/Makefile @@ -13,12 +13,12 @@ COMMENT= GTK application to securely store sensitive data LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libgringotts.so:${PORTSDIR}/security/libgringotts -USES= pkgconfig +USES= gettext pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile index 7ca99d012a43..2530c6af0341 100644 --- a/security/gtkpasman/Makefile +++ b/security/gtkpasman/Makefile @@ -11,10 +11,12 @@ COMMENT= GTK+ passwords manager for system and network administrators RUN_DEPENDS+= gpgv2:${PORTSDIR}/security/gnupg -USES= desktop-file-utils gmake pkgconfig tar:xz +USES= desktop-file-utils gettext gmake pkgconfig tar:xz USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk2 +CONFIGURE_ARGS= --with-gtk2 +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile index 7ae7eb0ce987..568183368542 100644 --- a/security/openvpn-admin/Makefile +++ b/security/openvpn-admin/Makefile @@ -14,13 +14,11 @@ RUN_DEPENDS= openvpn:${PORTSDIR}/security/openvpn WRKSRC= ${WRKDIR}/${DISTNAME:S/b//} -USES= gmake pkgconfig +USES= gettext gmake pkgconfig USE_GNOME= gtksharp20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -.include <bsd.port.pre.mk> +LIBS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/iconv,${LOCALBASE}/bin/iconv,g' \ @@ -37,4 +35,4 @@ do-install: ${STAGEDIR}${PREFIX}/lib/${PORTNAME} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/openvpn -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile index e09a9bc6b2e8..d80f393a0862 100644 --- a/sysutils/froxlor/Makefile +++ b/sysutils/froxlor/Makefile @@ -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> diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index 64f2daadd7db..d36d3e96d64b 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \ RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools -USES= cmake shared-mime-info pkgconfig tar:bzip2 +USES= cmake gettext pkgconfig shared-mime-info tar:bzip2 CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \ -DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF USE_KDE4= automoc4 kdeprefix kdelibs libkcddb diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile index 0de688802256..970302e7018d 100644 --- a/sysutils/kdirstat/Makefile +++ b/sysutils/kdirstat/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/jeromerobert-k4dirstat-1ad2e96d73fa -USES= cmake desktop-file-utils tar:bzip2 +USES= cmake desktop-file-utils gettext-tools tar:bzip2 USE_KDE4= automoc4 kdelibs kdeprefix libkonq USE_QT4= moc_build qmake_build rcc_build uic_build INSTALLS_ICONS= yes diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile index f4b0d3fce8ba..3d6ca869147a 100644 --- a/sysutils/krename-kde4/Makefile +++ b/sysutils/krename-kde4/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libpodofo.so:${PORTSDIR}/graphics/podofo -USES= cmake:outsource tar:bzip2 +USES= cmake:outsource gettext tar:bzip2 USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile index ae55659c4e9b..0577f563adff 100644 --- a/sysutils/kshutdown-kde4/Makefile +++ b/sysutils/kshutdown-kde4/Makefile @@ -9,7 +9,7 @@ DISTNAME= ${PORTNAME}-source-${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Advanced shutdown utility for KDE -USES= alias cmake:outsource compiler:c++0x zip +USES= alias cmake:outsource compiler:c++0x gettext zip USE_QT4= moc_build qmake_build rcc_build uic_build USE_KDE4= automoc4 kdeprefix workspace diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile index 80f14a639b9a..549d145280e9 100644 --- a/sysutils/libgksu/Makefile +++ b/sysutils/libgksu/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \ RUN_DEPENDS= xauth:${PORTSDIR}/x11/xauth \ sudo:${PORTSDIR}/security/sudo -USES= gmake libtool pathfix pkgconfig +USES= gettext gmake libtool pathfix pkgconfig USE_GNOME= glib20 gconf2 USE_LDCONFIG= yes USE_XORG= x11 diff --git a/sysutils/plasma-applet-apcups/Makefile b/sysutils/plasma-applet-apcups/Makefile index 0a538328de49..1ae2929f5ad4 100644 --- a/sysutils/plasma-applet-apcups/Makefile +++ b/sysutils/plasma-applet-apcups/Makefile @@ -13,7 +13,7 @@ COMMENT= Plasma applet to monitor the status of APC UPS PROJECTHOST= plasma-apcups -USES= cmake +USES= cmake gettext USE_KDE4= automoc4 kdeprefix kdelibs USE_QT4= qmake_build moc_build rcc_build uic_build diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 3569bda87027..32ae70c29434 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ USERS= polkit GROUPS= polkit -USES= gmake libtool:keepla pathfix pkgconfig +USES= gettext gmake libtool:keepla pathfix pkgconfig USE_GNOME= glib20 intlhack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 7a230275065c..ccbfecb27787 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -16,17 +16,13 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus -USES= gmake pathfix perl5 pkgconfig tar:bzip2 +USES= gettext-tools gmake pathfix perl5 pkgconfig tar:bzip2 USE_GNOME= intlhack glib20 GNU_CONFIGURE= yes USE_GNOME_SUBR= yes CONFIGURE_ARGS= --with-stb-group=wheel \ --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -post-configure: - @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \ - ${WRKSRC}/po/Makefile +LIBS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index fc656188efb3..7d507e013e86 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnome-doc-utils PORTVERSION= 0.20.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc gnome MASTER_SITES= GNOME @@ -17,7 +17,7 @@ RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \ ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml -USES= gettext gmake pathfix pkgconfig tar:xz +USES= gettext-tools:build,run gmake pathfix pkgconfig tar:xz USE_GNOME= gnomehier libxslt intlhack USE_PYTHON= 2 INSTALLS_OMF= yes diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 6897706a349f..3bae921d415c 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -26,7 +26,7 @@ CATALOG_DIR= ${PREFIX}/share/sgml/${PORTNAME} XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports -USES= gmake gettext:build pathfix perl5 pkgconfig python tar:xz +USES= gmake gettext-tools pathfix perl5 pkgconfig python tar:xz USE_GNOME= gnomeprefix libxslt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile index 5a127b20faff..45ed2a74825f 100644 --- a/textproc/libtranslate/Makefile +++ b/textproc/libtranslate/Makefile @@ -3,7 +3,7 @@ PORTNAME= libtranslate PORTVERSION= 0.99 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,12 +17,12 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= Natural language translation library -USES= gmake pathfix pkgconfig +USES= gettext gmake libtool pathfix pkgconfig USE_GNOME= glib20 intlhack GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc OPTIONS_DEFINE= GENERIC TALKFILTERS @@ -31,8 +31,7 @@ GENERIC_DESC= generic module TALKFILTERS_DESC= talkfilters module post-patch:: - @${REINPLACE_CMD} -e 's|echo aout|echo elf|' \ - -e 's|libsoup-2.2|libsoup-2.4|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|libsoup-2.2|libsoup-2.4|g' ${WRKSRC}/configure .include <bsd.port.options.mk> diff --git a/textproc/libtranslate/files/patch-configure b/textproc/libtranslate/files/patch-configure deleted file mode 100644 index cd4f4adb9623..000000000000 --- a/textproc/libtranslate/files/patch-configure +++ /dev/null @@ -1,101 +0,0 @@ ---- configure.orig 2014-06-20 22:12:16.401089000 +0000 -+++ configure -@@ -3608,7 +3608,7 @@ darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+dragonfly* | freebsd* | kfreebsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) -@@ -5545,7 +5545,7 @@ else - lt_cv_sys_max_cmd_len=8192; - ;; - -- netbsd* | freebsd* | openbsd* | darwin* ) -+ netbsd* | dragonfly* | freebsd* | openbsd* | darwin* ) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -@@ -7324,7 +7324,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ dragonfly* | freebsd* | kfreebsd*-gnu) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -7903,7 +7903,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+dragonfly* | freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -10260,7 +10260,7 @@ if test -z "$aix_libpath"; then aix_libp - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu) -+ dragonfly* | freebsd* | kfreebsd*-gnu) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -11004,7 +11004,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ dragonfly* | freebsd* | kfreebsd*-gnu) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) -@@ -11615,7 +11615,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+dragonfly* | freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -14196,7 +14196,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ dragonfly* | freebsd* | kfreebsd*-gnu) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -14775,7 +14775,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+dragonfly* | freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -16554,7 +16554,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ dragonfly* | freebsd* | kfreebsd*-gnu) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -17133,7 +17133,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+dragonfly* | freebsd*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in diff --git a/textproc/libtranslate/pkg-plist b/textproc/libtranslate/pkg-plist index 5cc2f24e434a..fa2700e51039 100644 --- a/textproc/libtranslate/pkg-plist +++ b/textproc/libtranslate/pkg-plist @@ -8,6 +8,7 @@ include/libtranslate/translate.h lib/libtranslate.a lib/libtranslate.so lib/libtranslate.so.0 +lib/libtranslate.so.0.0.0 %%GENERIC%%lib/libtranslate/modules/generic.so %%TALKFILTERS%%lib/libtranslate/modules/talkfilters.so libdata/pkgconfig/libtranslate.pc diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile index b40a653eeab7..89b7ae82e47e 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -19,6 +19,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-default-catalog=${PREFIX}/share/sgml/catalog \ --datadir=${DATADIR} +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install install-man MAKE_ENV= STRIP="${STRIP}" PLIST_SUB= XMLCATMGR=${XMLCATMGR} \ diff --git a/textproc/openjade/files/patch-Makefile.comm.in b/textproc/openjade/files/patch-Makefile.comm.in deleted file mode 100644 index 4cc8733e2a14..000000000000 --- a/textproc/openjade/files/patch-Makefile.comm.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.comm.in.orig Mon Jan 8 00:28:27 2007 -+++ Makefile.comm.in Mon Jan 8 00:29:02 2007 -@@ -32,7 +32,7 @@ - INCS=-I$(srcdir) -I$(srcdir)/../include -I$(spincludedir) -I$(spincludedir)/.. $(INCLUDE) - CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS) - CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS) --LDFLAGS=@LDFLAGS@ -+LDFLAGS=@LDFLAGS@ -lintl - MSGGENFLAGS= -l jstyleModule - CXXDEPGENFLAGS=-MM - diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index ed48cfceaf43..b2d0e6d59c70 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -21,9 +21,9 @@ RUN_DEPENDS= uim-el-agent:${PORTSDIR}/textproc/uim OPTIONS_DEFINE= DOCS +USES= gettext-tools gmake iconv perl5 tar:bzip2 USE_PERL5= build USE_GNOME= intltool -USES= iconv gmake perl5 tar:bzip2 USE_EMACS= yes GNU_CONFIGURE= yes diff --git a/www/cssed/Makefile b/www/cssed/Makefile index 9fce323b1a41..b25369273a3e 100644 --- a/www/cssed/Makefile +++ b/www/cssed/Makefile @@ -10,14 +10,14 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Application to help CSS style sheets creation and maintenance -USES= dos2unix pathfix pkgconfig +USES= dos2unix gettext pathfix pkgconfig DOS2UNIX_FILES= scintilla/gtk/ScintillaGTK.cxx USE_GNOME= gtk20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-plugin-headers CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES="CSSED" "CSS Editor" "${DATADIR}/pixmaps/cssed-icon.png" \ "${PORTNAME}" "GTK;Development;WebDevelopment;TextEditor;" "" diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile index 42b151821bbe..b6601ab02d81 100644 --- a/www/py-formencode/Makefile +++ b/www/py-formencode/Makefile @@ -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} diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile index 9aaf1aaa7415..2f5b45c08ee4 100644 --- a/www/rekonq/Makefile +++ b/www/rekonq/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:C,\..*,.0,}/ MAINTAINER= makc@FreeBSD.org COMMENT= Lightweight KDE browser based on WebKit -USES= cmake:outsource tar:xz +USES= cmake:outsource gettext tar:xz USE_KDE4= kdehier kdelibs kdeprefix automoc4 USE_QT4= script webkit \ moc_build qmake_build rcc_build uic_build diff --git a/www/sarg/Makefile b/www/sarg/Makefile index dc0d522ad561..23b846fa94e0 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -14,22 +14,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= GD PHP NLS PCRE LDAP ICONV OPTIONS_DEFAULT=GD PHP NLS PCRE LDAP ICONV +OPTIONS_SUB= yes PHP_DESC= Install PHP for reporting generating USES= gmake -USE_AUTOTOOLS= autoconf aclocal -OPTIONS_SUB= yes GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include \ - --sysconfdir="${ETCDIR}" \ +CONFIGURE_ARGS= --sysconfdir="${ETCDIR}" \ --enable-fontdir="${ETCDIR}/fonts" \ --enable-imagedir="${ETCDIR}/images" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib NLS_USES= gettext -NLS_LDFLAGS= -lintl NLS_CONFIGURE_ENABLE= nls +NLS_LIBS= -lintl GD_CONFIGURE_WITH= gd GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd PHP_CONFIGURE_ON= --enable-sargphp="${ETCDIR}" @@ -44,6 +43,6 @@ ICONV_LDFLAGS= ${ICONV_LIB} post-patch: @${REINPLACE_CMD} -e '/test .*==/ s/==/=/' \ - ${WRKSRC}/configure.in + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile index 0ac6512a4082..408b2f42e382 100644 --- a/x11-fm/rox-session/Makefile +++ b/x11-fm/rox-session/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \ WRKSRC= ${WRKDIR}/ROX-Session DATADIR= ${PREFIX}/apps/ROX-Session -USES= pkgconfig python +USES= gettext-tools pkgconfig python USE_GNOME= gtk20 libxml2 USE_XORG= x11 xext xtst xxf86vm diff --git a/x11-themes/adwaita-icon-theme/Makefile b/x11-themes/adwaita-icon-theme/Makefile index 4bf11fe34224..803525e6b557 100644 --- a/x11-themes/adwaita-icon-theme/Makefile +++ b/x11-themes/adwaita-icon-theme/Makefile @@ -12,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Symbolic Icons INSTALLS_ICONS= yes -USES= gmake pathfix pkgconfig tar:xz +USES= gettext-tools gmake pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix intltool GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_GTK_ENCODE_SYMBOLIC_SVG="false" diff --git a/x11-themes/gnome-themes-standard/Makefile b/x11-themes/gnome-themes-standard/Makefile index 61f4c63a1705..6b2d798e1feb 100644 --- a/x11-themes/gnome-themes-standard/Makefile +++ b/x11-themes/gnome-themes-standard/Makefile @@ -13,7 +13,7 @@ COMMENT= Standard themes for GNOME CONFLICTS= gnome-themes-2.[0-9]* -USES= gettext:build gmake libtool pathfix pkgconfig tar:xz +USES= gettext-tools gmake libtool pathfix pkgconfig tar:xz USE_GNOME= gnomeprefix gtk30 intlhack librsvg2 INSTALLS_ICONS= yes GNU_CONFIGURE= yes diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile index f52282766baf..700519917212 100644 --- a/x11-themes/gtk-murrine-engine/Makefile +++ b/x11-themes/gtk-murrine-engine/Makefile @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -engine MAINTAINER= pneumann@gmail.com COMMENT= Murrine GTK+ 2.x cairo based engine -USES= gmake libtool pkgconfig tar:xz +USES= gettext gmake libtool pkgconfig tar:xz USE_XORG= pixman USE_GNOME= gtk20 intltool intlhack USE_LDCONFIG= yes diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile index ae8639dbac8a..eaedc342731d 100644 --- a/x11-themes/icons-tango/Makefile +++ b/x11-themes/icons-tango/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libexec/icon-name-mapping:${PORTSDIR}/x11-themes/ico GNU_CONFIGURE= yes USE_GNOME= intlhack -USES+= pathfix gmake pkgconfig +USES+= gettext-tools gmake pathfix pkgconfig INSTALLS_ICONS= yes .include <bsd.port.mk> diff --git a/x11-themes/kde-gtk-config/Makefile b/x11-themes/kde-gtk-config/Makefile index 38eff71da424..17172371a516 100644 --- a/x11-themes/kde-gtk-config/Makefile +++ b/x11-themes/kde-gtk-config/Makefile @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src MAINTAINER= kde@FreeBSD.org COMMENT= GTK2 and GTK3 Configurator for KDE -USES= cmake:outsource pkgconfig tar:xz +USES= cmake:outsource gettext pkgconfig tar:xz USE_GNOME= gtk20 gtk30 USE_KDE4= automoc4 kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile index 7033788b6137..c3a551bacbe8 100644 --- a/x11-themes/kde4-style-polyester/Makefile +++ b/x11-themes/kde4-style-polyester/Makefile @@ -13,6 +13,6 @@ COMMENT= KDE style and window decoration USE_KDE4= kdelibs kdehier kdeprefix automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build -USES= cmake tar:bzip2 +USES= cmake gettext tar:bzip2 .include <bsd.port.mk> diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile index 7f37ed909369..57d00b5c0504 100644 --- a/x11-themes/nimbus/Makefile +++ b/x11-themes/nimbus/Makefile @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig tar:bzip2 +USES= gettext gmake libtool pkgconfig tar:bzip2 USE_LDCONFIG= yes USE_GNOME= gtk20 diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile index fc3234562a9a..7994069093fc 100644 --- a/x11-themes/qtcurve-kde4/Makefile +++ b/x11-themes/qtcurve-kde4/Makefile @@ -11,7 +11,7 @@ DISTNAME= QtCurve-KDE4-${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= QtCurve KDE4 widget style -USES= cmake tar:bzip2 +USES= cmake gettext-tools tar:bzip2 USE_QT4= qmake_build uic_build moc_build rcc_build USE_KDE4= kdelibs workspace kdehier kdeprefix automoc4 diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 9cfe0f169ceb..4546b10280e9 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -71,6 +71,7 @@ RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk2 .if ${WXGTK_FLAVOR:M*-common} != "" NO_BUILD= yes INSTALL_TARGET= install-common +USES+= gettext-tools .else USE_LDCONFIG= yes .endif # *-common diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile index 6940e701f23d..1443d8c4cc04 100644 --- a/x11-wm/libcompizconfig/Makefile +++ b/x11-wm/libcompizconfig/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compi GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 +USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_GNOME= intltool libxml2 CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 2c6f0a496f94..fb19dd97d9d6 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= PAM OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes -USES= tar:bzip2 +USES= gettext tar:bzip2 USE_XORG= x11 xmu GNU_CONFIGURE= yes CONFIGURE_ENV= DEF_SERVER="${DEF_SERVER}" XRDB_PATH="${XRDB_PATH}" @@ -43,7 +43,7 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm CPPFLAGS+= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT -LDFLAGS+= -L${LOCALBASE}/lib -lintl +LIBS+= -L${LOCALBASE}/lib DEF_SERVER?= ${LOCALBASE}/bin/X XRDB_PATH?= ${LOCALBASE}/bin/xrdb diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 4f00e00c2d1b..e818deaa9f78 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -34,7 +34,7 @@ ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo # !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 |