Attachment #10681 for bug #21365

View | Details | Raw Unified | Return to bug 21365
Collapse All | Expand All




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

MAINTAINER=	obrien@FreeBSD.org

EXTRACT_CMD=	${GZIP_CMD}
EXTRACT_BEFORE_ARGS=	-dc
EXTRACT_AFTER_ARGS=	|${SH}

NO_WRKSUBDIR=	yes

MAN5=		conserver.cf.5
MAN8=		console.8 conserver.8


# 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

post-install:
.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
.endif
	fi

.include <bsd.port.mk>

Lines 1-33 Link Here

(-)comms/conserver/patches/patch-aa (-12 / +26 lines)
1	--- conserver/Makefile.orig Sat Nov 22 20:42:18 1997	1	--- conserver/Makefile.orig Tue Aug 8 20:13:39 2000
2	+++ conserver/Makefile Sat Nov 22 20:43:24 1997	2	+++ conserver/Makefile Tue Aug 8 20:15:34 2000
3	@@ -8,6 +8,6 @@	3	@@ -7,8 +7,10 @@
		4	# (1) change ETC below to where you would like the console server installed
4	# I would not change the name, you have to much with the docs then...	5	# I would not change the name, you have to much with the docs then...
5	PROG= conserver	6	PROG= conserver
6	-ETC= ${DESTDIR}/usr/local/etc	7	-ETC= ${DESTDIR}/usr/local/etc
7	-DOC= ${DESTDIR}/usr/local/man	8	-DOC= ${DESTDIR}/usr/local/man
8	+ETC= ${PREFIX}/sbin	9	+ETC= ${PREFIX}/sbin
9	+DOC= ${PREFIX}/man/man8	10	+DOC= ${PREFIX}/man/man8
		11	+
		12	+CONFIG= ${PREFIX}/etc/conserver.cf
10		13
11	# if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o	14	# if we have to PUCC ptyd daemon we can use it to get ptys, else use fallback.o
12	@@ -25,5 +25,5 @@	15	# and change the CDEFS line below to =0
		16	@@ -23,9 +25,9 @@
		17	P=
		18
13	INCLUDE=	19	INCLUDE=
14	DEBUG=-O	20	-DEBUG=-O
15	-CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1	21	-CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1
16	+CDEFS= -DFREEBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782	22	-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
17	CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}	23	+DEBUG=
18		24	+CDEFS= -DFREEBSD -DCONFIG=\"${CONFIG}\" -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782
19	@@ -42,5 +42,5 @@	25	+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
		26
		27	HDR= cons.h \
		28	access.h client.h consent.h group.h main.h master.h \
		29	@@ -41,7 +43,7 @@
		30	all: ${PROG}
20		31
21	${PROG}:$P ${OBJ}	32	${PROG}:$P ${OBJ}
22	- ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl	33	- ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl
23	+ ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lcrypt	34	+ ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lcrypt
24		35
25	clean: FRC	36	clean: FRC
26	@@ -60,5 +60,6 @@	37	rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags
		38	@@ -59,7 +61,8 @@
		39	distrib -c ${ETC}/${PROG}
27		40
28	install: all dirs FRC	41	install: all dirs FRC
29	- install -c -s ${PROG} ${ETC}/${PROG}	42	- install -c -s ${PROG} ${ETC}/${PROG}
30	+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG}	43	+ ${BSD_INSTALL_PROGRAM} -o bin -g bin ${PROG} ${ETC}/${PROG}
31	+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.8	44	+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.8
32		45
33	lint: ${HDR} ${SRC} FRC	46	lint: ${HDR} ${SRC} FRC
		47	lint -h ${CDEFS} ${INCLUDE} ${SRC}




+#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)

Lines 1-5 Link Here

(-)comms/conserver/patches/patch-ae (-7 / +11 lines)
1	--- console/Makefile.orig Sat Nov 22 23:02:48 1997	1	--- console/Makefile.orig Tue Aug 8 19:20:12 2000
2	+++ console/Makefile Sat Nov 22 23:03:45 1997	2	+++ console/Makefile Tue Aug 8 19:27:08 2000
3	@@ -6,8 +6,8 @@	3	@@ -6,8 +6,8 @@
4	# edit the ETC directory below to change where the console client	4	# edit the ETC directory below to change where the console client
5	# is installed.	5	# is installed.
Lines 11-25 Link Here
11		11
12	I=/usr/include	12	I=/usr/include
13	S=/usr/include/sys	13	S=/usr/include/sys
14	@@ -17,7 +17,7 @@	14	@@ -16,9 +16,9 @@
		15	P=
15		16
16	INCLUDE= -I$C	17	INCLUDE= -I$C
17	DEBUG=-O	18	-DEBUG=-O
18	-CDEFS= -DSUN5	19	-CDEFS= -DSUN5
		20	-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}
		21	+DEBUG=
19	+CDEFS= -DFREEBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782	22	+CDEFS= -DFREEBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782
20	CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE}	23	+CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE}
21		24
22	HDR=	25	HDR=
		26	ONEC= console.c
23	@@ -29,7 +29,7 @@	27	@@ -29,7 +29,7 @@
24	all: ${PROG}	28	all: ${PROG}
25		29
Lines 34-41 Link Here
34		38
35	install: all dirs FRC	39	install: all dirs FRC
36	- install -cs ${PROG} ${ETC}/${PROG}	40	- install -cs ${PROG} ${ETC}/${PROG}
37	+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG}	41	+ ${BSD_INSTALL_PROGRAM} -o bin -g bin ${PROG} ${ETC}/${PROG}
38	+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/console.8	42	+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/console.8
39		43
40	lint: ${HDR} ${ONEC} FRC	44	lint: ${HDR} ${ONEC} FRC
41	lint -h ${CDEFS} ${INCLUDE} ${ONEC}	45	lint -h ${CDEFS} ${INCLUDE} ${ONEC}

Lines 29-36 Link Here

(-)comms/conserver/patches/patch-ag (-2 / +2 lines)
29		29
30	install: all dirs FRC	30	install: all dirs FRC
31	- install -c ${PROG} ${LIB}/${PROG}	31	- install -c ${PROG} ${LIB}/${PROG}
32	+ install -c -o bin -g bin -m 444 ${PROG} ${LIB}	32	+ ${BSD_INSTALL_DATA} -o bin -g bin ${PROG} ${LIB}
33	+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.cf.5	33	+ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.cf.5
34		34
35	lint: FRC	35	lint: FRC
36		36




--- autologin/Makefile.orig	Tue Aug  8 19:20:30 2000
+++ autologin/Makefile	Tue Aug  8 19:30:16 2000
@@ -7,12 +7,12 @@
 #
 
 DESTDIR=

 INCLUDE=
-DEBUG=	-g
-DEFS=	-DPUCC -DSUN5
-CFLAGS=	${DEBUG} ${DEFS} ${INCLUDE}
+DEBUG=
+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

Return to bug 21365

Lines 11-25 Link Here

(-)comms/conserver/Makefile (-12 / +13 lines)
11	CATEGORIES= comms	11	CATEGORIES= comms
12	MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \	12	MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \
13	ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/	13	ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/
14	DISTNAME= conserver-5.21-Beta	14	DISTNAME= ${PORTNAME}-5.21-Beta
15	EXTRACT_SUFX= .shar.gz	15	EXTRACT_SUFX= .shar.gz
16		16
17	MAINTAINER= obrien@FreeBSD.org	17	MAINTAINER= obrien@FreeBSD.org
18		18
19	EXTRACT_CMD= zcat	19	EXTRACT_CMD= ${GZIP_CMD}
20	EXTRACT_BEFORE_ARGS=	20	EXTRACT_BEFORE_ARGS= -dc
21	EXTRACT_AFTER_ARGS= \|sh	21	EXTRACT_AFTER_ARGS= \|${SH}
		22
22	NO_WRKSUBDIR= yes	23	NO_WRKSUBDIR= yes
		24
23	MAN5= conserver.cf.5	25	MAN5= conserver.cf.5
24	MAN8= console.8 conserver.8	26	MAN8= console.8 conserver.8
25		27
Lines 31-45 Link Here
31	# XXX we also have to work around ``new'' uudecode behavior, thanks guys!	33	# XXX we also have to work around ``new'' uudecode behavior, thanks guys!
32	post-extract:	34	post-extract:
33	${CP} ${FILESDIR}/Makefile ${WRKSRC}	35	${CP} ${FILESDIR}/Makefile ${WRKSRC}
34	if [ -f ${WRKSRC}/group.c ]; then \	36	.if !exists(${WRKSRC}/group.c)
35	${MV} ${WRKSRC}/group.c ${WRKSRC}/conserver/group.c ; \	37	${MV} ${WRKSRC}/group.c ${WRKSRC}/conserver/group.c
36	fi	38	.endif
37		39
38	post-install:	40	post-install:
39	@if [ ! -f ${PREFIX}/etc/rc.d/conserver.sh ]; then \	41	.if !exists(${PREFIX}/etc/rc.d/conserver.sh)
40	${ECHO} "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file."; \	42	@${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file."
41	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh \	43	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh ${PREFIX}/etc/rc.d
42	${PREFIX}/etc/rc.d/conserver.sh; \	44	.endif
43	fi
44		45
45	.include <bsd.port.mk>	46	.include <bsd.port.mk>

Lines 7-19 Link Here

(-)comms/conserver/patches/patch-ab (-7 lines)
7	+#define HAVE_UWAIT !(defined(IBMR2)\|\|defined(SUN5)\|\|defined(HPUX8)\|\|defined(HPUX9)\|\|defined(PTX)\|\|defined(IRIX5)\|\|defined(FREEBSD))	7	+#define HAVE_UWAIT !(defined(IBMR2)\|\|defined(SUN5)\|\|defined(HPUX8)\|\|defined(HPUX9)\|\|defined(PTX)\|\|defined(IRIX5)\|\|defined(FREEBSD))
8	#endif	8	#endif
9		9
10	@@ -86,5 +86,5 @@
11	*/
12	#if !defined(CONFIG)
13	-#define CONFIG "/usr/local/lib/conserver.cf"
14	+#define CONFIG "/usr/local/etc/conserver.cf"
15	#endif
16
17	@@ -171,5 +171,5 @@	10	@@ -171,5 +171,5 @@
18		11
19	#if !defined(HAVE_SETSID)	12	#if !defined(HAVE_SETSID)

Lines 1-6 Link Here

(-)comms/conserver/patches/patch-ai (-5 / +16 lines)
1	--- autologin/Makefile Sun Apr 19 03:51:53 1998	1	--- autologin/Makefile.orig Tue Aug 8 19:20:30 2000
2	+++ autologin/Makefile Sun Apr 19 03:54:02 1998	2	+++ autologin/Makefile Tue Aug 8 19:30:16 2000
3	@@ -7,11 +7,11 @@	3	@@ -7,12 +7,12 @@
4	#	4	#
5		5
6	DESTDIR=	6	DESTDIR=
Lines 10-17 Link Here
10	INCLUDE=	10	INCLUDE=
11	-DEBUG= -g	11	-DEBUG= -g
12	-DEFS= -DPUCC -DSUN5	12	-DEFS= -DPUCC -DSUN5
13	+DEBUG= -O	13	-CFLAGS= ${DEBUG} ${DEFS} ${INCLUDE}
		14	+DEBUG=
14	+DEFS= -DFREEBSD	15	+DEFS= -DFREEBSD
15	CFLAGS= ${DEBUG} ${DEFS} ${INCLUDE}	16	+CFLAGS+= ${DEBUG} ${DEFS} ${INCLUDE}
16		17
17	GENC= main.c	18	GENC= main.c
		19	GENH= main.h
		20	@@ -56,7 +56,7 @@
		21	lint -h ${CDEFS} ${INCLUDE} ${GEN} ${SRC}
		22
		23	install: all
		24	- install -c -s -m 755 autologin ${BINDIR}
		25	+ ${BSD_INSTALL_PROGRAM} autologin ${BINDIR}
		26
		27	distrib:
		28	distrib -c ${BINDIR}/autologin