Date: Mon, 18 Sep 2000 13:30:43 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21365: Update port: comms/conserver Message-ID: <20000918203043.078C337B422@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21365 >Category: ports >Synopsis: Update port: comms/conserver >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Sep 18 13:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Support CFLAGS/PREFIX properly >How-To-Repeat: >Fix: diff -urN /usr/ports/comms/conserver/Makefile comms/conserver/Makefile --- /usr/ports/comms/conserver/Makefile Fri Aug 25 19:07:51 2000 +++ comms/conserver/Makefile Wed Aug 30 20:06:42 2000 @@ -11,15 +11,17 @@ CATEGORIES= comms MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \ ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/ -DISTNAME= conserver-5.21-Beta +DISTNAME= ${PORTNAME}-5.21-Beta EXTRACT_SUFX= .shar.gz MAINTAINER= obrien@FreeBSD.org -EXTRACT_CMD= zcat -EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= |sh +EXTRACT_CMD= ${GZIP_CMD} +EXTRACT_BEFORE_ARGS= -dc +EXTRACT_AFTER_ARGS= |${SH} + NO_WRKSUBDIR= yes + MAN5= conserver.cf.5 MAN8= console.8 conserver.8 @@ -31,15 +33,14 @@ # XXX we also have to work around ``new'' uudecode behavior, thanks guys! post-extract: ${CP} ${FILESDIR}/Makefile ${WRKSRC} - if [ -f ${WRKSRC}/group.c ]; then \ - ${MV} ${WRKSRC}/group.c ${WRKSRC}/conserver/group.c ; \ - fi +.if !exists(${WRKSRC}/group.c) + ${MV} ${WRKSRC}/group.c ${WRKSRC}/conserver/group.c +.endif post-install: - @if [ ! -f ${PREFIX}/etc/rc.d/conserver.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file."; \ - ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh \ - ${PREFIX}/etc/rc.d/conserver.sh; \ - fi +.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 .include <bsd.port.mk> diff -urN /usr/ports/comms/conserver/patches/patch-aa comms/conserver/patches/patch-aa --- /usr/ports/comms/conserver/patches/patch-aa Fri Feb 18 13:00:44 2000 +++ comms/conserver/patches/patch-aa Tue Sep 19 01:50:50 2000 @@ -1,33 +1,47 @@ ---- conserver/Makefile.orig Sat Nov 22 20:42:18 1997 -+++ conserver/Makefile Sat Nov 22 20:43:24 1997 -@@ -8,6 +8,6 @@ +--- conserver/Makefile.orig Tue Aug 8 20:13:39 2000 ++++ conserver/Makefile Tue Aug 8 20:15:34 2000 +@@ -7,8 +7,10 @@ + # (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 -@@ -25,5 +25,5 @@ + # and change the CDEFS line below to =0 +@@ -23,9 +25,9 @@ + P= + INCLUDE= - DEBUG=-O +-DEBUG=-O -CDEFS= -DSUN5 -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -+CDEFS= -DFREEBSD -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782 - CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} - -@@ -42,5 +42,5 @@ +-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} ++DEBUG= ++CDEFS= -DFREEBSD -DCONFIG=\"${CONFIG}\" -DHAVE_PTYD=0 -DDO_VIRTUAL=1 -DPORT=782 ++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} + + HDR= cons.h \ + access.h client.h consent.h group.h main.h master.h \ +@@ -41,7 +43,7 @@ + all: ${PROG} ${PROG}:$P ${OBJ} - ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lsocket -lnsl + ${CC} -o $@ ${CFLAGS} ${OBJ} ${PUCCLIB} -lcrypt clean: FRC -@@ -60,5 +60,6 @@ + rm -f Makefile.bak ${PROG} a.out *.o core errs lint.out tags +@@ -59,7 +61,8 @@ + distrib -c ${ETC}/${PROG} install: all dirs FRC - install -c -s ${PROG} ${ETC}/${PROG} -+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG} -+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.8 ++ ${BSD_INSTALL_PROGRAM} -o bin -g bin ${PROG} ${ETC}/${PROG} ++ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.8 lint: ${HDR} ${SRC} FRC + lint -h ${CDEFS} ${INCLUDE} ${SRC} diff -urN /usr/ports/comms/conserver/patches/patch-ab comms/conserver/patches/patch-ab --- /usr/ports/comms/conserver/patches/patch-ab Mon Apr 20 12:52:46 1998 +++ comms/conserver/patches/patch-ab Tue Aug 8 19:17:16 2000 @@ -7,13 +7,6 @@ +#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) diff -urN /usr/ports/comms/conserver/patches/patch-ae comms/conserver/patches/patch-ae --- /usr/ports/comms/conserver/patches/patch-ae Fri Feb 18 13:00:45 2000 +++ comms/conserver/patches/patch-ae Tue Sep 19 01:51:18 2000 @@ -1,5 +1,5 @@ ---- console/Makefile.orig Sat Nov 22 23:02:48 1997 -+++ console/Makefile Sat Nov 22 23:03:45 1997 +--- console/Makefile.orig Tue Aug 8 19:20:12 2000 ++++ console/Makefile Tue Aug 8 19:27:08 2000 @@ -6,8 +6,8 @@ # edit the ETC directory below to change where the console client # is installed. @@ -11,15 +11,19 @@ I=/usr/include S=/usr/include/sys -@@ -17,7 +17,7 @@ +@@ -16,9 +16,9 @@ + P= INCLUDE= -I$C - DEBUG=-O +-DEBUG=-O -CDEFS= -DSUN5 +-CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} ++DEBUG= +CDEFS= -DFREEBSD -DHOST=\"${DEFAULTHOST}\" -DPORT=782 - CFLAGS= ${DEBUG} ${CDEFS} ${INCLUDE} ++CFLAGS+= ${DEBUG} ${CDEFS} ${INCLUDE} HDR= + ONEC= console.c @@ -29,7 +29,7 @@ all: ${PROG} @@ -34,8 +38,8 @@ install: all dirs FRC - install -cs ${PROG} ${ETC}/${PROG} -+ install -c -s -o bin -g bin -m 555 ${PROG} ${ETC}/${PROG} -+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/console.8 ++ ${BSD_INSTALL_PROGRAM} -o bin -g bin ${PROG} ${ETC}/${PROG} ++ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/console.8 lint: ${HDR} ${ONEC} FRC lint -h ${CDEFS} ${INCLUDE} ${ONEC} diff -urN /usr/ports/comms/conserver/patches/patch-ag comms/conserver/patches/patch-ag --- /usr/ports/comms/conserver/patches/patch-ag Fri Feb 18 13:00:45 2000 +++ comms/conserver/patches/patch-ag Tue Sep 19 01:51:42 2000 @@ -29,8 +29,8 @@ install: all dirs FRC - install -c ${PROG} ${LIB}/${PROG} -+ install -c -o bin -g bin -m 444 ${PROG} ${LIB} -+ install -c -o bin -g bin -m 444 ${MAN} ${DOC}/conserver.cf.5 ++ ${BSD_INSTALL_DATA} -o bin -g bin ${PROG} ${LIB} ++ ${BSD_INSTALL_MAN} ${MAN} ${DOC}/conserver.cf.5 lint: FRC diff -urN /usr/ports/comms/conserver/patches/patch-ai comms/conserver/patches/patch-ai --- /usr/ports/comms/conserver/patches/patch-ai Fri Feb 18 13:00:45 2000 +++ comms/conserver/patches/patch-ai Tue Aug 8 19:44:27 2000 @@ -1,6 +1,6 @@ ---- autologin/Makefile Sun Apr 19 03:51:53 1998 -+++ autologin/Makefile Sun Apr 19 03:54:02 1998 -@@ -7,11 +7,11 @@ +--- autologin/Makefile.orig Tue Aug 8 19:20:30 2000 ++++ autologin/Makefile Tue Aug 8 19:30:16 2000 +@@ -7,12 +7,12 @@ # DESTDIR= @@ -10,8 +10,19 @@ INCLUDE= -DEBUG= -g -DEFS= -DPUCC -DSUN5 -+DEBUG= -O +-CFLAGS= ${DEBUG} ${DEFS} ${INCLUDE} ++DEBUG= +DEFS= -DFREEBSD - CFLAGS= ${DEBUG} ${DEFS} ${INCLUDE} ++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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000918203043.078C337B422>