diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/coda5_server/Makefile | 37 | ||||
| -rw-r--r-- | net/coda5_server/distinfo | 4 | ||||
| -rw-r--r-- | net/coda5_server/patches/patch-ab | 22 | ||||
| -rw-r--r-- | net/coda5_server/patches/patch-ac | 16 | ||||
| -rw-r--r-- | net/coda5_server/pkg/DEINSTALL | 72 | ||||
| -rw-r--r-- | net/coda5_server/pkg/INSTALL | 30 | ||||
| -rw-r--r-- | net/coda5_server/pkg/PLIST | 6 |
7 files changed, 175 insertions, 12 deletions
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile index 3e54d3e9a78..df19795f79d 100644 --- a/net/coda5_server/Makefile +++ b/net/coda5_server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2001/05/15 08:32:48 phil Exp $ +# $NetBSD: Makefile,v 1.28 2001/05/31 22:58:08 jlam Exp $ # DISTNAME= coda-5.3.13 @@ -10,11 +10,6 @@ MAINTAINER= phil@cs.wwu.edu HOMEPAGE= http://www.coda.cs.cmu.edu/ COMMENT= server programs for a replicated high-performance network file system -DEPENDS+= lwp>=1.6:../../devel/lwp -DEPENDS+= rvm>=1.3:../../devel/rvm -DEPENDS+= rpc2>=1.10:../../devel/rpc2 -DEPENDS+= readline>=4.0:../../devel/readline - # Only enable platforms that can build "lwp". ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc @@ -25,7 +20,33 @@ USE_PERL5= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${WRKSRC}/include" -CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/include" +.include "../../devel/lwp/buildlink.mk" +.include "../../devel/readline/buildlink.mk" +.include "../../devel/rpc2/buildlink.mk" +.include "../../devel/rvm/buildlink.mk" + +CFLAGS+= -I${BUILDLINK_INCDIR} +CXXFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} + +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +INSTALL_FILE= ${WRKDIR}/INSTALL + +INSTALL_SUBST= CAT=${CAT} +INSTALL_SUBST+= LN=${LN} +INSTALL_SUBST+= RM=${RM} +INSTALL_SUBST+= RMDIR=${RMDIR} +INSTALL_SUBST+= TRUE=${TRUE} + +pre-configure: ${BUILDLINK_TARGETS} + +pre-install: + ${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \ + ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} + ${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \ + ${PKGDIR}/INSTALL > ${INSTALL_FILE} + +post-install: + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/net/coda5_server/distinfo b/net/coda5_server/distinfo index 72b3e560d7a..08adb88c1df 100644 --- a/net/coda5_server/distinfo +++ b/net/coda5_server/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/05/15 08:32:49 phil Exp $ +$NetBSD: distinfo,v 1.4 2001/05/31 22:58:08 jlam Exp $ SHA1 (coda-5.3.13.tar.gz) = 6f06e73d8441f4ae7010acb2a35d0f0bde6ff7a4 Size (coda-5.3.13.tar.gz) = 1324328 bytes SHA1 (patch-aa) = 085adda0e65ff348e3679813b79197e9856c109c +SHA1 (patch-ab) = c80609c7bd113799587827fc9f0ad3770c441de1 +SHA1 (patch-ac) = 3f746a14752a0bae6d68e9d5c4071904e9fc6c7d diff --git a/net/coda5_server/patches/patch-ab b/net/coda5_server/patches/patch-ab new file mode 100644 index 00000000000..1f84a3ee142 --- /dev/null +++ b/net/coda5_server/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.9 2001/05/31 22:58:08 jlam Exp $ + +--- coda-src/scripts/Makefile.in.orig Wed Aug 30 16:41:33 2000 ++++ coda-src/scripts/Makefile.in Thu May 31 16:09:20 2001 +@@ -31,7 +31,7 @@ + VICE-SCRIPTS = startserver codastart + REINIT-SCRIPTS = partial-reinit.sh + UPGRADE-SCRIPTS = pwdtopdbtool.py +-VICE-SETUP = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes coda-setup-ports codaconfedit ++VICE-SETUP = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes vice-coda-setup-ports vice-codaconfedit + + BACKUP-SCRIPTS = backup.sh tape.pl + +@@ -66,3 +66,8 @@ + + include $(TOPDIR)/configs/Makerules + ++vice-coda-setup-ports: coda-setup-ports ++ cp coda-setup-ports vice-coda-setup-ports ++ ++vice-codaconfedit: codaconfedit ++ cp codaconfedit vice-codaconfedit diff --git a/net/coda5_server/patches/patch-ac b/net/coda5_server/patches/patch-ac new file mode 100644 index 00000000000..9186878bd1f --- /dev/null +++ b/net/coda5_server/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.5 2001/05/31 22:58:08 jlam Exp $ + +--- lib-src/base/parser.c.orig Sun Jan 30 19:01:28 2000 ++++ lib-src/base/parser.c Wed May 30 22:00:39 2001 +@@ -34,10 +34,7 @@ + + #define READLINE_LIBRARY + #include <readline/readline.h> +- +-extern void using_history(); +-extern void stifle_history(int); +-extern void add_history(char *); ++#include <readline/history.h> + + #ifdef __cplusplus + } diff --git a/net/coda5_server/pkg/DEINSTALL b/net/coda5_server/pkg/DEINSTALL new file mode 100644 index 00000000000..2dbf8658829 --- /dev/null +++ b/net/coda5_server/pkg/DEINSTALL @@ -0,0 +1,72 @@ +#! /bin/sh +# +# $NetBSD: DEINSTALL,v 1.1 2001/05/31 22:58:08 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +CAT="@CAT@" +LN="@LN@" +RM="@RM@" +RMDIR="@RMDIR@" +TRUE="@TRUE@" + +CONFDIR=${PKG_PREFIX}/etc/coda + +case ${STAGE} in +DEINSTALL) + ;; + +POST-DEINSTALL) + # If coda-server is installed, then point these links to the + # venus-* versions of these scripts. + # + for script in coda-setup-ports codaconfedit; do + ${RM} -f ${PKG_PREFIX}/sbin/${script} + if [ -f ${PKG_PREFIX}/sbin/venus-${script} ] + then + ${LN} -sf venus-${script} ${PKG_PREFIX}/sbin/${script} + fi + done + + ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} + + existing_dirs='' + for dir in ${CONFDIR} + do + if [ -d ${dir} ] + then + existing_dirs="${existing_dirs} ${dir}" + fi + done + + if [ -n "${existing_dirs}" ] + then + ${CAT} << EOF +=========================================================================== +If you won't be using ${PKGNAME} any longer, you may want to remove: +EOF + if [ -n "${existing_dirs}" ] + then + ${CAT} << EOF + + * the following directories: + +EOF + for dir in ${existing_dirs} + do + echo " ${dir}" + done + fi + ${CAT} << EOF +=========================================================================== +EOF + fi + ;; + +*) + echo "Unexpected argument: ${STAGE}" + exit 1 + ;; +esac +exit 0 diff --git a/net/coda5_server/pkg/INSTALL b/net/coda5_server/pkg/INSTALL new file mode 100644 index 00000000000..f1f070eb297 --- /dev/null +++ b/net/coda5_server/pkg/INSTALL @@ -0,0 +1,30 @@ +#! /bin/sh +# +# $NetBSD: INSTALL,v 1.1 2001/05/31 22:58:08 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +LN="@LN@" +RM="@RM@" + +case ${STAGE} in +PRE-INSTALL) + ;; + +POST-INSTALL) + # coda-client may have already created these links + for script in coda-setup-ports codaconfedit; do + if [ ! -f ${PKG_PREFIX}/sbin/${script} ] + then + ${LN} -sf vice-${script} ${PKG_PREFIX}/sbin/${script} + fi + done + ;; + +*) + echo "Unexpected argument: ${STAGE}" + exit 1 + ;; +esac +exit 0 diff --git a/net/coda5_server/pkg/PLIST b/net/coda5_server/pkg/PLIST index 8c2d6d420a1..988f540586b 100644 --- a/net/coda5_server/pkg/PLIST +++ b/net/coda5_server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2001/05/15 08:32:52 phil Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/05/31 22:58:08 jlam Exp $ bin/norton bin/norton-reinit bin/reinit @@ -7,8 +7,6 @@ sbin/auth2 sbin/backup sbin/backup.sh sbin/bldvldb.sh -sbin/coda-setup-ports -sbin/codaconfedit sbin/codasrv sbin/codastart sbin/createvol_rep @@ -29,6 +27,8 @@ sbin/tape.pl sbin/updateclnt sbin/updatefetch sbin/updatesrv +sbin/vice-coda-setup-ports +sbin/vice-codaconfedit sbin/vice-killvolumes sbin/vice-setup sbin/vice-setup-rvm |