Index: head/net/unison/Makefile =================================================================== --- head/net/unison/Makefile (revision 555473) +++ head/net/unison/Makefile (revision 555474) @@ -1,101 +1,101 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison -PORTVERSION= 2.51.2 +PORTVERSION= 2.51.3 DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= unison x11_CONFLICTS_INSTALL= unison-nox11 x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes CONFLICTS= unison-devel-[0-9]* MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all USE_GITHUB= yes GH_ACCOUNT= bcpierce00 DOCS= BUGS.txt NEWS README OPTIONS_DEFINE= DOCS FSMONITOR OPTIONS_DEFAULT?= FSMONITOR FSMONITOR_DESC= Compile and install fsmonitor plugin OPTIONS_SUB= YES FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .if ${FLAVOR} == nox11 MAKE_ARGS= UISTYLE=text PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 PLIST_SUB+= X11="@comment " .else MAKE_ARGS= UISTYLE=gtk2 SUB_FILES= ${PORTNAME}.desktop USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif post-patch-FSMONITOR-off: @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ ${WRKSRC}/Makefile.OCaml post-patch: .if ${FLAVOR} == nox11 @${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .else @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif -.if ${FLAVOR} == x11 post-build: + (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) +.if ${FLAVOR} == x11 @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text @cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .if ${FLAVOR} == x11 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} do-install-FSMONITOR-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin .include Index: head/net/unison/distinfo =================================================================== --- head/net/unison/distinfo (revision 555473) +++ head/net/unison/distinfo (revision 555474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520431786 -SHA256 (bcpierce00-unison-v2.51.2_GH0.tar.gz) = a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e -SIZE (bcpierce00-unison-v2.51.2_GH0.tar.gz) = 1398790 +TIMESTAMP = 1603288220 +SHA256 (bcpierce00-unison-v2.51.3_GH0.tar.gz) = 0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b +SIZE (bcpierce00-unison-v2.51.3_GH0.tar.gz) = 1370060 Index: head/net/unison232/Makefile =================================================================== --- head/net/unison232/Makefile (revision 555473) +++ head/net/unison232/Makefile (revision 555474) @@ -1,89 +1,89 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= net MASTER_SITES= https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${_EXTRA_DOCS} DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mandree@FreeBSD.org # Implicit approval for port changes granted to Guido Falsi COMMENT= User-level file synchronization tool LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} USES= gmake _VERSIONSUFFIX= 232 nox11_PKGNAMESUFFIX= ${_VERSIONSUFFIX}-nox11 nox11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX} x11_PKGNAMESUFFIX= ${_VERSIONSUFFIX} x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 x11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX}-nox11 PLIST_SUB= PORTVERSION=${PORTVERSION} USE_OCAML= yes NO_OCAML_RUNDEPENDS=yes MAKE_ARGS= CFLAGS="" TEST_TARGET= selftest _DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} _EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps OPTIONS_DEFINE= DOCS .if ${FLAVOR} == nox11 MAKE_ARGS+= UISTYLE=text PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 PLIST_SUB+= X11="@comment " .else MAKE_ARGS+= UISTYLE=gtk2 SUB_FILES= ${PORTNAME}.desktop USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: d=$$(mktemp -d) && trap "rm -rf $$d" 0 && ( cd ${WRKSRC} && HOME=$$d ./unison -selftest -ui text -batch ) .if ${FLAVOR} == x11 @${ECHO} Building text-only version in ${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}${_VERSIONSUFFIX} .if ${FLAVOR} == x11 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${_VERSIONSUFFIX}-text ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${_VERSIONSUFFIX}.desktop ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${_VERSIONSUFFIX}.png .endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${_EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/net/unison232/files/patch-uigtk2.ml =================================================================== --- head/net/unison232/files/patch-uigtk2.ml (nonexistent) +++ head/net/unison232/files/patch-uigtk2.ml (revision 555474) @@ -0,0 +1,17 @@ +--- uigtk2.ml.orig 2009-05-14 15:59:33 UTC ++++ uigtk2.ml +@@ -93,12 +93,12 @@ let fontMonospaceMediumPango = lazy (Pango.Font.from_s + (* This does not work with the current version of Lablgtk, due to a bug + let icon = + GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true +- (Gpointer.region_of_string Pixmaps.icon_data) ++ (Gpointer.region_of_bytes Pixmaps.icon_data) + *) + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + (********************************************************************* Property changes on: head/net/unison232/files/patch-uigtk2.ml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/unison240/Makefile =================================================================== --- head/net/unison240/Makefile (revision 555473) +++ head/net/unison240/Makefile (revision 555474) @@ -1,92 +1,93 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} VERSIONSUFFIX= 240 nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11 nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX} x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 PLIST_SUB= PORTVERSION=${PORTVERSION} USES= gmake USE_OCAML= yes NO_OCAML_RUNDEPENDS=yes MAKE_ARGS= CFLAGS="" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all +TEST_TARGET= selftest DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps OPTIONS_DEFINE= DOCS .if ${FLAVOR} == nox11 MAKE_ARGS+= UISTYLE=text PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 PLIST_SUB+= X11="@comment " .else MAKE_ARGS+= UISTYLE=gtk2 SUB_FILES= ${PORTNAME}.desktop USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif pre-patch: # BCP 5/16: Eta-expand for backward compatibility with OCaml >4.02 @${REINPLACE_CMD} -e 's,= Unix\.symlink,s1 s2 & s1 s2,' \ ${WRKSRC}/system/system_generic.ml -.if ${FLAVOR} == x11 post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml post-build: + (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) +.if ${FLAVOR} == x11 @${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}${VERSIONSUFFIX} .if ${FLAVOR} == x11 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX}-text ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${VERSIONSUFFIX}.desktop ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${VERSIONSUFFIX}.png .endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/net/unison240/files/patch-uigtk2.ml =================================================================== --- head/net/unison240/files/patch-uigtk2.ml (nonexistent) +++ head/net/unison240/files/patch-uigtk2.ml (revision 555474) @@ -0,0 +1,17 @@ +--- uigtk2.ml.orig 2009-05-14 15:59:33 UTC ++++ uigtk2.ml +@@ -93,12 +93,12 @@ let fontMonospaceMediumPango = lazy (Pango.Font.from_s + (* This does not work with the current version of Lablgtk, due to a bug + let icon = + GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true +- (Gpointer.region_of_string Pixmaps.icon_data) ++ (Gpointer.region_of_bytes Pixmaps.icon_data) + *) + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + (********************************************************************* Property changes on: head/net/unison240/files/patch-uigtk2.ml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/unison248/Makefile =================================================================== --- head/net/unison248/Makefile (revision 555473) +++ head/net/unison248/Makefile (revision 555474) @@ -1,113 +1,115 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.48.15 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= v4 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} VERSIONSUFFIX= 248 nox11_PKGNAMESUFFIX= ${VERSIONSUFFIX}-nox11 nox11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX} x11_PKGNAMESUFFIX= ${VERSIONSUFFIX} x11_CONFLICTS_INSTALL= unison${VERSIONSUFFIX}-nox11 x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 PLIST_SUB= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes CONFLICTS= unison-devel-[0-9]* MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" -MAKE_JOBS_UNSAFE= yes ALL_TARGET= unison all USE_GITHUB= yes GH_ACCOUNT= bcpierce00 DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= DOCS FSMONITOR OPTIONS_DEFAULT?= FSMONITOR FSMONITOR_DESC= Compile and install fsmonitor plugin OPTIONS_SUB= YES FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .if ${FLAVOR} == nox11 MAKE_ARGS= UISTYLE=text PKGMESSAGE= ${PKGDIR}/pkg-message.nox11 PLIST_SUB+= X11="@comment " .else MAKE_ARGS= UISTYLE=gtk2 SUB_FILES= ${PORTNAME}.desktop SUB_LIST= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif post-patch-FSMONITOR-off: @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ ${WRKSRC}/Makefile.OCaml post-patch-FSMONITOR-on: @${REINPLACE_CMD} \ -e '/let suffix = if Util.osType/s/else "" in/else "${VERSIONSUFFIX}" in/' \ ${WRKSRC}/fswatch.ml post-patch: +# remove unconditional raise, which causes self tests to always fail + ${REINPLACE_CMD} -e '/remove me/d' ${WRKSRC}/test.ml .if ${FLAVOR} == nox11 @${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .else @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif -.if ${FLAVOR} == x11 post-build: + (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) +.if ${FLAVOR} == x11 @${ECHO} Building text-only version @${ECHO} ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} 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}${VERSIONSUFFIX} .if ${FLAVOR} == x11 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX}-text ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${VERSIONSUFFIX}.desktop ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${VERSIONSUFFIX}.png .endif do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} do-install-FSMONITOR-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-fsmonitor${VERSIONSUFFIX} .include Index: head/net/unison248/files/patch-uigtk2.ml =================================================================== --- head/net/unison248/files/patch-uigtk2.ml (nonexistent) +++ head/net/unison248/files/patch-uigtk2.ml (revision 555474) @@ -0,0 +1,17 @@ +--- uigtk2.ml.orig 2009-05-14 15:59:33 UTC ++++ uigtk2.ml +@@ -93,12 +93,12 @@ let fontMonospaceMediumPango = lazy (Pango.Font.from_s + (* This does not work with the current version of Lablgtk, due to a bug + let icon = + GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true +- (Gpointer.region_of_string Pixmaps.icon_data) ++ (Gpointer.region_of_bytes Pixmaps.icon_data) + *) + let icon = + let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in + Gpointer.blit +- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); ++ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + p + + (********************************************************************* Property changes on: head/net/unison248/files/patch-uigtk2.ml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/ocaml-lablgtk2/Makefile =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile (revision 555473) +++ head/x11-toolkits/ocaml-lablgtk2/Makefile (revision 555474) @@ -1,146 +1,148 @@ # Created by: Rene Ladan # $FreeBSD$ PORTNAME= lablgtk2 -PORTVERSION= 2.18.5 +PORTVERSION= 2.18.11 PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= https://download.ocamlcore.org/lablgtk/Lablgtk2/${PORTVERSION}/ PKGNAMEPREFIX= ocaml- -DISTNAME= lablgtk-${PORTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= Objective Caml interface to GTK+ 2.x LICENSE= LGPL21 USES= gmake gnome pkgconfig USE_GNOME= gtk20 USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAMLFIND_PLIST= yes USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAML_WASH= yes OPTIONS_DEFINE= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ GTKSPELL LIBRSVG2 DOCS EXAMPLES OPTIONS_DEFAULT= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \ GTKSPELL LIBRSVG2 GNOMECANVAS_DESC= GnomeCanvas support GNOMEUI_DESC= GNOME 2 UI support GTKGLAREA_DESC= GtkGLArea support GTKSOURCEVIEW2_DESC= GtkSourceView 2 support GTKSPELL_DESC= GtkSpell support #GNOMEPANEL_DESC= GNOME Panel support HAS_CONFIGURE= yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes + +USE_GITHUB= yes +GH_ACCOUNT= garrigue +GH_PROJECT= lablgtk CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/${OCAML_LIBDIR} \ --without-gtksourceview CONFIGURE_ENV= CAMLP4O="camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo" PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] .include .if ${PORT_OPTIONS:MDOCS} DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= COPYING README .endif .if ${PORT_OPTIONS:MEXAMPLES} EXAMPLESDIR= ${OCAML_EXAMPLESDIR}/${PORTNAME} PORTEXAMPLES= * .endif .if ${PORT_OPTIONS:MGTKGLAREA} CONFIGURE_ARGS+= --with-gl BUILD_DEPENDS+= lablgl:graphics/ocaml-lablgl RUN_DEPENDS+= lablgl:graphics/ocaml-lablgl LIB_DEPENDS+= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 EXAMPLES_SUBDIRS+= GL .else CONFIGURE_ARGS+= --without-gl .endif .if ${PORT_OPTIONS:MGLADE} CONFIGURE_ARGS+= --with-glade USE_GNOME+= libglade2 PLIST_SUB+= GLADE="" EXAMPLES_SUBDIRS+= glade .else CONFIGURE_ARGS+= --without-glade PLIST_SUB+= GLADE="@comment " .endif .if ${PORT_OPTIONS:MGNOMEUI} CONFIGURE_ARGS+= --with-gnomeui USE_GNOME+= libgnomeui .else CONFIGURE_ARGS+= --without-gnomeui .endif .if ${PORT_OPTIONS:MGNOMECANVAS} CONFIGURE_ARGS+= --with-gnomecanvas USE_GNOME+= libgnomecanvas EXAMPLES_SUBDIRS+= canvas .else CONFIGURE_ARGS+= --without-gnomecanvas .endif .if ${PORT_OPTIONS:MLIBRSVG2} CONFIGURE_ARGS+= --with-rsvg USE_GNOME+= librsvg2 EXAMPLES_SUBDIRS+= rsvg .else CONFIGURE_ARGS+= --without-rsvg .endif #.if ${PORT_OPTIONS:MGNOMEPANEL} #CONFIGURE_ARGS+= --with-panel #USE_GNOME+= gnomepanel #EXAMPLES_SUBDIRS+= panel #.else CONFIGURE_ARGS+= --without-panel #.endif .if ${PORT_OPTIONS:MGTKSOURCEVIEW2} CONFIGURE_ARGS+= --with-gtksourceview2 USE_GNOME+= gtksourceview2 EXAMPLES_SUBDIRS+= sourceview .else CONFIGURE_ARGS+= --without-gtksourceview2 .endif .if ${PORT_OPTIONS:MGTKSPELL} LIB_DEPENDS+= libgtkspell.so:textproc/gtkspell CONFIGURE_ARGS+= --with-gtkspell .else CONFIGURE_ARGS+= --without-gtkspell .endif post-patch: @${REINPLACE_CMD} -E \ -e 's|^(CFLAGS[[:space:]]*\+=[[:space:]]*-O)|\1 ${CFLAGS}|' \ -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ -e 's,(touch)( "\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),${TRUE}\2,' \ -e 's,(-ldconf )("\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),\1ignore,' \ ${WRKSRC}/src/Makefile post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \ "*.ml *.png *.rgb *.xpm text ${EXAMPLES_SUBDIRS}" \ ${STAGEDIR}${EXAMPLESDIR} .include Index: head/x11-toolkits/ocaml-lablgtk2/distinfo =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/distinfo (revision 555473) +++ head/x11-toolkits/ocaml-lablgtk2/distinfo (revision 555474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559922306 -SHA256 (lablgtk-2.18.5.tar.gz) = 2bf251db21c077fdd26c035ea03edd8fe609187f908e520e87a8ffdd9c36d233 -SIZE (lablgtk-2.18.5.tar.gz) = 808005 +TIMESTAMP = 1603308851 +SHA256 (garrigue-lablgtk-2.18.11_GH0.tar.gz) = ff3c551df4e220b0c0fb9a3da6429413bff14f8fc93f4dd6807a35463982c863 +SIZE (garrigue-lablgtk-2.18.11_GH0.tar.gz) = 1068587 Index: head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common =================================================================== --- head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common (revision 555473) +++ head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common (nonexistent) @@ -1,22 +0,0 @@ ---- src/ml_gdk.c.orig -+++ src/ml_gdk.c -@@ -48,6 +48,8 @@ - #include "gdk_tags.h" - - -+lookup_info *ml_table_extension_events; -+ - CAMLprim void ml_raise_gdk (const char *errmsg) - { - static const value * exn = NULL; ---- src/ml_gdk.h.orig -+++ src/ml_gdk.h -@@ -86,7 +86,7 @@ CAMLexport value Val_GdkEvent (GdkEvent *); - CAMLexport int OptFlags_GdkModifier_val (value); - CAMLexport int Flags_GdkModifier_val (value); - CAMLexport int Flags_Event_mask_val (value); --CAMLexport lookup_info *ml_table_extension_events; -+CAMLextern lookup_info *ml_table_extension_events; - #define Extension_events_val(key) ml_lookup_to_c(ml_table_extension_events,key) - - #define GdkDragContext_val(val) check_cast(GDK_DRAG_CONTEXT,val) Property changes on: head/x11-toolkits/ocaml-lablgtk2/files/patch-fno-common ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property