diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-12-11 23:02:44 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-12-11 23:02:44 +0000 |
| commit | 1bace88b3451589ef9cdd5f720f3c443b6632d75 (patch) | |
| tree | 9a5b2e44615805d97881d637d04ac956df5cac97 /net/unison | |
| parent | f11b6eddaf4043df42fea7c4002a49c6a2bf2203 (diff) | |
| download | ports-1bace88b3451589ef9cdd5f720f3c443b6632d75.tar.gz ports-1bace88b3451589ef9cdd5f720f3c443b6632d75.zip | |
Notes
Diffstat (limited to 'net/unison')
| -rw-r--r-- | net/unison/Makefile | 17 | ||||
| -rw-r--r-- | net/unison/pkg-message | 9 |
2 files changed, 11 insertions, 15 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile index 2b53480a81c0..4958b2af07b6 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -9,7 +9,7 @@ PORTNAME= unison PORTVERSION= 2.13.16 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/ +MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz @@ -17,12 +17,10 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= daniel+unison@pelleg.org COMMENT= A user-level file synchronization tool -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml-nox11 -PATCH_DEPENDS= ${BUILD_DEPENDS} - PLIST_SUB= PORTVERSION=${PORTVERSION} USE_GMAKE= yes MAKE_ARGS= CFLAGS="" +CONFLICTS= unison-devel-[0-9]* .include <bsd.port.pre.mk> @@ -32,18 +30,23 @@ EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps .endif -.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) && exists(${LOCALBASE}/bin/lablgtk2) +.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) WITH_GTK2= yes .endif .if defined(WITH_GTK2) MAKE_ARGS+= UISTYLE=gtk2 -RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 PLIST_SUB+= TEXT="" +BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ + lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +PATCH_DEPENDS+= ${BUILD_DEPENDS} +CONFLICTS+= ocaml-nox11* .else MAKE_ARGS+= UISTYLE=text PLIST_SUB+= TEXT="@comment " +BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11 +PATCH_DEPENDS+= ${BUILD_DEPENDS} .endif .if defined(WITH_GTK2) diff --git a/net/unison/pkg-message b/net/unison/pkg-message index c7cedb69cfdc..3c1cfd40d2c0 100644 --- a/net/unison/pkg-message +++ b/net/unison/pkg-message @@ -1,11 +1,4 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - ATTENTION: - -1) Unison archive format has changed since 2.10.2. The old archive -won't be deleted automatically in case you want to downgrade it. - -2) Merge functionality has seriously changed. Check the manual. - -3) Together with gtk-enabled version, a text-only unison-text binary +Together with a gtk-enabled version, a text-only unison-text binary is installed as it depends on a smaller number of libraries. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |