On Sun, May 12 2019, Christian Weisgerber <[email protected]> wrote:
> Update devel/gettext to 0.20.1.
>
> This also switches the port to MULTI_PACKAGES, replacing the formerly
> separate devel/gettext-tools port. There is also a third subpackage
> now, libtextstyle. I'm following the packaging recommendations from
> upstream.
>
> It will also require tweaking the *_DEPENDS of dependent ports and
> bumping the REVISION of all ports that have a LIB_DEPENDS/RUN_DEPENDS
> on one of the gettext components. I'll handle that.
>
> It could use additional eyeballs.
>
> (Yes, SUBST_VARS=VERSION is unused in this point release. I have
> left it in for now.)
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/gettext/Makefile,v
> retrieving revision 1.87
> diff -u -p -r1.87 Makefile
> --- Makefile 25 Oct 2018 13:21:58 -0000 1.87
> +++ Makefile 12 May 2019 20:56:35 -0000
> @@ -1,11 +1,23 @@
> # $OpenBSD: Makefile,v 1.87 2018/10/25 13:21:58 sthen Exp $
>
> -COMMENT= GNU gettext runtime libraries and programs
> +COMMENT-runtime= GNU gettext runtime libraries and programs
> +COMMENT-textstyle= text styling library
> +COMMENT-tools= GNU gettext development and translation tools
> +
> +VERSION= 0.20.1
> +DISTNAME= gettext-${VERSION}
> +PKGNAME-runtime= gettext-${VERSION}
> +PKGNAME-textstyle= libtextstyle-${VERSION}
> +PKGNAME-tools= gettext-tools-${VERSION}
>
> -DISTNAME= gettext-0.19.8.1
> -REVISION = 3
> -SHARED_LIBS += intl 6.0 # 9.5
> +SHARED_LIBS += intl 6.0 # 9.6
> SHARED_LIBS += asprintf 1.1 # unknown
> +SHARED_LIBS += textstyle 0.0 # 0.0
> +SHARED_LIBS += gettextlib 8.0 # unknown
> +SHARED_LIBS += gettextsrc 7.0 # unknown
> +SHARED_LIBS += gettextpo 9.0 # 5.5
> +
> +SUBST_VARS= VERSION
>
> CATEGORIES= devel
> # DPB: parallel-safe, not worth it. Too much time in configure
> @@ -20,21 +32,34 @@ MAINTAINER= Christian Weisgerber <naddy@
> # LGPLv2.1, GPLv3
> PERMIT_PACKAGE_CDROM= Yes
>
> -LIB_DEPENDS= converters/libiconv
> -WANTLIB= c m iconv ${COMPILER_LIBCXX}
> +MULTI_PACKAGES= -runtime -textstyle -tools
> +SUBPACKAGE?= -runtime
I would play it dumb and use -main instead of -runtime.
Note that bsd.port.mk(5) says SUBPACKAGE is read-only.
> +
> +WANTLIB-runtime= c iconv m ${COMPILER_LIBCXX}
> +WANTLIB-textstyle= curses iconv m
> +WANTLIB-tools= c curses iconv intl m textstyle
> +
> +LIB_DEPENDS= converters/libiconv
> +LIB_DEPENDS-tools= ${BASE_PKGPATH},-runtime \
> + ${BASE_PKGPATH},-textstyle
>
> # on critical path to lang/gcc. XXX c++ used in libasprintf but seems
> # unused at present; may need to revisit if this changes
> COMPILER = base-clang base-gcc
>
> -WRKSRC= ${WRKDIST}/gettext-runtime
> CONFIGURE_STYLE=gnu
> CONFIGURE_ARGS= --disable-csharp \
> --disable-java \
> + --disable-acl \
> --with-libiconv-prefix="${LOCALBASE}" \
> - --with-included-gettext
> + --with-included-gettext \
> + --with-included-libunistring \
> + --with-included-libxml \
> + --without-emacs \
> + --without-git
>
> -MODGNU_CONFIG_GUESS_DIRS=${WRKDIST}/build-aux
> +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux \
> + ${WRKSRC}/libtextstyle/build-aux
>
> EXTRA_LOCALES= en he lv no
> # only in gettext-tools
> @@ -43,6 +68,11 @@ EXTRA_LOCALES+= eu pa
> post-install:
> for l in ${EXTRA_LOCALES}; do \
> ${INSTALL_DATA_DIR} ${PREFIX}/share/locale/$$l/LC_MESSAGES; \
> + done
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
> + for f in start-po.el po-mode.el po-compat.el; do \
> + ${INSTALL_DATA} ${WRKSRC}/gettext-tools/emacs/$$f \
> + ${PREFIX}/share/emacs/site-lisp; \
> done
>
> .include <bsd.port.mk>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
