Update to 1.2.4, and use the official version of GNU getline() from gsed.

7 files changed, 49 insertions, 133 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a05c098b95a8..4763a5314784 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	1.2.2
-PORTREVISION=	4
+PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 42266d2639af..6dfcc71583c2 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,2 +1,2 @@
-MD5 (anjuta-1.2.2.tar.gz) = a30858dba0b902064d0d702cedfdc84f
-SIZE (anjuta-1.2.2.tar.gz) = 8556051
+MD5 (anjuta-1.2.4.tar.gz) = 5a709fbaedc816a88fd8b9ad5276a47b
+SIZE (anjuta-1.2.4.tar.gz) = 7413573
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index e9fe21a1db2a..1b5fe700ae63 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,30 +1,24 @@
---- Makefile.in.orig	Wed May 14 13:01:45 2003
-+++ Makefile.in	Wed May 14 13:02:02 2003
-@@ -281,17 +281,17 @@
+--- Makefile.in.orig	Wed Aug 17 02:27:09 2005
++++ Makefile.in	Wed Aug 17 02:27:33 2005
+@@ -395,14 +395,14 @@
+ 	  rm -f "$(DESTDIR)$(anjuta_glade_filedir)/$$f"; \
  	done
- 
  install-anjutadocDATA: $(anjutadoc_DATA)
 -	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(anjutadocdir)
+-	test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)"
 -	@list='$(anjutadoc_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p; \
--	  fi; fi; \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \
+-	  $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \
 -	done
 +#	@$(NORMAL_INSTALL)
-+#	$(mkinstalldirs) $(DESTDIR)$(anjutadocdir)
++#	test -z "$(anjutadocdir)" || $(mkdir_p) "$(DESTDIR)$(anjutadocdir)"
 +#	@list='$(anjutadoc_DATA)'; for p in $$list; do \
-+#	  if test -f $(srcdir)/$$p; then \
-+#	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p"; \
-+#	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p; \
-+#	  else if test -f $$p; then \
-+#	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p"; \
-+#	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p; \
-+#	  fi; fi; \
++#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++#	  f=$(am__strip_dir) \
++#	  echo " $(anjutadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjutadocdir)/$$f'"; \
++#	  $(anjutadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjutadocdir)/$$f"; \
 +#	done
  
  uninstall-anjutadocDATA:
diff --git a/devel/anjuta/files/patch-data::Makefile.in b/devel/anjuta/files/patch-data::Makefile.in
index 81ae99415581..956f6a81535a 100644
--- a/devel/anjuta/files/patch-data::Makefile.in
+++ b/devel/anjuta/files/patch-data::Makefile.in
@@ -1,16 +1,15 @@
---- data/Makefile.in.orig	Wed May 14 17:19:02 2003
-+++ data/Makefile.in	Wed May 14 17:19:32 2003
-@@ -176,11 +176,11 @@
- 	autogen.sh.wxwin
- 
+--- data/Makefile.in.orig	Wed Aug 17 02:30:12 2005
++++ data/Makefile.in	Wed Aug 17 02:29:02 2005
+@@ -270,10 +270,10 @@
+ 	welcome.txt\
+ 	autogen.sh
  
 -anjuta_mimedir = $(prefix)/share/mime-info
 +anjuta_mimedir = $(prefix)/share/gnome/mime-info
  anjuta_mime_DATA = anjuta.mime
- 
  anjuta_mimelnkdir = $(prefix)/share/mimelnk/application
 -anjuta_mimelnk_DATA = x-anjuta-project.desktop
 +anjuta_mimelnk_DATA =
+ EXTRA_DIST = $(anjuta_data_DATA) $(anjuta_mime_DATA) $(anjuta_mimelnk_DATA)
+ all: all-recursive
  
- MACROS = \
- 	ChangeLog \
diff --git a/devel/anjuta/files/patch-doc::Makefile.in b/devel/anjuta/files/patch-doc::Makefile.in
index c7d02c112811..525553c21f84 100644
--- a/devel/anjuta/files/patch-doc::Makefile.in
+++ b/devel/anjuta/files/patch-doc::Makefile.in
@@ -1,30 +1,24 @@
---- doc/Makefile.in.orig	Wed May 14 13:04:06 2003
-+++ doc/Makefile.in	Wed May 14 13:04:39 2003
-@@ -239,17 +239,17 @@
- 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
- 
+--- doc/Makefile.in.orig	Wed Aug 17 02:31:26 2005
++++ doc/Makefile.in	Wed Aug 17 02:31:56 2005
+@@ -352,14 +352,14 @@
+ 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
  install-anjuta_docDATA: $(anjuta_doc_DATA)
 -	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(anjuta_docdir)
+-	test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)"
 -	@list='$(anjuta_doc_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p; \
--	  fi; fi; \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \
+-	  $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \
 -	done
 +#	@$(NORMAL_INSTALL)
-+#	$(mkinstalldirs) $(DESTDIR)$(anjuta_docdir)
++#	test -z "$(anjuta_docdir)" || $(mkdir_p) "$(DESTDIR)$(anjuta_docdir)"
 +#	@list='$(anjuta_doc_DATA)'; for p in $$list; do \
-+#	  if test -f $(srcdir)/$$p; then \
-+#	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
-+#	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p; \
-+#	  else if test -f $$p; then \
-+#	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
-+#	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p; \
-+#	  fi; fi; \
++#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++#	  f=$(am__strip_dir) \
++#	  echo " $(anjuta_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(anjuta_docdir)/$$f'"; \
++#	  $(anjuta_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(anjuta_docdir)/$$f"; \
 +#	done
  
  uninstall-anjuta_docDATA:
diff --git a/devel/anjuta/files/patch-src::launcher.c b/devel/anjuta/files/patch-src::launcher.c
index 0015b841ed42..5783dc99ee6f 100644
--- a/devel/anjuta/files/patch-src::launcher.c
+++ b/devel/anjuta/files/patch-src::launcher.c
@@ -1,18 +1,6 @@
---- src/launcher.c.orig	Thu Nov 27 17:37:16 2003
-+++ src/launcher.c	Tue Dec  9 15:27:12 2003
-@@ -23,10 +23,10 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <pty.h>
- #include <assert.h>
- #include <gnome.h>
- #include <termios.h>
-+#include <vte/pty.h>
- 
- #include "pixmaps.h"
- #include "launcher.h"
-@@ -845,9 +845,9 @@
+--- src/launcher.c.orig	Sun Apr 24 09:28:02 2005
++++ src/launcher.c	Wed Aug 17 02:33:34 2005
+@@ -1130,9 +1130,9 @@ anjuta_launcher_fork (AnjutaLauncher *la
  		/* Set no delays for the write pipes (non_buffered) so
  		that we get all the outputs immidiately */
  		if ((md = fcntl (stdout_pipe[1], F_GETFL)) != -1)
@@ -23,13 +11,4 @@
 +			fcntl (stderr_pipe[1], F_SETFL, O_FSYNC | md);
  		
  		execvp (args[0], args);
- 		g_error (_("Cannot execute command shell"));
-@@ -902,7 +902,7 @@
- 					ECHOCTL | ISIG | ICANON | IEXTEN | NOFLSH | TOSTOP);
- //	termios_flags.c_lflag |= 0;
- 	termios_flags.c_cc[VMIN] = 0;
--	cfsetospeed(&termios_flags, __MAX_BAUD);
-+	cfsetospeed(&termios_flags, B115200);
- 	tcsetattr(pty_master_fd, TCSANOW, &termios_flags);
- 
- 	launcher->priv->stdout_watch = 
+ 		g_warning (_("Cannot execute command: \"%s\""), args[0]);
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 9a1cb656b4ad..4ff71306d5fd 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -22,13 +22,7 @@ lib/anjuta/libanjuta_sample1.so.0
 %%PORTDOCS%%share/doc/anjuta/TODO
 share/gnome/anjuta/README.stock_libs
 share/gnome/anjuta/anjuta_project.template
-share/gnome/anjuta/autogen.sh.generic
-share/gnome/anjuta/autogen.sh.gnome
-share/gnome/anjuta/autogen.sh.gnome2
-share/gnome/anjuta/autogen.sh.gnomemm
-share/gnome/anjuta/autogen.sh.gtk
-share/gnome/anjuta/autogen.sh.gtkmm
-share/gnome/anjuta/autogen.sh.wxwin
+share/gnome/anjuta/autogen.sh
 share/gnome/anjuta/gdb.init
 share/gnome/anjuta/gdl/glade/layout.glade
 share/gnome/anjuta/glade/anjuta.glade
@@ -36,50 +30,6 @@ share/gnome/anjuta/glade/applogo.png
 share/gnome/anjuta/glade/start-with-import.png
 share/gnome/anjuta/glade/start-with-open.png
 share/gnome/anjuta/glade/start-with-wizard.png
-share/gnome/anjuta/gnome/ChangeLog
-share/gnome/anjuta/gnome/Makefile.am
-share/gnome/anjuta/gnome/aclocal-include.m4
-share/gnome/anjuta/gnome/autogen.sh
-share/gnome/anjuta/gnome/compiler-flags.m4
-share/gnome/anjuta/gnome/curses.m4
-share/gnome/anjuta/gnome/gnome-bonobo-check.m4
-share/gnome/anjuta/gnome/gnome-common.m4
-share/gnome/anjuta/gnome/gnome-cxx-check.m4
-share/gnome/anjuta/gnome/gnome-fileutils.m4
-share/gnome/anjuta/gnome/gnome-gettext.m4
-share/gnome/anjuta/gnome/gnome-ghttp-check.m4
-share/gnome/anjuta/gnome/gnome-gnorba-check.m4
-share/gnome/anjuta/gnome/gnome-guile-checks.m4
-share/gnome/anjuta/gnome/gnome-libgtop-check.m4
-share/gnome/anjuta/gnome/gnome-objc-checks.m4
-share/gnome/anjuta/gnome/gnome-orbit-check.m4
-share/gnome/anjuta/gnome/gnome-pilot.m4
-share/gnome/anjuta/gnome/gnome-print-check.m4
-share/gnome/anjuta/gnome/gnome-pthread-check.m4
-share/gnome/anjuta/gnome/gnome-support.m4
-share/gnome/anjuta/gnome/gnome-undelfs.m4
-share/gnome/anjuta/gnome/gnome-vfs.m4
-share/gnome/anjuta/gnome/gnome-x-checks.m4
-share/gnome/anjuta/gnome/gnome-xml-check.m4
-share/gnome/anjuta/gnome/gnome.m4
-share/gnome/anjuta/gnome/gperf-check.m4
-share/gnome/anjuta/gnome/linger.m4
-share/gnome/anjuta/gnome/need-declaration.m4
-share/gnome/anjuta/gnome/psiconv.m4
-share/gnome/anjuta/gnome2/ChangeLog
-share/gnome/anjuta/gnome2/Makefile.am
-share/gnome/anjuta/gnome2/autogen.sh
-share/gnome/anjuta/gnome2/check-utmp.m4
-share/gnome/anjuta/gnome2/compiler-flags.m4
-share/gnome/anjuta/gnome2/curses.m4
-share/gnome/anjuta/gnome2/gnome-common.m4
-share/gnome/anjuta/gnome2/gnome-cxx-check.m4
-share/gnome/anjuta/gnome2/gnome-gettext.m4
-share/gnome/anjuta/gnome2/gnome-pkgconfig.m4
-share/gnome/anjuta/gnome2/gnome-platform.m4
-share/gnome/anjuta/gnome2/gnome-pthread-check.m4
-share/gnome/anjuta/gnome2/gnome-x-checks.m4
-share/gnome/anjuta/gnome2/linger.m4
 share/gnome/anjuta/header.c
 share/gnome/anjuta/properties/ada.properties
 share/gnome/anjuta/properties/anjuta.properties
@@ -452,12 +402,14 @@ share/locale/fr/LC_MESSAGES/anjuta.mo
 share/locale/ga/LC_MESSAGES/anjuta.mo
 share/locale/hi/LC_MESSAGES/anjuta.mo
 share/locale/hr/LC_MESSAGES/anjuta.mo
+share/locale/hu/LC_MESSAGES/anjuta.mo
 share/locale/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
 share/locale/ko/LC_MESSAGES/anjuta.mo
 share/locale/mk/LC_MESSAGES/anjuta.mo
 share/locale/ml/LC_MESSAGES/anjuta.mo
 share/locale/ms/LC_MESSAGES/anjuta.mo
+share/locale/nb/LC_MESSAGES/anjuta.mo
 share/locale/nl/LC_MESSAGES/anjuta.mo
 share/locale/no/LC_MESSAGES/anjuta.mo
 share/locale/pl/LC_MESSAGES/anjuta.mo
@@ -484,12 +436,10 @@ share/locale/zh_TW/LC_MESSAGES/anjuta.mo
 @dirrm share/gnome/help/anjuta/C/figures
 @dirrm share/gnome/help/anjuta/C
 @dirrm share/gnome/help/anjuta
-@dirrm share/gnome/anjuta/gdl/glade
-@dirrm share/gnome/anjuta/gdl
 @dirrm share/gnome/anjuta/properties
-@dirrm share/gnome/anjuta/gnome2
-@dirrm share/gnome/anjuta/gnome
 @dirrm share/gnome/anjuta/glade
+@dirrm share/gnome/anjuta/gdl/glade
+@dirrm share/gnome/anjuta/gdl
 @dirrm share/gnome/anjuta
 %%PORTDOCS%%@dirrm share/doc/anjuta
 @dirrm lib/anjuta