Fix build with new gtk20.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7681 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 141 insertions, 0 deletions

diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
new file mode 100644
index 000000000..cecddc823
--- /dev/null
+++ b/devel/maketool/Makefile
@@ -0,0 +1,65 @@
+# New ports collection makefile for:	maketool
+# Date created:				2002-10-15
+# Whom:					trevor
+#
+# $FreeBSD: ports/devel/maketool/Makefile,v 1.13 2006/08/16 15:23:40 shaun Exp $
+#
+
+PORTNAME=	maketool
+PORTVERSION=	0.8.4
+PORTREVISION=	6
+CATEGORIES=	devel
+MASTER_SITES=	http://home.alphalink.com.au/~gnb/maketool/downloads/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	GUI interface for make or gmake
+
+LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype.9:${PORTSDIR}/print/freetype2
+
+DOCS=		COPYING COPYRIGHT ChangeLog TODO
+GNU_CONFIGURE=	yes
+MAN1=		maketool.1
+PLIST=		${WRKDIR}/pkg-plist
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	atk glib20 gtk20 pango
+USE_X_PREFIX=	yes
+
+pre-install:
+	${ECHO_CMD} bin/maketool > ${PLIST}
+.for ii in make maketool_client
+	${ECHO_CMD} libexec/maketool/${ii} >> ${PLIST}
+.endfor
+	${ECHO_CMD} @dirrm libexec/maketool >> ${PLIST}
+.if !defined(NOPORTDOCS)
+.for ii in ${DOCS}
+	${ECHO_CMD} share/doc/maketool/${ii} >> ${PLIST}
+.endfor
+	${ECHO_CMD} @dirrm share/doc/maketool >> ${PLIST}
+.endif
+	cd ${WRKSRC}/doc/help/C/help && ${LS} | ${SED} -e \
+		"s:^:share/maketool/help/C/:g" >> ${PLIST}
+	cd ${WRKSRC}/doc/help/C && ${LS} *dat *gif | ${SED} -e \
+		"s:^:share/maketool/help/C/:g" >> ${PLIST}
+.for ii in autoconf-dist autoconf-maint automake imake
+	${ECHO_CMD} share/maketool/${ii}.mk >> ${PLIST}
+.endfor
+.for ii in /help/C /help /
+	${ECHO_CMD} @dirrm share/maketool${ii} >> ${PLIST}
+.endfor
+	${ECHO_CMD} lib/charset.alias >> ${PLIST}
+	${ECHO_CMD} share/locale/locale.alias >> ${PLIST}
+.for ii in cs ja
+	${ECHO_CMD} share/locale/${ii}/LC_MESSAGES/maketool.mo >> ${PLIST}
+.endfor
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for ii in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/maketool/distinfo b/devel/maketool/distinfo
new file mode 100644
index 000000000..2212b6b14
--- /dev/null
+++ b/devel/maketool/distinfo
@@ -0,0 +1,3 @@
+MD5 (maketool-0.8.4.tar.bz2) = 28b99001dba9c70fad92d37cd9f7dddd
+SIZE (maketool-0.8.4.tar.bz2) = 691069
+SHA256 (maketool-0.8.4.tar.bz2) = 735a565d7fb51a19e81c2c66f544daad00bd889240fe7dc4ca7588e4d479dfda
diff --git a/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
new file mode 100644
index 000000000..da481dae8
--- /dev/null
+++ b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
@@ -0,0 +1,50 @@
+--- lib/gtk2/gtk/gtkctree.c.orig	Sun Oct  8 23:15:57 2006
++++ lib/gtk2/gtk/gtkctree.c	Sun Oct  8 23:18:58 2006
+@@ -563,24 +563,12 @@ gtk_ctree_set_arg (GtkObject      *objec
+   switch (arg_id)
+     {
+     case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
+-      g_return_if_fail (clist->row_mem_chunk == NULL);
+       clist->columns = MAX (1, GTK_VALUE_UINT (*arg));
+-      clist->row_mem_chunk = g_mem_chunk_new ("ctree row mem chunk",
+-					      sizeof (GtkCTreeRow),
+-					      sizeof (GtkCTreeRow)
+-					      * CLIST_OPTIMUM_SIZE,
+-					      G_ALLOC_AND_FREE);
+-      clist->cell_mem_chunk = g_mem_chunk_new ("ctree cell mem chunk",
+-					       sizeof (GtkCell) * clist->columns,
+-					       sizeof (GtkCell) * clist->columns
+-					       * CLIST_OPTIMUM_SIZE,
+-					       G_ALLOC_AND_FREE);
+       ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+       break;
+     case ARG_TREE_COLUMN: /* construct-only arg, only set at construction time */
+       ctree->tree_column = GTK_VALUE_UINT (*arg);
+-      if (clist->row_mem_chunk)
+-	ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
++      ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+       break;
+     case ARG_INDENT:
+       gtk_ctree_set_indent (ctree, GTK_VALUE_UINT (*arg));
+@@ -3197,8 +3185,8 @@ row_new (GtkCTree *ctree)
+   int i;
+ 
+   clist = GTK_CLIST (ctree);
+-  ctree_row = g_chunk_new (GtkCTreeRow, clist->row_mem_chunk);
+-  ctree_row->row.cell = g_chunk_new (GtkCell, clist->cell_mem_chunk);
++  ctree_row = g_slice_new (GtkCTreeRow);
++  ctree_row->row.cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
+ 
+   for (i = 0; i < clist->columns; i++)
+     {
+@@ -3286,8 +3274,8 @@ row_delete (GtkCTree    *ctree,
+       dnotify (ddata);
+     }
+ 
+-  g_mem_chunk_free (clist->cell_mem_chunk, ctree_row->row.cell);
+-  g_mem_chunk_free (clist->row_mem_chunk, ctree_row);
++  g_slice_free1 (sizeof (GtkCell) * clist->columns, ctree_row->row.cell);
++  g_slice_free (GtkCTreeRow, ctree_row);
+ }
+ 
+ static void
diff --git a/devel/maketool/pkg-descr b/devel/maketool/pkg-descr
new file mode 100644
index 000000000..77632960d
--- /dev/null
+++ b/devel/maketool/pkg-descr
@@ -0,0 +1,23 @@
+Maketool is a simple GTK+ based GUI front-end for GNU make and other make
+programs.
+
+Maketool's features include:
+
+  * Figures out what targets are available and presents them in a menu.
+  * Runs make and detects compiler errors and warnings in the output.
+  * Double-clicking on errors starts an editor with that file and line.
+  * Works with any makefile system that uses GNU make.
+  * Automatically updates Makefile if project uses automake, autoconf or imake.
+  * GUI for selecting configure options for automake and autoconf.
+  * Special handling for standard GNU targets such as all, install, clean etc.
+  * Save and reload logs of make runs.
+  * Summarise make logs to reduce visual clutter.
+  * With recursive make, expand or collapse each directory separately
+  * Override values of make and environment variables.
+  * Make in series or in parallel, (using make's -j and -l flags).
+  * Dryrun mode (using make's -n flag).
+  * Implements many of make's command-line options.
+  * Configure foreground & background colours of error & warnings lines.
+  * Now also supports Solaris make, IRIX smake, and BSD pmake.
+
+WWW: http://home.alphalink.com.au/~gnb/maketool/