cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Put config in /etc (and make manpages refer to it there)

Browse Source 
o Put examples and README.OpenBSD in share/examples/conserver
o Update packing list to reflect new locations
This commit is contained in:
jason 1999-01-05 16:57:17 +00:00
parent cb5e8f8b85
commit a66db21260
7 changed files with 77 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comms/conserver/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 1998/10/07 05:24:18 marc Exp $
# $OpenBSD: Makefile,v 1.3 1999/01/05 16:57:17 jason Exp $
#
DISTNAME= conserver-5.21-Beta
@ -36,13 +36,7 @@ post-extract:
cp ${FILESDIR}/Makefile ${WRKSRC}
post-install:
@if [ ! -f ${PREFIX}/etc/rc.d/conserver.sh ]; then \
echo "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file."; \
echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/conserver.sh; \
echo "if [ -x /usr/local/sbin/conserver -a -f /usr/local/etc/conserver.cf ]; then" >> ${PREFIX}/etc/rc.d/conserver.sh; \
echo " /usr/local/sbin/conserver -d -n ; echo -n ' conserver'" >> ${PREFIX}/etc/rc.d/conserver.sh; \
echo "fi" >> ${PREFIX}/etc/rc.d/conserver.sh; \
chmod 751 ${PREFIX}/etc/rc.d/conserver.sh; \
fi
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/examples/conserver
more ${FILESDIR}/README.OpenBSD
.include <bsd.port.mk>

22
comms/conserver/files/README.OpenBSD Normal file
View File

@ -0,0 +1,22 @@
Using conserver in an OpenBSD environment:
1. Copy /usr/local/share/examples/conserver/conserver.cf.eg to
/etc/conserver.cf and customize it as necessary.
2. Edit /etc/rc.conf file:
...
conserver=YES
3. Edit /etc/rc.local file:
echo -n 'starting local daemons:'
...
if [ -f /etc/conserver.cf ]; then
if [ X"${conserver}" = X"YES" -a -x /usr/local/sbin/conserver ]; then
echo -n ' conserver'; /usr/local/sbin/conserver -d -n
fi
fi
...
echo '.'
4. See the man pages for conserver, conserver.cf, and console as well as
the files in /usr/local/share/examples/conserver for more information.

30
comms/conserver/patches/patch-ab
View File

@ -1,44 +1,56 @@
--- ./conserver/cons.h Sat Nov 22 20:11:48 1997
+++ ./conserver/cons.h Sat Aug 23 17:40:11 1997
@@ -54,5 +54,5 @@
--- ./conserver/cons.h.orig Mon Jan 4 19:55:36 1999
+++ ./conserver/cons.h Mon Jan 4 20:05:26 1999
@@ -53,7 +53,7 @@
#endif
#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(OPENBSD))
#endif
@@ -86,5 +86,5 @@
#if !defined(HAVE_WAIT3)
@@ -85,7 +85,7 @@
/* Location of the configuration file
*/
#if !defined(CONFIG)
-#define CONFIG "/usr/local/lib/conserver.cf"
+#define CONFIG "/usr/local/etc/conserver.cf"
+#define CONFIG "/etc/conserver.cf"
#endif
@@ -171,5 +171,5 @@
@@ -170,7 +170,7 @@
#endif /* virtual (process on a pseudo-tty) console support */
#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(OPENBSD))
#endif
@@ -193,5 +193,5 @@
/* should we use flock to keep multiple conservers from hurting each other?
@@ -192,7 +192,7 @@
#define USE_TERMIO (defined(ETA10)||defined(V386))
#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(OPENBSD))
#endif
#if !defined(USE_TCBREAK)
@@ -258,5 +258,5 @@
#define USE_TCBREAK (defined(SUN4)||defined(PTX))
@@ -257,7 +257,7 @@
/* 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(OPENBSD)
#define SIGRETS void
#else
@@ -273,5 +273,5 @@
#define SIGRETS int
@@ -272,7 +272,7 @@
/* does this system have the ANSI strerror() function?
*/
#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(OPENBSD))
#endif
#if ! HAVE_STRERROR
extern int errno;

15
comms/conserver/patches/patch-ag
View File

@ -1,5 +1,5 @@
--- conserver.cf/Makefile.orig Sat Nov 22 22:25:19 1997
+++ conserver.cf/Makefile Sat Nov 22 22:29:15 1997
--- ./conserver.cf/Makefile.orig Mon Jan 4 19:55:41 1999
+++ ./conserver.cf/Makefile Mon Jan 4 20:03:10 1999
@@ -4,18 +4,19 @@
#
@ -8,7 +8,7 @@
-LIB= ${DESTDIR}/usr/local/lib
-DOC= ${DESTDIR}/usr/man
+PROG= conserver.cf.eg
+LIB= ${DESTDIR}/usr/local/etc
+LIB= ${DESTDIR}/usr/local/share/examples/conserver
+DOC= ${DESTDIR}/usr/local/man/man5
SRCs= conserver.cf
@ -34,3 +34,12 @@
lint: FRC
@@ -47,7 +49,7 @@
tags: FRC
/ ${LIB} ${LIB}:
- install -dr $@
+ install -d $@
${SOURCE}:
co -q $@

17
comms/conserver/patches/patch-ah
View File

@ -1,11 +1,20 @@
--- conserver/conserver.man.orig Mon Jan 4 08:21:05 1999
+++ conserver/conserver.man Mon Jan 4 08:21:24 1999
--- ./conserver/conserver.man.orig Mon Jan 4 19:55:39 1999
+++ ./conserver/conserver.man Mon Jan 4 20:17:41 1999
@@ -18,7 +18,7 @@
error messages, these unloved errors are labeled with a machine name
and output on stdout.
.PP
-When started, it forks a child for each group in /usr/local/etc/conserver.cf,
+When started, it forks a child for each group in /etc/conserver.cf,
and assigns each process a port number to listen on.
The \fIconsole\fP client program knows how to request port numbers and
forwards to find the various slave hosts.
@@ -38,7 +38,7 @@
.TP
.BI \-C config
With this option the invoker may specify an alternate confguration.
-The default \fIconfig\fP is /usr/local/lib/conserver.cf.
+The default \fIconfig\fP is /usr/local/etc/conserver.cf.
+The default \fIconfig\fP is /etc/conserver.cf.
.TP
.B \-h
Output a brief help message.
@ -14,7 +23,7 @@
.TS
l l.
-/usr/local/lib/conserver.cf description of console terminal lines
+/usr/local/etc/conserver.cf description of console terminal lines
+/etc/conserver.cf description of console terminal lines
/usr/adm/\fIhost\fP.console log files for \fIhost\fP's console
/dev/tty?? terminal line device files
\fIstdout\fP summary of unloved console errors

6
comms/conserver/patches/patch-ai
View File

@ -1,11 +1,11 @@
--- conserver.cf/conserver.cf.5l.orig Mon Jan 4 08:22:08 1999
+++ conserver.cf/conserver.cf.5l Mon Jan 4 08:22:26 1999
--- ./conserver.cf/conserver.cf.5l.orig Mon Jan 4 19:55:40 1999
+++ ./conserver.cf/conserver.cf.5l Mon Jan 4 19:59:21 1999
@@ -4,7 +4,7 @@
.SH NAME
conserver.cf \- table of server console terminals used by conserver(8L)
.SH SYNOPSIS
-.B /usr/local/lib/conserver.cf
+.B /usr/local/etc/conserver.cf
+.B /etc/conserver.cf
.br
\fIaccess hosts\fP
.br

5
comms/conserver/pkg/PLIST
View File

@ -1,5 +1,6 @@
etc/conserver.cf.eg
etc/rc.d/conserver.sh
share/examples/conserver/conserver.cf.eg
share/examples/conserver/README.OpenBSD
@dirrm share/examples/conserver
man/man5/conserver.cf.5
man/man8/conserver.8
man/man8/console.8