Update to 1.2.2:

New: Anjuta advanced tutorial
New: Goes to first error automatically (Default is off. need to enable in
     anjuta.properties).
Bug fix: Use build.silent option from preferences (bug #895726)
Bug fix: Use font style defined for message indicators (bug #885032)
Bug fix: Set bold color as foreground color in terminal (bug #864924)
Bug fix: Removed 'cmp' dependency and used internal function to compare files.
Bug fix: Fixed return value when dest file could not be created.
Bug fix: Fixed a typo in Hello World indentation style.
Bug fix: Fixed misuse of translated strings when looking for style (bug #876037)
Bug fix: Save-all action now asks for filenames for new files (bug #898111)
Bug fix: Fixed a compiler warnings.
Bug fix: Disabled printing of long debug lines.
Bug fix: Close buttons on all dialogs (HIG) and ESC closes them (bug #671596).
Bug fix: Fixed a program execution crash bug.
Bug fix: Fixed Crash on Find & Replace (#887833)
Bug fix: Use defined file name when saving new files (fixes bug #898105).
Bug fix: Don't change filename when clicking on a directory.
Bug fix: Implemented keypress ctrl-c and ctrl-d for terminal (bug #878357).
Bug fix: Do not reload new files (bug #900897).
Bug fix: Disconnects menuitem signal properly (bug #901723).
Bug fix: Fixed bugs #890609 and #890609, #900903.
Bug fix: Fixed a typo in tutorial (bug #866143).
Bug fix: Reduced size of Search and Replace dialog (bug #902636).
Bug fix: Fixed a runtime warning (bug #900087).
Bug fix: Changed build shortcut to F11 (bug #877683).
Bug fix: Do not defualt to -k make option (bug #875486).
Bug fix: CFLAGS passed correctly (bug #816130, #801056, #782798, #773459)
Bug fix: Improved Search and Replace. Fixed crash bug.
Bug fix: Fixed bug #910097 (Insert comment).
Bug fix: Find-Usage rework (bug #890609).
Bug fix: Generated projects read m4 directory. Project generation works.
         (bug #917781).
Bug fix: Fixed Find-Usage crash when no project open
Bug fix: Fixed bug #893400 ("Remove file" in project tree).
Bug fix: Aligned buttons in the New file dialog and HIG compliance.
Bug fix: Fixed to get correct child exit status	using mask (bug #905738).
Bug fix: Goto the first error if it exists (bug #874380).
Bug fix: Save-all for 1 file opened (bug #912618).
Bug fix: Fixed conditional breakpoints.
Bug fix: Fixed debugger calltips displayed for wrong file.
Bug fix: Fixed delete breakpoints.
Bug fix: Fixed Breakpoint setting bugs (bug #895536).
Bug fix: Fixed a crash bug with debugger attach process dialog
Bug fix: Fixed freeze-ups during build terminations (bug #905738).
Bug fix: Fixed a memory corruption (bug #921893).
Bug fix: Open file starts in right directory (bug #908941).
Bug fix: Fixed another crash bug in Find-Usage.
Bug fix: Correctly prompts and reponds passwords (bug #894533).
Bug fix: Fixed 'remove' and 'clear' of Defines list in compiler options
         (bug #883837).
Bug fix: Installs .glade file of libgllade projects (bug #861038).
Bug fix: Glade based projects can now find installed pixmaps (bug #919903).
Bug fix: Fixed ADA syntax highlighting (bug #923474).
Bug fix: Fixed HANGUP bug for long lines (bugs #700968 and #911376)
Bug fix: Fixed core file loading in debugger.
Bug fix: Partially fixed to show long calltips properly (bug #917982).
Bug fix: Fixed a crash bug in search replace. (bug #921893).
Bug fix: Fixed a crash when launcher child could not be executed (bug #926606).
Bug fix: Fixed a crash bug when opening and closing a large project repeatedly.
Bug fix: Sets filename when saving new files.
Bug fix: Most font and print related bugs fixed (bug #885023, #925956, #890473).

16 files changed, 66 insertions, 549 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a1eb1ddcbd6..775a0f60154 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/04/14 16:15:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/21 15:01:28 jmmv Exp $
 #
 
-DISTNAME=		anjuta-1.2.1
-PKGREVISION=		2
+DISTNAME=		anjuta-1.2.2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
@@ -12,15 +11,15 @@ COMMENT=		Gnome based IDE for C and C++
 
 DEPENDS+=		autoconf>=2.59:../../devel/autoconf
 DEPENDS+=		automake>=1.8.2:../../devel/automake
-DEPENDS+=		gdk-pixbuf>=0.22:../../graphics/gdk-pixbuf
 DEPENDS+=		gettext>=0.11.5:../../devel/gettext
-DEPENDS+=		glade2>=2.0.1:../../devel/glade2
+DEPENDS+=		glade2>=2.6.0:../../devel/glade2
 DEPENDS+=		gmake>=3.80:../../devel/gmake
 DEPENDS+=		gnome2-terminal>=2.4.2:../../x11/gnome2-terminal
 DEPENDS+=		libtool>=1.5.2:../../devel/libtool
 DEPENDS+=		pkgconfig>=0.15.0:../../devel/pkgconfig
 DEPENDS+=		yelp>=2.4.2:../../misc/yelp
 
+GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
@@ -28,11 +27,12 @@ USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=        --localstatedir=${LOCALSTATEDIR}
-
-# Build system adds the last component ('/scrollkeeper')
-LOCALSTATEDIR=          ${SCROLLKEEPER_DATADIR:H}
+SUBST_CLASSES+=		make
+SUBST_STAGE.make=	pre-configure
+SUBST_MESSAGE.make=	"Fixing path to GNU make."
+SUBST_FILES.make=	data/properties/anjuta.properties
+SUBST_FILES.make+=	src/defaults.c
+SUBST_SED.make=		-e 's|make=make|make=${GMAKE}|'
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/anjuta/PLIST b/devel/anjuta/PLIST
index 07b3d394623..84046d9d71e 100644
--- a/devel/anjuta/PLIST
+++ b/devel/anjuta/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/26 16:25:52 cube Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/21 15:01:28 jmmv Exp $
 bin/anjuta
 bin/anjuta_import.sh
 bin/anjuta_launcher
@@ -128,8 +128,8 @@ share/doc/anjuta/INSTALL
 share/doc/anjuta/NEWS
 share/doc/anjuta/README
 share/doc/anjuta/ScintillaDoc.html
-share/doc/anjuta/THANKS
 share/doc/anjuta/TODO
+share/gnome/help/anjuta/C/anjuta-advanced-tutorial.xml
 share/gnome/help/anjuta/C/anjuta-faqs.xml
 share/gnome/help/anjuta/C/anjuta-manual.xml
 share/gnome/help/anjuta/C/anjuta-tutorial.xml
@@ -139,6 +139,14 @@ share/gnome/help/anjuta/C/compileopts.xml
 share/gnome/help/anjuta/C/debugger.xml
 share/gnome/help/anjuta/C/execute.xml
 share/gnome/help/anjuta/C/figures/a2ps.png
+share/gnome/help/anjuta/C/figures/aat_additional_options.png
+share/gnome/help/anjuta/C/figures/aat_config_libraries_lib3ds.png
+share/gnome/help/anjuta/C/figures/aat_config_libraries_libxml2.png
+share/gnome/help/anjuta/C/figures/aat_include_paths.png
+share/gnome/help/anjuta/C/figures/aat_libraries.png
+share/gnome/help/anjuta/C/figures/aat_options_lib3ds.png
+share/gnome/help/anjuta/C/figures/aat_options_libxml2.png
+share/gnome/help/anjuta/C/figures/aat_project_type.png
 share/gnome/help/anjuta/C/figures/arguments.png
 share/gnome/help/anjuta/C/figures/attach.png
 share/gnome/help/anjuta/C/figures/brk_add.png
@@ -315,10 +323,13 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/anjuta.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/anjuta.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/anjuta.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/anjuta.mo
@@ -342,6 +353,7 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/anjuta.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/anjuta.mo
 share/mime-info/anjuta.mime
 share/mimelnk/application/x-anjuta-project.desktop
+share/omf/anjuta/anjuta-advanced-tutorial-C.omf
 share/omf/anjuta/anjuta-faqs-C.omf
 share/omf/anjuta/anjuta-faqs-ja_JP.UTF-8.omf
 share/omf/anjuta/anjuta-manual-C.omf
@@ -470,8 +482,12 @@ share/pixmaps/anjuta/undock.png
 share/pixmaps/anjuta/watch.xpm
 share/pixmaps/anjuta/wizard.xpm
 @dirrm share/pixmaps/anjuta
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/anjuta
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/anjuta/ja/figures
 @dirrm share/gnome/help/anjuta/ja
 @dirrm share/gnome/help/anjuta/de/images
@@ -479,7 +495,9 @@ share/pixmaps/anjuta/wizard.xpm
 @dirrm share/gnome/help/anjuta/C/figures
 @dirrm share/gnome/help/anjuta/C
 @dirrm share/gnome/help/anjuta
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/doc/anjuta
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm share/anjuta/properties
 @dirrm share/anjuta/gnome2
 @dirrm share/anjuta/gnome
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index ff1852a54de..c471fc5db11 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,17 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/02/26 16:25:52 cube Exp $
+$NetBSD: distinfo,v 1.6 2004/04/21 15:01:28 jmmv Exp $
 
-SHA1 (anjuta-1.2.1.tar.gz) = e935196572de86948f4b278783a2572cc195fcd8
-Size (anjuta-1.2.1.tar.gz) = 8013051 bytes
-SHA1 (patch-ab) = 02722945134044cb8436eb510c506263e0370ad3
-SHA1 (patch-ac) = 887e11b556f5f54aec2165de5e605cdfa03a3320
-SHA1 (patch-ad) = 872c499d816948de4fd5be93804c974f972423ea
-SHA1 (patch-ag) = b710b422ac934cb6243c714571efc002a323b329
-SHA1 (patch-aj) = 2ba7aaf84adefa291ca7ba59310289d973a8e4cf
-SHA1 (patch-ak) = 60785b3dfe83494c6c4f6c346ebf67aca8af2195
-SHA1 (patch-al) = 480966ad54419cd7d9a9dde3ddcc07df5d0c0ed6
-SHA1 (patch-am) = 790a5a0adc7cf72d0c4fdd71941e9477049d4612
-SHA1 (patch-an) = 03ed70e9273ce13253c13bbe3953fdebdd0eef96
-SHA1 (patch-ao) = 5b26239bbadb854673bb03c02ec380bb719189ce
-SHA1 (patch-ap) = 88cc6f1630485ce62e77cc65c62f0ac80c52ca10
-SHA1 (patch-aq) = f99d657c1ac8981340848c100d8b015204613cfe
-SHA1 (patch-ar) = 10afe882826503e8f8b7b61afdd99f9188ac122f
+SHA1 (anjuta-1.2.2.tar.gz) = ee956653effb91467b64efd50609d31b17fde789
+Size (anjuta-1.2.2.tar.gz) = 8556051 bytes
+SHA1 (patch-ad) = bd35b80fb12c88d3ebda4e607e08f25f7eb6d266
+SHA1 (patch-al) = a4958c02654da6a6277ee74559083a1de46048d7
+SHA1 (patch-an) = dbb51d78e15e946aa81419750a76189715a8c4ec
+SHA1 (patch-aq) = 24a55f3504d74905a42fb74a482e31047173db0b
diff --git a/devel/anjuta/patches/patch-ab b/devel/anjuta/patches/patch-ab
deleted file mode 100644
index 2cc40f41792..00000000000
--- a/devel/anjuta/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/02/26 16:25:52 cube Exp $
-
---- Makefile.in.orig	2004-01-22 16:43:25.000000000 +0100
-+++ Makefile.in
-@@ -171,7 +171,7 @@ SUBDIRS = po tagmanager global-tags scin
- 
- 
- anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@
--anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	FUTURE
-+anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	FUTURE 	THANKS
- 
- 
- anjuta_glade_filedir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/glade
diff --git a/devel/anjuta/patches/patch-ac b/devel/anjuta/patches/patch-ac
deleted file mode 100644
index 3d03529897d..00000000000
--- a/devel/anjuta/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/02/26 16:25:52 cube Exp $
-
---- configure.in.orig	2003-12-05 09:15:58.000000000 +0100
-+++ configure.in
-@@ -266,7 +266,7 @@ dnl Checks for header files.
- AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h)
- AC_CHECK_HEADERS(time.h types.h unistd.h)
- AC_CHECK_HEADERS(sys/dir.h sys/stat.h sys/times.h sys/types.h)
--
-+AC_CHECK_HEADERS(pty.h util.h sched.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_CYGWIN
-@@ -399,21 +399,33 @@ fi
- dnl -----------------------------
- dnl Checks for FreeBSD Build
- dnl -----------------------------
--AC_MSG_CHECKING(if building on FreeBSD)
-+dnl AC_MSG_CHECKING(if building on FreeBSD)
- 
--if test `uname -s` = "FreeBSD" ; then
--        AC_MSG_RESULT(yes)
--        FREEBSD_BUILD=-DFREEBSD
--        AC_SUBST(FREEBSD_BUILD)
--	AC_PATH_PROG(GMAKE, gmake, no)
--	if test "x$GMAKE" = "xno"; then
-+dnl if test `uname -s` = "FreeBSD" ; then
-+dnl         AC_MSG_RESULT(yes)
-+dnl         FREEBSD_BUILD=-DFREEBSD
-+dnl         AC_SUBST(FREEBSD_BUILD)
-+dnl 	AC_PATH_PROG(GMAKE, gmake, no)
-+dnl 	if test "x$GMAKE" = "xno"; then
-+dnl 		AC_ERROR(You need gmake installed to build Anjuta!)
-+dnl 	fi
-+dnl else
-+dnl         AC_MSG_RESULT(no)
-+dnl 	GMAKE="make"
-+dnl fi
-+
-+AC_CHECK_FUNCS(getline)
-+FREEBSD_BUILD=
-+AC_SUBST(FREEBSD_BUILD)
-+
-+AC_PATH_PROG(GMAKE, gmake, no)
-+if test "x$GMAKE" = "xno"; then
-+	if (make -v | grep GNU) 2>&1 1>/dev/null; then
-+		GMAKE="make"
-+	else
- 		AC_ERROR(You need gmake installed to build Anjuta!)
- 	fi
--else
--        AC_MSG_RESULT(no)
--	GMAKE="make"
- fi
--
- AC_SUBST(GMAKE)
-  
- dnl Checks for missing prototypes
diff --git a/devel/anjuta/patches/patch-ad b/devel/anjuta/patches/patch-ad
index 1c7ba0c1ea8..c22e29960fa 100644
--- a/devel/anjuta/patches/patch-ad
+++ b/devel/anjuta/patches/patch-ad
@@ -1,281 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2004/02/26 16:25:52 cube Exp $
+$NetBSD: patch-ad,v 1.4 2004/04/21 15:01:28 jmmv Exp $
 
---- configure.orig	2003-12-08 07:38:26.000000000 +0100
+--- configure.orig	2004-04-13 06:37:20.000000000 +0200
 +++ configure
-@@ -10514,6 +10514,148 @@ done
+@@ -21414,7 +21414,7 @@ done
  
  
  
-+for ac_header in pty.h util.h sched.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+else
-+  # Is the header compilable?
-+echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_header_compiler=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+# Is the header present?
-+echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc in
-+  yes:no )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+  no:yes )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    (
-+      cat <<\_ASBOX
-+## ------------------------------------ ##
-+## Report this to bug-autoconf@gnu.org. ##
-+## ------------------------------------ ##
-+_ASBOX
-+    ) |
-+      sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=$ac_header_preproc"
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- 
- case $host_os in
-   *cygwin* ) CYGWIN=yes;;
-@@ -12562,15 +12704,96 @@ _ACEOF
-     fi
- fi
- 
--echo "$as_me:$LINENO: checking if building on FreeBSD" >&5
--echo $ECHO_N "checking if building on FreeBSD... $ECHO_C" >&6
- 
--if test `uname -s` = "FreeBSD" ; then
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--        FREEBSD_BUILD=-DFREEBSD
- 
--	# Extract the first word of "gmake", so it can be a program name with args.
-+
-+for ac_func in getline
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+eval "$as_ac_var=no"
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+FREEBSD_BUILD=
-+
-+
-+# Extract the first word of "gmake", so it can be a program name with args.
- set dummy gmake; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-@@ -12610,19 +12833,17 @@ else
- echo "${ECHO_T}no" >&6
- fi
- 
--	if test "x$GMAKE" = "xno"; then
-+if test "x$GMAKE" = "xno"; then
-+	if (make -v | grep GNU) 2>&1 1>/dev/null; then
-+		GMAKE="make"
-+	else
- 		{ { echo "$as_me:$LINENO: error: You need gmake installed to build Anjuta!" >&5
- echo "$as_me: error: You need gmake installed to build Anjuta!" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
--else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--	GMAKE="make"
- fi
- 
- 
--
- { echo "$as_me:$LINENO: checking \"for missing prototypes\"..." >&5
- echo "$as_me: checking \"for missing prototypes\"..." >&6;}
- 
+-for ac_header in sys/dir.h sys/stat.h sys/times.h sys/types.h
++for ac_header in sys/dir.h sys/stat.h sys/times.h sys/types.h pty.h sched.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/devel/anjuta/patches/patch-ag b/devel/anjuta/patches/patch-ag
deleted file mode 100644
index 7f993a89bf9..00000000000
--- a/devel/anjuta/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/02/26 16:25:53 cube Exp $
-
---- data/properties/anjuta.properties.orig	2003-10-08 12:55:51.000000000 +0200
-+++ data/properties/anjuta.properties
-@@ -500,7 +500,7 @@ fold.symbols=3
- #                                   | $(top.proj.dir)               | project directory path     #
- ##################################################################################################
- 
--make=make
-+make=gmake
- anjuta.make.options=-k
- 
- command.build.module=$(make) $(anjuta.make.options)
-@@ -511,7 +511,7 @@ command.build.clean=$(make) $(anjuta.mak
- command.build.clean.all=$(make) $(anjuta.make.options) distclean
- command.clean.build.module=$(make) clean all $(anjuta.make.options)
- command.clean.build.project=$(make) clean all $(anjuta.make.options)
--command.execute.project="$(top.proj.dir)/$(module.source.name)/$(project.source.target)" $(anjuta.program.arguments)
-+command.execute.project=$(top.proj.dir)/$(module.source.name)/$(project.source.target) $(anjuta.program.arguments)
- command.terminal=gnome-terminal -e "$(anjuta.current.command)"
- 
- # This for campatibility with older versions which might
diff --git a/devel/anjuta/patches/patch-aj b/devel/anjuta/patches/patch-aj
deleted file mode 100644
index 88eda5604a3..00000000000
--- a/devel/anjuta/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/02/26 16:25:53 cube Exp $
-
---- src/Makefile.in.orig	2003-12-08 08:02:35.000000000 +0100
-+++ src/Makefile.in
-@@ -538,7 +538,7 @@ $(top_srcdir)/scintilla/LexPS.o $(top_sr
- $(top_srcdir)/scintilla/LexRuby.o $(top_srcdir)/scintilla/LexScriptol.o \
- $(top_srcdir)/scintilla/LexSQL.o $(top_srcdir)/scintilla/LexTeX.o \
- $(top_srcdir)/scintilla/LexVB.o $(top_srcdir)/scintilla/LexYAML.o
--anjuta_LDFLAGS = 
-+anjuta_LDFLAGS = -export-dynamic
- CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/devel/anjuta/patches/patch-ak b/devel/anjuta/patches/patch-ak
deleted file mode 100644
index 9d8c5a28d8c..00000000000
--- a/devel/anjuta/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/02/26 16:25:53 cube Exp $
-
---- src/defaults.c.orig	2003-05-27 08:49:05.000000000 +0200
-+++ src/defaults.c
-@@ -267,7 +267,7 @@ char* default_settings=
- "style.cpp.12=$(style.default.unclosedstring)\n"
- "style.cpp.13=fore:#007F00,back:#E0FFE0,eolfilled\n"
- "braces.cpp.style=10\n"
--"make=make\n"
-+"make=gmake\n"
- "command.build.module=$(make) $(anjuta.make.options)\n"
- "command.build.project=$(make) $(anjuta.make.options)\n"
- "command.build.tarball=$(make) $(anjuta.make.options) dist\n"
diff --git a/devel/anjuta/patches/patch-al b/devel/anjuta/patches/patch-al
index c7b31047bfa..22fe9539485 100644
--- a/devel/anjuta/patches/patch-al
+++ b/devel/anjuta/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2004/02/26 16:25:53 cube Exp $
+$NetBSD: patch-al,v 1.3 2004/04/21 15:01:28 jmmv Exp $
 
---- src/mainmenu_callbacks.c.orig	2004-01-07 18:25:32.000000000 +0100
+--- src/mainmenu_callbacks.c.orig	2004-04-08 06:15:31.000000000 +0200
 +++ src/mainmenu_callbacks.c
 @@ -24,7 +24,9 @@
  #include <unistd.h>
diff --git a/devel/anjuta/patches/patch-am b/devel/anjuta/patches/patch-am
deleted file mode 100644
index 225986245fa..00000000000
--- a/devel/anjuta/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2004/02/26 16:25:53 cube Exp $
-
---- tagmanager/general.h.orig	2002-12-24 15:34:02.000000000 +0100
-+++ tagmanager/general.h
-@@ -20,6 +20,8 @@
- # include "mac.h"
- #endif
- 
-+#include <stdlib.h>
-+
- /*
- *   MACROS
- */
diff --git a/devel/anjuta/patches/patch-an b/devel/anjuta/patches/patch-an
index 75428a6cd29..a50034ed571 100644
--- a/devel/anjuta/patches/patch-an
+++ b/devel/anjuta/patches/patch-an
@@ -1,27 +1,25 @@
-$NetBSD: patch-an,v 1.1 2004/02/26 16:25:53 cube Exp $
+$NetBSD: patch-an,v 1.2 2004/04/21 15:01:28 jmmv Exp $
 
---- src/launcher.c.orig	2003-11-27 09:37:16.000000000 +0100
+--- src/launcher.c.orig	2004-04-08 06:15:31.000000000 +0200
 +++ src/launcher.c
-@@ -23,7 +23,12 @@
+@@ -23,7 +23,9 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <signal.h>
 +#ifdef HAVE_PTY_H
  #include <pty.h>
 +#endif
-+#ifdef HAVE_UTIL_H
-+#include <util.h>
-+#endif
  #include <assert.h>
  #include <gnome.h>
  #include <termios.h>
-@@ -902,6 +907,9 @@ anjuta_launcher_fork (AnjutaLauncher *la
- 					ECHOCTL | ISIG | ICANON | IEXTEN | NOFLSH | TOSTOP);
- //	termios_flags.c_lflag |= 0;
- 	termios_flags.c_cc[VMIN] = 0;
+@@ -37,6 +39,10 @@
+ #include "anjuta-marshalers.h"
+ #include "anjuta.h"
+ 
 +#ifndef __MAX_BAUD
-+#define	__MAX_BAUD B230400
++#define __MAX_BAUD B230400
 +#endif
- 	cfsetospeed(&termios_flags, __MAX_BAUD);
- 	tcsetattr(pty_master_fd, TCSANOW, &termios_flags);
- 
++
+ #define FILE_BUFFER_SIZE 1024
+ /*
+ static gboolean
diff --git a/devel/anjuta/patches/patch-ao b/devel/anjuta/patches/patch-ao
deleted file mode 100644
index f20e9493c09..00000000000
--- a/devel/anjuta/patches/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/02/26 16:25:53 cube Exp $
-
---- src/attach_process.c.orig	Thu Jan 15 19:44:13 2004
-+++ src/attach_process.c
-@@ -170,10 +170,11 @@ iter_stack_push_new (AttachProcess *ap, 
- static gboolean
- iter_stack_pop (AttachProcess *ap)
- {
-+	GtkTreeIter *iter;
- 	if (ap->priv->iter_stack_level < 0)
- 		return FALSE;
- 
--	GtkTreeIter *iter =
-+	iter =
- 			(GtkTreeIter *) (g_slist_nth_data (ap->priv->iter_stack, 0));
- 	ap->priv->iter_stack =
- 			g_slist_delete_link (ap->priv->iter_stack, ap->priv->iter_stack);
diff --git a/devel/anjuta/patches/patch-ap b/devel/anjuta/patches/patch-ap
deleted file mode 100644
index 07c27a8fb90..00000000000
--- a/devel/anjuta/patches/patch-ap
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/02/26 16:25:53 cube Exp $
-
---- src/debugger.c.orig	Thu Jan 15 19:44:13 2004
-+++ src/debugger.c
-@@ -2092,9 +2092,10 @@ static void query_set_print_pretty (gboo
- void debugger_query_evaluate_expr_tip (const gchar *expr,
- 			void (*parser) (GList *outputs, gpointer data), gpointer data)
- {
-+	gchar *printcmd;
- 	query_set_verbose (FALSE);
- 	query_set_print_staticmembers (FALSE);
--	gchar *printcmd = g_strconcat ("print ", expr, NULL);
-+	printcmd = g_strconcat ("print ", expr, NULL);
- 	debugger_put_cmd_in_queqe (printcmd, DB_CMD_NONE, parser, data);
- 	query_set_verbose (TRUE);
- 	query_set_print_staticmembers (TRUE);
-@@ -2104,9 +2105,10 @@ void debugger_query_evaluate_expr_tip (c
- void debugger_query_evaluate_expr (const gchar *expr,
- 			void (*parser) (GList *outputs, gpointer data), gpointer data)
- {
-+	gchar *printcmd;
- 	query_set_print_pretty (TRUE);
- 	query_set_verbose (FALSE);
--	gchar *printcmd = g_strconcat ("print ", expr, NULL);
-+	printcmd = g_strconcat ("print ", expr, NULL);
- 	debugger_put_cmd_in_queqe (printcmd, DB_CMD_SE_MESG | DB_CMD_SE_DIALOG,
- 				parser, data);
- 	query_set_print_pretty (FALSE);
diff --git a/devel/anjuta/patches/patch-aq b/devel/anjuta/patches/patch-aq
index b98f81a6599..c022669b993 100644
--- a/devel/anjuta/patches/patch-aq
+++ b/devel/anjuta/patches/patch-aq
@@ -1,44 +1,14 @@
-$NetBSD: patch-aq,v 1.1 2004/02/26 16:25:53 cube Exp $
+$NetBSD: patch-aq,v 1.2 2004/04/21 15:01:28 jmmv Exp $
 
---- config.h.in.orig	2004-01-16 22:40:10.000000000 +0100
+--- config.h.in.orig	2004-04-08 07:49:09.000000000 +0200
 +++ config.h.in
-@@ -45,6 +45,9 @@
- /* Define to 1 if you have the `ftruncate' function. */
- #undef HAVE_FTRUNCATE
+@@ -266,3 +266,9 @@
  
-+/* Define to 1 if you have the `getline' function. */
-+#undef HAVE_GETLINE
+ /* Define to `unsigned' if <sys/types.h> does not define. */
+ #undef size_t
 +
- /* Define if the GNU gettext() function is already present or preinstalled. */
- #undef HAVE_GETTEXT
- 
-@@ -69,6 +72,9 @@
- /* Define to 1 if you have the `opendir' function. */
- #undef HAVE_OPENDIR
- 
-+/* Define to 1 if you have the <pty.h> header file. */
-+#undef HAVE_PTY_H
-+
- /* Define to 1 if you have the `putenv' function. */
- #undef HAVE_PUTENV
- 
-@@ -78,6 +84,9 @@
- /* Define to 1 if you have the `remove' function. */
- #undef HAVE_REMOVE
- 
 +/* Define to 1 if you have the <sched.h> header file. */
 +#undef HAVE_SCHED_H
 +
- /* Define to 1 if you have the `setenv' function. */
- #undef HAVE_SETENV
- 
-@@ -138,6 +147,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the <util.h> header file. */
-+#undef HAVE_UTIL_H
-+
- /* Define as const if the declaration of iconv() needs const. */
- #undef ICONV_CONST
- 
++/* Define to 1 if you have the <pty.h> header file. */
++#undef HAVE_PTY_H
diff --git a/devel/anjuta/patches/patch-ar b/devel/anjuta/patches/patch-ar
deleted file mode 100644
index fc2495d41d7..00000000000
--- a/devel/anjuta/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2004/02/26 16:25:53 cube Exp $
-
---- src/getline.c.orig	2003-05-27 08:49:05.000000000 +0200
-+++ src/getline.c
-@@ -15,7 +15,9 @@
-  * Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--#ifdef FREEBSD
-+#include <config.h>
-+
-+#ifndef HAVE_GETLINE
- 
- #include <stdio.h>
- #include <string.h>