Page MenuHomeFreeBSD
Files F157141073

D13783.id37654.diff
No OneTemporary
Actions

D13783.id37654.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9844,3 +9844,4 @@
devel/p5-Test-Block||2018-01-06|Has expired: Marked as deprecated upstream
sysutils/socket||2018-01-06|Has expired: Out of date
x11-toolkits/qt5-declarative-render2d/||2018-01-06|Merged into x11-toolkits/qt5-quick
+net/unison-nox11|net/unison@nox11|2018-01-09|Moved to a flavored, generic, version
Index: net/unison-nox11/Makefile
===================================================================
--- net/unison-nox11/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: Boris Samorodov <bsam@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX= -nox11
-
-MAINTAINER= bsam@FreeBSD.org
-COMMENT= User-level file synchronization tool (without x11 stuff)
-
-CONFLICTS= unison-[0-9]* unison-devel-[0-9]*
-
-OPTIONS_EXCLUDE= X11
-MASTERDIR= ${.CURDIR}/../unison
-
-.include "${MASTERDIR}/Makefile"
Index: net/unison/Makefile
===================================================================
--- net/unison/Makefile
+++ net/unison/Makefile
@@ -3,24 +3,35 @@
PORTNAME= unison
PORTVERSION= 2.48.4
-PORTREVISION?= 2
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
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]}
+
+nox11_PKGNAMESUFFIX= -nox11
+nox11_CONFLICTS_INSTALL= unison-[0-9]*
+
+x11_CONFLICTS_INSTALL= unison-nox11-[0-9]*
+x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \
+ icotool:graphics/icoutils
+x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2
+
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake localbase
USE_OCAML= yes
WRKSRC= ${WRKDIR}/src
NO_OCAML_RUNDEPENDS=yes
-CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]*
+CONFLICTS= unison-devel-[0-9]*
MAKE_ENV= CLIBS="${LIBS:S/^-/-ccopt -/}" COFLAGS="${CFLAGS:C/ *(-[^ ]*) */ -ccopt \"\1 \"/gW}"
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= unison all
@@ -29,8 +40,8 @@
EXTRA_DOCS= ${DISTNAME}-manual.html \
${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps
-OPTIONS_DEFINE= DOCS FSMONITOR X11
-OPTIONS_DEFAULT?= FSMONITOR X11
+OPTIONS_DEFINE= DOCS FSMONITOR
+OPTIONS_DEFAULT?= FSMONITOR
FSMONITOR_DESC= Compile and install fsmonitor plugin
@@ -38,46 +49,50 @@
FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify
-X11_MAKE_ARGS= UISTYLE=gtk2
-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:U} == nox11
+MAKE_ARGS= UISTYLE=text
+PKGMESSAGE= ${PKGDIR}/pkg-message.nox11
+PLIST_SUB+= X11="@comment "
+.else
+MAKE_ARGS= UISTYLE=gtk2
+SUB_FILES= ${PORTNAME}.desktop
+PLIST_SUB+= X11=""
+.endif
-X11_MAKE_ARGS_OFF= UISTYLE=text
-X11_VARS_OFF= PKGMESSAGE=${PKGDIR}/pkg-message.nox11
-
post-patch-FSMONITOR-off:
@${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \
${WRKSRC}/Makefile.OCaml
-post-patch-X11-off:
+post-patch:
+.if ${FLAVOR:U} == nox11
@${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \
${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
-
-post-patch-X11-on:
+.elif ${FLAVOR:U${FLAVORS:[1]}} == x11
@${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \
- -e 's/CFLAGS/COFLAGS/g' \
+ -e 's/CFLAGS/COFLAGS/g' \
${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile
+.endif
-post-build-X11-on:
+.if ${FLAVOR:U${FLAVORS:[1]}} == x11
+post-build:
@${ECHO} Building text-only version
@${ECHO} ${WRKSRC}
${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} UISTYLE=text NAME=unison-text
@cd ${WRKSRC}/win32rc && ${LOCALBASE}/bin/icotool -x U.ico
+.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
-
-do-install-FSMONITOR-on:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin
-
-do-install-X11-on:
+.if ${FLAVOR:U${FLAVORS:[1]}} == x11
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+.endif
+
+do-install-FSMONITOR-on:
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, May 19, 5:40 PM (4 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33322982
Default Alt Text
D13783.id37654.diff (4 KB)

Event Timeline