From 16af549a21c1641e61ae972858968436cdfb7737 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 27 Nov 2002 17:41:05 +0000 Subject: bite the bullet and upgrade to 0.11.5 There are too many changes to list in a sensible way. The most visible change for me is that libintl requires libiconv now. Also untangled the 3 sub-pkgs -- a common patch dir makes it too complex. This pkg used to expose buildlink2 problems - the pkg libintl was pulled in in cases where USE_GNU_GETTEXT was not set. There were some improvements to libtool filtering, and x11/gtk builds now, so I hope this is settled. --- devel/gettext/Makefile | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'devel/gettext/Makefile') diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index a08e784a9f4..d6fdba84aa5 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2002/08/28 06:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2002/11/27 17:41:05 drochner Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # -DISTNAME= gettext-0.10.35 -PKGREVISION= 2 +DISTNAME= gettext-0.11.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} @@ -11,31 +10,27 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html COMMENT= tools for providing messages in different languages -DEPENDS+= gettext-m4-0.10.35:../../devel/gettext-m4 +DEPENDS+= gettext-m4-0.11.5:../../devel/gettext-m4 USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +USE_GNU_GETTEXT= yes +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} INFO_FILES= gettext.info TEXINFO_OVERRIDE= YES -post-patch: - ${RM} -f ${WRKSRC}/intl/libgettext.h - ${RM} -f ${WRKSRC}/intl/libintl.h - ${CP} ${FILESDIR}/libgettext.h ${WRKSRC}/intl - -post-configure: - ${RM} -f ${WRKSRC}/intl/libintl.h - post-install: cd ${WRKSRC}/intl; ${MAKE_PROGRAM} install-data .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../converters/libiconv/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3