Index: head/net/unison/Makefile =================================================================== --- head/net/unison/Makefile (revision 381477) +++ head/net/unison/Makefile (revision 381478) @@ -1,79 +1,77 @@ # Created by: Dan Pelleg # $FreeBSD$ 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} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER?= madpilot@FreeBSD.org COMMENT?= User-level file synchronization tool LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]* MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all DOCS= BUGS.txt NEWS README EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT?= DOCS X11 .include .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 .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 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 @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Index: head/net/unison-devel/Makefile =================================================================== --- head/net/unison-devel/Makefile (revision 381477) +++ head/net/unison-devel/Makefile (revision 381478) @@ -1,86 +1,83 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.48.1 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ PKGNAMESUFFIX= -devel 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 IGNORE= No devel release available. \ Install net/unison which is the latest stable version. LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" CONFLICTS= unison-[0-9]* unison-nox11-[0-9]* DOCS= BUGS.txt NEWS README EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all .include .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 .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}/unison ${STAGEDIR}${PREFIX}/bin post-install: .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin .endif @${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 @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif .include Index: head/net/unison-nox11/Makefile =================================================================== --- head/net/unison-nox11/Makefile (revision 381477) +++ head/net/unison-nox11/Makefile (revision 381478) @@ -1,16 +1,16 @@ # Created by: Boris Samorodov # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -nox11 MAINTAINER= bsam@FreeBSD.org COMMENT= User-level file synchronization tool (without x11 stuff) CONFLICTS= unison-[0-9]* unison-devel-[0-9]* OPTIONS_EXCLUDE= X11 OPTIONS_DEFAULT= DOCS MASTERDIR= ${.CURDIR}/../unison .include "${MASTERDIR}/Makefile" Index: head/net/unison232/Makefile =================================================================== --- head/net/unison232/Makefile (revision 381477) +++ head/net/unison232/Makefile (revision 381478) @@ -1,80 +1,77 @@ # Created by: Dan Pelleg # $FreeBSD$ 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 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz MAINTAINER= mandree@FreeBSD.org # Implicit approval for port changes granted to Guido Falsi COMMENT= User-level file synchronization tool LICENSE= GPLv3 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake WANT_GNOME= yes MAKE_ARGS= CFLAGS="" MAKE_JOBS_UNSAFE= yes DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= ${PORTNAME}-${PORTVERSION}-manual.html \ ${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= DOCS X11 .include .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} 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=${PORTNAME}-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 Index: head/net/unison240/Makefile =================================================================== --- head/net/unison240/Makefile (revision 381477) +++ head/net/unison240/Makefile (revision 381478) @@ -1,80 +1,78 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.40.128 +PORTREVISION= 1 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 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml + 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 .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 .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