[116078] users/raimue/ports/sysutils
raimue at macports.org
raimue at macports.org
Fri Jan 17 08:56:58 PST 2014
Revision: 116078
https://trac.macports.org/changeset/116078
Author: raimue at macports.org
Date: 2014-01-17 08:56:57 -0800 (Fri, 17 Jan 2014)
Log Message:
-----------
sysutils/ori:
New port
Added Paths:
-----------
users/raimue/ports/sysutils/ori/
users/raimue/ports/sysutils/ori/Portfile
users/raimue/ports/sysutils/ori/files/
users/raimue/ports/sysutils/ori/files/patch-cxx-tr1.diff
users/raimue/ports/sysutils/ori/files/patch-destdir.diff
Added: users/raimue/ports/sysutils/ori/Portfile
===================================================================
--- users/raimue/ports/sysutils/ori/Portfile (rev 0)
+++ users/raimue/ports/sysutils/ori/Portfile 2014-01-17 16:56:57 UTC (rev 116078)
@@ -0,0 +1,77 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name ori
+version 0.8.0
+categories sysutils
+platforms darwin
+maintainers raimue
+license ISC Permissive
+
+description A secure distributed file system
+
+long_description \
+ Ori is a distributed file system built for offline operation and empowers \
+ the user with control over synchronization operations and conflict \
+ resolution. It provides history through light weight snapshots and allow \
+ users to verify the history has not been tampered with. Through the use of \
+ replication instances can be resilient and recover damaged data from other \
+ nodes.
+
+homepage http://ori.scs.stanford.edu/
+master_sites https://bitbucket.org/orifs/ori/downloads/
+use_xz yes
+
+checksums rmd160 9861edad04ab6df399525256df97862234acd507 \
+ sha256 0589db3480e733dbeba2a1f6be6553701684b283507437c7500ad069f4b49631
+
+depends_build port:scons \
+ path:bin/pkg-config:pkgconfig
+depends_lib path:lib/pkgconfig/fuse.pc:fuse4x \
+ port:libevent \
+ port:boost \
+ port:openssl
+
+patchfiles patch-cxx-tr1.diff \
+ patch-destdir.diff
+patch.pre_args -p1
+
+use_configure no
+
+build.cmd scons
+build.target
+build.args CC=${configure.cc} \
+ CXX=${configure.cxx} \
+ CPPFLAGS="${configure.cppflags}" \
+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ LINKFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+ PREFIX=${prefix} \
+ BUILDTYPE=RELEASE \
+ WITH_FUSE=1 \
+ WITH_HTTPD=0 \
+ WITH_ORILOCAL=0 \
+ WITH_MDNS=0 \
+ VERBOSE=1
+
+# libs3 is GPLv3, linking would make this non-distributable
+build.args-append WITH_LIBS3=0
+
+destroot.cmd scons
+eval destroot.args ${build.args}
+destroot.destdir DESTDIR=${destroot}
+
+default_variants +mdns +httpd
+
+variant mdns description {Include Zeroconf/mDNS support} {
+ build.args-replace WITH_MDNS=0 WITH_MDNS=1
+}
+
+variant httpd description {Include HTTPD server} {
+ build.args-replace WITH_HTTPD=0 WITH_HTTPD=1
+}
+
+variant checkout description {Include Ori checkout support} {
+ build.args-replace WITH_ORILOCAL=0 WITH_ORILOCAL=1
+}
Property changes on: users/raimue/ports/sysutils/ori/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: users/raimue/ports/sysutils/ori/files/patch-cxx-tr1.diff
===================================================================
--- users/raimue/ports/sysutils/ori/files/patch-cxx-tr1.diff (rev 0)
+++ users/raimue/ports/sysutils/ori/files/patch-cxx-tr1.diff 2014-01-17 16:56:57 UTC (rev 116078)
@@ -0,0 +1,116 @@
+Upstream: https://bitbucket.org/orifs/ori/commits/7c5f894d87be1c79447fc7af9381a65307429801
+
+From 7c5f894d87be1c79447fc7af9381a65307429801 Mon Sep 17 00:00:00 2001
+From: Ali Mashtizadeh <mashti at cs.stanford.edu>
+Date: Sat, 28 Sep 2013 18:19:06 -0700
+Subject: [PATCH] Fix FreeBSD 10 and C++11 issues.
+
+---
+ libori/peer.cc | 2 --
+ libori/remoterepo.cc | 2 --
+ libori/sshrepo.cc | 2 --
+ libori/treediff.cc | 2 --
+ libori/udsrepo.cc | 2 --
+ libori/udsserver.cc | 2 +-
+ orisync/server.cc | 2 +-
+ 7 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/libori/peer.cc b/libori/peer.cc
+index b5cd5f6..2a361bd 100644
+--- a/libori/peer.cc
++++ b/libori/peer.cc
+@@ -34,9 +34,7 @@
+ #include <ori/peer.h>
+
+ using namespace std;
+-#ifdef HAVE_CXXTR1
+ using namespace std::tr1;
+-#endif /* HAVE_CXXTR1 */
+
+ /********************************************************************
+ *
+diff --git a/libori/remoterepo.cc b/libori/remoterepo.cc
+index ec62a4d..e589ad4 100644
+--- a/libori/remoterepo.cc
++++ b/libori/remoterepo.cc
+@@ -34,9 +34,7 @@
+ #include <ori/remoterepo.h>
+
+ using namespace std;
+-#ifdef HAVE_CXXTR1
+ using namespace std::tr1;
+-#endif /* HAVE_CXXTR1 */
+
+ RemoteRepo::RemoteRepo()
+ : r(NULL)
+diff --git a/libori/sshrepo.cc b/libori/sshrepo.cc
+index 76fdba9..7011808 100644
+--- a/libori/sshrepo.cc
++++ b/libori/sshrepo.cc
+@@ -38,9 +38,7 @@
+ #include <ori/sshrepo.h>
+
+ using namespace std;
+-#ifdef HAVE_CXXTR1
+ using namespace std::tr1;
+-#endif /* HAVE_CXXTR1 */
+
+ /*
+ * SshRepo
+diff --git a/libori/treediff.cc b/libori/treediff.cc
+index 49a0aab..1d4a63a 100644
+--- a/libori/treediff.cc
++++ b/libori/treediff.cc
+@@ -33,9 +33,7 @@
+ #include <ori/largeblob.h>
+
+ using namespace std;
+-#ifdef HAVE_CXXTR1
+ using namespace std::tr1;
+-#endif /* HAVE_CXXTR1 */
+
+ TreeDiffEntry::TreeDiffEntry()
+ : type(Noop),
+diff --git a/libori/udsrepo.cc b/libori/udsrepo.cc
+index b489bf3..84051c1 100644
+--- a/libori/udsrepo.cc
++++ b/libori/udsrepo.cc
+@@ -34,9 +34,7 @@
+ #include <ori/udsrepo.h>
+
+ using namespace std;
+-#ifdef HAVE_CXXTR1
+ using namespace std::tr1;
+-#endif /* HAVE_CXXTR1 */
+
+ /*
+ * UDSRepo
+diff --git a/libori/udsserver.cc b/libori/udsserver.cc
+index ca89da1..0149f92 100644
+--- a/libori/udsserver.cc
++++ b/libori/udsserver.cc
+@@ -58,7 +58,7 @@ UDSServer::UDSServer(LocalRepo *repo)
+ strcpy(addr.sun_path, fuseSock.c_str());
+ unlink(fuseSock.c_str());
+ len = SUN_LEN(&addr);
+- status = bind(sock, (struct sockaddr *)&addr, len);
++ status = ::bind(sock, (struct sockaddr *)&addr, len);
+ if (status < 0)
+ throw SystemException();
+
+diff --git a/orisync/server.cc b/orisync/server.cc
+index c538339..0dcdeb3 100644
+--- a/orisync/server.cc
++++ b/orisync/server.cc
+@@ -172,7 +172,7 @@ public:
+ addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ addr.sin_port = htons(ORISYNC_UDPPORT);
+
+- status = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
++ status = ::bind(fd, (struct sockaddr *)&addr, sizeof(addr));
+ if (status < 0) {
+ perror("bind");
+ close(fd);
+--
+1.8.5.2
+
Added: users/raimue/ports/sysutils/ori/files/patch-destdir.diff
===================================================================
--- users/raimue/ports/sysutils/ori/files/patch-destdir.diff (rev 0)
+++ users/raimue/ports/sysutils/ori/files/patch-destdir.diff 2014-01-17 16:56:57 UTC (rev 116078)
@@ -0,0 +1,62 @@
+Upstream: https://bitbucket.org/orifs/ori/commits/e7cb65c2ce92380066a35bd390d2019086fbadd9
+
+From e7cb65c2ce92380066a35bd390d2019086fbadd9 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom at gmx.net>
+Date: Mon, 6 Jan 2014 15:10:29 +0100
+Subject: [PATCH] Feature: Use DESTDIR for installation, Fixes issue #1
+
+---
+ SConstruct | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 018a32c..c9b6021 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -53,7 +53,8 @@ opts.AddVariables(
+ ("COMPRESSION_ALGO", "Compression algorithm (LZMA; FASTLZ; SNAPPY; NONE).",
+ "FASTLZ"),
+ ("CHUNKING_ALGO", "Chunking algorithm (RK; FIXED).", "RK"),
+- ("PREFIX", "Installation target directory.", "/usr/local/bin/")
++ ("PREFIX", "Installation target directory.", "/usr/local/bin/"),
++ ("DESTDIR", "The root directory to install into. Useful mainly for binary package building", ""),
+ )
+
+ env = Environment(options = opts,
+@@ -375,21 +376,21 @@ if env["BUILD_BINARIES"] == "1":
+
+ # Install Targets
+ if env["WITH_FUSE"] == "1":
+- env.Install('$PREFIX/bin','build/orifs/orifs')
+-env.Install('$PREFIX/bin','build/ori/ori')
+-env.Install('$PREFIX/bin','build/oridbg/oridbg')
+-env.Install('$PREFIX/bin','build/orisync/orisync')
++ env.Install('$DESTDIR$PREFIX/bin','build/orifs/orifs')
++env.Install('$DESTDIR$PREFIX/bin','build/ori/ori')
++env.Install('$DESTDIR$PREFIX/bin','build/oridbg/oridbg')
++env.Install('$DESTDIR$PREFIX/bin','build/orisync/orisync')
+ if env["WITH_LIBS3"] == "1":
+- env.Install('$PREFIX/bin','build/ori/oris3')
++ env.Install('$DESTDIR$PREFIX/bin','build/ori/oris3')
+ if env["WITH_HTTPD"] == "1":
+- env.Install('$PREFIX/bin','build/ori_httpd/ori_httpd')
++ env.Install('$DESTDIR$PREFIX/bin','build/ori_httpd/ori_httpd')
+ if env["WITH_ORILOCAL"] == "1":
+- env.Install('$PREFIX/bin','build/orilocal/orilocal')
++ env.Install('$DESTDIR$PREFIX/bin','build/orilocal/orilocal')
+
+-env.Install('$PREFIX/share/man/man1','docs/ori.1')
+-env.Install('$PREFIX/share/man/man1','docs/orifs.1')
+-env.Install('$PREFIX/share/man/man1','docs/orisync.1')
+-env.Install('$PREFIX/share/man/man1','docs/oridbg.1')
++env.Install('$DESTDIR$PREFIX/share/man/man1','docs/ori.1')
++env.Install('$DESTDIR$PREFIX/share/man/man1','docs/orifs.1')
++env.Install('$DESTDIR$PREFIX/share/man/man1','docs/orisync.1')
++env.Install('$DESTDIR$PREFIX/share/man/man1','docs/oridbg.1')
+
+-env.Alias('install','$PREFIX')
++env.Alias('install','$DESTDIR$PREFIX')
+
+--
+1.8.5.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140117/b35a4490/attachment.html>
More information about the macports-changes
mailing list