8 files changed, 40 insertions, 53 deletions

diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index 7f264731ad3c..f46762b72739 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -6,40 +6,43 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.40.61
+PORTVERSION=	2.32.52
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
+PKGNAMESUFFIX=	232
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 
-MAINTAINER=	mad@madpilot.net
+MAINTAINER=	mandree@FreeBSD.org
+# Implicit approval for port changes granted to Guido Falsi <mad@madpilot.net>
 COMMENT=	A user-level file synchronization tool
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 MAKE_ARGS=	CFLAGS=""
-CONFLICTS=	unison-devel-[0-9]* unison-nox11-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
-ALL_TARGET=	unison all
 
 LICENCE=	GPLv3
 
+.if defined(WITHOUT_X11)
+WITHOUT_GTK2=	yes
+.else
+OPTIONS=	GTK2 "Build a GTK2-based version" on
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
 DOCS=		BUGS.txt NEWS README
-EXTRA_DOCS=	unison-${PORTVERSION}-manual.html \
-		unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+EXTRA_DOCS=	${PORTNAME}-${PORTVERSION}-manual.html \
+		${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps
 .endif
 
-.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11)
-WITH_GTK2=	yes
-.endif
-
-.if defined(WITH_GTK2)
+.if !defined(WITHOUT_GTK2)
 MAKE_ARGS+=	UISTYLE=gtk2
 PLIST_SUB+=	TEXT=""
 BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
@@ -56,29 +59,27 @@ BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml-nox11
 PATCH_DEPENDS+=	${BUILD_DEPENDS}
 .endif
 
-.if defined(WITH_GTK2)
+.if !defined(WITHOUT_GTK2)
 post-build:
 	@${ECHO} Building text-only version
 	@${ECHO} ${WRKSRC}
-	@${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text
+	${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=${PORTNAME}-text
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
 .endif
-.if defined(WITH_GTK2)
-	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
-	@-update-desktop-database > /dev/null
-	@${CAT} ${PKGMESSAGE}
-.else
-	@${CAT} ${PKGMESSAGE}.nox11
+.if !defined(WITHOUT_GTK2)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
+	${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
+	-update-desktop-database > /dev/null
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/unison232/distinfo b/net/unison232/distinfo
index 567a7a8fbf3b..97a021d6f9a0 100644
--- a/net/unison232/distinfo
+++ b/net/unison232/distinfo
@@ -1,8 +1,8 @@
-SHA256 (unison-2.40.61/unison-2.40.61.tar.gz) = e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
-SIZE (unison-2.40.61/unison-2.40.61.tar.gz) = 2702722
-SHA256 (unison-2.40.61/unison-2.40.61-manual.html) = b88c6c3a24c359e306e702672cc8da904e72c367861ef2a3dc3df07566948223
-SIZE (unison-2.40.61/unison-2.40.61-manual.html) = 267159
-SHA256 (unison-2.40.61/unison-2.40.61-manual.pdf) = 75ff6909abcf6f9ea0a981a8e3827218491fcdfb03c088c8dd1e43fcc9c687ef
-SIZE (unison-2.40.61/unison-2.40.61-manual.pdf) = 507350
-SHA256 (unison-2.40.61/unison-2.40.61-manual.ps) = 106dba47ebfe205f0454c0fdfdba484208449dace0223b37e1d1fe1eec7807fb
-SIZE (unison-2.40.61/unison-2.40.61-manual.ps) = 598969
+SHA256 (unison-2.32.52/unison-2.32.52.tar.gz) = 1542e5d4ad03e928260e061a8ff9d5e0bca3282481ed8bec5552de17a0270485
+SIZE (unison-2.32.52/unison-2.32.52.tar.gz) = 697866
+SHA256 (unison-2.32.52/unison-2.32.52-manual.html) = c898239d8139d8405b96d87e12c06c7f41fd3629cac0c83bc338aad50fed7f81
+SIZE (unison-2.32.52/unison-2.32.52-manual.html) = 249124
+SHA256 (unison-2.32.52/unison-2.32.52-manual.pdf) = b3fee7ac99907f3b1ed02c6ac901678e82ea1eed936acb45e9735b95d55cc4eb
+SIZE (unison-2.32.52/unison-2.32.52-manual.pdf) = 478388
+SHA256 (unison-2.32.52/unison-2.32.52-manual.ps) = 779924e2a89ab2592c512e808cfcdf302c1a691fb1f2a6a02cc415fdc87770e5
+SIZE (unison-2.32.52/unison-2.32.52-manual.ps) = 572128
diff --git a/net/unison232/files/patch-Makefile b/net/unison232/files/patch-Makefile
deleted file mode 100644
index 121357a47a5b..000000000000
--- a/net/unison232/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2010-12-06 00:44:55.164242569 +0100
-+++ Makefile	2010-12-06 00:45:26.227615139 +0100
-@@ -60,7 +60,7 @@
- # NAME, VERSION, and MAJORVERSION, automatically generated
- -include Makefile.ProjectInfo
- 
--Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
-+Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
- 	./mkProjectInfo > $@
- 
- mkProjectInfo: mkProjectInfo.ml
diff --git a/net/unison232/files/unison.desktop.in b/net/unison232/files/unison.desktop.in
index 9a85315843f7..24202d62f5e2 100644
--- a/net/unison232/files/unison.desktop.in
+++ b/net/unison232/files/unison.desktop.in
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Unison
+Name=Unison 2.32
 GenericName=File-synchronization tool
 Type=Application
 Terminal=false
 StartupNotify=true
 Categories=GTK;Utility;
-Exec=unison
+Exec=unison232
 Comment=Synchronize files (directories) over different disks (hosts)
+Comment[de]=Dateien oder Verzeichnisse über Festplatten oder Computer hinweg abgleichen
 Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах)
diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr
index 10d805d9eb0a..31c198db6830 100644
--- a/net/unison232/pkg-descr
+++ b/net/unison232/pkg-descr
@@ -1,3 +1,6 @@
+This is Unison version 2.32, kept for compatibility with older
+installations on other computer across the network.      -- Matthias Andree
+
 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
diff --git a/net/unison232/pkg-message b/net/unison232/pkg-message
deleted file mode 100644
index 3c1cfd40d2c0..000000000000
--- a/net/unison232/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-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/unison232/pkg-message.nox11 b/net/unison232/pkg-message.nox11
deleted file mode 100644
index fe8b86b9b4eb..000000000000
--- a/net/unison232/pkg-message.nox11
+++ /dev/null
@@ -1,3 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-A text-only unison binary is installed.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist
index a7e19c203c90..153799bdb8b7 100644
--- a/net/unison232/pkg-plist
+++ b/net/unison232/pkg-plist
@@ -1,6 +1,6 @@
-bin/unison
-%%TEXT%%share/applications/unison.desktop
-%%TEXT%%bin/unison-text
+bin/unison232
+%%TEXT%%share/applications/unison232.desktop
+%%TEXT%%bin/unison232-text
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README