diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2018-04-12 09:48:32 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2018-04-12 09:48:32 +0000 |
commit | acb0b31a695a93b99de78b6354580705e418b0b9 (patch) | |
tree | 20414f37c46aa4e085d33ce1ebc48b36b42f707f /net/unison232 | |
parent | 3eb64ea5c00adf79ecd76ca88de75a4cffca6224 (diff) | |
download | ports-acb0b31a695a93b99de78b6354580705e418b0b9.tar.gz ports-acb0b31a695a93b99de78b6354580705e418b0b9.zip |
- 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
Notes
Notes:
svn path=/head/; revision=467139
Diffstat (limited to 'net/unison232')
-rw-r--r-- | net/unison232/Makefile | 61 | ||||
-rw-r--r-- | net/unison232/files/patch-update.mli (renamed from net/unison232/files/patch-update.mli.diff) | 4 | ||||
-rw-r--r-- | net/unison232/pkg-plist | 6 |
3 files changed, 44 insertions, 27 deletions
diff --git a/net/unison232/Makefile b/net/unison232/Makefile index c2041ff8970f..936b8faef92a 100644 --- a/net/unison232/Makefile +++ b/net/unison232/Makefile @@ -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}${PKGNAMESUFFIX} EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT= X11 - -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 +OPTIONS_DEFINE= DOCS -X11_MAKE_ARGS_OFF= UISTYLE=text -X11_PLIST_SUB_OFF= TEXT="@comment " +.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 -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> diff --git a/net/unison232/files/patch-update.mli.diff b/net/unison232/files/patch-update.mli index af31c8b3f6ae..e475f8da8d58 100644 --- a/net/unison232/files/patch-update.mli.diff +++ b/net/unison232/files/patch-update.mli @@ -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) *) diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist index 8725e2738de5..448c1b2dab47 100644 --- a/net/unison232/pkg-plist +++ b/net/unison232/pkg-plist @@ -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 |