From d9df5ce65cb10f6d9962a105eefdf4af5185b5f4 Mon Sep 17 00:00:00 2001 From: fredb Date: Mon, 3 Jan 2000 23:36:17 +0000 Subject: Update maketool to 0.5.1. Incorporates pkgsrc patches, fixes some long-standing bugs, works now with gtk-1.2.6. --- devel/maketool/Makefile | 15 ++++++------ devel/maketool/files/md5 | 4 +-- devel/maketool/files/patch-sum | 14 ++++------- devel/maketool/patches/patch-aa | 30 ++++++----------------- devel/maketool/patches/patch-ab | 4 +-- devel/maketool/patches/patch-ac | 52 +++++++++++++++++++++++++++------------ devel/maketool/patches/patch-ad | 43 +++++++++++++++++++++----------- devel/maketool/patches/patch-ae | 40 ------------------------------ devel/maketool/patches/patch-af | 14 ----------- devel/maketool/patches/patch-ag | 14 ----------- devel/maketool/patches/patch-ah | 54 ----------------------------------------- devel/maketool/pkg/PLIST | 6 ++--- 12 files changed, 91 insertions(+), 199 deletions(-) delete mode 100644 devel/maketool/patches/patch-ae delete mode 100644 devel/maketool/patches/patch-af delete mode 100644 devel/maketool/patches/patch-ag delete mode 100644 devel/maketool/patches/patch-ah (limited to 'devel') 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 -+#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 , +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 -- cgit v1.2.3