diff --git a/net/unison232/Makefile b/net/unison232/Makefile index 30fcf0fe4897..970b35e96d39 100644 --- a/net/unison232/Makefile +++ b/net/unison232/Makefile @@ -1,89 +1,85 @@ # Created by: Dan Pelleg PORTNAME= unison PORTVERSION= 2.32.52 PORTREVISION= 12 CATEGORIES= net MASTER_SITES= https://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${_EXTRA_DOCS} DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mandree@FreeBSD.org # Implicit approval for port changes granted to Guido Falsi COMMENT= User-level file synchronization tool LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} USES= gmake _VERSIONSUFFIX= 232 nox11_PKGNAMESUFFIX= ${_VERSIONSUFFIX}-nox11 nox11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX} x11_PKGNAMESUFFIX= ${_VERSIONSUFFIX} x11_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 \ icotool:graphics/icoutils x11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz x11_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 x11_CONFLICTS_INSTALL= unison${_VERSIONSUFFIX}-nox11 PLIST_SUB= PORTVERSION=${PORTVERSION} USE_OCAML= yes NO_OCAML_RUNDEPENDS=yes MAKE_ARGS= CFLAGS="" TEST_TARGET= selftest _DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} _EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps OPTIONS_DEFINE= DOCS .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 gnome PLIST_SUB+= X11="" .endif -post-patch: - @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ - ${WRKSRC}/Makefile.OCaml - post-build: d=$$(mktemp -d) && trap "rm -rf $$d" 0 && ( cd ${WRKSRC} && HOME=$$d ./unison -selftest -ui text -batch ) .if ${FLAVOR} == x11 @${ECHO} Building text-only version in ${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}${_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} .include diff --git a/net/unison232/files/patch-Makefile.OCaml b/net/unison232/files/patch-Makefile.OCaml new file mode 100644 index 000000000000..8c9629cf3e8e --- /dev/null +++ b/net/unison232/files/patch-Makefile.OCaml @@ -0,0 +1,29 @@ +--- Makefile.OCaml.orig 2009-06-18 09:29:40 UTC ++++ Makefile.OCaml +@@ -65,7 +65,7 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -n -1 | sed -e 's + # This should be set to an appropriate value automatically, depending + # on whether the lablgtk library is available + LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk +-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2 ++LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2 + ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well + ## at the moment and we don't want to confuse people by building it by default + ifeq ($(OSARCH),osx) +@@ -84,7 +84,7 @@ buildexecutable:: + ### Default parameters + + INCLFLAGS=-I lwt -I ubase +-CAMLFLAGS+=$(INCLFLAGS) ++CAMLFLAGS+=$(INCLFLAGS) -unsafe-string + + ifeq ($(OSARCH),win32) + # Win32 system +@@ -246,7 +246,7 @@ endif + + # Gtk2 GUI + ifeq ($(UISTYLE), gtk2) +- CAMLFLAGS+=-I +lablgtk2 ++ CAMLFLAGS+=-I +site-lib/lablgtk2 + OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo + OCAMLLIBS+=lablgtk.cma + endif diff --git a/net/unison240/Makefile b/net/unison240/Makefile index 38f82a554fb8..a65bd9dcff63 100644 --- a/net/unison240/Makefile +++ b/net/unison240/Makefile @@ -1,92 +1,88 @@ # Created by: Dan Pelleg PORTNAME= unison PORTVERSION= 2.40.128 PORTREVISION= 4 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 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING 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="" ALL_TARGET= unison all TEST_TARGET= selftest DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} EXTRA_DOCS= ${DISTNAME}-manual.html \ ${DISTNAME}-manual.pdf ${DISTNAME}-manual.ps OPTIONS_DEFINE= DOCS .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 gnome PLIST_SUB+= X11="" .endif pre-patch: # BCP 5/16: Eta-expand for backward compatibility with OCaml >4.02 @${REINPLACE_CMD} -e 's,= Unix\.symlink,s1 s2 & s1 s2,' \ ${WRKSRC}/system/system_generic.ml -post-patch: - @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ - ${WRKSRC}/Makefile.OCaml - post-build: (cd ${WRKSRC} && HOME=${WRKSRC} ./unison -selftest -ui text -batch) .if ${FLAVOR} == x11 @${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}${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} .include diff --git a/net/unison240/files/patch-Makefile.OCaml b/net/unison240/files/patch-Makefile.OCaml new file mode 100644 index 000000000000..dfd96642b5e9 --- /dev/null +++ b/net/unison240/files/patch-Makefile.OCaml @@ -0,0 +1,29 @@ +--- Makefile.OCaml.orig 2014-12-30 02:21:28 UTC ++++ Makefile.OCaml +@@ -72,7 +72,7 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* + # This should be set to an appropriate value automatically, depending + # on whether the lablgtk library is available + LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk +-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2 ++LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2 + ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well + ## at the moment and we don't want to confuse people by building it by default + ifeq ($(OSARCH),osx) +@@ -91,7 +91,7 @@ buildexecutable:: + ### Default parameters + + INCLFLAGS=-I lwt -I ubase -I system +-CAMLFLAGS+=$(INCLFLAGS) ++CAMLFLAGS+=$(INCLFLAGS) -unsafe-string + CAMLFLAGS+=-I system/$(SYSTEM) -I lwt/$(SYSTEM) + + ifeq ($(OSARCH),win32) +@@ -292,7 +292,7 @@ endif + + # Gtk2 GUI + ifeq ($(UISTYLE), gtk2) +- CAMLFLAGS+=-I +lablgtk2 ++ CAMLFLAGS+=-I +site-lib/lablgtk2 + OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo + OCAMLLIBS+=lablgtk.cma + endif