Date: Thu, 12 Apr 2018 09:48:33 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467139 - in head/net: unison232 unison232/files unison240 Message-ID: <201804120948.w3C9mXax008766@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Apr 12 09:48:32 2018 New Revision: 467139 URL: https://svnweb.freebsd.org/changeset/ports/467139 Log: - Add x11/nox11 flavors to old unison ports - While here rename and regenerate patch file to conform to standard Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D15006 Added: head/net/unison232/files/patch-update.mli - copied, changed from r467138, head/net/unison232/files/patch-update.mli.diff Deleted: head/net/unison232/files/patch-update.mli.diff Modified: head/net/unison232/Makefile head/net/unison232/pkg-plist head/net/unison240/Makefile head/net/unison240/pkg-plist Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Thu Apr 12 09:44:13 2018 (r467138) +++ head/net/unison232/Makefile Thu Apr 12 09:48:32 2018 (r467139) @@ -3,10 +3,9 @@ PORTNAME= unison PORTVERSION= 2.32.52 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ -PKGNAMESUFFIX= 232 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -17,12 +16,27 @@ COMMENT= User-level file synchronization tool LICENSE= GPLv3 +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS[1]} + +VERSIONSUFFIX= 232 + +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 DOCS= BUGS.txt NEWS README @@ -30,38 +44,41 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFI EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= DOCS -X11_MAKE_ARGS= UISTYLE=gtk2 -X11_PLIST_SUB= TEXT="" -X11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ - icotool:graphics/icoutils -X11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 -X11_SUB_FILES= ${PORTNAME}.desktop +.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 +PLIST_SUB+= X11="" +.endif -X11_MAKE_ARGS_OFF= UISTYLE=text -X11_PLIST_SUB_OFF= TEXT="@comment " - -post-patch-X11-on: +.if ${FLAVOR} == x11 +post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml -post-build-X11-on: +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} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${VERSIONSUFFIX} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} - -do-install-X11-on: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text - ${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 +.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 .include <bsd.port.mk> Copied and modified: head/net/unison232/files/patch-update.mli (from r467138, head/net/unison232/files/patch-update.mli.diff) ============================================================================== --- head/net/unison232/files/patch-update.mli.diff Thu Apr 12 09:44:13 2018 (r467138, copy source) +++ head/net/unison232/files/patch-update.mli Thu Apr 12 09:48:32 2018 (r467139) @@ -1,7 +1,7 @@ Source: https://webdav.seas.upenn.edu/viewvc/unison/branches/2.40/src/update.mli?view=patch&r1=435&r2=457&pathrev=457 ---- ./update.mli 2010/04/15 17:29:31 435 -+++ ./update.mli 2010/07/19 13:05:04 457 +--- update.mli.orig 2009-05-02 02:31:27 UTC ++++ update.mli @@ -1,7 +1,7 @@ (* Unison file synchronizer: src/update.mli *) (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) Modified: head/net/unison232/pkg-plist ============================================================================== --- head/net/unison232/pkg-plist Thu Apr 12 09:44:13 2018 (r467138) +++ head/net/unison232/pkg-plist Thu Apr 12 09:48:32 2018 (r467139) @@ -1,7 +1,7 @@ bin/unison232 -%%TEXT%%share/applications/unison232.desktop -%%TEXT%%bin/unison232-text -%%TEXT%%share/pixmaps/unison232.png +%%X11%%bin/unison232-text +%%X11%%share/applications/unison232.desktop +%%X11%%share/pixmaps/unison232.png %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README Modified: head/net/unison240/Makefile ============================================================================== --- head/net/unison240/Makefile Thu Apr 12 09:44:13 2018 (r467138) +++ head/net/unison240/Makefile Thu Apr 12 09:48:32 2018 (r467139) @@ -3,25 +3,39 @@ PORTNAME= unison PORTVERSION= 2.40.128 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ -PKGNAMESUFFIX= 240 DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= madpilot@FreeBSD.org -COMMENT?= User-level file synchronization tool +MAINTAINER= madpilot@FreeBSD.org +COMMENT= User-level file synchronization tool LICENSE= GPLv3 +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 @@ -30,41 +44,43 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFI EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT?= X11 +OPTIONS_DEFINE= DOCS -X11_MAKE_ARGS= UISTYLE=gtk2 -X11_PLIST_SUB= TEXT="" -X11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ - icotool:graphics/icoutils -X11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 -X11_SUB_FILES= ${PORTNAME}.desktop +.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 +PLIST_SUB+= X11="" +.endif -X11_MAKE_ARGS_OFF= UISTYLE=text -X11_PLIST_SUB_OFF= TEXT="@comment " -X11_VARS_OFF= PKGMESSAGE=${PKGDIR}/pkg-message.nox11 - -post-patch-X11-on: +.if ${FLAVOR} == x11 +post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml -post-build-X11-on: +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} + ${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} - -do-install-X11-on: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text - ${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 .include <bsd.port.mk> Modified: head/net/unison240/pkg-plist ============================================================================== --- head/net/unison240/pkg-plist Thu Apr 12 09:44:13 2018 (r467138) +++ head/net/unison240/pkg-plist Thu Apr 12 09:48:32 2018 (r467139) @@ -1,7 +1,7 @@ bin/unison240 -%%TEXT%%share/applications/unison240.desktop -%%TEXT%%bin/unison240-text -%%TEXT%%share/pixmaps/unison240.png +%%X11%%bin/unison240-text +%%X11%%share/applications/unison240.desktop +%%X11%%share/pixmaps/unison240.png %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804120948.w3C9mXax008766>