Update "maketool" to 0.6.1. Changes since 0.5.1:

0.6.1 (19 Jul 2000)

     * Fixed bug with glib 1.2.7 and the glib 1.2.6-7 in RH 6.2.

0.6 (13 Jul 2000)

     * Initial  implementation  of  printing  the  make  log. Prints to
       PostScript. Preferences entries exist (e.g. paper size, margins)
       but  there  is  no GUI for them yet. Reads list of printers from
       /etc/printcap or lpstat -c` (decided at configure time).
     * Initial  implementation  of  a  Find window. Still several rough
       edges.  Can enter a literal or a regexp, and find or find-again.
       Stack  of  historical search cases, navigable with PgUp/PgDn. No
       case-insensitive literals yet.
     * Implemented  a  File->Change  Directory  command,  and a menu of
       previous  directories.  Shows  basename  of current directory in
       main window title bar.
     * Dialogs  are  properly  marked  as  transient so that the window
       manager handles them correctly.
     * Dialogs  are  positioned over the main window instead of letting
       the window manager choose a random and inconvenient position.
     * Rewrote the process spawning code. This made the code a lot more
       orthogonal  and  also  fixed  a  bug whereby the Stop button was
       broken.
     * Tooltip  for  Again toolbar button, and the Again menu item, now
       mention what the last target is. This avoids nasty surprises.
     * Implemented Edit->Copy command which copies the selected line to
       the clipboard.
     * Added filter support for the MWOS xcc cross-compiler.
     * Added filter support for bison.
     * Added filter support for flex.
     * Dependencies are built using makedepend rather than hardcoded.
     * Can   now   build   debugging  version  using  DEBUG=n  on  make
       commandline.
     * Solaris debugging & Purifying patches for Makefile.
     * NetBSD port makefile fixes.
     * configure checks for filio.h> for Solaris.
     * Worked  around incompatibility with GDK/GTK 1.2.6. I still don't
       know  why  this change actually matters, and I still think its a
       GDK  or  GLIB  bug,  but  for  the  time being this change fixes
       maketool. This obsoletes the gtk-1.2.6 patch.
     * Fixed  bug  introduced  in  the  gtk-1.2.6  patch which lost the
       output  of  gmake  --version  when building the Help->About make
       dialog.
     * Fixed   bug  where  an  error  message  specifying  an  absolute
       pathname,  when  found  in  a  recursive  make,  would result in
       maketool   attempting   to   edit  sub_dir/abs_path  instead  of
       abs_path.
     * Fixed  bug  which caused coredump when pressing Clear Log during
       build -- by greying out the Clear Log item.
     * Fixed alignment of labels in Preferences window.
     * Fixed a few minor warnings -Wall found.
     * Fixed  bug which caused menu item greying to be done prematurely
       when child make processes were started.

7 files changed, 102 insertions, 114 deletions

diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 43c98a6a520..d7b312bcb5c 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2000/07/31 04:14:07 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/11 18:47:40 fredb Exp $
 #
 
-DISTNAME=	maketool-0.5.1
+DISTNAME=	maketool-0.6.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/
-EXTRACT_SUFX=	-src.tgz
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 
-BUILD_DEPENDS+=	autoconf:../../devel/autoconf
 DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
@@ -19,7 +18,4 @@ USE_X11=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
-pre-configure:
-	cd ${WRKSRC}; autoconf
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/files/md5 b/devel/maketool/files/md5
index ebd417a7d23..1daef8dedc5 100644
--- a/devel/maketool/files/md5
+++ b/devel/maketool/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/01/03 23:36:18 fredb Exp $
+$NetBSD: md5,v 1.4 2000/08/11 18:47:40 fredb Exp $
 
-MD5 (maketool-0.5.1-src.tgz) = e7d3d673967da0446bdf6bb5225e369b
+MD5 (maketool-0.6.1-src.tar.gz) = cdd197dbe9b2202d66ac0a02e266fe92
diff --git a/devel/maketool/files/patch-sum b/devel/maketool/files/patch-sum
index fc1b32db2d6..14e4ab933ba 100644
--- a/devel/maketool/files/patch-sum
+++ b/devel/maketool/files/patch-sum
@@ -1,6 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/01/03 23:36:18 fredb Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/11 18:47:40 fredb Exp $
 
-MD5 (patch-aa) = 3e07cbc2866f431cfd0766a0d9b7653a
-MD5 (patch-ab) = 514a35d6631788e359b24640ba35da9b
-MD5 (patch-ac) = 7e6f9a4d3f2878648e6fec56522138c2
-MD5 (patch-ad) = 1ca15f11baa3e37118b5d85908a844cc
+MD5 (patch-aa) = 058d441875a971090a97952d2c8d30d5
diff --git a/devel/maketool/patches/patch-aa b/devel/maketool/patches/patch-aa
index 924c9595ae3..e01c5902719 100644
--- a/devel/maketool/patches/patch-aa
+++ b/devel/maketool/patches/patch-aa
@@ -1,20 +1,97 @@
-$NetBSD: patch-aa,v 1.3 2000/01/03 23:36:19 fredb Exp $
+$NetBSD: patch-aa,v 1.4 2000/08/11 18:47:40 fredb Exp $
 
---- Makefile.in.orig	Sun Nov  7 05:09:56 1999
-+++ Makefile.in	Sun Nov 21 14:47:41 1999
-@@ -26,13 +26,13 @@
- PACKAGE=	@PACKAGE@
- VERSION=	@VERSION@
- @USRDOC@DOCDIR=		$(prefix)/doc/$(PACKAGE)-$(VERSION)
--localedir=	$(prefix)/@DATADIRNAME@/locale
-+localedir=	$(prefix)/share/locale
- 
- CC=		@CC@
- CFLAGS=		@CFLAGS@
- CPPFLAGS=	@GTK_CFLAGS@ -D_USE_BSD -I. -Iicons -Iintl \
- 		-DLOCALEDIR=\"$(localedir)\" \
--		$(TESTCPPFLAGS)
-+		@CPPFLAGS@ $(TESTCPPFLAGS)
- LDLIBS=		@GTK_LIBS@ @INTLLIBS@
- O=		objs
+--- configure.orig	Tue Jul 18 12:58:44 2000
++++ configure	Fri Aug 11 12:53:21 2000
+@@ -927,16 +927,16 @@
  
+ fi
+ 
+-DOCDIR=/usr/doc
+-echo $ac_n "checking for presence of $DOCDIR""... $ac_c" 1>&6
+-echo "configure:933: checking for presence of $DOCDIR" >&5
+-if test -d $DOCDIR ; then
+-  USRDOC=
+-  echo "$ac_t""yes" 1>&6
+-else
++#DOCDIR=/usr/doc
++#echo $ac_n "checking for presence of $DOCDIR""... $ac_c" 1>&6
++#echo "configure:933: checking for presence of $DOCDIR" >&5
++#if test -d $DOCDIR ; then
++#  USRDOC=
++#  echo "$ac_t""yes" 1>&6
++#else
+   USRDOC="#USRDOC#"
+-  echo "$ac_t""no" 1>&6
+-fi
++#  echo "$ac_t""no" 1>&6
++#fi
+ 
+ 
+ 
+@@ -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
diff --git a/devel/maketool/patches/patch-ab b/devel/maketool/patches/patch-ab
deleted file mode 100644
index ea73c048e7b..00000000000
--- a/devel/maketool/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/01/03 23:36:19 fredb Exp $
-
---- po/Makefile.in.in.orig	Sun May 30 08:42:41 1999
-+++ po/Makefile.in.in	Sun Nov 21 14:49:07 1999
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/devel/maketool/patches/patch-ac b/devel/maketool/patches/patch-ac
deleted file mode 100644
index 3ad1d1a6954..00000000000
--- a/devel/maketool/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/01/03 23:36:19 fredb Exp $
-
---- configure.in.orig	Sat Nov 13 19:25:31 1999
-+++ configure.in	Sun Nov 21 14:08:05 1999
-@@ -22,10 +22,10 @@
- dnl
- 
- AC_INIT(main.c)
--sinclude(/usr/share/aclocal/gettext.m4)dnl
--sinclude(/usr/share/aclocal/lcmessage.m4)dnl
--sinclude(/usr/share/aclocal/progtest.m4)dnl
--sinclude(/usr/share/aclocal/gtk.m4)dnl
-+sinclude(/usr/pkg/share/aclocal/gettext.m4)dnl
-+sinclude(/usr/pkg/share/aclocal/lcmessage.m4)dnl
-+sinclude(/usr/pkg/share/aclocal/progtest.m4)dnl
-+sinclude(/usr/X11R6/share/aclocal/gtk.m4)dnl
- AC_CONFIG_HEADER(config.h)
- 
- PACKAGE=maketool
-@@ -56,13 +56,13 @@
- DOCDIR=/usr/doc
- AC_MSG_CHECKING(for presence of $DOCDIR)
- changequote(,)dnl
--if test -d $DOCDIR ; then
--  USRDOC=
--  AC_MSG_RESULT(yes)
--else
-+#if test -d $DOCDIR ; then
-+#  USRDOC=
-+#  AC_MSG_RESULT(yes)
-+#else
-   USRDOC="#USRDOC#"
-   AC_MSG_RESULT(no)
--fi
-+#fi
- changequote([,])dnl
- AC_SUBST(USRDOC)
- 
diff --git a/devel/maketool/patches/patch-ad b/devel/maketool/patches/patch-ad
deleted file mode 100644
index 7f62fb4a7eb..00000000000
--- a/devel/maketool/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/01/03 23:36:20 fredb Exp $
-
-This patch supplied by the author, Greg Banks <gnb@alphalink.com.au>,
-in private mail.
-
---- glib_extra.c.orig	Sat Nov 13 19:23:07 1999
-+++ glib_extra.c	Mon Jan  3 17:22:50 2000
-@@ -153,6 +153,14 @@
- g_unix_source_destroy
- };
- 
-+/*
-+ * TODO: there is some bizarre subtle problem with either my code
-+ * or one of gtk or gdk which causes strange display bugs when
-+ * this priority is made equal to 1. This needs to be properly
-+ * tracked down and exterminated, but for the time being making
-+ * the priority equal to G_PRIORITY_DEFAULT works -- Greg, 3Jan2000.
-+ */
-+#define G_UNIX_REAP_PRIORITY	G_PRIORITY_DEFAULT
- 
- void
- g_unix_reap_init(void)
-@@ -163,7 +171,7 @@
-     {
-     	first = FALSE;
- 	g_source_add(
--		1,			/* priority */
-+		G_UNIX_REAP_PRIORITY,	/* priority */
- 		TRUE,			/* can_recurse */
- 		&reaper_source_funcs,
- 		(gpointer)0,		/* source_data */