diff options
| -rw-r--r-- | net/coda/Makefile | 8 | ||||
| -rw-r--r-- | net/coda/distinfo | 13 | ||||
| -rw-r--r-- | net/coda/patches/patch-aa | 13 | ||||
| -rw-r--r-- | net/coda/patches/patch-ab | 13 | ||||
| -rw-r--r-- | net/coda/patches/patch-ac | 12 |
5 files changed, 16 insertions, 43 deletions
diff --git a/net/coda/Makefile b/net/coda/Makefile index 3cfe30fffc8..680ee1ab81c 100644 --- a/net/coda/Makefile +++ b/net/coda/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2009/05/20 00:58:25 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2011/03/11 20:27:42 gdt Exp $ # -DISTNAME= coda-6.9.2 -PKGREVISION= 3 +DISTNAME= coda-6.9.5 CATEGORIES= net MASTER_SITES= http://www.coda.cs.cmu.edu/pub/coda/src/ @@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir # See http://coda.wikidev.net/Quick_Client_Action for hints on how # to configure venus. -USE_TOOLS+= gmake perl perl:run +USE_TOOLS+= gmake pkg-config perl perl:run GNU_CONFIGURE= yes USE_LANGUAGES= c c++ REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge @@ -25,5 +24,6 @@ REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge .include "../../devel/rvm/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/coda/distinfo b/net/coda/distinfo index 78f9fb9d126..384b981e138 100644 --- a/net/coda/distinfo +++ b/net/coda/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2007/12/02 14:33:05 rillig Exp $ +$NetBSD: distinfo,v 1.6 2011/03/11 20:27:42 gdt Exp $ -SHA1 (coda-6.9.2.tar.gz) = 47e71299d04dbb9e03f9f5a7101933679b1cb316 -RMD160 (coda-6.9.2.tar.gz) = 4cdf2ad53333359d39793147daee865b22b38993 -Size (coda-6.9.2.tar.gz) = 1650937 bytes -SHA1 (patch-aa) = f9cb4a72a4ff72020ba52382481811fe71931ab2 -SHA1 (patch-ab) = 07675cfb2eb7ebe40609338368ca7df813a7d5dd -SHA1 (patch-ac) = ecbd62e4007a77b2e7734de918f70712f9fc9144 +SHA1 (coda-6.9.5.tar.gz) = 248af27c506f5c3be4c4e53f821c9c904580fe60 +RMD160 (coda-6.9.5.tar.gz) = 9ef0643aacc7d1352ef253af00d4c7e6ad9e1f78 +Size (coda-6.9.5.tar.gz) = 1723098 bytes +SHA1 (patch-ac) = b9f9fd68c633e09717252562b06238b87df1a6b7 +SHA1 (patch-ad) = 464c8e435ccfd23d5dd68f94a87e18fa2899f335 diff --git a/net/coda/patches/patch-aa b/net/coda/patches/patch-aa deleted file mode 100644 index bc2e5adb5f5..00000000000 --- a/net/coda/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/08/06 12:31:25 gdt Exp $ - ---- coda-src/scripts/Makefile.am.orig 2007-08-01 14:31:53.000000000 -0400 -+++ coda-src/scripts/Makefile.am -@@ -23,7 +23,7 @@ dist_man_MANS += bldvldb.sh.8 createvol_ - if SYSVINIT - dist_init_SCRIPTS += auth2.init codasrv.init update.init - else --dist_init_SCRIPTS += rc.vice -+#dist_init_SCRIPTS += rc.vice - endif - endif - EXTRA_DIST = findparents.sh volinfo.pl volsizes.pl diff --git a/net/coda/patches/patch-ab b/net/coda/patches/patch-ab deleted file mode 100644 index d808caecb79..00000000000 --- a/net/coda/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2007/08/06 12:31:25 gdt Exp $ - ---- coda-src/scripts/Makefile.in.orig 2007-08-02 14:59:50.000000000 -0400 -+++ coda-src/scripts/Makefile.in -@@ -51,7 +51,7 @@ host_triplet = @host@ - @BUILD_SERVER_TRUE@ startserver.8 vice-setup.8 volumelist.5 - - @BUILD_SERVER_TRUE@@SYSVINIT_TRUE@am__append_8 = auth2.init codasrv.init update.init --@BUILD_SERVER_TRUE@@SYSVINIT_FALSE@am__append_9 = rc.vice -+#@BUILD_SERVER_TRUE@@SYSVINIT_FALSE@am__append_9 = rc.vice - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ - AMDEP_TRUE = @AMDEP_TRUE@ diff --git a/net/coda/patches/patch-ac b/net/coda/patches/patch-ac index 0bf215913ae..7316cef018e 100644 --- a/net/coda/patches/patch-ac +++ b/net/coda/patches/patch-ac @@ -1,11 +1,11 @@ -$NetBSD: patch-ac,v 1.3 2007/12/02 14:33:06 rillig Exp $ +$NetBSD: patch-ac,v 1.4 2011/03/11 20:27:42 gdt Exp $ Added experimental code to support mounting on NetBSD >= 4.99.24. The magic value of 256 is taken from coda_vfsops in coda_vfsops.c. ---- coda-src/venus/worker.cc.orig 2007-08-01 18:32:29.000000000 +0000 -+++ coda-src/venus/worker.cc 2007-11-30 23:12:18.000000000 +0000 -@@ -367,11 +367,19 @@ void VFSMount() +--- coda-src/venus/worker.cc.orig 2008-10-06 16:52:22.000000000 +0000 ++++ coda-src/venus/worker.cc +@@ -403,11 +403,19 @@ void VFSMount() error = nmount(md, 6, 0); } #endif @@ -13,9 +13,9 @@ magic value of 256 is taken from coda_vfsops in coda_vfsops.c. + +#if defined(__NetBSD__) && defined(__NetBSD_Prereq__) && __NetBSD_Prereq__(4,99,24) + if (error < 0) -+ error = mount("coda", venusRoot, 0, kernDevice, 256); ++ error = mount("coda", venusRoot, 0, (void *)kernDevice, 256); + if (error < 0) -+ error = mount("cfs", venusRoot, 0, kernDevice, 256); ++ error = mount("cfs", venusRoot, 0, (void *)kernDevice, 256); +#else if (error < 0) error = mount("coda", venusRoot, 0, kernDevice); |