Fix gettext dependency, USE_LIBINTL, and reduce patch by libintl workaround.

3 files changed, 6 insertions, 72 deletions

diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index d7b312bcb5c..e7cfcdd5d75 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/11 18:47:40 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2000/12/31 14:00:09 wiz Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -9,10 +9,11 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 
-DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
+BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_GMAKE=	yes
+USE_LIBINTL=	yes
 USE_X11=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/devel/maketool/files/patch-sum b/devel/maketool/files/patch-sum
index 14e4ab933ba..4f3b7acadba 100644
--- a/devel/maketool/files/patch-sum
+++ b/devel/maketool/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.5 2000/08/11 18:47:40 fredb Exp $
+$NetBSD: patch-sum,v 1.6 2000/12/31 14:00:10 wiz Exp $
 
-MD5 (patch-aa) = 058d441875a971090a97952d2c8d30d5
+MD5 (patch-aa) = 342e5c6f9c9d2bfaf99e495323c50d5a
diff --git a/devel/maketool/patches/patch-aa b/devel/maketool/patches/patch-aa
index e01c5902719..1b47128df70 100644
--- a/devel/maketool/patches/patch-aa
+++ b/devel/maketool/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2000/08/11 18:47:40 fredb Exp $
+$NetBSD: patch-aa,v 1.5 2000/12/31 14:00:10 wiz Exp $
 
 --- configure.orig	Tue Jul 18 12:58:44 2000
 +++ configure	Fri Aug 11 12:53:21 2000
@@ -28,70 +28,3 @@ $NetBSD: patch-aa,v 1.4 2000/08/11 18:47:40 fredb Exp $
  
  
  
-@@ -2255,8 +2255,8 @@
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:2260: checking for gettext in -lintl" >&5
-+#  echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-+#echo "configure:2260: checking for gettext in -lintl" >&5
- ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2298,7 +2298,7 @@
- 
- fi
- 
--echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
-+#echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -2466,27 +2466,27 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--		cat > conftest.$ac_ext <<EOF
--#line 2471 "configure"
--#include "confdefs.h"
--
--int main() {
--extern int _nl_msg_cat_cntr;
--			       return _nl_msg_cat_cntr
--; return 0; }
--EOF
--if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
--  rm -rf conftest*
--  CATOBJEXT=.gmo
-+#		cat > conftest.$ac_ext <<EOF
-+##line 2471 "configure"
-+##include "confdefs.h"
-+#
-+#int main() {
-+#extern int _nl_msg_cat_cntr;
-+#			       return _nl_msg_cat_cntr
-+#; return 0; }
-+#EOF
-+#if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+#  rm -rf conftest*
-+#  CATOBJEXT=.gmo
- 		   DATADIRNAME=share
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
-+#else
-+#  echo "configure: failed program was:" >&5
-+#  cat conftest.$ac_ext >&5
-+#  rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
--fi
--rm -f conftest*
-+#		   DATADIRNAME=lib
-+#fi
-+#rm -f conftest*
- 		INSTOBJEXT=.mo
- 	      fi
- 	    fi