4 files changed, 30 insertions, 44 deletions

diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 7634ca13ed21..ffff3f148dfe 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ggiterm
-PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggiterm
@@ -20,10 +19,11 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ggi=${LOCALBASE}
+CONFIGURE_ARGS=	--with-ggi-prefix=${LOCALBASE}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -35,8 +35,15 @@ OPTIONS=	FREETYPE "Build with Freetype support" on
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-freetype
 .endif
 
+MAN1=		ggiterm.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/configure
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/x11/ggiterm/distinfo b/x11/ggiterm/distinfo
index 63ec0484a5c5..8598e6930474 100644
--- a/x11/ggiterm/distinfo
+++ b/x11/ggiterm/distinfo
@@ -1,2 +1,2 @@
-MD5 (ggiterm-0.5.1.tar.gz) = fc1d37b2dfb82699dc54b6e080329241
-SIZE (ggiterm-0.5.1.tar.gz) = 123078
+MD5 (ggiterm-0.7.0.tar.gz) = abdaca4081e5b313330b9b597ce88596
+SIZE (ggiterm-0.7.0.tar.gz) = 159164
diff --git a/x11/ggiterm/files/patch-Makefile.am b/x11/ggiterm/files/patch-Makefile.am
deleted file mode 100644
index 243f0888cfcd..000000000000
--- a/x11/ggiterm/files/patch-Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ruN ../ggiterm-0.5.1.bak/Makefile.am ./Makefile.am
---- ../ggiterm-0.5.1.bak/Makefile.am	Mon Oct 20 18:04:02 2003
-+++ ./Makefile.am	Mon Oct 20 18:24:29 2003
-@@ -1,3 +1,3 @@
- bin_PROGRAMS = ggiterm
- ggiterm_SOURCES = ggiterm.c ft_support.c ansi.c iconv_support.c graphics.c ggiterm.h config.rpath
--ggiterm_LDFLAGS = @FT2_LIBS@
-+ggiterm_LDFLAGS = @FT2_LIBS@ @LIBICONV@
-diff -ruN ../ggiterm-0.5.1.bak/Makefile.in ./Makefile.in
---- ../ggiterm-0.5.1.bak/Makefile.in	Mon Oct 20 18:04:02 2003
-+++ ./Makefile.in	Mon Oct 20 18:26:21 2003
-@@ -119,7 +119,7 @@
- target_alias = @target_alias@
- bin_PROGRAMS = ggiterm
- ggiterm_SOURCES = ggiterm.c ft_support.c ansi.c iconv_support.c graphics.c ggiterm.h config.rpath
--ggiterm_LDFLAGS = @FT2_LIBS@
-+ggiterm_LDFLAGS = @FT2_LIBS@ @LIBICONV@
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/x11/ggiterm/files/patch-ggiterm.c b/x11/ggiterm/files/patch-ggiterm.c
index e376da7dbee1..0480e1462f3d 100644
--- a/x11/ggiterm/files/patch-ggiterm.c
+++ b/x11/ggiterm/files/patch-ggiterm.c
@@ -1,21 +1,20 @@
-diff -ruN ../ggiterm-0.5.1.bak/ggiterm.c ./ggiterm.c
---- ../ggiterm-0.5.1.bak/ggiterm.c	Mon Oct 20 18:04:02 2003
-+++ ./ggiterm.c	Mon Oct 20 18:05:09 2003
-@@ -18,13 +18,10 @@
- #include <signal.h>
+--- ggiterm.c.orig	Fri Oct 22 11:32:34 2004
++++ ggiterm.c	Sun Dec  5 23:39:35 2004
+@@ -38,6 +38,8 @@
  
- /* for forkpty */
--#ifdef HAVE_FORKPTY
--/* forkpty is in libc */
--#include <util.h>
--#else
--/* forkpty is in libutil */
--#include <pty.h>
--#endif /* HAVE_FORKPTY */
-+#include <libutil.h>
-+
-+/* for struct winsize */
-+#include <termios.h>
+ /* for openpty() */
+ #include <sys/ioctl.h> /* some systems (BSD) need it even with OPENPTY_HEADER */
++/* for pid_t, strangely not included by OPENPTY_HEADER */
++#include <sys/types.h>
+ #ifdef OPENPTY_HEADER
+ # include OPENPTY_HEADER
+ #else
+@@ -52,8 +54,6 @@
+ # include <utmp.h>
+ #endif
+ 
+-/* for pid_t, strangely not included by OPENPTY_HEADER */
+-#include <sys/types.h>
+ /* for execve, read, write */
+ #include <unistd.h>
  
- /* for strcmp */
- #include <string.h>