diff options
author | jlam <jlam> | 2001-05-31 22:55:54 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-05-31 22:55:54 +0000 |
commit | 2aef6a8cd24d3ecfe25cfa9e0d1b87b72d2a5de5 (patch) | |
tree | 5d5c08070ca727bd82d176d444aa8b827140547f | |
parent | 1655a169c1dd7b162f0fde302c5665fccdacf7d5 (diff) | |
download | pkgsrc-2aef6a8cd24d3ecfe25cfa9e0d1b87b72d2a5de5.tar.gz |
* Use buildlink.mk files to get dependencies and to prevent unintended
linking against installed libraries or finding installed headers except
for those that are explicitly linked into ${BUILDLINK_INCDIR} and
${BUILDLINK_LIBDIR}.
* Don't prototype history functions directly, but use
<readline/history.h> to pull them in. This allows us to use libedit's
readline emulation.
* Add INSTALL/DEINSTALL scripts to handle coda-server and coda-client both
installing coda-setup-ports and codaconfedit.
* Try to remove ${PREFIX}/etc/coda at post-deinstall time.
-rw-r--r-- | net/coda5_client/Makefile | 38 | ||||
-rw-r--r-- | net/coda5_client/distinfo | 4 | ||||
-rw-r--r-- | net/coda5_client/patches/patch-aa | 22 | ||||
-rw-r--r-- | net/coda5_client/patches/patch-ab | 16 | ||||
-rw-r--r-- | net/coda5_client/pkg/PLIST | 21 |
5 files changed, 80 insertions, 21 deletions
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile index fb6bae7f864..e34bcc5383b 100644 --- a/net/coda5_client/Makefile +++ b/net/coda5_client/Makefile @@ -1,21 +1,15 @@ -# $NetBSD: Makefile,v 1.28 2001/04/27 19:05:45 phil Exp $ +# $NetBSD: Makefile,v 1.29 2001/05/31 22:55:54 jlam Exp $ # DISTNAME= coda-5.3.13 PKGNAME= coda-client-5.3.13 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ -#EXTRACT_SUFX= .tar.gz MAINTAINER= phil@cs.wwu.edu HOMEPAGE= http://www.coda.cs.cmu.edu/ COMMENT= client 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 - # Requires "lwp" plus "filesystem CODA" to operate. Should build on # any NetBSD-*-m68k, though. ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* NetBSD-*-arm32 @@ -27,7 +21,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_client/distinfo b/net/coda5_client/distinfo index 09da6a53cfe..bd1003bd9af 100644 --- a/net/coda5_client/distinfo +++ b/net/coda5_client/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/04/27 19:05:45 phil Exp $ +$NetBSD: distinfo,v 1.4 2001/05/31 22:55:54 jlam Exp $ SHA1 (coda-5.3.13.tar.gz) = 6f06e73d8441f4ae7010acb2a35d0f0bde6ff7a4 Size (coda-5.3.13.tar.gz) = 1324328 bytes +SHA1 (patch-aa) = 8b837514b87683608b52d103a3743396027145d9 +SHA1 (patch-ab) = 0170aeef668bb4a1ace0691beaefa9d67e95f28a diff --git a/net/coda5_client/patches/patch-aa b/net/coda5_client/patches/patch-aa new file mode 100644 index 00000000000..ed19ad3470b --- /dev/null +++ b/net/coda5_client/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.11 2001/05/31 22:55:54 jlam Exp $ + +--- coda-src/scripts/Makefile.in.orig Wed Aug 30 16:41:33 2000 ++++ coda-src/scripts/Makefile.in Thu May 31 16:06:31 2001 +@@ -25,7 +25,7 @@ + # Need to conditionalize this + include $(TOPDIR)/Makeconf + +-VENUS-SCRIPTS = vutil volmunge venus-setup codaconfedit coda-setup-ports ++VENUS-SCRIPTS = vutil volmunge venus-setup venus-codaconfedit venus-coda-setup-ports + + VOL-SCRIPTS = createvol_rep purgevol purgevol_rep bldvldb.sh + VICE-SCRIPTS = startserver codastart +@@ -66,3 +66,8 @@ + + include $(TOPDIR)/configs/Makerules + ++venus-coda-setup-ports: coda-setup-ports ++ cp coda-setup-ports venus-coda-setup-ports ++ ++venus-codaconfedit: codaconfedit ++ cp codaconfedit venus-codaconfedit diff --git a/net/coda5_client/patches/patch-ab b/net/coda5_client/patches/patch-ab new file mode 100644 index 00000000000..4f613e96e5d --- /dev/null +++ b/net/coda5_client/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.9 2001/05/31 22:55:55 jlam Exp $ + +--- lib-src/base/parser.c.orig Sun Jan 30 19:01:28 2000 ++++ lib-src/base/parser.c Thu May 31 14:29:28 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_client/pkg/PLIST b/net/coda5_client/pkg/PLIST index 6f9f9a94a1d..5c34de5eb4d 100644 --- a/net/coda5_client/pkg/PLIST +++ b/net/coda5_client/pkg/PLIST @@ -1,12 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2001/04/27 19:05:47 phil Exp $ -sbin/au -sbin/codaconfedit -sbin/coda-setup-ports -sbin/sidekick -sbin/venus -sbin/venus-setup -sbin/volmunge -sbin/vutil +@comment $NetBSD: PLIST,v 1.10 2001/05/31 22:55:55 jlam Exp $ bin/cfs bin/clog bin/cmon @@ -23,6 +15,13 @@ bin/replay bin/spy bin/xaskuser bin/xfrepair -etc/coda/venus.conf.ex etc/coda/sidekick.intr.ex -@dirrm etc/coda +etc/coda/venus.conf.ex +sbin/au +sbin/sidekick +sbin/venus +sbin/venus-coda-setup-ports +sbin/venus-codaconfedit +sbin/venus-setup +sbin/volmunge +sbin/vutil |