sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add x11/nox11 flavors to old unison ports

Browse source 
- While here rename and regenerate patch file to conform to standard

Approved by:		portmgr (mat)
Differential Revision:	https://reviews.freebsd.org/D15006
This commit is contained in:
Guido Falsi 2018-04-12 09:48:32 +00:00
parent 3eb64ea5c0
commit acb0b31a69
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=467139
5 changed files with 88 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
net/unison232/Makefile
View file

@ -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
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>

4
net/unison232/files/patch-update.mli.diff → net/unison232/files/patch-update.mli
View file

@ -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) *)

6
net/unison232/pkg-plist
View file

@ -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

66
net/unison240/Makefile
View file

@ -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}${PKGNAMESUFFIX}
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>

6
net/unison240/pkg-plist
View file

@ -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