Date: Tue, 17 Mar 2015 09:46:23 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381478 - in head/net: unison unison-devel unison-nox11 unison232 unison240 Message-ID: <201503170946.t2H9kNAj090293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Mar 17 09:46:23 2015 New Revision: 381478 URL: https://svnweb.freebsd.org/changeset/ports/381478 QAT: https://qat.redports.org/buildarchive/r381478/ Log: - 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) Modified: head/net/unison-devel/Makefile head/net/unison-nox11/Makefile head/net/unison/Makefile head/net/unison232/Makefile head/net/unison240/Makefile Modified: head/net/unison-devel/Makefile ============================================================================== --- head/net/unison-devel/Makefile Tue Mar 17 09:31:24 2015 (r381477) +++ head/net/unison-devel/Makefile Tue Mar 17 09:46:23 2015 (r381478) @@ -18,6 +18,8 @@ IGNORE= No devel release available. \ LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes @@ -39,18 +41,13 @@ ALL_TARGET= unison all .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ +BUILD_DEPENDS+= 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 Modified: head/net/unison-nox11/Makefile ============================================================================== --- head/net/unison-nox11/Makefile Tue Mar 17 09:31:24 2015 (r381477) +++ head/net/unison-nox11/Makefile Tue Mar 17 09:46:23 2015 (r381478) @@ -1,7 +1,7 @@ # Created by: Boris Samorodov <bsam@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -nox11 MAINTAINER= bsam@FreeBSD.org Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Tue Mar 17 09:31:24 2015 (r381477) +++ head/net/unison/Makefile Tue Mar 17 09:46:23 2015 (r381478) @@ -3,6 +3,7 @@ PORTNAME= unison PORTVERSION= 2.48.3 +PORTREVISION?= 1 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} @@ -14,6 +15,8 @@ COMMENT?= User-level file synchronizatio LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes @@ -35,18 +38,13 @@ OPTIONS_DEFAULT?= DOCS X11 .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ +BUILD_DEPENDS+= 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 Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Tue Mar 17 09:31:24 2015 (r381477) +++ head/net/unison232/Makefile Tue Mar 17 09:46:23 2015 (r381478) @@ -3,7 +3,7 @@ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= 232 @@ -17,6 +17,8 @@ COMMENT= User-level file synchronization LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes @@ -37,18 +39,13 @@ OPTIONS_DEFAULT= DOCS X11 .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ +BUILD_DEPENDS+= 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} .endif .if ${PORT_OPTIONS:MX11} Modified: head/net/unison240/Makefile ============================================================================== --- head/net/unison240/Makefile Tue Mar 17 09:31:24 2015 (r381477) +++ head/net/unison240/Makefile Tue Mar 17 09:46:23 2015 (r381478) @@ -3,6 +3,7 @@ PORTNAME= unison PORTVERSION= 2.40.128 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= 240 @@ -15,6 +16,8 @@ COMMENT?= User-level file synchronizatio LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes @@ -36,18 +39,13 @@ OPTIONS_DEFAULT?= DOCS X11 .if ${PORT_OPTIONS:MX11} MAKE_ARGS+= UISTYLE=gtk2 PLIST_SUB+= TEXT="" -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \ - lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 \ +BUILD_DEPENDS+= 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503170946.t2H9kNAj090293>