Various fixes for new scheme of detecting intl.4, which comes with this

version of GNU make.

Submitted by:	KATO Tsuguru <tkato@prontomail.com>

Also provide WITHOUT_NLS knob to build without localized messages.

3 files changed, 30 insertions, 35 deletions

diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 120da05987d2..ba7a1cdc6692 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -14,14 +14,23 @@ DISTNAME=	make-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
+.if !defined(WITHOUT_NLS)
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
+.endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g \
-		--with-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LOCALE_H -DHAVE_LC_MESSAGES" \
-		LDFLAGS="-L${LOCALBASE}/lib" MAKEINFO="/usr/bin/makeinfo"
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=--program-prefix=g
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+		--with-libintl-prefix=${LOCALBASE}
+PLIST_SUB=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB=	NLS="@comment "
+.endif
+CONFIGURE_ENV+=	MAKEINFO="/usr/bin/makeinfo --no-split"
 
 MAN1=		gmake.1
 
diff --git a/devel/gmake/files/patch-aa b/devel/gmake/files/patch-aa
deleted file mode 100644
index b037a724fb6a..000000000000
--- a/devel/gmake/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon Oct  7 23:09:23 2002
-+++ doc/Makefile.in	Mon Oct  7 23:09:31 2002
-@@ -76,7 +76,7 @@
- LTLIBICONV = @LTLIBICONV@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MAKE_HOST = @MAKE_HOST@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist
index 2a2b0baa601a..27a78e0fccb1 100644
--- a/devel/gmake/pkg-plist
+++ b/devel/gmake/pkg-plist
@@ -2,22 +2,19 @@ bin/gmake
 @unexec install-info --delete %D/info/make.info %D/info/dir
 info/make.info
 @exec install-info %D/info/make.info %D/info/dir
-share/locale/da/LC_MESSAGES/make.mo
-share/locale/de/LC_MESSAGES/make.mo
-share/locale/es/LC_MESSAGES/make.mo
-share/locale/fr/LC_MESSAGES/make.mo
-share/locale/gl/LC_MESSAGES/make.mo
-share/locale/he/LC_MESSAGES/make.mo
-share/locale/hr/LC_MESSAGES/make.mo
-share/locale/ja/LC_MESSAGES/make.mo
-share/locale/ko/LC_MESSAGES/make.mo
-share/locale/nl/LC_MESSAGES/make.mo
-share/locale/pl/LC_MESSAGES/make.mo
-share/locale/pt_BR/LC_MESSAGES/make.mo
-share/locale/ru/LC_MESSAGES/make.mo
-share/locale/sv/LC_MESSAGES/make.mo
-share/locale/tr/LC_MESSAGES/make.mo
-share/locale/zh_CN/LC_MESSAGES/make.mo
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+%%NLS%%share/locale/da/LC_MESSAGES/make.mo
+%%NLS%%share/locale/de/LC_MESSAGES/make.mo
+%%NLS%%share/locale/es/LC_MESSAGES/make.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/make.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/make.mo
+%%NLS%%share/locale/he/LC_MESSAGES/make.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/make.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/make.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/make.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/make.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/make.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/make.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/make.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/make.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo