mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

- Update to 1.0.2

Browse source 
- Mark IGNORE on FreeBSD 4.x, missing library functions

PR:		ports/76424
Submitted by:	Jean-Yves Lefort <jylefort@brutele.be> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-01-19 19:28:06 +00:00
parent 646f5e9ad7
commit 4e20cfbb93
5 changed files with 39 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shells/viewglob/Makefile
View file

@ -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}
@ -25,8 +24,13 @@ USE_GCC= 3.4
MAN1= gviewglob.1 viewglob.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
IGNORE= does not compile on FreeBSD 4.x, it's missing posix_openpt and ptsname functions
.endif
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>
.include <bsd.port.post.mk>

4
shells/viewglob/distinfo
View file

@ -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

23
shells/viewglob/files/patch-src::Makefile.in
View file

@ -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

27
shells/viewglob/files/patch-src::ptutil.viewglob.c
View file

@ -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;

22
shells/viewglob/files/patch-src::ptytty.c Normal file
View file

@ -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"];