diff options
Diffstat (limited to 'comms')
-rw-r--r-- | comms/conserver/Makefile | 63 | ||||
-rw-r--r-- | comms/conserver/distinfo | 2 | ||||
-rw-r--r-- | comms/conserver/files/conserver.sh | 2 | ||||
-rw-r--r-- | comms/conserver/files/conserver.sh.in | 2 | ||||
-rw-r--r-- | comms/conserver/files/patch-aa | 46 | ||||
-rw-r--r-- | comms/conserver/files/patch-ab | 51 | ||||
-rw-r--r-- | comms/conserver/files/patch-ac | 36 | ||||
-rw-r--r-- | comms/conserver/files/patch-ad | 60 | ||||
-rw-r--r-- | comms/conserver/files/patch-ae | 45 | ||||
-rw-r--r-- | comms/conserver/files/patch-af | 16 | ||||
-rw-r--r-- | comms/conserver/files/patch-ag | 36 | ||||
-rw-r--r-- | comms/conserver/files/patch-ah | 75 | ||||
-rw-r--r-- | comms/conserver/files/patch-ai | 28 | ||||
-rw-r--r-- | comms/conserver/files/patch-autologin-Make.host | 11 | ||||
-rw-r--r-- | comms/conserver/files/patch-conserver-Make.host | 10 | ||||
-rw-r--r-- | comms/conserver/files/patch-console-Make.host | 10 | ||||
-rw-r--r-- | comms/conserver/files/patch-machine.h | 17 | ||||
-rw-r--r-- | comms/conserver/pkg-plist | 1 |
18 files changed, 140 insertions, 371 deletions
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index 3d5c4e2f6afe..c1716dbdb0ed 100644 --- a/comms/conserver/Makefile +++ b/comms/conserver/Makefile @@ -7,38 +7,63 @@ # PORTNAME= conserver -PORTVERSION= 5.21b +PORTVERSION= 8.5 CATEGORIES= comms -MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \ - ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/ -DISTNAME= ${PORTNAME}-5.21-Beta -EXTRACT_SUFX= .shar.gz +MASTER_SITES= ftp://ftp.physics.purdue.edu/pub/pundits/ +EXTRACT_SUFX= .tgz MAINTAINER= obrien@FreeBSD.org -EXTRACT_CMD= zcat -EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |sh -NO_WRKSUBDIR= yes +BUILD_DEPENDS= makeme:${PORTSDIR}/devel/msrc0 \ + mkcmd:${PORTSDIR}/devel/mkcmd + MAN5= conserver.cf.5 -MAN8= console.8 conserver.8 +MAN8= autologin.8 console.8 conserver.8 # Set this to where you want console(8) to connect to by default # or use something like ``make DEFAULTHOST=myserver.mydomain.net'' DEFAULTHOST?= localhost -MAKE_ENV+= DEFAULTHOST="${DEFAULTHOST}" +DEFAULTPORT?= 782 +MAKE_ENV+= DEFAULTHOST="${DEFAULTHOST}" DEFAULTPORT="${DEFAULTPORT}" +PKGMESSAGE= ${WRKDIR}/MESSAGE -# XXX we also have to work around ``new'' uudecode behavior, thanks guys! -post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKSRC} -.if !exists(${WRKSRC}/group.c) - @${MV} ${WRKSRC}/group.c ${WRKSRC}/conserver/group.c -.endif +do-build: + ${PERL} -pi.orig -e 's:/usr/local/lib:${PREFIX}/etc:g' \ + ${WRKSRC}/etc/conserver/cons.h +.for d in etc/conserver etc/console etc/autologin + (cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \ + ${MAKE_ARGS} ${ALL_TARGET}) +.endfor + @${SED} -e 's:/usr/local:${PREFIX}:g' \ + ${.CURDIR}/pkg-message > ${PKGMESSAGE} -post-install: +do-install: +.for d in etc/conserver etc/console etc/autologin + @(cd ${WRKSRC}/$d && ${SETENV} ${MAKE_ENV} makeme \ + ${MAKE_ARGS} ${INSTALL_TARGET}) +.endfor + @${INSTALL_DATA} ${WRKSRC}/lib/conserver.cf/conserver.cf \ + ${PREFIX}/etc/conserver.cf.eg + @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \ + ${WRKSRC}/lib/conserver.cf/conserver.cf.man \ + > ${PREFIX}/man/man5/conserver.cf.5 + @${SED} -e 's:/usr/local/etc:${PREFIX}/sbin:g' \ + ${WRKSRC}/etc/autologin/autologin.man \ + > ${PREFIX}/man/man8/autologin.8 + @${SED} -e 's:/usr/local/lib:${PREFIX}/etc:g' \ + ${WRKSRC}/etc/conserver/conserver.man \ + > ${PREFIX}/man/man8/conserver.8 + @${SED} -e 's:console\.itsd\.fedex\.com:${DEFAULTHOST}:g' \ + ${WRKSRC}/etc/console/console.man \ + > ${PREFIX}/man/man8/console.8 + @${CHMOD} 0444 ${PREFIX}/man/man5/conserver.cf.5 \ + ${PREFIX}/man/man8/autologin.8 \ + ${PREFIX}/man/man8/conserver.8 \ + ${PREFIX}/man/man8/console.8 .if !exists(${PREFIX}/etc/rc.d/conserver.sh) @${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file." - ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh ${PREFIX}/etc/rc.d + @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh ${PREFIX}/etc/rc.d .endif + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/comms/conserver/distinfo b/comms/conserver/distinfo index 17f296d341fd..8aa58cb1f8e0 100644 --- a/comms/conserver/distinfo +++ b/comms/conserver/distinfo @@ -1 +1 @@ -MD5 (conserver-5.21-Beta.shar.gz) = f19d56fba0c85d8b2c680c4b630f1a1b +MD5 (conserver-8.5.tgz) = 2f56c68e470fe00043a2eb510cea3174 diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh index cf27a4764ecf..a133bc29cc96 100644 --- a/comms/conserver/files/conserver.sh +++ b/comms/conserver/files/conserver.sh @@ -14,7 +14,7 @@ start) fi ;; stop) - killall conserver && echo -n ' conserver' + killall -TERM conserver && echo -n ' conserver' ;; restart) $0 stop diff --git a/comms/conserver/files/conserver.sh.in b/comms/conserver/files/conserver.sh.in index cf27a4764ecf..a133bc29cc96 100644 --- a/comms/conserver/files/conserver.sh.in +++ b/comms/conserver/files/conserver.sh.in @@ -14,7 +14,7 @@ start) fi ;; stop) - killall conserver && echo -n ' conserver' + killall -TERM conserver && echo -n ' conserver' ;; restart) $0 stop diff --git a/comms/conserver/files/patch-aa b/comms/conserver/files/patch-aa deleted file mode 100644 index 7f3e11bd8b38..000000000000 --- a/comms/conserver/files/patch-aa +++ /dev/null @@ -1,46 +0,0 @@ ---- conserver/Makefile.orig Fri Nov 10 22:22:39 2000 -+++ conserver/Makefile Fri Nov 10 22:26:14 2000 -@@ -7,8 +7,9 @@ - # (1) change ETC below to where you would like the console server installed - # I would not change the name, you have to much with the docs then... - PROG= conserver --ETC= ${DESTDIR}/usr/local/etc --DOC= ${DESTDIR}/usr/local/man -+ETC= ${PREFIX}/sbin -+DOC= ${PREFIX}/man/man8 -+CONFIG= ${PREFIX}/etc/conserver.cf - - # if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o - # and change the CDEFS line below to =0 -@@ -23,9 +24,9 @@ - P= - - INCLUDE= --DEBUG=-O --CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1 --CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} -+#DEBUG=-O -+CDEFS= -DFREEBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782 -DCONFIG=\"${CONFIG}\" -+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} - - HDR= cons.h \ - access.h client.h consent.h group.h main.h master.h \ -@@ -41,7 +42,7 @@ - all: ${PROG} - - ${PROG}:$P ${OBJ} -- ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl -+ ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lcrypt - - clean: FRC - rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags -@@ -59,7 +60,8 @@ - distrib -c ${ETC}/${PROG} - - install: all dirs FRC -- install -c -s ${PROG} ${ETC}/${PROG} -+ ${BSD_INSTALL_PROGRAM} ${PROG} ${ETC}/${PROG} -+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.8 - - lint: ${HDR} ${SRC} FRC - lint -h ${CDEFS} ${INCLUDE} ${SRC} diff --git a/comms/conserver/files/patch-ab b/comms/conserver/files/patch-ab deleted file mode 100644 index 84651a870758..000000000000 --- a/comms/conserver/files/patch-ab +++ /dev/null @@ -1,51 +0,0 @@ ---- conserver/cons.h.orig Sun Apr 19 05:10:22 1998 -+++ conserver/cons.h Mon Apr 20 11:52:25 1998 -@@ -54,5 +54,5 @@ - #endif - #if !defined(HAVE_UWAIT) --#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)) -+#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(FREEBSD)) - #endif - -@@ -86,5 +86,5 @@ - */ - #if !defined(CONFIG) --#define CONFIG "/usr/local/lib/conserver.cf" -+#define CONFIG "/usr/local/etc/conserver.cf" - #endif - -@@ -171,5 +171,5 @@ - - #if !defined(HAVE_SETSID) --#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)) -+#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(FREEBSD)) - #endif - -@@ -193,5 +193,5 @@ - #endif - #if !defined(USE_TERMIOS) --#define USE_TERMIOS (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(SUN5)||defined(PTX)||defined(IRIX5)) -+#define USE_TERMIOS (defined(HPUX7)||defined(HPUX8)||defined(HPUX9)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(FREEBSD)) - #endif - #if !defined(USE_TCBREAK) -@@ -258,5 +258,5 @@ - /* which type signal handlers return on this machine - */ --#if defined(sun) || defined(NEXT2) || defined(SUN5) || defined(PTX) || defined(IRIX5) -+#if defined(sun) || defined(NEXT2) || defined(SUN5) || defined(PTX) || defined(IRIX5) || defined(FREEBSD) - #define SIGRETS void - #else -@@ -267,5 +267,5 @@ - */ - #if !defined(HAVE_SETSOCKOPT) --#define HAVE_SETSOCKOPT (defined(sun)||defined(PTX)) -+#define HAVE_SETSOCKOPT (defined(sun)||defined(PTX)||defined(FREEBSD)) - #endif - -@@ -273,5 +273,5 @@ - */ - #if !defined(HAVE_STRERROR) --#define HAVE_STRERROR (defined(IBMR2)||defined(ETA10)||defined(V386)||defined(SUN5)||defined(NEXT2)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)) -+#define HAVE_STRERROR (defined(IBMR2)||defined(ETA10)||defined(V386)||defined(SUN5)||defined(NEXT2)||defined(HPUX8)||defined(HPUX9)||defined(PTX)||defined(IRIX5)||defined(FREEBSD)) - #endif - #if ! HAVE_STRERROR diff --git a/comms/conserver/files/patch-ac b/comms/conserver/files/patch-ac index 3081ae3f0a16..dc4a1bb3a2ef 100644 --- a/comms/conserver/files/patch-ac +++ b/comms/conserver/files/patch-ac @@ -1,22 +1,16 @@ ---- ./conserver/group.c Sat Nov 22 20:11:49 1997 -+++ ./conserver/group.c Sat Aug 23 17:19:13 1997 -@@ -406,7 +406,7 @@ - continue; - } - /* read terminal line */ -- if ((nr = read(pCEServing->fdtty, acIn, sizeof(acIn))) < 0) { -+ if ((nr = read(pCEServing->fdtty, acIn, sizeof(acIn))) <= 0) { - /* carrier lost */ - fprintf(stderr, "%s: lost carrier on %s (%s)!\n", progname, pCEServing->server, pCEServing->dfile); - #if DO_VIRTUAL -@@ -750,5 +750,5 @@ - CSTROUT(pCLServing->fd, "- "); - if (-1 == tcsendbreak(pCEServing->fdtty, 9)) { +--- etc/conserver/group.c.orig Wed Nov 17 18:07:38 1999 ++++ etc/conserver/group.c Wed Nov 17 18:09:43 1999 +@@ -902,7 +902,7 @@ + #endif + #if USE_TERMIO + if (-1 == ioctl(pCEServing->fdtty, TCSBRK, (char *)0)) { - CSTROUT(pCLServing->fd, "failed]\r\n"); + CSTROUT(pCLServing->fd, "tcsendbreak failed]\r\n"); continue; } -@@ -1119,11 +1119,9 @@ + #else +@@ -1274,15 +1274,12 @@ + continue; } #if !defined(XTABS) /* XXX hack */ -#define XTABS TAB3 @@ -25,9 +19,13 @@ - if (XTABS == (TABDLY&sbuf.c_oflag)) { - sbuf.c_oflag &= ~TABDLY; - sbuf.c_oflag |= TAB0; -+ if (XTABS & sbuf.c_oflag) { -+ sbuf.c_oflag &= ~XTABS; - } else { +- } else { - sbuf.c_oflag &= ~TABDLY; ++ if (XTABS & sbuf.c_oflag) ++ sbuf.c_oflag &= ~XTABS; ++ else sbuf.c_oflag |= XTABS; - } +- } + if (-1 == tcsetattr(pCEServing->fdtty, TCSANOW, & sbuf)) { + CSTROUT(pCLServing->fd, "failed]\r\n"); + continue; diff --git a/comms/conserver/files/patch-ad b/comms/conserver/files/patch-ad index 0a100025f35b..632dd0464753 100644 --- a/comms/conserver/files/patch-ad +++ b/comms/conserver/files/patch-ad @@ -1,19 +1,6 @@ ---- conserver/consent.c.orig Thu Feb 17 19:50:41 2000 -+++ conserver/consent.c Thu Feb 17 19:50:42 2000 -@@ -78,6 +78,12 @@ - - - BAUD baud [] = { -+#if defined(B115200) -+ { "115200", B115200 }, -+#endif -+#if defined(B57600) -+ { "57600", B57600 }, -+#endif - #if defined(B38400) - { "38400", B38400 }, - #endif -@@ -197,7 +203,7 @@ +--- etc/conserver/consent.c.orig Wed Nov 17 18:10:14 1999 ++++ etc/conserver/consent.c Wed Nov 17 18:12:57 1999 +@@ -295,7 +295,7 @@ */ termp.c_iflag = IXON|IXOFF|BRKINT; termp.c_oflag = 0; @@ -22,7 +9,7 @@ termp.c_cflag |= pCE->pparity->iset; termp.c_lflag = 0; /* -@@ -205,7 +211,7 @@ +@@ -303,7 +303,7 @@ * Set the VTIME == 1 (0.1 sec) * Don't bother with the control characters as they are not used */ @@ -31,32 +18,17 @@ termp.c_cc[VTIME] = 1; if (-1 == cfsetospeed(&termp,pCE->pbaud->irate)) { -@@ -424,15 +430,15 @@ - #endif - - #if USE_TERMIOS -- if (0 != ioctl(0, TCGETS, & n_tio)) { -+ if (0 != tcgetattr(0, & n_tio)) { - fprintf(stderr, "%s: iotcl: getsw: %s\n", progname, strerror(errno)); - exit(1); - } -- n_tio.c_iflag &= ~(IGNCR|IUCLC); -+ -+ n_tio.c_iflag &= ~(IGNCR); - n_tio.c_iflag |= ICRNL|IXON|IXANY; -- n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY); - n_tio.c_oflag |= OPOST|ONLCR; -- n_tio.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL); -+ n_tio.c_lflag &= ~(NOFLSH|ECHOK|ECHONL); - n_tio.c_lflag |= ISIG|ICANON|ECHO; - n_tio.c_cc[VEOF] = '\004'; - n_tio.c_cc[VEOL] = '\000'; -@@ -444,7 +450,7 @@ - n_tio.c_cc[VSTART] = '\021'; - n_tio.c_cc[VSTOP] = '\023'; - n_tio.c_cc[VSUSP] = '\032'; -- if (0 != ioctl(0, TCSETS, & n_tio)) { -+ if (0 != tcsetattr(0, TCSANOW, & n_tio)) { - fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno)); +@@ -563,11 +563,10 @@ exit(1); } + #endif +- n_tios.c_iflag &= ~(IGNCR|IUCLC); ++ n_tios.c_iflag &= ~(IGNCR); + n_tios.c_iflag |= ICRNL|IXON|IXANY; +- n_tios.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY); + n_tios.c_oflag |= OPOST|ONLCR; +- n_tios.c_lflag &= ~(XCASE|NOFLSH|ECHOK|ECHONL); ++ n_tios.c_lflag &= ~(NOFLSH|ECHOK|ECHONL); + n_tios.c_lflag |= ISIG|ICANON|ECHO; + n_tios.c_cc[VEOF] = '\004'; + n_tios.c_cc[VEOL] = '\000'; diff --git a/comms/conserver/files/patch-ae b/comms/conserver/files/patch-ae deleted file mode 100644 index 0dde107a601f..000000000000 --- a/comms/conserver/files/patch-ae +++ /dev/null @@ -1,45 +0,0 @@ ---- console/Makefile.orig Fri Nov 10 22:22:39 2000 -+++ console/Makefile Fri Nov 10 22:30:59 2000 -@@ -6,8 +6,8 @@ - # edit the ETC directory below to change where the console client - # is installed. - PROG= console --ETC= ${DESTDIR}/usr/local/etc --DOC= ${DESTDIR}/usr/local/man -+ETC= ${PREFIX}/bin -+DOC= ${PREFIX}/man/man8 - - I=/usr/include - S=/usr/include/sys -@@ -16,9 +16,9 @@ - P= - - INCLUDE= -I$C --DEBUG=-O --CDEFS= -DSUN5 --CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} -+#DEBUG=-O -+CDEFS= -DFREEBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782 -+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} - - HDR= - ONEC= console.c -@@ -29,7 +29,7 @@ - all: ${PROG} - - ${PROG}: -- ${CC} -o $@ ${CFLAGS} ${ONEC} -lsocket -lnsl -+ ${CC} -o $@ ${CFLAGS} ${ONEC} - - clean: FRC - rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags -@@ -47,7 +47,8 @@ - distrib -c ${ETC}/${PROG} - - install: all dirs FRC -- install -cs ${PROG} ${ETC}/${PROG} -+ ${BSD_INSTALL_PROG} ${PROG} ${ETC}/${PROG} -+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/console.8 - - lint: ${HDR} ${ONEC} FRC - lint -h ${CDEFS} ${INCLUDE} ${ONEC} diff --git a/comms/conserver/files/patch-af b/comms/conserver/files/patch-af index 665ad9443e66..3e6784f3e2c2 100644 --- a/comms/conserver/files/patch-af +++ b/comms/conserver/files/patch-af @@ -1,6 +1,7 @@ ---- ./console/console.c Sat Nov 22 20:11:48 1997 -+++ ./console/console.c Sat Aug 23 17:40:44 1997 -@@ -367,15 +367,15 @@ +--- etc/console/console.m.orig Sat Nov 22 23:19:33 1997 ++++ etc/console/console.m Wed Nov 17 18:29:04 1999 +@@ -566,17 +566,17 @@ + return; #if USE_TERMIOS - if (0 != ioctl(0, TCGETS, & o_tios)) { @@ -19,17 +20,22 @@ + if (0 != tcsetattr(0, TCSANOW, & n_tios)) { fprintf(stderr, "%s: getarrt: %s\n", progname, strerror(errno)); exit(10); -@@ -453,5 +453,5 @@ + } +@@ -652,7 +652,7 @@ + if (!screwy) return; #if USE_TERMIOS - (void)ioctl(0, TCSETS, (char *)&o_tios); + (void)tcsetattr(0, TCSANOW, &o_tios); #else #if USE_TERMIO -@@ -478,5 +478,5 @@ + (void)ioctl(0, TCSETA, (char *)&o_tio); +@@ -677,7 +677,7 @@ + register int nr; while (0 != iLen) { - if (-1 == (nr = write(fd, pcBuf, iLen))) { + if (0 >= (nr = write(fd, pcBuf, iLen))) { c2cooked(); fprintf(stderr, "%s: lost connection\n", progname); + exit(3); diff --git a/comms/conserver/files/patch-ag b/comms/conserver/files/patch-ag deleted file mode 100644 index 30b55e456a02..000000000000 --- a/comms/conserver/files/patch-ag +++ /dev/null @@ -1,36 +0,0 @@ ---- conserver.cf/Makefile.orig Sat Nov 22 22:25:19 1997 -+++ conserver.cf/Makefile Sat Nov 22 22:29:15 1997 -@@ -4,18 +4,19 @@ - # - - # if you edit LIB below you have to change cons.hs default config define. --PROG= conserver.cf --LIB= ${DESTDIR}/usr/local/lib --DOC= ${DESTDIR}/usr/man -+PROG= conserver.cf.eg -+LIB= ${PREFIX}/etc -+DOC= ${PREFIX}/man/man5 - - SRCs= conserver.cf - MAN= conserver.cf.5l - OTHER= README - SOURCE= Makefile ${OTHER} ${MAN} ${SRCl} ${SRCs} - --all: ${SRCl} ${PROG} -+all: ${PROG} - - ${PROG}: ${SRCs} -+ sed -e '/^[^#]/s/^/#/' < ${SRCs} > ${PROG} - - clean: FRC - rm -f Makefile.bak a.out core errs lint.out tags -@@ -29,7 +30,8 @@ - dirs: ${LIB} ${DOC} - - install: all dirs FRC -- install -c ${PROG} ${LIB}/${PROG} -+ ${BSD_INSTALL_PROG} ${PROG} ${LIB} -+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.cf.5 - - lint: FRC - diff --git a/comms/conserver/files/patch-ah b/comms/conserver/files/patch-ah deleted file mode 100644 index 3179ba333dd6..000000000000 --- a/comms/conserver/files/patch-ah +++ /dev/null @@ -1,75 +0,0 @@ ---- autologin/autologin.c.orig Sun Apr 19 04:13:35 1998 -+++ autologin/autologin.c Sun Apr 19 04:46:10 1998 -@@ -22,7 +22,7 @@ - - - #include <errno.h> --#if !defined IBMR2 -+#if !defined IBMR2 && !defined FREEBSD - extern char *sys_errlist[]; - #define strerror(Me) (sys_errlist[Me]) - #endif -@@ -118,14 +118,16 @@ - #if defined(FREEBSD) - #include <sys/time.h> - #include <sys/ioctl.h> -+#include <sys/termios.h> - #include <sys/uio.h> - #include <sys/proc.h> - #include <sys/ioctl_compat.h> --#define setsid() getpid() --#define getsid(Mp) (Mp) --#define USE_IOCTL 1 --#define USE_OLD_UTENT 1 --#define PATH_SU "/usr/ucb/su" -+#include <sys/ttydefaults.h> -+#include <ttyent.h> -+#define getsid(Mp) (-1) -+#define USE_TC 1 -+#define PATH_SU "/usr/bin/su" -+#define UTMP_PATH "/var/run/utmp" - #else - - #include <sys/termios.h> -@@ -348,6 +350,11 @@ - dup(0); - dup(0); - } -+#ifdef TIOCSCTTY -+ if (ioctl(0, TIOCSCTTY, NULL) == -1) { -+ (void) fprintf(stderr, "%s: TIOCSCTTY: %s\n", progname, strerror(errno)); -+ } -+#endif - - /* put the tty in out process group - */ -@@ -439,6 +446,21 @@ - /* NOTREACHED */ - } - #endif -+#ifdef FREEBSD -+ n_tio.c_iflag = TTYDEF_IFLAG; -+ n_tio.c_oflag = TTYDEF_OFLAG; -+ n_tio.c_lflag = TTYDEF_LFLAG; -+ n_tio.c_cc[VEOF] = CEOF; -+ n_tio.c_cc[VEOL] = CEOL; -+ n_tio.c_cc[VERASE] = CERASE; -+ n_tio.c_cc[VINTR] = CINTR; -+ n_tio.c_cc[VSTATUS] = CSTATUS; -+ n_tio.c_cc[VKILL] = CKILL; -+ n_tio.c_cc[VQUIT] = CQUIT; -+ n_tio.c_cc[VSUSP] = CSUSP; -+ n_tio.c_cc[VSTART] = CSTART; -+ n_tio.c_cc[VSTOP] = CSTOP; -+#else - n_tio.c_iflag &= ~(IGNCR|IUCLC); - n_tio.c_iflag |= ICRNL|IXON|IXANY; - n_tio.c_oflag &= ~(OLCUC|ONOCR|ONLRET|OFILL|NLDLY|CRDLY|TABDLY|BSDLY); -@@ -455,6 +477,7 @@ - n_tio.c_cc[VSTART] = '\021'; /* ^Q */ - n_tio.c_cc[VSTOP] = '\023'; /* ^S */ - n_tio.c_cc[VSUSP] = '\032'; /* ^Z */ -+#endif - #if USE_TC - if (0 != tcsetattr(0, TCSANOW, &n_tio)) { - (void) fprintf(stderr, "%s: tcsetattr: %s\n", progname, strerror(errno)); diff --git a/comms/conserver/files/patch-ai b/comms/conserver/files/patch-ai deleted file mode 100644 index 406aa9626657..000000000000 --- a/comms/conserver/files/patch-ai +++ /dev/null @@ -1,28 +0,0 @@ ---- autologin/Makefile.orig Fri Nov 10 22:22:39 2000 -+++ autologin/Makefile Fri Nov 10 22:32:54 2000 -@@ -7,12 +7,12 @@ - # - - DESTDIR= --BINDIR= ${DESTDIR}/usr/local/etc -+BINDIR= ${PREFIX}/sbin - - INCLUDE= --DEBUG= -g --DEFS= -DPUCC -DSUN5 --CFLAGS= ${DEBUG} ${DEFS} ${INCLUDE} -+#DEBUG= -O -+DEFS= -DFREEBSD -+CFLAGS+= ${DEBUG} ${DEFS} ${INCLUDE} - - GENC= main.c - GENH= main.h -@@ -56,7 +56,7 @@ - lint -h ${CDEFS} ${INCLUDE} ${GEN} ${SRC} - - install: all -- install -c -s -m 755 autologin ${BINDIR} -+ ${BSD_INSTALL_PROGRAM} autologin ${BINDIR} - - distrib: - distrib -c ${BINDIR}/autologin diff --git a/comms/conserver/files/patch-autologin-Make.host b/comms/conserver/files/patch-autologin-Make.host new file mode 100644 index 000000000000..4a11bf890b7e --- /dev/null +++ b/comms/conserver/files/patch-autologin-Make.host @@ -0,0 +1,11 @@ +--- etc/autologin/Make.host.orig Sat Nov 22 20:19:33 1997 ++++ etc/autologin/Make.host Tue Nov 21 18:07:15 2000 +@@ -11,7 +11,7 @@ + HOSTTYPE,`PARAGON',` + BINDIR= ${DESTDIR}/etc + ',` +-BINDIR= ${DESTDIR}/usr/local/etc ++BINDIR= ${PREFIX}/sbin + ')` + + INCLUDE= diff --git a/comms/conserver/files/patch-conserver-Make.host b/comms/conserver/files/patch-conserver-Make.host new file mode 100644 index 000000000000..064116961f18 --- /dev/null +++ b/comms/conserver/files/patch-conserver-Make.host @@ -0,0 +1,10 @@ +--- etc/conserver/Make.host.orig Sat Nov 22 20:19:31 1997 ++++ etc/conserver/Make.host Tue Nov 21 18:11:42 2000 +@@ -10,2 +10,2 @@ +-ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc +-DOC= ${DESTDIR}/usr/local/man ++ETC= ${DESTDIR}/${PREFIX}/sbin ++DOC= ${DESTDIR}/${PREFIX}/man +@@ -36 +36 @@ +-HOSTTYPE,`EPIX',` -systype bsd43')` ++HOSTTYPE,`EPIX',` -systype bsd43')` -DPORT=${DEFAULTPORT} diff --git a/comms/conserver/files/patch-console-Make.host b/comms/conserver/files/patch-console-Make.host new file mode 100644 index 000000000000..1d2e690044c1 --- /dev/null +++ b/comms/conserver/files/patch-console-Make.host @@ -0,0 +1,10 @@ +--- etc/console/Make.host.orig Sat Nov 22 20:19:33 1997 ++++ etc/console/Make.host Tue Nov 21 18:12:28 2000 +@@ -18,2 +18,2 @@ +-ETC= ${DESTDIR}/usr/'ifdef(`NEW',`new',`local')`/etc +-DOC= ${DESTDIR}/usr/local/man ++ETC= ${DESTDIR}/${PREFIX}/bin ++DOC= ${DESTDIR}/${PREFIX}/man +@@ -34 +34 @@ +-HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${SERVER}\" ++HOSTTYPE,`EPIX',` -systype bsd43')` -DHOST=\"${DEFAULTHOST}\" -DPORT=${DEFAULTPORT} diff --git a/comms/conserver/files/patch-machine.h b/comms/conserver/files/patch-machine.h new file mode 100644 index 000000000000..973c6833dd25 --- /dev/null +++ b/comms/conserver/files/patch-machine.h @@ -0,0 +1,17 @@ +--- etc/conserver/machine.h.orig Wed Aug 2 11:39:42 2000 ++++ etc/conserver/machine.h Thu Nov 23 03:45:25 2000 +@@ -85,3 +85,3 @@ + #if !defined(HAVE_UWAIT) +-#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) ++#define HAVE_UWAIT !(defined(IBMR2)||defined(SUN5)||defined(HPUX8)||defined(HPUX9)||defined(HPUX10)||defined(HPUX11)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) + #endif +@@ -137,3 +137,3 @@ + #if !defined(HAVE_SETSID) +-#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) ++#define HAVE_SETSID (defined(IBMR2)||defined(SUN5)||defined(HPUX)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) + #endif +@@ -159,3 +159,3 @@ + #if !defined(USE_TERMIOS) +-#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)) ++#define USE_TERMIOS (defined(HPUX)||defined(SUN5)||defined(PTX)||defined(IRIX5)||defined(IRIX6)||defined(LINUX)||defined(FREEBSD)) + #endif diff --git a/comms/conserver/pkg-plist b/comms/conserver/pkg-plist index 5b0ba7d4883d..02f52897b01c 100644 --- a/comms/conserver/pkg-plist +++ b/comms/conserver/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/console etc/conserver.cf.eg etc/rc.d/conserver.sh |