diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/zephyr/HEADER | 55 | ||||
| -rw-r--r-- | net/zephyr/INSTALL | 17 | ||||
| -rw-r--r-- | net/zephyr/MESSAGE | 7 | ||||
| -rw-r--r-- | net/zephyr/Makefile | 28 | ||||
| -rw-r--r-- | net/zephyr/PLIST | 102 | ||||
| -rw-r--r-- | net/zephyr/distinfo | 8 | ||||
| -rw-r--r-- | net/zephyr/files/zhm.sh | 12 | ||||
| -rw-r--r-- | net/zephyr/patches/patch-aj | 18 | ||||
| -rw-r--r-- | net/zephyr/patches/patch-al | 23 | ||||
| -rw-r--r-- | net/zephyr/patches/patch-au | 24 |
10 files changed, 188 insertions, 106 deletions
diff --git a/net/zephyr/HEADER b/net/zephyr/HEADER new file mode 100644 index 00000000000..e003320b582 --- /dev/null +++ b/net/zephyr/HEADER @@ -0,0 +1,55 @@ +# $NetBSD: HEADER,v 1.1 2003/07/30 10:53:00 jmmv Exp $ + +EGDIR="${PKG_PREFIX}/share/examples/zephyr" + +for f in \ + acl/class-registry.acl \ + acl/iui-filsrv.acl \ + acl/iui-hm_ctl.acl \ + acl/iui-hm_stat.acl \ + acl/iui-login.acl \ + acl/iui-operations.acl \ + acl/iui-ops.acl \ + acl/iui-user_locate.acl \ + acl/iui-wg_ctl.acl \ + acl/iui-zephyr_admin.acl \ + acl/iui-zephyr_ctl.acl \ + acl/iui-zmatch_all.acl \ + acl/iws-filsrv.acl \ + acl/iws-hm_ctl.acl \ + acl/iws-hm_stat.acl \ + acl/iws-login.acl \ + acl/iws-operations.acl \ + acl/iws-ops.acl \ + acl/iws-user_locate.acl \ + acl/iws-wg_ctl.acl \ + acl/iws-zephyr_admin.acl \ + acl/iws-zephyr_ctl.acl \ + acl/iws-zmatch_all.acl \ + acl/sub-filsrv.acl \ + acl/sub-hm_ctl.acl \ + acl/sub-hm_stat.acl \ + acl/sub-login.acl \ + acl/sub-operations.acl \ + acl/sub-ops.acl \ + acl/sub-user_locate.acl \ + acl/sub-wg_ctl.acl \ + acl/sub-zephyr_admin.acl \ + acl/sub-zephyr_ctl.acl \ + acl/sub-zmatch_all.acl \ + acl/xmt-filsrv.acl \ + acl/xmt-hm_ctl.acl \ + acl/xmt-hm_stat.acl \ + acl/xmt-login.acl \ + acl/xmt-operations.acl \ + acl/xmt-ops.acl \ + acl/xmt-user_locate.acl \ + acl/xmt-wg_ctl.acl \ + acl/xmt-zephyr_admin.acl \ + acl/xmt-zephyr_ctl.acl \ + acl/xmt-zmatch_all.acl \ + default.subscriptions \ + zephyr.vars; +do + CONF_FILES="${CONF_FILES} ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f" +done diff --git a/net/zephyr/INSTALL b/net/zephyr/INSTALL deleted file mode 100644 index 84f140c1ff5..00000000000 --- a/net/zephyr/INSTALL +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/10/31 23:00:01 zuntum Exp $ -# - -case "$2" in - ""|POST-INSTALL) cat <<EOF -============================================================= - -Zephyr requires a single master server, and then a host server for -every host that supports zephyr. You must start these out of your -rc script. - -============================================================= -EOF - ;; -esac diff --git a/net/zephyr/MESSAGE b/net/zephyr/MESSAGE new file mode 100644 index 00000000000..3d760075b00 --- /dev/null +++ b/net/zephyr/MESSAGE @@ -0,0 +1,7 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2003/07/30 10:53:02 jmmv Exp $ + +Zephyr requires a single master server, and then a host server for every +host that supports zephyr. You must start these out of your rc script. + +=========================================================================== diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile index f56915d8ffd..d2c96d07fcf 100644 --- a/net/zephyr/Makefile +++ b/net/zephyr/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2003/07/17 22:52:07 grant Exp $ +# $NetBSD: Makefile,v 1.27 2003/07/30 10:53:02 jmmv Exp $ # DISTNAME= zephyr-2.0.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/ @@ -21,20 +22,29 @@ CPPFLAGS+= -I/usr/include/kerberosIV CONFIGURE_ARGS+="--without-krb4" .endif +USE_BUILDLINK2= yes +USE_PKGINSTALL= yes USE_X11= yes GNU_CONFIGURE= yes -ZEPHYR_RCDIR= ${PREFIX}/etc/rc.d ZEPHYR_DOCDIR= ${PREFIX}/share/doc/zephyr ZEPHYR_DOCS= INSTALL NOTES OPERATING README USING -post-install: - ${INSTALL_DATA_DIR} ${ZEPHYR_RCDIR} - ${SED} -e 's|@prefix@|'${PREFIX}'|g' < ${FILESDIR}/zhm.sh > ${WRKDIR}/zhm.sh - ${INSTALL_SCRIPT} ${WRKDIR}/zhm.sh ${ZEPHYR_RCDIR}/zhm +RCD_SCRIPTS= zhm + +CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +PKG_SYSCONFSUBDIR= zephyr +OWN_DIRS= ${PKG_SYSCONFDIR}/acl +EGDIR= ${PREFIX}/share/examples/zephyr +CONF_FILES= # Contents set in HEADER file + +pre-install: + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA_DIR} ${EGDIR}/acl ${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR} - for file in ${ZEPHYR_DOCS} ; do \ - ${INSTALL_DATA} ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \ - done +.for f in ${ZEPHYR_DOCS} + ${INSTALL_DATA} ${WRKSRC}/$f ${ZEPHYR_DOCDIR} +.endfor +.undef f .include "../../mk/bsd.pkg.mk" diff --git a/net/zephyr/PLIST b/net/zephyr/PLIST index 848509fd829..565a0ffc8d5 100644 --- a/net/zephyr/PLIST +++ b/net/zephyr/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:00:01 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/07/30 10:53:02 jmmv Exp $ bin/xzwrite bin/zaway bin/zctl @@ -9,53 +9,6 @@ bin/zstat bin/zwgc bin/zwrite etc/rc.d/zhm -etc/zephyr/acl/class-registry.acl -etc/zephyr/acl/iui-filsrv.acl -etc/zephyr/acl/iui-hm_ctl.acl -etc/zephyr/acl/iui-hm_stat.acl -etc/zephyr/acl/iui-login.acl -etc/zephyr/acl/iui-operations.acl -etc/zephyr/acl/iui-ops.acl -etc/zephyr/acl/iui-user_locate.acl -etc/zephyr/acl/iui-wg_ctl.acl -etc/zephyr/acl/iui-zephyr_admin.acl -etc/zephyr/acl/iui-zephyr_ctl.acl -etc/zephyr/acl/iui-zmatch_all.acl -etc/zephyr/acl/iws-filsrv.acl -etc/zephyr/acl/iws-hm_ctl.acl -etc/zephyr/acl/iws-hm_stat.acl -etc/zephyr/acl/iws-login.acl -etc/zephyr/acl/iws-operations.acl -etc/zephyr/acl/iws-ops.acl -etc/zephyr/acl/iws-user_locate.acl -etc/zephyr/acl/iws-wg_ctl.acl -etc/zephyr/acl/iws-zephyr_admin.acl -etc/zephyr/acl/iws-zephyr_ctl.acl -etc/zephyr/acl/iws-zmatch_all.acl -etc/zephyr/acl/sub-filsrv.acl -etc/zephyr/acl/sub-hm_ctl.acl -etc/zephyr/acl/sub-hm_stat.acl -etc/zephyr/acl/sub-login.acl -etc/zephyr/acl/sub-operations.acl -etc/zephyr/acl/sub-ops.acl -etc/zephyr/acl/sub-user_locate.acl -etc/zephyr/acl/sub-wg_ctl.acl -etc/zephyr/acl/sub-zephyr_admin.acl -etc/zephyr/acl/sub-zephyr_ctl.acl -etc/zephyr/acl/sub-zmatch_all.acl -etc/zephyr/acl/xmt-filsrv.acl -etc/zephyr/acl/xmt-hm_ctl.acl -etc/zephyr/acl/xmt-hm_stat.acl -etc/zephyr/acl/xmt-login.acl -etc/zephyr/acl/xmt-operations.acl -etc/zephyr/acl/xmt-ops.acl -etc/zephyr/acl/xmt-user_locate.acl -etc/zephyr/acl/xmt-wg_ctl.acl -etc/zephyr/acl/xmt-zephyr_admin.acl -etc/zephyr/acl/xmt-zephyr_ctl.acl -etc/zephyr/acl/xmt-zmatch_all.acl -etc/zephyr/default.subscriptions -etc/zephyr/zephyr.vars include/com_err.h include/zephyr/mit-copyright.h include/zephyr/zephyr.h @@ -94,7 +47,54 @@ share/doc/zephyr/NOTES share/doc/zephyr/OPERATING share/doc/zephyr/README share/doc/zephyr/USING -@dirrm etc/zephyr/acl -@dirrm etc/zephyr -@dirrm include/zephyr +share/examples/zephyr/acl/class-registry.acl +share/examples/zephyr/acl/iui-filsrv.acl +share/examples/zephyr/acl/iui-hm_ctl.acl +share/examples/zephyr/acl/iui-hm_stat.acl +share/examples/zephyr/acl/iui-login.acl +share/examples/zephyr/acl/iui-operations.acl +share/examples/zephyr/acl/iui-ops.acl +share/examples/zephyr/acl/iui-user_locate.acl +share/examples/zephyr/acl/iui-wg_ctl.acl +share/examples/zephyr/acl/iui-zephyr_admin.acl +share/examples/zephyr/acl/iui-zephyr_ctl.acl +share/examples/zephyr/acl/iui-zmatch_all.acl +share/examples/zephyr/acl/iws-filsrv.acl +share/examples/zephyr/acl/iws-hm_ctl.acl +share/examples/zephyr/acl/iws-hm_stat.acl +share/examples/zephyr/acl/iws-login.acl +share/examples/zephyr/acl/iws-operations.acl +share/examples/zephyr/acl/iws-ops.acl +share/examples/zephyr/acl/iws-user_locate.acl +share/examples/zephyr/acl/iws-wg_ctl.acl +share/examples/zephyr/acl/iws-zephyr_admin.acl +share/examples/zephyr/acl/iws-zephyr_ctl.acl +share/examples/zephyr/acl/iws-zmatch_all.acl +share/examples/zephyr/acl/sub-filsrv.acl +share/examples/zephyr/acl/sub-hm_ctl.acl +share/examples/zephyr/acl/sub-hm_stat.acl +share/examples/zephyr/acl/sub-login.acl +share/examples/zephyr/acl/sub-operations.acl +share/examples/zephyr/acl/sub-ops.acl +share/examples/zephyr/acl/sub-user_locate.acl +share/examples/zephyr/acl/sub-wg_ctl.acl +share/examples/zephyr/acl/sub-zephyr_admin.acl +share/examples/zephyr/acl/sub-zephyr_ctl.acl +share/examples/zephyr/acl/sub-zmatch_all.acl +share/examples/zephyr/acl/xmt-filsrv.acl +share/examples/zephyr/acl/xmt-hm_ctl.acl +share/examples/zephyr/acl/xmt-hm_stat.acl +share/examples/zephyr/acl/xmt-login.acl +share/examples/zephyr/acl/xmt-operations.acl +share/examples/zephyr/acl/xmt-ops.acl +share/examples/zephyr/acl/xmt-user_locate.acl +share/examples/zephyr/acl/xmt-wg_ctl.acl +share/examples/zephyr/acl/xmt-zephyr_admin.acl +share/examples/zephyr/acl/xmt-zephyr_ctl.acl +share/examples/zephyr/acl/xmt-zmatch_all.acl +share/examples/zephyr/default.subscriptions +share/examples/zephyr/zephyr.vars +@dirrm share/examples/zephyr/acl +@dirrm share/examples/zephyr @dirrm share/doc/zephyr +@dirrm include/zephyr diff --git a/net/zephyr/distinfo b/net/zephyr/distinfo index ac988e14bbc..81a3e24d0b2 100644 --- a/net/zephyr/distinfo +++ b/net/zephyr/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:42 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/07/30 10:53:02 jmmv Exp $ SHA1 (zephyr-2.0.4.tar.gz) = df0e3f6da42d54fc218787c4e7eb9934f5bf5548 Size (zephyr-2.0.4.tar.gz) = 435872 bytes @@ -11,9 +11,9 @@ SHA1 (patch-af) = 916f07244f23ea0fbe20cb9f39cd86c6e4e80aba SHA1 (patch-ag) = abf58efa9da47405f277a80c5b098087ccb3d6dd SHA1 (patch-ah) = 1d181663cf85dea3635392886c68dac2f8950e10 SHA1 (patch-ai) = 2a55884f62c016a592b27342433dc8c624883a4a -SHA1 (patch-aj) = 9f8e27c4b823e53da7d9bd4b52803cd26127f6e3 +SHA1 (patch-aj) = a458b70331ecc996c71eae07d9e2f64d340cd028 SHA1 (patch-ak) = 2f22602c2dbca980872c6b7dffafb709c05a7a22 -SHA1 (patch-al) = 140b60bc09ea7e24e5487d2535840821fa807820 +SHA1 (patch-al) = ea69bec71bfac6c0093a4b46840f1eedc89f12b1 SHA1 (patch-am) = e1158c4f45d8a1d92f91df9c0c102e9c9bc2b523 SHA1 (patch-an) = 9b3ee33c50072835ff899732c9ba19b9d5784ddd SHA1 (patch-ao) = af1d162cf8a0cf7367a9d7717ac8e7045f7113e5 @@ -22,7 +22,7 @@ SHA1 (patch-aq) = ce0283541623070e43558c3cc9460d17deaae663 SHA1 (patch-ar) = 7bfcadad0ae701051a5784710805e9c18a71581c SHA1 (patch-as) = 14858ff528c9e38a947a1215aad388e46a8863c4 SHA1 (patch-at) = ad95c4d16d6344afe53ddfec16165b8a85562a64 -SHA1 (patch-au) = 57a0e0a36b907ab0fb6d88ad25f91481eb2cc93e +SHA1 (patch-au) = bf64536800c30f698c7d2264551364dcd07bd616 SHA1 (patch-av) = 741c1429955d08a56ee05ebeb79ee24aedf396f8 SHA1 (patch-aw) = 5ba3962c76037364577894596cdde5a051bf2e2d SHA1 (patch-ax) = 3b66feaf74e5c97d880d7ea8eb6cf2b3acced06b diff --git a/net/zephyr/files/zhm.sh b/net/zephyr/files/zhm.sh index c214a1d9266..5c230870c2d 100644 --- a/net/zephyr/files/zhm.sh +++ b/net/zephyr/files/zhm.sh @@ -1,24 +1,22 @@ -#!/bin/sh +#!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: zhm.sh,v 1.3 2002/07/29 11:55:26 joda Exp $ +# $NetBSD: zhm.sh,v 1.4 2003/07/30 10:53:03 jmmv Exp $ # # PROVIDE: zhm # REQUIRE: DAEMON . /etc/rc.subr -PREFIX=${PREFIX-@prefix@} - name="zhm" rcvar="$name" -command="${PREFIX}/sbin/${name}" +command="@PREFIX@/sbin/${name}" pidfile="/var/run/${name}.pid" -required_files="${PREFIX}/etc/zephyr/server.list" +required_files="@PKG_SYSCONFDIR@/server.list" start_precmd="zhm_precmd" zhm_precmd() { - _flags="`cat ${PREFIX}/etc/zephyr/server.list`" + _flags="`cat @PKG_SYSCONFDIR@/server.list`" } load_rc_config "$name" run_rc_command "$1" diff --git a/net/zephyr/patches/patch-aj b/net/zephyr/patches/patch-aj index b9dc544d774..7b2bb72aecd 100644 --- a/net/zephyr/patches/patch-aj +++ b/net/zephyr/patches/patch-aj @@ -1,9 +1,8 @@ -$NetBSD: patch-aj,v 1.1 1999/11/25 01:50:43 hubertf Exp $ +$NetBSD: patch-aj,v 1.2 2003/07/30 10:53:03 jmmv Exp $ -diff -x *.orig -urN ./clients/zwgc/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwgc/Makefile.in ---- ./clients/zwgc/Makefile.in Fri Jul 7 23:59:07 1995 -+++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/clients/zwgc/Makefile.in Thu Nov 25 02:52:55 1999 -@@ -20,7 +20,7 @@ +--- clients/zwgc/Makefile.in.orig 1995-07-07 23:59:07.000000000 +0200 ++++ clients/zwgc/Makefile.in +@@ -20,7 +20,7 @@ YACC=@YACC@ INSTALL=@INSTALL@ INSTANTIATE=$(srcdir)/instantiate @@ -12,3 +11,12 @@ diff -x *.orig -urN ./clients/zwgc/Makefile.in /usr/pkgsrc/net/zephyr/work.i386. CFLAGS= $(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \ -I$(srcdir) -I. @X_CFLAGS@ @CPPFLAGS@ YFLAGS=-d +@@ -73,7 +73,7 @@ install: zwgc + $(INSTALL) -m 644 $(srcdir)/zwgc.1 $(mandir)/man1 + $(INSTALL) -m 644 $(srcdir)/zwgc.desc $(datadir) + $(INSTALL) -m 644 $(srcdir)/zwgc_resources $(datadir) +- $(INSTALL) -m 644 zephyr.vars $(confdir) ++ $(INSTALL) -m 644 zephyr.vars $(datadir)/examples/zephyr + + clean: + rm -f $(OBJS) zwgc port_dictionary.[ch] pointer_dictionary.[ch] diff --git a/net/zephyr/patches/patch-al b/net/zephyr/patches/patch-al index aba17bfdd1f..defb53b6803 100644 --- a/net/zephyr/patches/patch-al +++ b/net/zephyr/patches/patch-al @@ -1,9 +1,8 @@ -$NetBSD: patch-al,v 1.1 1999/11/25 01:50:44 hubertf Exp $ +$NetBSD: patch-al,v 1.2 2003/07/30 10:53:03 jmmv Exp $ -diff -x *.orig -urN ./configure /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/configure ---- ./configure Thu Apr 4 01:42:30 1996 -+++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/configure Thu Nov 25 02:52:54 1999 -@@ -502,7 +502,7 @@ +--- configure.orig 1996-04-04 01:42:30.000000000 +0200 ++++ configure +@@ -502,7 +502,7 @@ else fi ac_ext=c @@ -12,15 +11,23 @@ diff -x *.orig -urN ./configure /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephy ac_cpp='echo $CPP $CPPFLAGS 1>&5; $CPP $CPPFLAGS' ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5; -@@ -767,9 +767,9 @@ +@@ -559,6 +559,7 @@ else + cp ${srcdir}/lib/et/com_err.h h + cp ${srcdir}/lib/ss/*.h h/ss + fi ++confdir=${PKG_SYSCONFDIR} + + + +@@ -767,9 +768,9 @@ fi echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" -+ CFLAGS="-g -O2" ++ CFLAGS="$CFLAGS -g -O2" else - CFLAGS="-O" -+ CFLAGS="-O2" ++ CFLAGS="$CFLAGS -O2" fi fi else diff --git a/net/zephyr/patches/patch-au b/net/zephyr/patches/patch-au index 303cd6d0e7a..e2cf9a6afc0 100644 --- a/net/zephyr/patches/patch-au +++ b/net/zephyr/patches/patch-au @@ -1,9 +1,8 @@ -$NetBSD: patch-au,v 1.1 1999/11/25 01:50:45 hubertf Exp $ +$NetBSD: patch-au,v 1.2 2003/07/30 10:53:04 jmmv Exp $ -diff -x *.orig -urN ./server/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/Makefile.in ---- ./server/Makefile.in Thu Apr 4 01:41:13 1996 -+++ /usr/pkgsrc/net/zephyr/work.i386.unpatched/zephyr-2.0.4/server/Makefile.in Thu Nov 25 02:52:56 1999 -@@ -19,7 +19,7 @@ +--- server/Makefile.in.orig 1996-04-04 01:41:13.000000000 +0200 ++++ server/Makefile.in +@@ -19,7 +19,7 @@ CC=@CC@ INSTALL=@INSTALL@ COMPILE_ET=@COMPILE_ET@ @@ -12,3 +11,18 @@ diff -x *.orig -urN ./server/Makefile.in /usr/pkgsrc/net/zephyr/work.i386.unpatc CFLAGS= $(DEBUG) -DCONFDIR=\"$(confdir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \ -I. @CPPFLAGS@ LDFLAGS=$(DEBUG) -L$(BUILDTOP)/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@ +@@ -48,10 +48,10 @@ check: + install: + $(INSTALL) -m 755 -s zephyrd $(sbindir) + $(INSTALL) -m 644 $(srcdir)/zephyrd.8 $(mandir)/man8 +- $(INSTALL) -m 644 $(srcdir)/default.subscriptions $(confdir) +- rm -f $(confdir)/acl/?*.acl +- cp $(srcdir)/acl/?*.acl $(confdir)/acl +- chmod 644 $(confdir)/acl/* ++ $(INSTALL) -m 644 $(srcdir)/default.subscriptions $(datadir)/examples/zephyr ++ for f in $(srcdir)/acl/?*.acl; do \ ++ $(INSTALL) -m 644 $$f $(datadir)/examples/zephyr/acl; \ ++ done + + clean: + rm -f $(OBJS) zephyrd zsrv_err.[ch] |