- Unbreak on 7.x and CURREN.

Approved by:	portmgr (erwin)

4 files changed, 38 insertions, 4 deletions

diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index db1024cb3d48..ec0216eb09c7 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -27,6 +27,7 @@ BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_XLIB=	yes
+USE_AUTOTOOLS=  autoconf:261
 MAKEFILE=	makefile
 HAS_CONFIGURE=	yes
 
@@ -54,10 +55,6 @@ PLIST_SUB+=	EMACS_LOGO_MODE="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700000
-BROKEN=		Does not compile on FreeBSD >= 7.0
-.endif
-
 pre-everything::
 .if !defined(EMACS_LOGO_MODE)
 	@${ECHO_MSG} ""
diff --git a/lang/logo/files/patch-config.h.in b/lang/logo/files/patch-config.h.in
new file mode 100644
index 000000000000..130100f00501
--- /dev/null
+++ b/lang/logo/files/patch-config.h.in
@@ -0,0 +1,18 @@
+--- config.h.in.orig	2005-03-17 03:23:00.000000000 +0300
++++ config.h.in	2007-12-04 15:40:18.000000000 +0300
+@@ -4,13 +4,13 @@
+ #undef _POSIX_SOURCE
+ 
+ /* Define as the return instruction for signal handlers. */
+-#undef SIGRET
++#define SIGRET
+ 
+ /* Define as the return type of signal handlers (int or void).  */
+ #undef RETSIGTYPE
+ 
+ /* Define if signal handlers take an argument. */
+-#undef SIG_TAKES_ARG
++#define SIG_TAKES_ARG
+ 
+ /* Define to `unsigned' if <sys/types.h> doesn't define.  */
+ #undef size_t
diff --git a/lang/logo/files/patch-makehelp.c b/lang/logo/files/patch-makehelp.c
new file mode 100644
index 000000000000..733aeeed9f3b
--- /dev/null
+++ b/lang/logo/files/patch-makehelp.c
@@ -0,0 +1,8 @@
+--- makehelp.c.orig	2007-12-04 15:33:12.000000000 +0300
++++ makehelp.c	2007-12-04 15:33:19.000000000 +0300
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ 
+ char line[100], line2[100], line3[100];
diff --git a/lang/logo/files/patch-term.c b/lang/logo/files/patch-term.c
new file mode 100644
index 000000000000..b2cae1cc935a
--- /dev/null
+++ b/lang/logo/files/patch-term.c
@@ -0,0 +1,11 @@
+--- term.c.orig	2007-12-04 15:42:55.000000000 +0300
++++ term.c	2007-12-04 15:43:04.000000000 +0300
+@@ -85,7 +85,7 @@
+ 
+ char *termcap_ptr;
+ 
+-int termcap_putter(char ch) {
++int termcap_putter(int ch) {
+     *termcap_ptr++ = ch;
+     return 0;
+ }