Index: head/net-mgmt/sx/Makefile =================================================================== --- head/net-mgmt/sx/Makefile (revision 392772) +++ head/net-mgmt/sx/Makefile (revision 392773) @@ -1,43 +1,41 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= sx -PORTVERSION= 0.4 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= net-mgmt MASTER_SITES= http://cdn.skylable.com/source/ MAINTAINER= vg@FreeBSD.org COMMENT= Skylable Sx is a reliable, fully distributed cluster solution LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libfcgi.so:${PORTSDIR}/www/fcgi HAS_CONFIGURE= yes USE_LDCONFIG= yes +INSTALL_TARGET= install-strip USES= gmake libtool pkgconfig CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" --prefix="${STAGE}${PREFIX}" \ - --sysconfdir="${ETCDIR}" + --sysconfdir="${ETCDIR}" --mandir="${MANPREFIX}/man" OPTIONS_DEFINE= SXSERVER DOCS SXSERVER_DESC= Enable sxhttpd server OPTIONS_DEFAULT=SXSERVER .include .if ${PORT_OPTIONS:MSXSERVER} CONFIGURE_ARGS+=--localstatedir="${STAGE}${PREFIX}/sxserver" PLIST_SUB+= SXSERVER="" -PLIST_SUB+= SXCLIENT="@comment " USE_RC_SUBR= sxserver SUB_FILES= pkg-message .else -CONFIGURE_ARGS+=--disable-sxhttpd +CONFIGURE_ARGS+=--disable-sxhttpd --disable-server PLIST_SUB+= SXSERVER="@comment " -PLIST_SUB+= SXCLIENT="" .endif .include Index: head/net-mgmt/sx/distinfo =================================================================== --- head/net-mgmt/sx/distinfo (revision 392772) +++ head/net-mgmt/sx/distinfo (revision 392773) @@ -1,2 +1,2 @@ -SHA256 (sx-0.4.tar.gz) = 813526bd6a1f1d40febbd25bfb6c08b7979970c0af36938d018dd7e0d41f4066 -SIZE (sx-0.4.tar.gz) = 6589868 +SHA256 (sx-1.1.tar.gz) = 60e9b00f0863d2d0b2b0136fe2c0ccf0910e5ffcc8bff7d6d9eb70fc7dca208d +SIZE (sx-1.1.tar.gz) = 7175913 Index: head/net-mgmt/sx/files/patch-server_sxscripts_sbin_sxdump.in =================================================================== --- head/net-mgmt/sx/files/patch-server_sxscripts_sbin_sxdump.in (nonexistent) +++ head/net-mgmt/sx/files/patch-server_sxscripts_sbin_sxdump.in (revision 392773) @@ -0,0 +1,8 @@ +--- server/sxscripts/sbin/sxdump.in.orig 2015-05-22 16:15:46 UTC ++++ server/sxscripts/sbin/sxdump.in +@@ -1,4 +1,4 @@ +-#! /usr/bin/python ++#!/usr/bin/env python + + """ Print commands to recreate users, volumes and ACL on a new SX cluster """ + Property changes on: head/net-mgmt/sx/files/patch-server_sxscripts_sbin_sxdump.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/sx/pkg-plist =================================================================== --- head/net-mgmt/sx/pkg-plist (revision 392772) +++ head/net-mgmt/sx/pkg-plist (revision 392773) @@ -1,40 +1,80 @@ -bin/randgen bin/sxacl bin/sxcat bin/sxcp bin/sxinit bin/sxls +bin/sxmv bin/sxreport-client +bin/sxrev bin/sxrm -bin/sxsim +%%SXSERVER%%bin/sxsim bin/sxvol %%SXSERVER%%%%ETCDIR%%/sxserver/errors/414.json %%SXSERVER%%%%ETCDIR%%/sxserver/errors/50x.json %%SXSERVER%%%%ETCDIR%%/sxserver/fastcgi_params %%SXSERVER%%%%ETCDIR%%/sxserver/sxhttpd.conf.default include/sx.h lib/libsx.so -lib/libsx.so.0 -lib/libsx.so.0.0.0 -lib/sxclient/libsxf_aes256-13.so +lib/libsx.so.2 +lib/libsx.so.2.0.0 +lib/sxclient/libsxf_aes256-15.so lib/sxclient/libsxf_aes256.so -lib/sxclient/libsxf_attribs-11.so +lib/sxclient/libsxf_attribs-12.so lib/sxclient/libsxf_attribs.so -lib/sxclient/libsxf_null-11.so -lib/sxclient/libsxf_null.so -lib/sxclient/libsxf_zcomp-10.so +lib/sxclient/libsxf_undelete-12.so +lib/sxclient/libsxf_undelete.so +lib/sxclient/libsxf_zcomp-11.so lib/sxclient/libsxf_zcomp.so -sbin/sx.fcgi -sbin/sxadm +%%SXSERVER%%sbin/sx.fcgi +%%SXSERVER%%sbin/sxadm +%%SXSERVER%%sbin/sxdump %%SXSERVER%%sbin/sxhttpd -sbin/sxreport-server +%%SXSERVER%%sbin/sxreport-server %%SXSERVER%%sbin/sxserver %%SXSERVER%%sbin/sxsetup +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%SXSERVER%%%%PORTDOCS%%%%DOCSDIR%%/logrotate.d/sxserver +%%PORTDOCS%%%%DOCSDIR%%/manual.pdf +man/man1/sxacl-useradd.1.gz +man/man1/sxacl-userclone.1.gz +man/man1/sxacl-userdel.1.gz +man/man1/sxacl-usergetkey.1.gz +man/man1/sxacl-userlist.1.gz +man/man1/sxacl-usernewkey.1.gz +man/man1/sxacl-volperm.1.gz +man/man1/sxacl-volshow.1.gz +man/man1/sxacl-whoami.1.gz +man/man1/sxacl.1.gz +man/man1/sxcat.1.gz +man/man1/sxcp.1.gz +man/man1/sxinit.1.gz +man/man1/sxls.1.gz +man/man1/sxmv.1.gz +man/man1/sxreport-client.1.gz +man/man1/sxrev-copy.1.gz +man/man1/sxrev-delete.1.gz +man/man1/sxrev-list.1.gz +man/man1/sxrev.1.gz +man/man1/sxrm.1.gz +%%SXSERVER%%man/man1/sxsim.1.gz +man/man1/sxvol-create.1.gz +man/man1/sxvol-filter.1.gz +man/man1/sxvol-modify.1.gz +man/man1/sxvol-remove.1.gz +man/man1/sxvol.1.gz +%%SXSERVER%%man/man5/sxfcgi.conf.5.gz +%%SXSERVER%%man/man5/sxsetup.conf.5.gz +%%SXSERVER%%man/man8/sx.fcgi.8.gz +%%SXSERVER%%man/man8/sxadm-cluster.8.gz +%%SXSERVER%%man/man8/sxadm-node.8.gz +%%SXSERVER%%man/man8/sxadm.8.gz +%%SXSERVER%%man/man8/sxdump.8.gz +%%SXSERVER%%man/man8/sxreport-server.8.gz +%%SXSERVER%%man/man8/sxserver.8.gz +%%SXSERVER%%man/man8/sxsetup.8.gz %%SXSERVER%%@dir sxserver/lib/sxserver %%SXSERVER%%@dir sxserver/log/sxserver %%SXSERVER%%@dir sxserver/run/sxserver -%%SXSERVER%%@dir sxserver/sxserver -%%SXCLIENT%%@dir var/lib/sxserver -%%SXCLIENT%%@dir var/log/sxserver -%%SXCLIENT%%@dir var/run/sxserver