diff --git a/net/unison/Makefile b/net/unison/Makefile index 04ddde6951cc..812d6a8e3411 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,89 +1,87 @@ PORTNAME= unison -PORTVERSION= 2.53.8 +PORTVERSION= 2.54.0 DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool WWW= https://www.cis.upenn.edu/~bcpierce/unison/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/src/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= unison x11_BUILD_DEPENDS= icotool:graphics/icoutils \ ocaml-lablgtk3>0:x11-toolkits/ocaml-lablgtk3 x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz x11_CONFLICTS_INSTALL= unison-nox11 USES= localbase ocaml:build pkgconfig USE_GITHUB= yes GH_ACCOUNT= bcpierce00 MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" \ COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}" PLIST_SUB= PORTVERSION=${PORTVERSION} ALL_TARGET= manpage OPTIONS_DEFINE= DOCS FSMONITOR -OPTIONS_DEFAULT?= FSMONITOR +OPTIONS_DEFAULT= FSMONITOR OPTIONS_SUB= YES FSMONITOR_DESC= Compile and install fsmonitor plugin DOCS_USES= tex DOCS_USE= TEX=dvipsk:build,latex:build FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .if ${FLAVOR} == nox11 ALL_TARGET+= tui PLIST_SUB+= X11="@comment " .else ALL_TARGET+= tui gui -SUB_FILES= ${PORTNAME}.desktop USE_GNOME= atk cairo gdkpixbuf glib20 gtk30 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif DOCS= NEWS.md README.md .include .if ${ARCH} == powerpc USE_BINUTILS= yes .endif .if ${PORT_OPTIONS:MFSMONITOR} ALL_TARGET+= fsmonitor .endif post-build: cd ${WRKSRC}/src && HOME=${WRKSRC}/src ./unison -selftest -ui text -batch .if ${FLAVOR} == x11 cd ${WRKSRC}/src/win32rc && ${LOCALBASE}/bin/icotool -x U.ico .endif post-build-DOCS-on: ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc unison-manual.pdf post-install: .if ${FLAVOR} != nox11 - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/src/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} unison-manual.pdf ${STAGEDIR}${DOCSDIR} .include diff --git a/net/unison/distinfo b/net/unison/distinfo index 0624804c8197..ecc6f26bd40e 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762328383 -SHA256 (bcpierce00-unison-v2.53.8_GH0.tar.gz) = d0d30ea63e09fc8edf10bd8cbab238fffc8ed510d27741d06b5caa816abd58b6 -SIZE (bcpierce00-unison-v2.53.8_GH0.tar.gz) = 1448430 +TIMESTAMP = 1777631583 +SHA256 (bcpierce00-unison-v2.54.0_GH0.tar.gz) = 0f14154611a2dfebb8c229be85ceda29a750eace4fb75d06e0d43fe5b58a6e87 +SIZE (bcpierce00-unison-v2.54.0_GH0.tar.gz) = 1141341 diff --git a/net/unison/files/unison.desktop.in b/net/unison/files/unison.desktop.in deleted file mode 100644 index fcecb1edd9c0..000000000000 --- a/net/unison/files/unison.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Unison -GenericName=File-synchronization tool -Type=Application -Terminal=false -StartupNotify=true -Categories=GTK;Utility; -Exec=unison-gui -Icon=unison.png -Comment=Synchronize files (directories) over different disks (hosts) -Comment[ru]=Синхронизация файлов (каталогов) на нескольких дисках (компьютерах) diff --git a/net/unison/pkg-plist b/net/unison/pkg-plist index 8f498db4a7de..9b84ad0a64c7 100644 --- a/net/unison/pkg-plist +++ b/net/unison/pkg-plist @@ -1,9 +1,15 @@ bin/unison -%%FSMONITOR%%bin/unison-fsmonitor -%%X11%%share/applications/unison.desktop %%X11%%bin/unison-gui -%%X11%%share/pixmaps/unison.png +%%FSMONITOR%%bin/unison-fsmonitor +%%X11%%share/applications/unison-gui.desktop +%%X11%%share/icons/hicolor/16x16/apps/unison-gui.png +%%X11%%share/icons/hicolor/24x24/apps/unison-gui.png +%%X11%%share/icons/hicolor/256x256/apps/unison-gui.png +%%X11%%share/icons/hicolor/32x32/apps/unison-gui.png +%%X11%%share/icons/hicolor/48x48/apps/unison-gui.png +%%X11%%share/icons/hicolor/scalable/apps/unison-gui.svg share/man/man1/unison.1.gz +%%X11%%share/pixmaps/unison.png %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf