Diff below brings net/unison to 2.53.0. Changes are listed on https://github.com/bcpierce00/unison/releases/tag/v2.53.0. Noticeable change is the switch to GTK3.
While here: - The Unison project is now hosted on GitHub. Old HOMEPAGE is archival. New HOMEPAGE is set by GH_* - Update DEPS and WANTLIB to reflect switch to GTK3 'make test' passes all tests. Run tested on ams64 against unison-2.52.1 and unison-2.53.0. Comments/OK? diff --git Makefile Makefile index 4920e392b7e..8856a3c2bd8 100644 --- Makefile +++ Makefile @@ -2,12 +2,10 @@ COMMENT = multi-platform file synchronization tool GH_ACCOUNT = bcpierce00 GH_PROJECT = unison -GH_TAGNAME = v2.52.1 +GH_TAGNAME = v2.53.0 CATEGORIES = net -HOMEPAGE = https://www.cis.upenn.edu/~bcpierce/unison/ - MAINTAINER = Bjorn Ketelaars <[email protected]> # GPLv3 @@ -18,8 +16,6 @@ WANTLIB = c m util MODULES = lang/ocaml MODOCAML_RUNDEP = if-not-native -TEST_DEPENDS = emacs->=24:editors/emacs - USE_GMAKE = Yes # CFLAGS _must_ be empty. This is an OCaml compiler. @@ -33,37 +29,26 @@ FLAVOR ?= .if ${FLAVOR:Mno_x11} MAKE_FLAGS += UISTYLE=text .else -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender atk-1.0 cairo fontconfig freetype gdk-x11-2.0 -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 -WANTLIB += harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += z -BUILD_DEPENDS += sysutils/findlib \ - x11/lablgtk2 -LIB_DEPENDS += x11/gtk+2 -MAKE_FLAGS += UISTYLE=gtk2 +WANTLIB += atk-1.0 cairo cairo-gobject fontconfig freetype gdk-3 +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 harfbuzz +WANTLIB += intl pango-1.0 pangocairo-1.0 +BUILD_DEPENDS += x11/lablgtk3 +LIB_DEPENDS += x11/gtk+3 +MAKE_FLAGS += UISTYLE=gtk3 .endif -FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g} -SUBST_VARS = FLAVOR_COMMA - -# Avoid multiple all:: entries and use the real target entry. -ALL_TARGET = unison -TEST_TARGET = selftest +FLAVOR_COMMA = ${FLAVOR_EXT:S/-/,/g} +SUBST_VARS = FLAVOR_COMMA PORTHOME = ${WRKDIR} -WRKDIST = ${WRKDIR}/${DISTNAME}/src DOCS = NEWS.md README.md -post-build: - @cd ${WRKSRC}/../man && ${MAKE} - # Avoid the nightmare of their Makefile install target. # Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped! do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/unison ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/../man/unison.1 ${PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/src/unison ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/unison.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unison - @cd ${WRKSRC}/.. && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison + @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/unison .include <bsd.port.mk> diff --git distinfo distinfo index e2feb9efb53..1052cc9f1d1 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (unison-2.52.1.tar.gz) = /32SDhtOwIct92QTC4KlFfbyGjYfMaZ7OcPj6hK/2oA= -SIZE (unison-2.52.1.tar.gz) = 1360920 +SHA256 (unison-2.53.0.tar.gz) = k2RHffRQG5xzd+LKGnxLRMHxb6fLwSt/W1Q9CMPwdAo= +SIZE (unison-2.53.0.tar.gz) = 1387266 diff --git pkg/PLIST pkg/PLIST index 9a848ccc1a2..c8a7e9ab292 100644 --- pkg/PLIST +++ pkg/PLIST @@ -3,6 +3,8 @@ @pkgpath net/unison/snapshot${FLAVOR_COMMA} @pkgpath net/unison/stable${FLAVOR_COMMA} @bin bin/unison +lib/ocaml/ +lib/ocaml/stublibs/ @man man/man1/unison.1 share/doc/pkg-readmes/${PKGSTEM} share/doc/unison/
