net/mcabber: replace gettext module

On Wed Jul 19, 2017 at 07:05:03AM +0000, Markus Hennecke wrote:
> On Thu, 13 Jul 2017, Rafael Sadowski wrote:
>
> > On Mon Jul 10, 2017 at 02:02:39PM +0200, Markus Hennecke wrote:
> > > On Mon, 10 Jul 2017, Ricardo Mestre wrote:
> > >
> > > > Hi ports@
> > > >
> > > > Please find attached an update to mcabber 1.1.0, it includes a new vi
> > > > mode and some bugfixes.
> > > >
> > > > OK?
> > >
> > > Yes please. But your patch is not against -current (Makefile version
> > > 1.31)?
> >
> > I think we don't need gettext as MODULE here. Could you run pkg_delete
> > gettext gettext-tools and build and run mcabber? If build fails please
> > add devel/gettext-tools as BUILD_DEPENDS and devel/gettext as
> > RUN_DEPENDS and test again.
>
> It will build without the MODULE, but gettext is a dependency of at least
> loudmouth, so it is installed when mcabber is being build. So I am
> not quiet sure if we need to add the BUILD_DEPENDS bit. It ends up
> requiring WANTLIB entries for iconv and intl. I came up with the diff
> below which lacks a revision entry. Does that look ok to you?
>
> Kind regards
> Markus

I agree with Markus. Please find the same diff as Markus with regen
WANTLIB. It doesn't look like mcabber needs gettext-tools at
build/configure time so I think LIB_DEPENDS is enough.

Thanks to Markus who did the work after my request.

Ok?

>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/mcabber/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile 13 Jul 2017 09:36:12 -0000 1.32
> +++ Makefile 18 Jul 2017 10:28:10 -0000
> @@ -14,18 +14,18 @@ PERMIT_PACKAGE_CDROM= Yes
> MASTER_SITES= ${HOMEPAGE}/files/
> EXTRACT_SUFX= .tar.bz2
>
> -MODULES= devel/gettext
> -
> # uses pledge()
> WANTLIB= c crypto gcrypt gpg-error ncursesw panelw pcre pthread \
> - ssl glib-2.0 gpgme loudmouth-1>=3 idn otr assuan
> + ssl glib-2.0 gpgme loudmouth-1>=3 idn otr assuan \
> + iconv intl
>
> LIB_DEPENDS= devel/glib2 \
> security/gpgme \
> net/loudmouth \
> devel/libidn \
> security/libotr
> -RUN_DEPENDS= devel/desktop-file-utils
> +RUN_DEPENDS= devel/desktop-file-utils \
> + devel/gettext
>
> USE_GMAKE = Yes
> LIBTOOL_FLAGS= --tag=disable-static



Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mcabber/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile 13 Jul 2017 09:36:12 -0000 1.32
+++ Makefile 14 Sep 2017 16:45:39 -0000
@@ -14,18 +14,18 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}/files/
EXTRACT_SUFX= .tar.bz2

-MODULES= devel/gettext
-
# uses pledge()
-WANTLIB= c crypto gcrypt gpg-error ncursesw panelw pcre pthread \
- ssl glib-2.0 gpgme loudmouth-1>=3 idn otr assuan
+WANTLIB += assuan c crypto gcrypt glib-2.0 gpg-error gpgme iconv
+WANTLIB += idn intl loudmouth-1>=3 ncursesw otr panelw pcre pthread
+WANTLIB += ssl

LIB_DEPENDS= devel/glib2 \
security/gpgme \
net/loudmouth \
devel/libidn \
security/libotr
-RUN_DEPENDS= devel/desktop-file-utils
+RUN_DEPENDS= devel/desktop-file-utils \
+ devel/gettext \

USE_GMAKE = Yes
LIBTOOL_FLAGS= --tag=disable-static