Index: head/x11-toolkits/xview/Makefile =================================================================== --- head/x11-toolkits/xview/Makefile (revision 282351) +++ head/x11-toolkits/xview/Makefile (revision 282352) @@ -1,76 +1,72 @@ # New ports collection makefile for: XView # Date created: 22 November 1994 # Whom: ljo (orig) # # $FreeBSD$ # PORTNAME= xview PORTVERSION= 3.2.1 PORTREVISION= 11 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.efd.lth.se/pub/X11/ \ ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav DISTNAME= xview3.2p1-X11R6 MAINTAINER= cy@FreeBSD.org COMMENT= X Window-System-based Visual/Integrated Environment for Workstations MAKE_JOBS_UNSAFE= yes BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale ONLY_FOR_ARCHS= i386 REINPLACE_ARGS= -i "" USE_IMAKE= yes USE_XORG= x11 USE_LDCONFIG= yes IMAKEINCLUDE= "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config" MAKE_ENV+= IMAKEINCLUDE=${IMAKEINCLUDE} ALL_TARGET= World SUB_FILES= pkg-message MAN1= xview.1 X11BASE2FIX= clients/olwmslave/help_file.c lib/libxview/help/help_file.c \ lib/libxview/misc/gettext.h lib/libxview/textsw/txt_e_menu.c .include .if ${OSVERSION} > 800089 CFLAGS+= -DCOMPAT_43TTY .endif -.if ${OSVERSION} > 900007 -BROKEN= fails to build with new utmpx -.endif - pre-configure: @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+;' \ ${WRKSRC}/config/XView.cf @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \ ${WRKSRC}/config/XView.tmpl .if ${OSVERSION} < 800090 @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \ ${WRKSRC}/config/XView.tmpl .endif @${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \ ${WRKSRC}/clients/olwm/screen.c ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \ ${X11BASE2FIX:C|^|${WRKSRC}/|} @${REINPLACE_CMD} -e "s,^MSG_UTIL,#MSG_UTIL," \ ${WRKSRC}/util/Imakefile @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\ s|^/\*\*/#*|XCOMM |' post-install: .if !defined{NOPORTDOCS} @(cd ${WRKSRC}/doc; ${MAKE} install) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11-toolkits/xview/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.55 \ No newline at end of property +1.56 \ No newline at end of property Index: head/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c =================================================================== --- head/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c (revision 282351) +++ head/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c (revision 282352) @@ -1,75 +1,162 @@ ---- lib/libxview/ttysw/tty_init.c.orig Tue Jun 29 00:17:19 1993 -+++ lib/libxview/ttysw/tty_init.c Fri Oct 17 09:40:42 2003 +--- lib/libxview/ttysw/tty_init.c.orig 1993-06-28 22:17:19.000000000 -0700 ++++ lib/libxview/ttysw/tty_init.c 2011-09-24 22:14:48.726921496 -0700 @@ -14,6 +14,7 @@ * Ttysw initialization, destruction and error procedures */ +#include #include #include #include -@@ -82,7 +83,11 @@ +@@ -23,10 +24,17 @@ + #include /* for XV* defines and termios */ + ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++#define SVR4 ++#define XV_USE_SVR4_PTYS ++#endif ++ + #ifdef XV_USE_SVR4_PTYS ++#if !(defined(__FreeBSD_version) && __FreeBSD_version > 900007) + #include + #include + #include ++#endif + #endif /* XV_USE_SVR4_PTYS */ + + #ifndef SVR4 +@@ -82,7 +90,11 @@ + extern char *strncpy(); extern char *strcpy(); +#if (defined(BSD) && (BSD >= 199306)) +extern off_t lseek(); +#else extern long lseek(); +#endif char *textsw_checkpoint_undo(); /* static */ void ttysw_parseargs(); -@@ -106,6 +111,7 @@ +@@ -106,6 +118,7 @@ extern int ttysel_use_seln_service; +static int ttyinit(); struct ttysw_createoptions { int becomeconsole; /* be the console */ -@@ -518,6 +524,9 @@ +@@ -518,6 +531,9 @@ (void) dup2(ttysw->ttysw_tty, 2); (void) close(ttysw->ttysw_tty); +#if (defined(BSD) && (BSD >= 199103)) + (void) ioctl(0, TIOCSCTTY, NULL); +#endif if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) { /* Process arg list */ int argc; -@@ -955,7 +964,11 @@ +@@ -544,15 +560,25 @@ + * ttcompat seems to leave things in a funny state and assumes + * (seemingly) that login will fix things up. Do it here. + */ ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++ if (tcgetattr (0, &tp) == -1) ++ perror("tcgetattr"); ++#else + if (ioctl (0, TCGETS, &tp) == -1) + perror("ioctl TCGETS"); ++#endif + else { + tp.c_lflag |= ECHO; + tp.c_oflag |= ONLCR; + tp.c_iflag |= ICRNL; + } ++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007 ++ if (tcsetattr (0, TCSANOW, &tp) == -1) ++ perror("tcsetattr"); ++#else + if (ioctl (0, TCSETS, &tp) == -1) + perror("ioctl TCSETS"); ++#endif + #endif /* BSD_TTY_COMPAT */ + #endif /* SVR4 */ + +@@ -739,7 +765,9 @@ + + #ifdef SB_NO_DROPS /* defined as result of including new bufmod.h */ + ++#if !defined(__FreeBSD_version) + if(ioctl(pty, I_PUSH, "bufmod") == -1) { /* some buffering ... */ ++#endif + + /* we can't push bufmod... this means we're probably + running on a generic SVR4 system - we can ignore this +@@ -864,13 +892,16 @@ + #endif SB_NO_DROPS + + ++#ifndef __FreeBSD_version + if (ioctl(pty, I_PUSH, "pckt") == -1) { /* must use getmsg for read */ + perror("push pckt"); + return XV_ERROR; + } ++#endif + + if ((tty = open(ptsname(pty),O_RDWR))<0) + return XV_ERROR; ++#ifndef __FreeBSD_version + if (ioctl(tty, I_PUSH, "ptem") == -1) { + perror("push ptem"); + return XV_ERROR; +@@ -879,12 +910,15 @@ + perror("push ldterm"); + return XV_ERROR; + } ++#endif + #ifdef BSD_TTY_COMPAT ++#ifndef __FreeBSD_version + if (ioctl(tty, I_PUSH, "ttcompat") == -1) { /* for csh */ + perror("push ttcompat"); + return XV_ERROR; + } + #endif ++#endif + + #endif /* SVR4 */ + +@@ -955,7 +989,11 @@ struct utmpx utmp; #endif struct passwd *passwdent; +#if !(defined(BSD) && (BSD >= 199103)) extern struct passwd *getpwuid(); +#else + struct passwd *getpwuid __P((uid_t)); +#endif int f; char *ttyn; extern char *ttyname(); -@@ -1007,13 +1020,22 @@ +@@ -1007,13 +1045,22 @@ XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n")); return (0); } +#if !(defined(BSD) && (BSD >= 199103)) if ((f = open("/etc/utmp", 1)) >= 0) { +#else + if ((f = open(_PATH_UTMP, 1)) >= 0) { +#endif (void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0); (void) write(f, (char *) &utmp, sizeof(utmp)); (void) close(f); } else { (void) fprintf(stderr, +#if !(defined(BSD) && (BSD >= 199103)) XV_MSG("make sure that you can write /etc/utmp!\n")); +#else + XV_MSG("make sure that you can write ")); + (void) fprintf(stderr, "%s!\n", _PATH_UTMP); +#endif return (0); } return (ttyslotuse); Property changes on: head/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property