Update to 1.2.2. For a list of what's changed, see:

http://lists.gnome.org/archives/gnome-announce-list/2004-April/msg00021.html

8 files changed, 45 insertions, 63 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 573b55c6024a..7170854ba8e0 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -20,6 +19,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 NO_LATEST_LINK=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeprintui libgnomeui vte
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -27,6 +27,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		anjuta.1 anjuta_launcher.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -Ee \
+		's|-D[^[:space:]_]+_DISABLE_DEPRECATED||g'
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/applogo.png \
 		${PREFIX}/share/gnome/anjuta/glade
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 79edc0f0d3a8..ad4d7bf5feb7 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,2 +1,2 @@
-MD5 (anjuta-1.2.1.tar.gz) = f74a86d4541e0f55115be9de66d8c2c4
-SIZE (anjuta-1.2.1.tar.gz) = 8013051
+MD5 (anjuta-1.2.2.tar.gz) = 85709c7c8b29969ddccc04ee2b16456f
+SIZE (anjuta-1.2.2.tar.gz) = 8556047
diff --git a/devel/anjuta/files/patch-configure b/devel/anjuta/files/patch-configure
index 18957041874d..9356323c5758 100644
--- a/devel/anjuta/files/patch-configure
+++ b/devel/anjuta/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig	Thu Jun 26 06:50:27 2003
-+++ configure	Fri Jun 27 20:02:38 2003
-@@ -12994,11 +12995,11 @@
-   packageprefix=${prefix}
+--- configure.orig	Tue Apr 13 13:24:27 2004
++++ configure	Tue Apr 13 13:25:03 2004
+@@ -23995,11 +23995,11 @@
  fi
  
+ systemdatadir=share
 -packagedatadir=share/${PACKAGE}
 +packagedatadir=share/gnome/${PACKAGE}
  packagedocdir=share/doc/${PACKAGE}
diff --git a/devel/anjuta/files/patch-ltmain.sh b/devel/anjuta/files/patch-ltmain.sh
index cd8532332c91..5c98ef92fa1b 100644
--- a/devel/anjuta/files/patch-ltmain.sh
+++ b/devel/anjuta/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Thu Jan 22 10:41:27 2004
-+++ ltmain.sh	Thu Apr  8 22:08:27 2004
-@@ -1075,7 +1075,7 @@
+--- ltmain.sh.orig	Tue Oct 28 09:26:50 2003
++++ ltmain.sh	Tue Apr 13 13:25:36 2004
+@@ -1280,7 +1280,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1085,8 +1085,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2485,6 +2493,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4342,10 +4353,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/anjuta/files/patch-src::anjuta.c b/devel/anjuta/files/patch-src::anjuta.c
deleted file mode 100644
index da8a838ed74d..000000000000
--- a/devel/anjuta/files/patch-src::anjuta.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/anjuta.c.orig	Sun Jun  8 23:31:48 2003
-+++ src/anjuta.c	Sun Jun  8 23:33:26 2003
-@@ -1938,6 +1938,8 @@
- 	pid = waitpid (0, &status, WNOHANG);
- 	if (pid < 1)
- 		return;
-+	if (!app)
-+		return;
- 	idx = g_list_index (app->registered_child_processes, (int *) pid);
- 	if (idx < 0)
- 		return;
diff --git a/devel/anjuta/files/patch-src::attach_process.c b/devel/anjuta/files/patch-src::attach_process.c
index 2346334b4a44..e69de29bb2d1 100644
--- a/devel/anjuta/files/patch-src::attach_process.c
+++ b/devel/anjuta/files/patch-src::attach_process.c
@@ -1,17 +0,0 @@
---- src/attach_process.c.orig	Fri Jan 30 20:16:25 2004
-+++ src/attach_process.c	Fri Jan 30 20:20:48 2004
-@@ -170,11 +170,12 @@
- static gboolean
- iter_stack_pop (AttachProcess *ap)
- {
-+	GtkTreeIter *iter;
-+
- 	if (ap->priv->iter_stack_level < 0)
- 		return FALSE;
- 
--	GtkTreeIter *iter =
--			(GtkTreeIter *) (g_slist_nth_data (ap->priv->iter_stack, 0));
-+	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);
- 	g_free (iter);
diff --git a/devel/anjuta/files/patch-src::source.c b/devel/anjuta/files/patch-src::source.c
index 3d421d9bf133..f59845ef0124 100644
--- a/devel/anjuta/files/patch-src::source.c
+++ b/devel/anjuta/files/patch-src::source.c
@@ -1,15 +1,6 @@
---- src/source.c.orig	Wed May 14 14:17:11 2003
-+++ src/source.c	Wed May 14 14:17:23 2003
-@@ -314,7 +314,7 @@
- 		 "fi\n\n");
- 	fprintf (fp,
- 		 "dnl Set PACKAGE DATA & DOC DIR\n"
--		 "packagedatadir=share/${PACKAGE}\n"
-+		 "packagedatadir=share/gnome/${PACKAGE}\n"
- 		 "packagedocdir=doc/${PACKAGE}\n"
- 		 "\n");
- 	
-@@ -332,7 +332,7 @@
+--- src/source.c.orig	Thu Apr  8 00:15:35 2004
++++ src/source.c	Tue Apr 13 13:26:20 2004
+@@ -335,7 +335,7 @@
  	{
  		fprintf (fp,
  			 "dnl Set PACKAGE DIRs in config.h.\n"
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index d151e5da4ece..bd9186cb637a 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -121,6 +121,7 @@ share/gnome/anjuta/stock_libs.anj
 share/gnome/anjuta/system.tags
 share/gnome/anjuta/welcome.txt
 share/gnome/applications/anjuta.desktop
+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
@@ -130,6 +131,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
@@ -300,6 +309,8 @@ share/gnome/help/anjuta/ja/license.xml
 share/gnome/help/anjuta/ja/preferences.xml
 share/gnome/help/anjuta/ja/projects.xml
 share/gnome/mime-info/anjuta.mime
+share/gnome/omf/anjuta/anjuta-advanced-tutorial-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-advanced-tutorial-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/anjuta/anjuta-faqs-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/anjuta/anjuta-faqs-ja_JP.UTF-8.omf
@@ -440,10 +451,13 @@ share/locale/cs/LC_MESSAGES/anjuta.mo
 share/locale/da/LC_MESSAGES/anjuta.mo
 share/locale/de/LC_MESSAGES/anjuta.mo
 share/locale/el/LC_MESSAGES/anjuta.mo
+share/locale/en_CA/LC_MESSAGES/anjuta.mo
 share/locale/en_GB/LC_MESSAGES/anjuta.mo
 share/locale/es/LC_MESSAGES/anjuta.mo
 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/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
 share/locale/ko/LC_MESSAGES/anjuta.mo
@@ -485,6 +499,7 @@ share/locale/zh_TW/LC_MESSAGES/anjuta.mo
 @dirrm share/gnome/anjuta
 %%PORTDOCS%%@dirrm share/doc/anjuta
 @dirrm lib/anjuta
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-advanced-tutorial-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.UTF-8.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-manual-C.omf 2>/dev/null || /usr/bin/true