aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UPDATING11
-rw-r--r--net/unison-devel/Makefile5
-rw-r--r--net/unison/Makefile9
-rw-r--r--net/unison/distinfo16
-rw-r--r--net/unison232/Makefile4
-rw-r--r--net/unison240/Makefile80
-rw-r--r--net/unison240/distinfo8
-rw-r--r--net/unison240/files/unison.desktop.in12
-rw-r--r--net/unison240/pkg-descr11
-rw-r--r--net/unison240/pkg-message4
-rw-r--r--net/unison240/pkg-message.nox113
-rw-r--r--net/unison240/pkg-plist10
12 files changed, 157 insertions, 16 deletions
diff --git a/UPDATING b/UPDATING
index 6f3432db49d3..4df7078780f7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,17 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150101:
+ AFFECTS: users of net/unison and net/unison-nox11
+ AUTHOR: madpilot@FreeBSD.org
+
+ Unison has been upgraded to version 2.48, which uses a different wire
+ protocol than 2.40 did. In order to support synchronization with
+ other computers where Unison is still at version 2.40, a new port
+ net/unison240 has been created. It provides unison240 and if that is
+ GTK2-enabled, also unison240-text. This unison240 port can be
+ installed in parallel with the existing net/unison port.
+
20141230:
AFFECTS: users of deskutils/xpad
AUTHOR: jgh@FreeBSD.org
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 2b2b9ee6fd34..9c09f0c639ce 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -13,10 +13,13 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= madpilot@FreeBSD.org
COMMENT= User-level file synchronization tool
+IGNORE= No devel release available. \
+ Install net/unison which is the latest stable version.
+
LICENSE= GPLv3
PLIST_SUB= PORTVERSION=${PORTVERSION}
-USES= desktop-file-utils gmake
+USES= gmake
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS= unison-[0-9]* unison-nox11-[0-9]*
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 6329da961b9b..b7d3d930b098 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= unison
-PORTVERSION= 2.40.102
-PORTREVISION= 3
+PORTVERSION= 2.48.3
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -16,7 +15,7 @@ COMMENT?= User-level file synchronization tool
LICENSE= GPLv3
PLIST_SUB= PORTVERSION=${PORTVERSION}
-USES= desktop-file-utils gmake
+USES= gmake
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]*
@@ -64,14 +63,14 @@ post-build:
.endif
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/unison ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
post-install:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MX11}
- ${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin
@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
diff --git a/net/unison/distinfo b/net/unison/distinfo
index b294b563e301..98cdebcf14a8 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,8 @@
-SHA256 (unison-2.40.102/unison-2.40.102.tar.gz) = 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
-SIZE (unison-2.40.102/unison-2.40.102.tar.gz) = 2694761
-SHA256 (unison-2.40.102/unison-2.40.102-manual.html) = d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75
-SIZE (unison-2.40.102/unison-2.40.102-manual.html) = 267095
-SHA256 (unison-2.40.102/unison-2.40.102-manual.pdf) = 145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b
-SIZE (unison-2.40.102/unison-2.40.102-manual.pdf) = 496539
-SHA256 (unison-2.40.102/unison-2.40.102-manual.ps) = 88aa2c9b19f680db3c425f378aeb8ca204dd0c1fc81bdd5405be47f7e09f4a8e
-SIZE (unison-2.40.102/unison-2.40.102-manual.ps) = 752359
+SHA256 (unison-2.48.3/unison-2.48.3.tar.gz) = a695f9d45e95d3d9c3f25fcbf1891f5eb20e5aa51709f81b785a20e14270b7ee
+SIZE (unison-2.48.3/unison-2.48.3.tar.gz) = 1172532
+SHA256 (unison-2.48.3/unison-2.48.3-manual.html) = 55eea95ff61d3b40891ea9ff069683e825415abf868c157fa04beeb5905ad17c
+SIZE (unison-2.48.3/unison-2.48.3-manual.html) = 278110
+SHA256 (unison-2.48.3/unison-2.48.3-manual.pdf) = 3556b6d3bba7a020eceb49e90a7f410786e4ef67873a7a8c358030574e707729
+SIZE (unison-2.48.3/unison-2.48.3-manual.pdf) = 516344
+SHA256 (unison-2.48.3/unison-2.48.3-manual.ps) = 624090ba92aade7e7793370ab44bc5387b5e25bc715e5634451e69d61d532008
+SIZE (unison-2.48.3/unison-2.48.3-manual.ps) = 771393
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 9dfb85ead2da..1663d8eaec79 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.32.52
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 232
@@ -18,7 +18,7 @@ COMMENT= User-level file synchronization tool
LICENSE= GPLv3
PLIST_SUB= PORTVERSION=${PORTVERSION}
-USES= desktop-file-utils gmake
+USES= gmake
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
diff --git a/net/unison240/Makefile b/net/unison240/Makefile
new file mode 100644
index 000000000000..3ee3a5b9806e
--- /dev/null
+++ b/net/unison240/Makefile
@@ -0,0 +1,80 @@
+# Created by: Dan Pelleg <dpelleg+unison@cs.cmu.edu>
+# $FreeBSD$
+
+PORTNAME= unison
+PORTVERSION= 2.40.128
+CATEGORIES= net
+MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
+PKGNAMESUFFIX= 240
+DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
+DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
+EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
+
+MAINTAINER?= madpilot@FreeBSD.org
+COMMENT?= User-level file synchronization tool
+
+LICENSE= GPLv3
+
+PLIST_SUB= PORTVERSION=${PORTVERSION}
+USES= gmake
+WANT_GNOME= yes
+MAKE_ARGS= CFLAGS=""
+
+MAKE_JOBS_UNSAFE= yes
+ALL_TARGET= unison all
+
+DOCS= BUGS.txt NEWS README
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+EXTRA_DOCS= unison-${PORTVERSION}-manual.html \
+ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+
+OPTIONS_DEFINE= DOCS X11
+OPTIONS_DEFAULT?= DOCS X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+MAKE_ARGS+= UISTYLE=gtk2
+PLIST_SUB+= TEXT=""
+BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \
+ lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \
+ icotool:${PORTSDIR}/graphics/icoutils
+RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+PATCH_DEPENDS+= ${BUILD_DEPENDS}
+CONFLICTS+= ocaml-nox11*
+SUB_FILES+= ${PORTNAME}.desktop
+.else
+MAKE_ARGS+= UISTYLE=text
+PLIST_SUB+= TEXT="@comment "
+BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
+PATCH_DEPENDS+= ${BUILD_DEPENDS}
+PKGMESSAGE= ${PKGDIR}/pkg-message.nox11
+.endif
+
+.if ${PORT_OPTIONS:MX11}
+post-patch:
+ @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
+ ${WRKSRC}/Makefile.OCaml
+
+post-build:
+ @${ECHO} Building text-only version
+ @${ECHO} ${WRKSRC}
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} CFLAGS="" UISTYLE=text NAME=unison-text
+ @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
+.endif
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+ cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
+.if ${PORT_OPTIONS:MX11}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
+ @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
+ ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
+.endif
+
+.include <bsd.port.mk>
diff --git a/net/unison240/distinfo b/net/unison240/distinfo
new file mode 100644
index 000000000000..3b01539798d9
--- /dev/null
+++ b/net/unison240/distinfo
@@ -0,0 +1,8 @@
+SHA256 (unison-2.40.128/unison-2.40.128.tar.gz) = 2c979f3bcdc92fb6b009e9e79a6c973a70689e9b646341fff3ca8a220889efbf
+SIZE (unison-2.40.128/unison-2.40.128.tar.gz) = 2717542
+SHA256 (unison-2.40.128/unison-2.40.128-manual.html) = 8cd3901dffab27203fab1702a7eb25555539f1b566ebe08036aef695f39e8593
+SIZE (unison-2.40.128/unison-2.40.128-manual.html) = 267099
+SHA256 (unison-2.40.128/unison-2.40.128-manual.pdf) = ad6ea7afdd07515193c1546c530f5ed997618ee44fc4dc6907ce6abe8e8d4293
+SIZE (unison-2.40.128/unison-2.40.128-manual.pdf) = 496607
+SHA256 (unison-2.40.128/unison-2.40.128-manual.ps) = 2f3b8508355ad1853be0e8af547a86404bb0efe58e150aea1a83218d86374781
+SIZE (unison-2.40.128/unison-2.40.128-manual.ps) = 753150
diff --git a/net/unison240/files/unison.desktop.in b/net/unison240/files/unison.desktop.in
new file mode 100644
index 000000000000..0f8a0aef730c
--- /dev/null
+++ b/net/unison240/files/unison.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Unison 2.40
+GenericName=File-synchronization tool
+Type=Application
+Terminal=false
+StartupNotify=true
+Categories=GTK;Utility;
+Exec=unison240
+Icon=unison240.png
+Comment=Synchronize files (directories) over different disks (hosts)
+Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
diff --git a/net/unison240/pkg-descr b/net/unison240/pkg-descr
new file mode 100644
index 000000000000..ba302a0f4ae6
--- /dev/null
+++ b/net/unison240/pkg-descr
@@ -0,0 +1,11 @@
+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).
+
+WWW: http://www.cis.upenn.edu/~bcpierce/unison/
diff --git a/net/unison240/pkg-message b/net/unison240/pkg-message
new file mode 100644
index 000000000000..3c1cfd40d2c0
--- /dev/null
+++ b/net/unison240/pkg-message
@@ -0,0 +1,4 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+Together with a gtk-enabled version, a text-only unison-text binary
+is installed as it depends on a smaller number of libraries.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/net/unison240/pkg-message.nox11 b/net/unison240/pkg-message.nox11
new file mode 100644
index 000000000000..fe8b86b9b4eb
--- /dev/null
+++ b/net/unison240/pkg-message.nox11
@@ -0,0 +1,3 @@
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+A text-only unison binary is installed.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/net/unison240/pkg-plist b/net/unison240/pkg-plist
new file mode 100644
index 000000000000..f4ef70fad4d9
--- /dev/null
+++ b/net/unison240/pkg-plist
@@ -0,0 +1,10 @@
+bin/unison240
+%%TEXT%%share/applications/unison240.desktop
+%%TEXT%%bin/unison240-text
+%%TEXT%%share/pixmaps/unison240.png
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:47:33 +0000