Update maketool to 0.4. Bug fixes, new color prefs, more. See CHANGLOG.

Replaced some goofy sed stuff (make -> gmake) with proper patches
to configure.in and configure.

9 files changed, 159 insertions, 19 deletions

diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index c8c973b1e7a..b67e43f8efd 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
+# $NetBSD: Makefile,v 1.2 1999/10/13 11:31:26 fredb Exp $
 #
 
-DISTNAME=	maketool-0.3
+DISTNAME=	maketool-0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.alphalink.com.au/~gnb/maketool/
 EXTRACT_SUFX=	-src.tgz
 
 MAINTAINER=	fb@enteract.com
-HOMEPAGE=	http://www.alphalink.com.au/~gnb/#maketool
+HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
 DEPENDS+=	gtk+-1.2.4:../../x11/gtk
@@ -21,10 +21,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 post-patch:
 	cd ${WRKSRC}; \
-	${CP} filter.c filter.c.dist; \
-	${CP} preferences.c preferences.c.dist; \
-	${SED} 's|^make|${GMAKE}|' >extract_targets <extract_targets.sh; \
-	${SED} 's|\^make|${GMAKE}|' >filter.c <filter.c.dist; \
-	${SED} '/prefs.prog/s|\"make |\"${GMAKE} |' >preferences.c <preferences.c.dist
+	${SED} 's|^make|${GMAKE}|' >extract_targets <extract_targets.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/files/md5 b/devel/maketool/files/md5
index e92726f8a8d..dfed731a30b 100644
--- a/devel/maketool/files/md5
+++ b/devel/maketool/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
+$NetBSD: md5,v 1.2 1999/10/13 11:31:27 fredb Exp $
 
-MD5 (maketool-0.3-src.tgz) = 2ada85cdb4c211b0a0b54c86260d4297
+MD5 (maketool-0.4-src.tgz) = 4cd25403af019ad72cd120bce283926e
diff --git a/devel/maketool/files/patch-sum b/devel/maketool/files/patch-sum
index a769a0abdbd..a463755f612 100644
--- a/devel/maketool/files/patch-sum
+++ b/devel/maketool/files/patch-sum
@@ -1,5 +1,10 @@
-$NetBSD: patch-sum,v 1.2 1999/10/06 13:07:02 agc Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/13 11:31:27 fredb Exp $
 
-MD5 (patch-aa) = ae3ea2156dc1bc82ab5ab26488c67743
+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
diff --git a/devel/maketool/patches/patch-aa b/devel/maketool/patches/patch-aa
index c0726326575..3079dedd438 100644
--- a/devel/maketool/patches/patch-aa
+++ b/devel/maketool/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/13 11:31:28 fredb Exp $
 
---- Makefile.in.orig	Wed Jul 14 02:35:50 1999
-+++ Makefile.in	Fri Sep 17 06:17:47 1999
-@@ -25,13 +25,13 @@
+--- 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@
  PACKAGE=	@PACKAGE@
  VERSION=	@VERSION@
@@ -15,12 +15,13 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/17 14:40:45 fredb Exp $
  
  CC=		@CC@
  CFLAGS=		@CFLAGS@
--CPPFLAGS=	@GTK_CFLAGS@ -D_USE_BSD -I. -Iicons -Iintl \
-+CPPFLAGS=	@GTK_CFLAGS@ -D_USE_BSD -I. @CPPFLAGS@ -Iicons -Iintl \
+ CPPFLAGS=	@GTK_CFLAGS@ -D_USE_BSD -I. -Iicons -Iintl \
  		-DLICENCE="\"$(LICENCE)\"" -DLOCALEDIR=\"$(localedir)\" \
++		-DGNU_MAKE=@GMAKE@ @CPPFLAGS@ \
  		$(TESTCPPFLAGS)
  LDLIBS=		@GTK_LIBS@ @INTLLIBS@
-@@ -132,8 +132,8 @@
+ 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
diff --git a/devel/maketool/patches/patch-ad b/devel/maketool/patches/patch-ad
new file mode 100644
index 00000000000..20649d8e867
--- /dev/null
+++ b/devel/maketool/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 1999/10/13 11:31:28 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");
+ 
+     prefs.win_width = ui_config_get_int("win_width", 300);
diff --git a/devel/maketool/patches/patch-ae b/devel/maketool/patches/patch-ae
new file mode 100644
index 00000000000..ea2db792ecf
--- /dev/null
+++ b/devel/maketool/patches/patch-ae
@@ -0,0 +1,40 @@
+$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
new file mode 100644
index 00000000000..dbe2f68f6eb
--- /dev/null
+++ b/devel/maketool/patches/patch-af
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..ebc0a205ff2
--- /dev/null
+++ b/devel/maketool/patches/patch-ag
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..3034160a993
--- /dev/null
+++ b/devel/maketool/patches/patch-ah
@@ -0,0 +1,54 @@
+$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