7 files changed, 137 insertions, 4 deletions

diff --git a/misc/graphthing/Makefile b/misc/graphthing/Makefile
index 6903738f9d7c..bba6d55ce8a1 100644
--- a/misc/graphthing/Makefile
+++ b/misc/graphthing/Makefile
@@ -7,15 +7,19 @@
 #
 
 PORTNAME=	graphthing
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	misc
 MASTER_SITES=	http://members.optushome.com.au/davidsymonds/gt/
-DISTNAME=	GraphThing-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsdports@arved.de
+
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+CONFIGURE_ARGS=	--without-included-gettext \
+
 .include <bsd.port.mk>
diff --git a/misc/graphthing/distinfo b/misc/graphthing/distinfo
index 78b52e49fa9e..7158371e910b 100644
--- a/misc/graphthing/distinfo
+++ b/misc/graphthing/distinfo
@@ -1 +1 @@
-MD5 (GraphThing-0.6.tar.gz) = d7943a5018e86c28383f7d05a7fd62af
+MD5 (graphthing-0.7.tar.gz) = 935d840a1c0bfdc1b5bcabb74832d2e7
diff --git a/misc/graphthing/files/patch-Makefile.in b/misc/graphthing/files/patch-Makefile.in
new file mode 100644
index 000000000000..568d7fa87281
--- /dev/null
+++ b/misc/graphthing/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed May  1 14:00:12 2002
++++ Makefile.in	Wed May  1 14:00:22 2002
+@@ -3,7 +3,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @GT_VERSION@
+ 
+-SUBDIRS = intl src po
++SUBDIRS = src po
+ 
+ DISTFILES = COPYING ChangeLog Makefile.in README TODO aclocal.m4 \
+ 	configure configure.in install-sh mkinstalldirs version
diff --git a/misc/graphthing/files/patch-aclocal.m4 b/misc/graphthing/files/patch-aclocal.m4
new file mode 100644
index 000000000000..306327b6fe65
--- /dev/null
+++ b/misc/graphthing/files/patch-aclocal.m4
@@ -0,0 +1,20 @@
+--- aclocal.m4.orig	Wed May  1 14:15:28 2002
++++ aclocal.m4	Wed May  1 14:16:29 2002
+@@ -290,7 +290,7 @@
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+ 		 DATADIRNAME=lib
+-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
++		 dnl INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ 		 nls_cv_header_intl=intl/libintl.h
+@@ -319,7 +319,7 @@
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
++	dnl INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+         nls_cv_header_intl=intl/libintl.h
diff --git a/misc/graphthing/files/patch-configure b/misc/graphthing/files/patch-configure
new file mode 100644
index 000000000000..63be3956865c
--- /dev/null
+++ b/misc/graphthing/files/patch-configure
@@ -0,0 +1,77 @@
+--- configure.orig	Fri Apr  5 02:55:27 2002
++++ configure	Wed May  1 14:19:00 2002
+@@ -2199,7 +2199,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp -I/usr/local/include conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -2780,7 +2780,6 @@
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+ 		 DATADIRNAME=lib
+-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ 		 nls_cv_header_intl=intl/libintl.h
+@@ -2909,7 +2908,6 @@
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+         nls_cv_header_intl=intl/libintl.h
+@@ -3964,49 +3962,6 @@
+ ac_dests="$nls_cv_header_intl"
+ EOF
+ 
+-cat >> $CONFIG_STATUS <<\EOF
+-srcdir=$ac_given_srcdir
+-while test -n "$ac_sources"; do
+-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+-
+-  echo "linking $srcdir/$ac_source to $ac_dest"
+-
+-  if test ! -r $srcdir/$ac_source; then
+-    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+-  fi
+-  rm -f $ac_dest
+-
+-  # Make relative symlinks.
+-  # Remove last slash and all that follows it.  Not all systems have dirname.
+-  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+-  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+-    # The dest file is in a subdirectory.
+-    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+-    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
+-    # A "../" for each directory in $ac_dest_dir_suffix.
+-    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+-  else
+-    ac_dest_dir_suffix= ac_dots=
+-  fi
+-
+-  case "$srcdir" in
+-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+-  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+-  esac
+-
+-  # Make a symlink if possible; otherwise try a hard link.
+-  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+-    ln $srcdir/$ac_source $ac_dest; then :
+-  else
+-    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+-  fi
+-done
+-EOF
+-cat >> $CONFIG_STATUS <<EOF
+-
+-
+-EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ case "$CONFIG_FILES" in *po/Makefile.in*)
+         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
diff --git a/misc/graphthing/files/patch-configure.in b/misc/graphthing/files/patch-configure.in
new file mode 100644
index 000000000000..f71c0292b62f
--- /dev/null
+++ b/misc/graphthing/files/patch-configure.in
@@ -0,0 +1,10 @@
+--- configure.in.orig	Wed May  1 14:03:01 2002
++++ configure.in	Wed May  1 14:03:13 2002
+@@ -63,7 +63,6 @@
+ # Write stuff to Makefiles
+ AC_OUTPUT(Makefile
+ 	src/Makefile
+-	intl/Makefile
+ 	po/Makefile.in)
+ 
+ # If they've turned on Developer Flags, give a warning
diff --git a/misc/graphthing/files/patch-src-Makefile.in b/misc/graphthing/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..103211b92f77
--- /dev/null
+++ b/misc/graphthing/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed May  1 14:13:07 2002
++++ src/Makefile.in	Wed May  1 14:13:17 2002
+@@ -7,7 +7,7 @@
+ 
+ DISTFILES = Makefile.in config.h.in depend.1 *.cc *.h *.y *.l *.gt
+ 
+-INTL_INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
++INTL_INCLUDES = -DLOCALEDIR=\"$(localedir)\"
+ 
+ CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ $(INTL_INCLUDES)
+ CXXFLAGS = @CXXFLAGS@ @EXTRA_CFLAGS@ \