Attachment #48874 for bug #74746

View | Details | Raw Unified | Return to bug 74746
Collapse All | Expand All

Lines 6-13 Link Here

(-)ggiterm/Makefile (-3 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= ggiterm	8	PORTNAME= ggiterm
9	PORTVERSION= 0.5.1	9	PORTVERSION= 0.7.0
10	PORTREVISION= 1
11	CATEGORIES= x11	10	CATEGORIES= x11
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ggiterm	12	MASTER_SITE_SUBDIR= ggiterm
Lines 20-29 Link Here
20		19
21	USE_GMAKE= yes	20	USE_GMAKE= yes
22	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
		22	USE_REINPLACE= yes
23	INSTALLS_SHLIB= yes	23	INSTALLS_SHLIB= yes
24		24
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --with-ggi=${LOCALBASE}	26	CONFIGURE_ARGS= --with-ggi-prefix=${LOCALBASE}
27		27
28	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	28	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
29		29
Lines 35-42 Link Here
35	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2	35	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
36	USE_ICONV= yes	36	USE_ICONV= yes
37	CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}	37	CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}
		38	.else
		39	CONFIGURE_ARGS+=--without-freetype
38	.endif	40	.endif
39		41
		42	MAN1= ggiterm.1
		43
		44	post-configure:
		45	@${REINPLACE_CMD} -e 's\|-lggi\|-lggi ${PTHREAD_LIBS}\|' ${WRKSRC}/Makefile
		46	@${REINPLACE_CMD} -e 's\|-lggi\|-lggi ${PTHREAD_LIBS}\|' ${WRKSRC}/lib/Makefile
		47	@${REINPLACE_CMD} -e 's\|-lggi\|-lggi ${PTHREAD_LIBS}\|' ${WRKSRC}/lowlevel/Makefile
		48
40	post-install:	49	post-install:
41	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)
42	@${MKDIR} ${DOCSDIR}	51	@${MKDIR} ${DOCSDIR}

Lines 1-2 Link Here

(-)ggiterm/distinfo (-2 / +2 lines)
1	MD5 (ggiterm-0.5.1.tar.gz) = fc1d37b2dfb82699dc54b6e080329241	1	MD5 (ggiterm-0.7.0.tar.gz) = abdaca4081e5b313330b9b597ce88596
2	SIZE (ggiterm-0.5.1.tar.gz) = 123078	2	SIZE (ggiterm-0.7.0.tar.gz) = 159164




--- ggiterm.c.orig	Fri Oct 22 11:32:34 2004
+++ ggiterm.c	Sun Dec  5 23:39:35 2004
@@ -38,6 +38,8 @@
@@ -18,13 +18,10 @@
 #include <signal.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>

Return to bug 74746

Lines 1-21 Link Here

(-)ggiterm/files/patch-ggiterm.c (-19 / +18 lines)
1	diff -ruN ../ggiterm-0.5.1.bak/ggiterm.c ./ggiterm.c	1	--- ggiterm.c.orig Fri Oct 22 11:32:34 2004
2	--- ../ggiterm-0.5.1.bak/ggiterm.c Mon Oct 20 18:04:02 2003	2	+++ ggiterm.c Sun Dec 5 23:39:35 2004
3	+++ ./ggiterm.c Mon Oct 20 18:05:09 2003	3	@@ -38,6 +38,8 @@
4	@@ -18,13 +18,10 @@
5	#include <signal.h>
6		4
7	/* for forkpty */	5	/* for openpty() */
8	-#ifdef HAVE_FORKPTY	6	#include <sys/ioctl.h> /* some systems (BSD) need it even with OPENPTY_HEADER */
9	-/* forkpty is in libc */	7	+/* for pid_t, strangely not included by OPENPTY_HEADER */
10	-#include <util.h>	8	+#include <sys/types.h>
11	-#else	9	#ifdef OPENPTY_HEADER
12	-/* forkpty is in libutil */	10	# include OPENPTY_HEADER
13	-#include <pty.h>	11	#else
14	-#endif /* HAVE_FORKPTY */	12	@@ -52,8 +54,6 @@
15	+#include <libutil.h>	13	# include <utmp.h>
16	+	14	#endif
17	+/* for struct winsize */	15
18	+#include <termios.h>	16	-/* for pid_t, strangely not included by OPENPTY_HEADER */
		17	-#include <sys/types.h>
		18	/* for execve, read, write */
		19	#include <unistd.h>
19		20
20	/* for strcmp */
21	#include <string.h>