mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

- Fix dependency on ocaml to avoid conflicting oringins when building

Browse Source 
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)
This commit is contained in:
Guido Falsi 2015-03-17 09:46:23 +00:00
parent b385f58d0e
commit c1fdd19c8b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=381478
5 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/unison-devel/Makefile
View File

@ -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

2
net/unison-nox11/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Boris Samorodov <bsam@FreeBSD.org>
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 1
PKGNAMESUFFIX= -nox11
MAINTAINER= bsam@FreeBSD.org

10
net/unison/Makefile
View File

@ -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 synchronization tool
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

11
net/unison232/Makefile
View File

@ -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 tool
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}

10
net/unison240/Makefile
View File

@ -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 synchronization tool
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