diff options
| -rw-r--r-- | comms/conserver8/MESSAGE | 6 | ||||
| -rw-r--r-- | comms/conserver8/Makefile | 12 | ||||
| -rw-r--r-- | comms/conserver8/PLIST | 6 | ||||
| -rw-r--r-- | comms/conserver8/distinfo | 10 | ||||
| -rw-r--r-- | comms/conserver8/patches/patch-aa | 14 |
5 files changed, 24 insertions, 24 deletions
diff --git a/comms/conserver8/MESSAGE b/comms/conserver8/MESSAGE index c6a163d84f5..ec0d94e5b8b 100644 --- a/comms/conserver8/MESSAGE +++ b/comms/conserver8/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2005/06/03 20:08:04 wiz Exp $ +$NetBSD: MESSAGE,v 1.2 2006/05/11 21:42:43 seb Exp $ NB: The console command from versions of conserver prior to 8 does not interoperate with conserver version 8. @@ -9,12 +9,12 @@ conserver. For instruction on how to convert your configurtion files from conserver version 7.x.x see ${PREFIX}/share/doc/conserver/INSTALL. -The "convert" program was installed as ${PREFIX}/bin/conserverconvert. +The "convert" program was installed as ${PREFIX}/lib/conserver/convert. Briefly: mv ${PKG_SYSCONFDIR}/conserver.cf ${PKG_SYSCONFDIR}/conserver.cf-7 mv ${PKG_SYSCONFDIR}/conserver.passwd ${PKG_SYSCONFDIR}/conserver.passwd-7 -${PREFIX}/bin/conserverconvert ${PKG_SYSCONFDIR}/conserver.cf-7 >\ +${PREFIX}/lib/conserver/convert ${PKG_SYSCONFDIR}/conserver.cf-7 >\ ${PKG_SYSCONFDIR}/conserver.cf awk -F: '{print $1 ":" $2}' < ${PKG_SYSCONFDIR}/conserver.passwd-7 > \ ${PKG_SYSCONFDIR}/conserver.passwd diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile index dcd8ad7bc7f..99aa534f65c 100644 --- a/comms/conserver8/Makefile +++ b/comms/conserver8/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:34 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2006/05/11 21:42:43 seb Exp $ # -DISTNAME= conserver-8.1.11 -PKGNAME= conserver8-8.1.11 -PKGREVISION= 1 +DISTNAME= conserver-8.1.14 +PKGNAME= conserver8-8.1.14 CATEGORIES= comms MASTER_SITES= ftp://ftp.conserver.com/conserver/ @@ -22,7 +21,7 @@ CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q} CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q} CONFIGURE_ARGS+= --with-regex CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ARGS+= --with-logfile=${VARBASE}/log/conserver +CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/conserver PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8 PKG_SUPPORTED_OPTIONS= pam ssl uds @@ -65,9 +64,8 @@ pre-install: ${INSTALL_DATA_DIR} ${EGDIR} post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/conserver/convert ${PREFIX}/bin/conserverconvert ${INSTALL_DATA_DIR} ${DOCDIR} - for File in INSTALL README PROTOCOL; do \ + set -e; for File in INSTALL README PROTOCOL; do \ ${INSTALL_DATA} ${WRKSRC}/$${File} ${DOCDIR}/$${File}; \ done diff --git a/comms/conserver8/PLIST b/comms/conserver8/PLIST index dc1db8b8a25..9432c048844 100644 --- a/comms/conserver8/PLIST +++ b/comms/conserver8/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2005/08/12 14:35:15 he Exp $ -bin/conserverconvert +@comment $NetBSD: PLIST,v 1.3 2006/05/11 21:42:43 seb Exp $ bin/console +lib/conserver/convert man/man1/console.1 man/man5/conserver.cf.5 man/man5/conserver.passwd.5 @@ -14,3 +14,5 @@ share/examples/conserver/conserver.passwd share/examples/conserver/conserver.rc share/examples/rc.d/conserver8 @dirrm share/examples/conserver +@dirrm share/doc/conserver +@dirrm lib/conserver diff --git a/comms/conserver8/distinfo b/comms/conserver8/distinfo index 7850e25c7b7..193649dbb20 100644 --- a/comms/conserver8/distinfo +++ b/comms/conserver8/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/08/12 14:39:06 he Exp $ +$NetBSD: distinfo,v 1.3 2006/05/11 21:42:43 seb Exp $ -SHA1 (conserver-8.1.11.tar.gz) = d30d4c86b769d56707f6abfad47992cc59f128da -RMD160 (conserver-8.1.11.tar.gz) = 380386c3f488787bf132809071b308bc9a00c89f -Size (conserver-8.1.11.tar.gz) = 299281 bytes -SHA1 (patch-aa) = 1747fbc95109db50b1acd003235fca9556f9d084 +SHA1 (conserver-8.1.14.tar.gz) = 3275ba140e5d157ab022f3de083a61a37f058bd6 +RMD160 (conserver-8.1.14.tar.gz) = 9d0961d837f03ddbdaddccf7f45097b6f4e452b8 +Size (conserver-8.1.14.tar.gz) = 308609 bytes +SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01 SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3 diff --git a/comms/conserver8/patches/patch-aa b/comms/conserver8/patches/patch-aa index db2c13c69a8..20cc8aba19d 100644 --- a/comms/conserver8/patches/patch-aa +++ b/comms/conserver8/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/06/03 20:08:04 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2006/05/11 21:42:43 seb Exp $ ---- conserver/main.c.orig 2004-07-14 01:28:42.000000000 -0400 -+++ conserver/main.c 2005-05-22 14:16:15.000000000 -0400 -@@ -460,7 +460,9 @@ +--- conserver/main.c.orig 2006-04-03 09:32:08.000000000 -0400 ++++ conserver/main.c 2006-05-07 22:24:26.000000000 -0400 +@@ -463,7 +463,9 @@ int td; #endif @@ -12,17 +12,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/06/03 20:08:04 wiz Exp $ SimpleSignal(SIGQUIT, SIG_IGN); SimpleSignal(SIGINT, SIG_IGN); #if defined(SIGTTOU) -@@ -1259,7 +1261,9 @@ +@@ -1284,7 +1286,9 @@ Bye(EX_OK); } +#if 0 - Msg("%s", THIS_VERSION); + Msg(MyVersion()); +#endif #if HAVE_GETLOGIN origuser = getlogin(); -@@ -1286,7 +1290,9 @@ +@@ -1311,7 +1315,9 @@ BuildStringPrint(startedMsg, "started as `%s' by `%s'", curuser, (origuser == (char *)0) ? curuser : origuser); endpwent(); |