aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/unison-devel/Makefile14
-rw-r--r--net/unison-nox11/Makefile6
-rw-r--r--net/unison/Makefile16
-rw-r--r--net/unison232/Makefile12
4 files changed, 24 insertions, 24 deletions
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 92a300014e3d..fecfe3fe929e 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= unison
PORTVERSION= 2.45.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= -devel
@@ -26,8 +26,8 @@ WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS= unison-[0-9]* unison-nox11-[0-9]*
-OPTIONS_DEFINE= DOCS GTK2
-OPTIONS_DEFAULT= DOCS GTK2
+OPTIONS_DEFINE= DOCS X11
+OPTIONS_DEFAULT= DOCS X11
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= unison all
@@ -40,7 +40,7 @@ EXTRA_DOCS= unison-${PORTVERSION}-manual.html \
unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
MAKE_ARGS+= UISTYLE=gtk2
PLIST_SUB+= TEXT=""
BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \
@@ -57,7 +57,7 @@ BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
PATCH_DEPENDS+= ${BUILD_DEPENDS}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
post-build:
@${ECHO} Building text-only version
@${ECHO} ${WRKSRC}
@@ -68,7 +68,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/unison ${PREFIX}/bin
post-install:
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
.endif
.if ${PORT_OPTIONS:MDOCS}
@@ -76,7 +76,7 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
@${MKDIR} ${DESKTOPDIR}
@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
diff --git a/net/unison-nox11/Makefile b/net/unison-nox11/Makefile
index c5bec352d492..0cf12360c710 100644
--- a/net/unison-nox11/Makefile
+++ b/net/unison-nox11/Makefile
@@ -5,15 +5,15 @@
# $FreeBSD$
#
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -nox11
MAINTAINER= bsam@FreeBSD.org
COMMENT= A user-level file synchronization tool (without x11 stuff)
-CONFLICTS= unison-[0-9]*, unison-devel-[0-9]*
+CONFLICTS= unison-[0-9]* unison-devel-[0-9]*
-OPTIONS_EXCLUDE= GTK2
+OPTIONS_EXCLUDE= X11
OPTIONS_DEFAULT= DOCS
MASTERDIR= ${.CURDIR}/../unison
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 1427500aab00..7edfdfbb9696 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -7,15 +7,15 @@
PORTNAME= unison
PORTVERSION= 2.40.63
-PORTREVISION= 1
+PORTREVISION?= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz
-MAINTAINER= madpilot@FreeBSD.org
-COMMENT= A user-level file synchronization tool
+MAINTAINER?= madpilot@FreeBSD.org
+COMMENT?= A user-level file synchronization tool
LICENSE= GPLv3
@@ -28,8 +28,8 @@ CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]*
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= unison all
-OPTIONS_DEFINE= DOCS GTK2
-OPTIONS_DEFAULT?= DOCS GTK2
+OPTIONS_DEFINE= DOCS X11
+OPTIONS_DEFAULT?= DOCS X11
.include <bsd.port.options.mk>
@@ -39,7 +39,7 @@ EXTRA_DOCS= unison-${PORTVERSION}-manual.html \
unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
MAKE_ARGS+= UISTYLE=gtk2
PLIST_SUB+= TEXT=""
BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \
@@ -56,7 +56,7 @@ BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
PATCH_DEPENDS+= ${BUILD_DEPENDS}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
post-build:
@${ECHO} Building text-only version
@${ECHO} ${WRKSRC}
@@ -72,7 +72,7 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
@${MKDIR} ${DESKTOPDIR}
@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
diff --git a/net/unison232/Makefile b/net/unison232/Makefile
index f36fc4477e50..2925b0092643 100644
--- a/net/unison232/Makefile
+++ b/net/unison232/Makefile
@@ -7,7 +7,7 @@
PORTNAME= unison
PORTVERSION= 2.32.52
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 232
@@ -28,8 +28,8 @@ MAKE_JOBS_UNSAFE= yes
LICENCE= GPLv3
-OPTIONS_DEFINE= DOCS GTK
-OPTIONS_DEFAULT= DOCS GTK
+OPTIONS_DEFINE= DOCS X11
+OPTIONS_DEFAULT= DOCS X11
.include <bsd.port.options.mk>
@@ -40,7 +40,7 @@ EXTRA_DOCS= ${PORTNAME}-${PORTVERSION}-manual.html \
${PORTNAME}-${PORTVERSION}-manual.pdf ${PORTNAME}-${PORTVERSION}-manual.ps
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
MAKE_ARGS+= UISTYLE=gtk2
PLIST_SUB+= TEXT=""
BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml \
@@ -57,7 +57,7 @@ BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml-nox11
PATCH_DEPENDS+= ${BUILD_DEPENDS}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
post-build:
@${ECHO} Building text-only version
@${ECHO} ${WRKSRC}
@@ -73,7 +73,7 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
.endif
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
${MKDIR} ${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
generated by cgit (git 2.34.1) at 2025-02-04 09:01:56 +0800