Teach anjuta about the new gnu-autotools ports, and fix some problems with

command escaping during project execution.

5 files changed, 43 insertions, 54 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index cebf3d636f65..06c53da38d79 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	anjuta
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -16,18 +16,25 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated Development Environment for C and C++
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf \
+		${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \
+		${LOCALBASE}/gnu-autotools/bin/libtool:${PORTSDIR}/devel/gnu-libtool
 
-NO_LATEST_LINK=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeprintui libgnomeui vte
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		anjuta.1 anjuta_launcher.1
 
+post-configure:
+	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g ; \
+		s|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/anjuta \
+		> ${WRKDIR}/anjuta
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/applogo.png \
 		${PREFIX}/share/gnome/anjuta/glade
@@ -38,5 +45,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
+	${MV} ${PREFIX}/bin/anjuta ${PREFIX}/bin/anjuta-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/anjuta ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/devel/anjuta/files/patch-ltmain.sh b/devel/anjuta/files/patch-ltmain.sh
index 5c98ef92fa1b..e69de29bb2d1 100644
--- a/devel/anjuta/files/patch-ltmain.sh
+++ b/devel/anjuta/files/patch-ltmain.sh
@@ -1,51 +0,0 @@
---- 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
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/anjuta/files/patch-src_commands.c b/devel/anjuta/files/patch-src_commands.c
new file mode 100644
index 000000000000..89e481307f55
--- /dev/null
+++ b/devel/anjuta/files/patch-src_commands.c
@@ -0,0 +1,10 @@
+--- src/commands.c.orig	Tue Aug 31 00:41:32 2004
++++ src/commands.c	Tue Aug 31 00:41:56 2004
+@@ -102,6 +102,7 @@
+ /* Ditto */
+ static gchar *
+ term_commands[] = {
++	"gnome-terminal -e '$(anjuta.current.command)'",
+ 	"gnome-terminal -e \"$(anjuta.current.command)\"",
+ 	"gnome-terminal -x sh -c \"$(anjuta.current.command)\"",
+ 	"gnome-terminal --command=\"sh -c \\\"$(anjuta.current.command); read x\\\"\"",
diff --git a/devel/anjuta/files/patch-src_executer.c b/devel/anjuta/files/patch-src_executer.c
new file mode 100644
index 000000000000..dd5907d7310b
--- /dev/null
+++ b/devel/anjuta/files/patch-src_executer.c
@@ -0,0 +1,20 @@
+--- src/executer.c.orig	Tue Aug 31 00:40:58 2004
++++ src/executer.c	Tue Aug 31 00:41:25 2004
+@@ -154,7 +154,7 @@
+ 	if(e->terminal)
+ 	{
+ 		gchar* escaped_cmd;
+-		escaped_cmd = anjuta_util_escape_quotes(command);
++		escaped_cmd = command;
+ 		prop_set_with_key (e->props, "anjuta.current.command", escaped_cmd);
+ 
+ #ifdef DEBUG
+@@ -162,7 +162,7 @@
+ #endif
+ 		
+ 		cmd = command_editor_get_command (app->command_editor, COMMAND_TERMINAL);
+-		g_free(escaped_cmd);
++		/*g_free(escaped_cmd);*/
+ 	}
+ 	else
+ 	{
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index bd9186cb637a..07b2eb6b8e70 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,4 +1,5 @@
 bin/anjuta
+bin/anjuta-bin
 bin/anjuta_import.sh
 bin/anjuta_launcher
 lib/anjuta/libanjuta_clsGen.a