Date: Tue, 18 Jan 2005 19:30:02 +0100 (CET) From: Jean-Yves Lefort <jylefort@brutele.be> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76424: Update port: shells/viewglob to 1.0.2 Message-ID: <20050118183002.59DCD22E1A@jsite.lefort.net> Resent-Message-ID: <200501181830.j0IIUVWe045509@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76424
>Category: ports
>Synopsis: Update port: shells/viewglob to 1.0.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 18 18:30:31 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Thu Dec 2 15:08:28 CET 2004 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/shells/viewglob/Makefile viewglob/Makefile
--- /usr/ports/shells/viewglob/Makefile Mon Nov 8 05:46:32 2004
+++ viewglob/Makefile Tue Jan 18 19:13:44 2005
@@ -6,8 +6,7 @@
#
PORTNAME= viewglob
-PORTVERSION= 1.0
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -27,6 +26,5 @@
post-extract:
@${CP} ${WRKSRC}/src/tc_setraw.h ${WRKSRC}/src/tc_setraw.viewglob.h
- @${CP} ${WRKSRC}/src/ptutil.h ${WRKSRC}/src/ptutil.viewglob.h
.include <bsd.port.mk>
diff -ruN /usr/ports/shells/viewglob/distinfo viewglob/distinfo
--- /usr/ports/shells/viewglob/distinfo Thu Oct 14 09:38:35 2004
+++ viewglob/distinfo Tue Jan 18 19:11:52 2005
@@ -1,2 +1,2 @@
-MD5 (viewglob-1.0.tar.gz) = 99910845070a03f5d9e925564141fa7c
-SIZE (viewglob-1.0.tar.gz) = 197543
+MD5 (viewglob-1.0.2.tar.gz) = b7ddd1d31d84f300229defd2872ee35a
+SIZE (viewglob-1.0.2.tar.gz) = 202523
diff -ruN /usr/ports/shells/viewglob/files/patch-src::Makefile.in viewglob/files/patch-src::Makefile.in
--- /usr/ports/shells/viewglob/files/patch-src::Makefile.in Thu Oct 14 09:38:35 2004
+++ viewglob/files/patch-src::Makefile.in Tue Jan 18 19:15:15 2005
@@ -1,26 +1,17 @@
---- src/Makefile.in.orig Wed Oct 6 03:23:40 2004
-+++ src/Makefile.in Wed Oct 6 03:29:02 2004
-@@ -91,8 +91,6 @@
+--- src/Makefile.in.orig Tue Jan 18 19:14:11 2005
++++ src/Makefile.in Tue Jan 18 19:14:58 2005
+@@ -91,7 +91,6 @@
# Very slight modifications to these files from Marc J. Rochkind's
# book Advanced Unix Programming 2nd ed. You can get them on the
# web at: http://www.basepath.com/aup/
--BUILT_SOURCES = ptutil.viewglob.c ptutil.viewglob.h \
-- tc_setraw.viewglob.c tc_setraw.viewglob.h
+-BUILT_SOURCES = tc_setraw.viewglob.c tc_setraw.viewglob.h
-
- CLEANFILES = viewglob .zshrc getopt.sh ptutil.viewglob.c \
-@@ -484,16 +482,16 @@
+ CLEANFILES = viewglob .zshrc getopt.sh \
+ tc_setraw.viewglob.c tc_setraw.viewglob.h
+@@ -478,10 +477,10 @@
.zshrc: Makefile
cp -f init-viewglob.zshrc .zshrc
--ptutil.viewglob.c: Makefile
-+ptutil.viewglob.c:
- rm -f ptutil.viewglob.c
- patch -i ptutil.c.diff -o ptutil.viewglob.c ptutil.c
--ptutil.viewglob.h: Makefile
-+ptutil.viewglob.h:
- rm -f ptutil.viewglob.h
- patch -i ptutil.h.diff -o ptutil.viewglob.h ptutil.h
-tc_setraw.viewglob.c: Makefile
+tc_setraw.viewglob.c:
rm -f tc_setraw.viewglob.c
diff -ruN /usr/ports/shells/viewglob/files/patch-src::ptutil.viewglob.c viewglob/files/patch-src::ptutil.viewglob.c
--- /usr/ports/shells/viewglob/files/patch-src::ptutil.viewglob.c Thu Oct 14 09:38:35 2004
+++ viewglob/files/patch-src::ptutil.viewglob.c Thu Jan 1 01:00:00 1970
@@ -1,27 +0,0 @@
---- src/ptutil.viewglob.c.orig Wed Oct 6 03:34:54 2004
-+++ src/ptutil.viewglob.c Wed Oct 6 03:47:51 2004
-@@ -45,7 +45,6 @@
- #endif
- /*[incl]*/
- #ifdef _XOPEN_UNIX
--#include <stropts.h> /* for STREAMS */
- #endif
- #ifdef NEED_TIOCSCTTY
- #include <sys/ttycom.h> /* for TIOCSCTTY */
-@@ -73,14 +72,9 @@
- static bool find_and_open_master(PTINFO *p)
- {
- #if defined(_XOPEN_UNIX)
--#if _XOPEN_VERSION >= 600
- p->pt_name_m[0] = '\0'; /* don't know or need name */
-- ec_neg1( p->pt_fd_m = posix_openpt(O_RDWR | O_NOCTTY) )
--#else
-- strcpy(p->pt_name_m, "/dev/ptmx"); /* clone device */
-- if ( (p->pt_fd_m = open(p->pt_name_m, O_RDWR)) == -1)
-- goto failure;
--#endif
-+ if ((p->pt_fd_m = posix_openpt(O_RDWR | O_NOCTTY)) == -1)
-+ return false;
- #elif defined(MASTER_NAME_SEARCH)
- int i, j;
- char proto[] = PTY_PROTO;
diff -ruN /usr/ports/shells/viewglob/files/patch-src::ptytty.c viewglob/files/patch-src::ptytty.c
--- /usr/ports/shells/viewglob/files/patch-src::ptytty.c Thu Jan 1 01:00:00 1970
+++ viewglob/files/patch-src::ptytty.c Tue Jan 18 19:26:47 2005
@@ -0,0 +1,22 @@
+--- src/ptytty.c.orig Fri Nov 19 07:43:59 2004
++++ src/ptytty.c Tue Jan 18 19:26:30 2005
+@@ -48,7 +48,6 @@
+ # include <sys/ioctl.h>
+ #endif
+ #if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
+-# include <sys/stropts.h> /* for I_PUSH */
+ #endif
+
+
+@@ -71,6 +70,11 @@
+ rxvt_get_pty(int *fd_tty, const char **ttydev)
+ {
+ int pfd;
++
++ if ((pfd = posix_openpt(O_RDWR | O_NOCTTY)) != -1)
++ *ttydev = ptsname(pfd);
++
++ return pfd;
+
+ #ifdef PTYS_ARE_OPENPTY
+ char tty_name[sizeof "/dev/pts/????\0"];
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050118183002.59DCD22E1A>