Update maketool to 0.5.1. Incorporates pkgsrc patches,

fixes some long-standing bugs, works now with gtk-1.2.6.

12 files changed, 91 insertions, 199 deletions

diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index fc897d59437..1cb94aac2a8 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1999/10/23 00:05:15 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/03 23:36:17 fredb Exp $
 #
 
-DISTNAME=	maketool-0.4
+DISTNAME=	maketool-0.5.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/
 EXTRACT_SUFX=	-src.tgz
@@ -9,18 +9,17 @@ EXTRACT_SUFX=	-src.tgz
 MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 
+BUILD_DEPENDS+=	autoconf:../../devel/autoconf
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_GMAKE=	yes
-USE_X11BASE=	yes
+USE_X11=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" GMAKE=${GMAKE}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
-post-patch:
-	cd ${WRKSRC}; \
-	${SED} 's|^make|${GMAKE}|' >extract_targets <extract_targets.sh
+pre-configure:
+	cd ${WRKSRC}; autoconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/files/md5 b/devel/maketool/files/md5
index dfed731a30b..ebd417a7d23 100644
--- a/devel/maketool/files/md5
+++ b/devel/maketool/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/10/13 11:31:27 fredb Exp $
+$NetBSD: md5,v 1.3 2000/01/03 23:36:18 fredb Exp $
 
-MD5 (maketool-0.4-src.tgz) = 4cd25403af019ad72cd120bce283926e
+MD5 (maketool-0.5.1-src.tgz) = e7d3d673967da0446bdf6bb5225e369b
diff --git a/devel/maketool/files/patch-sum b/devel/maketool/files/patch-sum
index a463755f612..fc1b32db2d6 100644
--- a/devel/maketool/files/patch-sum
+++ b/devel/maketool/files/patch-sum
@@ -1,10 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/10/13 11:31:27 fredb Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/03 23:36:18 fredb Exp $
 
-MD5 (patch-aa) = 19857cd3150b81a010e933661ce6dc19
-MD5 (patch-ab) = 186474488d3ab4625db5ef715fd84ecf
-MD5 (patch-ac) = 9eb197189c10a2fc19eb578767f682b7
-MD5 (patch-ad) = cfb82a61bc750d0cb5b25331c09d0db9
-MD5 (patch-ae) = a017799179214c7dfc346ec736490ae3
-MD5 (patch-af) = 6b9aa0976c1aa6ebe3770597cc11ed12
-MD5 (patch-ag) = 6d2c00230b2f2cfdd16323ab922e9e61
-MD5 (patch-ah) = b43e4bf6c49bdd8e2469e40cad92d120
+MD5 (patch-aa) = 3e07cbc2866f431cfd0766a0d9b7653a
+MD5 (patch-ab) = 514a35d6631788e359b24640ba35da9b
+MD5 (patch-ac) = 7e6f9a4d3f2878648e6fec56522138c2
+MD5 (patch-ad) = 1ca15f11baa3e37118b5d85908a844cc
diff --git a/devel/maketool/patches/patch-aa b/devel/maketool/patches/patch-aa
index 3079dedd438..924c9595ae3 100644
--- a/devel/maketool/patches/patch-aa
+++ b/devel/maketool/patches/patch-aa
@@ -1,34 +1,20 @@
-$NetBSD: patch-aa,v 1.2 1999/10/13 11:31:28 fredb Exp $
+$NetBSD: patch-aa,v 1.3 2000/01/03 23:36:19 fredb Exp $
 
---- Makefile.in.orig	Sat Sep  4 23:41:34 1999
-+++ Makefile.in	Wed Oct 13 04:50:29 1999
-@@ -25,14 +25,15 @@
- INSTALL=	@INSTALL@
+--- 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@
--DOCDIR=		$(prefix)/doc/$(PACKAGE)-$(VERSION)
--LICENCE=	$(prefix)/doc/$(PACKAGE)-$(VERSION)/COPYING
+ @USRDOC@DOCDIR=		$(prefix)/doc/$(PACKAGE)-$(VERSION)
 -localedir=	$(prefix)/@DATADIRNAME@/locale
-+DOCDIR=		$(prefix)/share/$(PACKAGE)
-+LICENCE=	$(prefix)/share/$(PACKAGE)/COPYING
 +localedir=	$(prefix)/share/locale
  
  CC=		@CC@
  CFLAGS=		@CFLAGS@
  CPPFLAGS=	@GTK_CFLAGS@ -D_USE_BSD -I. -Iicons -Iintl \
- 		-DLICENCE="\"$(LICENCE)\"" -DLOCALEDIR=\"$(localedir)\" \
-+		-DGNU_MAKE=@GMAKE@ @CPPFLAGS@ \
- 		$(TESTCPPFLAGS)
+ 		-DLOCALEDIR=\"$(localedir)\" \
+-		$(TESTCPPFLAGS)
++		@CPPFLAGS@ $(TESTCPPFLAGS)
  LDLIBS=		@GTK_LIBS@ @INTLLIBS@
  O=		objs
-@@ -132,8 +133,8 @@
- 	test -d $(DOCDIR) || $(INSTALL) -m 755 -d $(DOCDIR)
- 	$(INSTALL) -m 755 COPYING $(DOCDIR)/COPYING
- 	$(INSTALL) -m 755 COPYRIGHT $(DOCDIR)/COPYRIGHT
--	$(INSTALL) -m 755 TODO $(DOCDIR)/TODO
--	$(INSTALL) -m 755 CHANGES $(DOCDIR)/CHANGES
-+#	$(INSTALL) -m 755 TODO $(DOCDIR)/TODO
-+#	$(INSTALL) -m 755 CHANGES $(DOCDIR)/CHANGES
- 	
  
- uninstall::
diff --git a/devel/maketool/patches/patch-ab b/devel/maketool/patches/patch-ab
index 14b21eb5acd..ea73c048e7b 100644
--- a/devel/maketool/patches/patch-ab
+++ b/devel/maketool/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
+$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	Thu Sep 16 07:26:53 1999
++++ po/Makefile.in.in	Sun Nov 21 14:49:07 1999
 @@ -18,7 +18,7 @@
  
  prefix = @prefix@
diff --git a/devel/maketool/patches/patch-ac b/devel/maketool/patches/patch-ac
index 058cb014a77..3ad1d1a6954 100644
--- a/devel/maketool/patches/patch-ac
+++ b/devel/maketool/patches/patch-ac
@@ -1,18 +1,38 @@
-$NetBSD: patch-ac,v 1.1 1999/10/06 13:07:04 agc Exp $
+$NetBSD: patch-ac,v 1.2 2000/01/03 23:36:19 fredb Exp $
 
-Define FIONREAD on Solaris
-
---- spawn.c	1999/10/06 12:59:44	1.1
-+++ spawn.c	1999/10/06 13:01:57
-@@ -85,6 +85,11 @@
-     }
- }
+--- 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)
  
-+#if defined(__sun__) && defined(__svr4__)
-+/* for FIONREAD on Solaris */
-+#include <sys/filio.h>
-+#endif
-+
- static void
- spawn_output_input(gpointer data, gint source, GdkInputCondition condition)
- {
diff --git a/devel/maketool/patches/patch-ad b/devel/maketool/patches/patch-ad
index 20649d8e867..7f62fb4a7eb 100644
--- a/devel/maketool/patches/patch-ad
+++ b/devel/maketool/patches/patch-ad
@@ -1,16 +1,31 @@
-$NetBSD: patch-ad,v 1.1 1999/10/13 11:31:28 fredb Exp $
+$NetBSD: patch-ad,v 1.2 2000/01/03 23:36:20 fredb Exp $
 
---- preferences.c.orig	Sun Sep  5 06:39:31 1999
-+++ preferences.c	Wed Oct 13 04:45:37 1999
-@@ -274,9 +274,9 @@
-     prefs_set_var_environment();
-     prefs_set_var_make_flags();
-     
--    prefs.prog_make = ui_config_get_string("prog_make", "make %n %m %k %p %v %t");
-+    prefs.prog_make = ui_config_get_string("prog_make", "GNU_MAKE %n %m %k %p %v %t");
-     prefs.prog_list_targets = ui_config_get_string("prog_list_targets", "extract_targets %m %v");
--    prefs.prog_list_version = ui_config_get_string("prog_list_version", "make --version");
-+    prefs.prog_list_version = ui_config_get_string("prog_list_version", "GNU_MAKE --version");
-     prefs.prog_edit_source = ui_config_get_string("prog_edit_source", "nc -noask %{l:+-line %l} %f");
+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
  
-     prefs.win_width = ui_config_get_int("win_width", 300);
+ 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 */
diff --git a/devel/maketool/patches/patch-ae b/devel/maketool/patches/patch-ae
deleted file mode 100644
index ea2db792ecf..00000000000
--- a/devel/maketool/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/10/13 11:31:29 fredb Exp $
-
---- filter.c.orig	Sun Sep  5 00:11:30 1999
-+++ filter.c	Wed Oct 13 05:34:14 1999
-@@ -88,7 +88,7 @@
- {
-     filter_add(
-     	"",				/* state */
--	"^make\\[[0-9]+\\]: Entering directory `([^']+)'", /* regexp */
-+	"^GNU_MAKE\\[[0-9]+\\]: Entering directory `([^']+)'", /* regexp */
- 	FR_PUSHDIR,			/* code */
- 	"\\1",				/* file */
- 	"",				/* line */
-@@ -98,7 +98,7 @@
- 
-     filter_add(
-     	"",				/* state */
--	"^make\\[[0-9]+\\]: Leaving directory", /* regexp */
-+	"^GNU_MAKE\\[[0-9]+\\]: Leaving directory", /* regexp */
- 	FR_POPDIR,			/* code */
- 	"",				/* file */
- 	"",				/* line */
-@@ -198,7 +198,7 @@
-      */
-     filter_add(
-     	"",				/* state */
--	"^(cc|c89|gcc|CC|c++|g++).*[ \t]*-c[ \t]*.*[ \t]([^ \t]*\\.)(c|C|cc|c++|cpp)", /* regexp */
-+	"^(cc|c89|gcc|CC|c\\+\\+|g\\+\\+).*[ \t]*-c[ \t]*.*[ \t]([^ \t]*\\.)(c|C|cc|c\\+\\+|cpp)", /* regexp */
- 	FR_INFORMATION,			/* code */
- 	"\\2\\3",			/* file */
- 	"",				/* line */
-@@ -216,7 +216,7 @@
-     	"Java compile line");		/* comment */
-     filter_add(
-     	"",				/* state */
--	"^(cc|c89|gcc|CC|c++|g++|ld).*[ \t]*-o[ \t]*([^ \t]*)", /* regexp */
-+	"^(cc|c89|gcc|CC|c\\+\\+|g\\+\\+|ld).*[ \t]*-o[ \t]*([^ \t]*)", /* regexp */
- 	FR_INFORMATION,			/* code */
- 	"",				/* file */
- 	"",				/* line */
diff --git a/devel/maketool/patches/patch-af b/devel/maketool/patches/patch-af
deleted file mode 100644
index dbe2f68f6eb..00000000000
--- a/devel/maketool/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/10/13 11:31:30 fredb Exp $
-
---- configure.in.orig	Sat Sep 11 00:03:34 1999
-+++ configure.in	Tue Oct 12 06:09:29 1999
-@@ -36,6 +36,9 @@
- AC_PROG_AWK
- AC_PROG_CC
- 
-+dnl Get name of GNU make
-+AC_CHECK_PROGS(GMAKE, gmake make, make)dnl
-+
- dnl Stuff for gettext
- ALL_LINGUAS="la"
- AM_GNU_GETTEXT
diff --git a/devel/maketool/patches/patch-ag b/devel/maketool/patches/patch-ag
deleted file mode 100644
index ebc0a205ff2..00000000000
--- a/devel/maketool/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/10/13 11:31:31 fredb Exp $
-
---- common.h.orig	Sun Sep  5 06:39:31 1999
-+++ common.h	Wed Oct 13 04:42:55 1999
-@@ -81,5 +81,9 @@
- #define _(s)	gettext(s)
- #endif
- 
-+#ifndef GNU_MAKE
-+#define GNU_MAKE	make
-+#endif
-+
- 
- #endif /* _common_h_ */
diff --git a/devel/maketool/patches/patch-ah b/devel/maketool/patches/patch-ah
deleted file mode 100644
index 3034160a993..00000000000
--- a/devel/maketool/patches/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/10/13 11:31:32 fredb Exp $
-
---- configure.orig	Sat Sep 11 00:03:52 1999
-+++ configure	Tue Oct 12 06:32:50 1999
-@@ -569,6 +569,41 @@
- # Owen Taylor     97-11-3
- 
- 
-+for ac_prog in gmake make
-+do
-+# Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:875: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_GMAKE'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$GMAKE"; then
-+  ac_cv_prog_GMAKE="$GMAKE" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_GMAKE="$ac_prog"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+GMAKE="$ac_cv_prog_GMAKE"
-+if test -n "$GMAKE"; then
-+  echo "$ac_t""$GMAKE" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+test -n "$GMAKE" && break
-+done
-+test -n "$GMAKE" || GMAKE="make"
-+
- 
- 
- PACKAGE=maketool
-@@ -3791,6 +3826,7 @@
- s%@CC@%$CC%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@RANLIB@%$RANLIB%g
-+s%@GMAKE@%$GMAKE%g
- s%@CPP@%$CPP%g
- s%@ALLOCA@%$ALLOCA%g
- s%@USE_NLS@%$USE_NLS%g
diff --git a/devel/maketool/pkg/PLIST b/devel/maketool/pkg/PLIST
index 243f781a189..136d298a5e4 100644
--- a/devel/maketool/pkg/PLIST
+++ b/devel/maketool/pkg/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/01/03 23:36:25 fredb Exp $
 bin/extract_targets
+bin/make_makefile
 bin/maketool
 share/locale/la/LC_MESSAGES/maketool.mo
 @dirrm share/locale/la/LC_MESSAGES
 @dirrm share/locale/la
-share/maketool/COPYING
-share/maketool/COPYRIGHT
-@dirrm share/maketool