Attachment 48874 Details for Bug 74746 – ggiterm.diff

[patch] ggiterm.diff

ggiterm.diff (text/plain), 3.14 KB, created by Antoine Brodin on 2004-12-05 23:10:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2004-12-05 23:10:24 UTC

Size: 3.14 KB

patch

obsolete

>ggiterm/files/patch-Makefile.am is dead.
>
>Index: ggiterm/Makefile
>===================================================================
>RCS file: /home/ncvs/ports/x11/ggiterm/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- ggiterm/Makefile	20 Aug 2004 22:54:45 -0000	1.4
>+++ ggiterm/Makefile	5 Dec 2004 22:53:41 -0000
>@@ -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 @@
> 
> 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,17 @@
> 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-configure:
>+	@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/lib/Makefile
>+	@${REINPLACE_CMD} -e 's|-lggi|-lggi ${PTHREAD_LIBS}|' ${WRKSRC}/lowlevel/Makefile
>+
> post-install:
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>Index: ggiterm/distinfo
>===================================================================
>RCS file: /home/ncvs/ports/x11/ggiterm/distinfo,v
>retrieving revision 1.2
>diff -u -r1.2 distinfo
>--- ggiterm/distinfo	29 Jan 2004 16:12:59 -0000	1.2
>+++ ggiterm/distinfo	4 Dec 2004 13:38:47 -0000
>@@ -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
>Index: ggiterm/files/patch-ggiterm.c
>===================================================================
>RCS file: /home/ncvs/ports/x11/ggiterm/files/patch-ggiterm.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-ggiterm.c
>--- ggiterm/files/patch-ggiterm.c	9 Dec 2003 00:05:55 -0000	1.1
>+++ ggiterm/files/patch-ggiterm.c	5 Dec 2004 22:40:02 -0000
>@@ -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>

Actions: View | Diff

Attachments on bug 74746: 48874