Index: head/lang/logo/Makefile =================================================================== --- head/lang/logo/Makefile (revision 204952) +++ head/lang/logo/Makefile (revision 204953) @@ -1,91 +1,91 @@ # New ports collection makefile for: logo # Date created: 22 October 1994 # Whom: jkh # # $FreeBSD$ # PORTNAME= ucblogo PORTVERSION= 5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Brian Harvey's logo language interpreter .if defined(EMACS_LOGO_MODE) BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs .endif .if defined(WITH_FULL_DOCS) .undef NOPORTDOCS BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \ ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT} .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes -USE_AUTOTOOLS= autoconf:261 +USE_AUTOTOOLS= autoconf:261 MAKEFILE= makefile HAS_CONFIGURE= yes ALL_TARGET= all .if defined(WITH_FULL_DOCS) || defined(EMACS_LOGO_MODE) USE_GMAKE= yes MAKE_ENV+= LIBLOC="${PREFIX}/lib/logo" BINDIR="${PREFIX}/bin" DOCSDIR="${DOCSDIR}" INFODIR="${PREFIX}/${INFO_PATH}" .endif .if defined(WITH_FULL_DOCS) INFO= ucblogo loops ALL_TARGET+= docs PLIST_SUB+= WITH_FULL_DOCS="" .else PLIST_SUB+= WITH_FULL_DOCS="@comment " .endif .if defined(EMACS_LOGO_MODE) ALL_TARGET+= logo-mode PLIST_SUB+= EMACS_LOGO_MODE="" .else PLIST_SUB+= EMACS_LOGO_MODE="@comment " .endif .include pre-everything:: .if !defined(EMACS_LOGO_MODE) @${ECHO_MSG} "" @${ECHO_MSG} " Define EMACS_LOGO_MODE to build the emacs logo mode" @${ECHO_MSG} "" .endif .if !defined(WITH_FULL_DOCS) @${ECHO_MSG} "" @${ECHO_MSG} " Define WITH_FULL_DOCS to build ps, pdf and html docs" @${ECHO_MSG} " This requires teTeX and ghostscript !" @${ECHO_MSG} "" .endif do-install: .for d in lib/logo lib/logo/logolib \ lib/logo/helpfiles ${MKDIR} ${PREFIX}/$d .endfor ${MKDIR} ${EXAMPLESDIR}/csls ${INSTALL_PROGRAM} ${WRKSRC}/logo ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/logolib/* ${PREFIX}/lib/logo/logolib/ ${INSTALL_DATA} ${WRKSRC}/helpfiles/* ${PREFIX}/lib/logo/helpfiles/ ${INSTALL_DATA} ${WRKSRC}/csls/* ${EXAMPLESDIR}/csls/ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/usermanual ${DOCSDIR} .endif .if defined(WITH_FULL_DOCS) cd ${WRKSRC}/docs/ ;${SETENV} ${MAKE_ENV} ${GMAKE} install .endif .ifdef defined(EMACS_LOGO_MODE) cd ${WRKSRC}/emacs; ${SETENV} ${MAKE_ENV} ${GMAKE} install-emacs .endif .include Property changes on: head/lang/logo/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/lang/logo/files/patch-term.c =================================================================== --- head/lang/logo/files/patch-term.c (revision 204952) +++ head/lang/logo/files/patch-term.c (revision 204953) @@ -1,11 +1,66 @@ --- term.c.orig 2007-12-04 15:42:55.000000000 +0300 +++ term.c 2007-12-04 15:43:04.000000000 +0300 +@@ -30,8 +30,8 @@ + #include + #endif + +-#ifdef HAVE_TERMIO_H +-#include ++#if 1 ++#include + #else + #ifdef HAVE_SGTTY_H + #include +@@ -71,8 +71,8 @@ + char so_arr[40]; + char se_arr[40]; + +-#ifdef HAVE_TERMIO_H +-struct termio tty_cooked, tty_cbreak; ++#if 1 ++struct termios tty_cooked, tty_cbreak; + #else + #ifdef HAVE_SGTTY_H + struct sgttyb tty_cooked, tty_cbreak; @@ -85,7 +85,7 @@ char *termcap_ptr; -int termcap_putter(char ch) { +int termcap_putter(int ch) { *termcap_ptr++ = ch; return 0; } +@@ -125,8 +125,8 @@ + #endif /* WIN32 */ + #else + if (interactive) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCGETA,(char *)(&tty_cooked)); ++#if 1 ++ tcgetattr(0, &tty_cooked); + tty_cbreak = tty_cooked; + tty_cbreak.c_cc[VMIN] = '\01'; + tty_cbreak.c_cc[VTIME] = '\0'; +@@ -181,8 +181,8 @@ + void charmode_on() { + #ifdef unix + if ((readstream == stdin) && interactive && !tty_charmode) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCSETA,(char *)(&tty_cbreak)); ++#if 1 ++ tcsetattr(0, TCSANOW, &tty_cbreak); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cbreak)); + #endif /* HAVE_TERMIO_H */ +@@ -197,8 +197,8 @@ + void charmode_off() { + #ifdef unix + if (tty_charmode) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCSETA,(char *)(&tty_cooked)); ++#if 1 ++ tcsetattr(0, TCSANOW, &tty_cooked); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cooked)); + #endif /* HAVE_TERMIO_H */ Property changes on: head/lang/logo/files/patch-term.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property