Unison is a file-synchronization tool for Unix and Windows. It allows two
replicas of a collection of files and directories to be stored on different
hosts (or different disks on the same host), modified separately, and then
brought up to date by propagating the changes in each replica to the other.
Unison shares a number of features with tools such as configuration
management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.)
uni-directional mirroring utilities (rsync, etc.) and other synchronizers
(Intellisync, Reconcile, etc).
===> The following configuration options are available for unison-2.54.0:
DOCS=on: Build and/or install documentation
FSMONITOR=on: Compile and install fsmonitor plugin
===> Use 'make config' to modify these settings
STarting with version 2.53.8 the "unison" binary is the text only version.
The GUI version is installed as unison-gui and no "unison-text" binary is
installed anymore.
Please make sure to update any local scripts and configurations that were
using the old naming scheme.
Reason:
With the update to version 2.53.8 the port uses upstream install target.
This causes the installed unison binary to always be the command line
version, even when the port is compiled with xorg support. The UI binary
is installed as unison-gui.
The unison.desktop file provided with the port is adjusted to launch the
new unison-gui binary.
Please verify any local scripts using the unison binaries are adapted to
this change.
Reason:
unison has been updated to version 2.52. The new version introduces
a new wire protocol and on disk archive format. This new version
is compatible with 2.51 clients for communication, so it's now
possible to upgrade one side and then the other.
The archive files are automatically converted to the new version,
but once they are converted the y are incompatible with the
previous version.
In case you need version 2.51, the previous version of the port
is preserved in net/unison251.
net/unison: Update to 2.53.8
With this release unison added an install target.
This install target always installs the text only executable as
unison, and the UI as unison-gui. The port is modified to follow
suit.
pkg-message has been modified to document this change when upgrading,
and an entry is added to UPDATING.
gnome.mk: rename gdkpixbuf2 to gdkpixbuf to prepare for port move
The GTK 1-based gdk-pixbuf has not existed for some time.
No functional or package changes.
Mk/**ocaml.mk: Convert remaining bsd.ocaml.mk to Uses/ocaml.mk
- Instead of USE_OCAML=yes use USES=ocaml. If empty USES=ocaml implies
build and run
- Instead of USE_OCAMLFIND_PLIST use USES=ocaml:findplist which also
implies USES=ocaml:findlib
- Instead of USE_OCAML_CAMLP4 use USES=ocaml:camlp4
- Instead of USE_OCAML_FINDLIB use USES=ocaml:findlib
- Instead of USE_OCAML_LDCONFIG use USES=ocaml:ldconfig
- Instead of USE_OCAML_WASH use USES=ocaml:wash
- Instead of NO_OCAML_BUILDDEPENDS use USES=ocaml:run
- Instead of NO_OCAML_RUNDDEPENDS use USES=ocaml:build
- Instead of USE_OCAML_TK use USES=ocaml:tk which actually implies
USES=ocaml:tkbuild and USES=ocaml:tkrun
- Instead of NO_OCAMLTK_BUILDDEPENDS use USES=ocaml:tkrun
- Instead of NO_OCAMLTK_RUNDEPENDS use USES=ocaml:tkbuild
- USES=ocaml:dune remains unchanged
- Prepare to add/remove keywords easily
Approved by: mat (portmgr)
Reviewed by: freebsd@dev.thsi.be
Differential Revision: https://reviews.freebsd.org/D48227
net/unison: Update to 2.53.4
- Some cosmetic changes to the Makefile
- DOCS option now has TeX as a build dependencies, so users wanting
to avoid heavy dependencies should disable it
- Port now installs a man page
lang/ocaml: Update to 4.08.1
This update allows (and for some requires) to also update dependencies
to newer versions. Where possible I updated to the latest version.
The ocaml port now is MAKE_JOBS safe.
Changes to dependent ports included in this commit:
- devel/ocaml-sexplib: Rename to devel/ocaml-sexplib0 adapting to
upstream. Update to 0.16.0
- devel/coccinelle: Update to 1.1.1, moved to github
- devel/ocaml-camlp4: Update to 4.08+1
- devel/ocaml-camomile: Use dune for build, adapt port
- devel/ocaml-cppo: Fix lib files installation [1]
(Only the first 15 lines of the commit message are shown above )
net/unison: Update to 2.53.2
- Use portfmt(1)
Many thanks to Tõivo Leedjärv <toivol@gmail.com> (upstream developer)
for providing a patch the allows compiling unison using ocaml 4.07
present in the ports tree.
Upstream development requires version 4.08 minimum at present.
PR: 270342
accessibility/at-spi2-core: update to 2.46.0
What's new in at-spi2-core 2.46.0:
* Fix GetInterfaces documentation on org.a11y.atspi.Accessible
interface.
What's new in at-spi2-core 2.45.91:
* Send device event controller events using the same signature as other
events.
* Document the Accessible, Action, and Cache dbus interfaces.
* Fix license of atspi-gmain.c (#87).
What's new in at-spi2-core 2.45.90:
* xml: Add some documentation.
* xml: Fix event arguments.
(Only the first 15 lines of the commit message are shown above )
net/unison: Update to 2.53.0
Project moved to GTK 3, through ocaml-lablgtk3.
Port includes patch to allow building with ocaml 4.07 included in
ports, provided by Tõivo Leedjärv on the unison-users mailing list.
Many thanks to him and Greg Troxel from the unison project for the
patch, their suggestions and support.
NOTE: version since 2.52.0 are wire compatibile so no need to
preserve the old version.
PR: 267693
Remove WWW entries moved into port Makefiles
Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner)
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
(Only the first 15 lines of the commit message are shown above )
net: remove 'Created by' lines
A big Thank You to the original contributors of these ports:
* <ports@c0decafe.net>
* Aaron Dalton <aaron@FreeBSD.org>
* Aaron Straup Cope <ascope@cpan.org>
* Aaron Zauner <az_mail@gmx.at>
* Adam Jette <jettea46@yahoo.com>
* Adam Weinberger <adamw@FreeBSD.org>
* Alan Eldridge <alane@geeksrus.net>
* Alex Bakhtin <Alex.Bakhtin@gmail.com>
* Alex Deiter <Alex.Deiter@Gmail.COM>
* Alex Dupre <ale@FreeBSD.org>
* Alex Dupre <sysadmin@alexdupre.com>
(Only the first 15 lines of the commit message are shown above )
*/*: Remove redundant '-[0-9]*' from CONFLICTS
The conflict checks compare the patterns first against the package
names without version (as reported by "pkg query "%n"), then - if
there was no match - agsinst the full package names including the
version (as reported by "pkg query "%n-%v").
Many CONFLICTS definitions used patterns like "bash-[0-9]*" to filter
for the bash package in any version. But that pattern is functionally
identical with just "bash".
Approved by: portmgr (blanket)
net/unison*, audio/asterisk-*: Set FLAVOR to a non-empty value by default
Use range modifier properly. The right syntax for looking up the
first word of a variable is ${FLAVORS:[1]}.
Reviewed by: madpilot
Differential Revision: https://reviews.freebsd.org/D22530
- Update net/unison to 2.48.15 [1]
- Grab distribution from github [1]
- Convert to using WRKSRC_SUBDIR
- Upstream does not provide precompiled pdf, ps, and html manual so remove them
from the port
Reported by: dutchman01@quicknet.nl [1]
Approved by: portmgr (previously approved FLAVORS)
Merge the nox11 version of unison with the main port as a flavor.
Reviewed by: bsam, mat
Approved by: bsam, portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D13783
- Add FSMONITOR option (on by default) to compile the linux fsmonitor,
leveraging the liinotify port. This enables the use of "repeat=watch"
mode in FreeBSD
- Convert port to using OPTIONS_SUB
When there is a do-install target, do not use a post-install target, do
everything at once. Sometime, rename post-install into a options helper
target.
I did not fix ports that were such a mess that I could not figure out
what they really wanted to do. I also did not change ports that had
some version of an auto-plist code in post-install, for the same reason.
With hat: portmgr
Sponsored by: Absolight
Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications'
was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago,
and fix some minor bogosities nearby.
Cleanup DIST* variables.
When appropriate:
- Try to use DISTVERSION{SUF,PRE}FIX
- Replace PORTNAME-PORTVERSION by DISTNAME
- Convert MASTER_SITES to use macros
- Other light cleanup
With hat: portmgr
Sponsored by: Absolight
- Add USE_OCAML_CAMLP4 and USE_OCAML_TK to bsd.ocaml.mk which add
depends on the camlp4 language and labltk ocaml modules, which are
now in separate ports.
- Update x11-toolkits/ocaml-lablgtk2 to 2.18.3
- Update graphics/ocaml-lablgl to 1.05
- Make unison ports use USE_OCAML
- Convert ports to the new flags where needed
- Bump PORTREVISION on ports depending on ocaml-lablgtk2, those need to be
rebuilt
PR: 199845
Submitted by: jbeich@
Differential Revision: https://reviews.freebsd.org/D2434
Approved by: portmgr (mat)
- Fix dependency on ocaml to avoid conflicting oringins when building
in poudriere [1]
- While here, remove an old uneeded PATCH_DEPENDS
- Bump PORTREVISION also in slave port due to changes in conflicts
and dependencies
Submitted by: jlh@ (via email) [1]
Approved by: mandree (implicit, for net/unison232)
- Update net/unison to 2.48.3
- Preserve unison 2.40 as net/unison240 and update to 2.40.128
- Remove uneeded USES=desktop-file-utils from unison ports [1]
Approved by: mandree (implicit, for net/unison232) [1]
Update the default version of GCC in the Ports Collection from GCC 4.7.4
to GCC 4.8.3.
Part II, Bump PORTREVISIONs.
PR: 192025
Tested by: antoine (-exp runs)
Approved by: portmgr (implicit)
Convert GMAKE to MAKE_CMD
Please note that lots of invocation of MAKE_CMD here are wrong as they do not
properly respect MAKE_ENV and friends
With hat: portmgr
update x11-toolkits/ocaml-lablgtk2 to 2.16.0+bugfixes, and adjust
dependent ports
PR: 144982, 149958
Reviewed by: johans (earlier version of the patch)
- Make port convert and use icons which come with the distribution
- Remove indefinite article from COMMENT
- Trim Makefiles headers
- Bump PORTREVISION
PR: ports/172492
Submitted by: Boris Samorodov <bsam@FreeBSD.org>
Approved by: mandree (implicit, maintainer of net/unison232)
Approved by: tabthorpe (portmgr)
Feature safe: yes
Remove more tags from pkg-descr files fo the form:
- Name
em@i.l
or variations thereof. While I'm here also fix some whitespace and other
formatting errors, including moving WWW: to the last line in the file.
. update to version 2.32.52;
. set MAKE_JOBS_UNSAFE.
PR: ports/152855
Submitted by: Guido Falsi <mad at madpilot.net>
Approved by: Dan Pelleg <dan at pelleg.org> (maintainer)
Those changes should deal with an upcomming new slave port net/unison-nox11
(PR/127117):
. add CONFLICTS;
. add pkg-message.nox11 file;
. show apropriate message file;
. switch from '=' to '?=' for PORTREVISION (seems that slave port should
be rarely bumpted having only 5 dependencies);
. bump PORTREVISION.
PR: 127118
Submitted by: bsam (me)
Approved by: maintainer (timeout for 19 days)
Bump portrevision due to upgrade of devel/gettext.
The affected ports are the ones with gettext as a run-dependency
according to ports/INDEX-7 (5007 of them) and the ones with USE_GETTEXT
in Makefile (29 of them).
PR: ports/124340
Submitted by: edwin@
Approved by: portmgr (pav)
- Backport some style changes from -devel port, and register conflicts against
it
PR: ports/117563
Submitted by: Dan Pelleg <daniel+unison@pelleg.org> (maintainer)
- Install documentation (both included text files and the manual available
separately)
- Minor tweaks (use STRIP_CMD, do not redefine WRKSRC anymore)
- Bump PORTREVISION as hint for users to upgrade to this version
in order to take advantage of availability of the documentation
PR: 52811
Submitted by: sergei
Approved by: maintainer, krion
Mark FORBIDDEN; can result in serious data loss.
Authors have been provided with an example of how
to reliably reproduce the bug in the "Losing data
with unison 2.9.1" thread here:
http://groups.yahoo.com/group/unison-users/
(The last message has not yet been approved by the
list maintainer as of this writing.)