From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 5 23:10:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76AC116A552 for ; Sun, 5 Dec 2004 23:10:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43CC743D6B for ; Sun, 5 Dec 2004 23:10:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iB5NAPuW016918 for ; Sun, 5 Dec 2004 23:10:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iB5NAPFi016917; Sun, 5 Dec 2004 23:10:25 GMT (envelope-from gnats) Resent-Date: Sun, 5 Dec 2004 23:10:25 GMT Resent-Message-Id: <200412052310.iB5NAPFi016917@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Antoine Brodin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C092516A537 for ; Sun, 5 Dec 2004 23:03:52 +0000 (GMT) Received: from barton.dreadbsd.org (massena-4-82-67-196-50.fbx.proxad.net [82.67.196.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0687143D46 for ; Sun, 5 Dec 2004 23:03:52 +0000 (GMT) (envelope-from antoine@massena-4-82-67-196-50.fbx.proxad.net) Received: from barton.dreadbsd.org (localhost [127.0.0.1]) by barton.dreadbsd.org (8.13.1/8.13.1) with ESMTP id iB5N3of4028031 for ; Mon, 6 Dec 2004 00:03:50 +0100 (CET) (envelope-from antoine@massena-4-82-67-196-50.fbx.proxad.net) Received: (from antoine@localhost) by barton.dreadbsd.org (8.13.1/8.13.1/Submit) id iB5N3oYC028030; Mon, 6 Dec 2004 00:03:50 +0100 (CET) (envelope-from antoine) Message-Id: <200412052303.iB5N3oYC028030@barton.dreadbsd.org> Date: Mon, 6 Dec 2004 00:03:50 +0100 (CET) From: Antoine Brodin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/74746: [patch] update x11/ggiterm to 0.7.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Antoine Brodin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Dec 2004 23:10:25 -0000 >Number: 74746 >Category: ports >Synopsis: [patch] update x11/ggiterm to 0.7.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Dec 05 23:10:24 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Antoine Brodin >Release: FreeBSD 6.0-CURRENT i386 >Organization: none >Environment: System: FreeBSD barton.dreadbsd.org 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Fri Dec 3 12:49:34 CET 2004 antoine@barton.dreadbsd.org:/usr/obj/usr/src/sys/BARTON i386 >Description: Update x11/ggiterm from 0.5.1 to 0.7.0 >How-To-Repeat: >Fix: --- ggiterm.diff begins here --- 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 +--- 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 --#else --/* forkpty is in libutil */ --#include --#endif /* HAVE_FORKPTY */ -+#include -+ -+/* for struct winsize */ -+#include + /* for openpty() */ + #include /* some systems (BSD) need it even with OPENPTY_HEADER */ ++/* for pid_t, strangely not included by OPENPTY_HEADER */ ++#include + #ifdef OPENPTY_HEADER + # include OPENPTY_HEADER + #else +@@ -52,8 +54,6 @@ + # include + #endif + +-/* for pid_t, strangely not included by OPENPTY_HEADER */ +-#include + /* for execve, read, write */ + #include - /* for strcmp */ - #include --- ggiterm.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: