Index: head/audio/asterisk-espeak/Makefile =================================================================== --- head/audio/asterisk-espeak/Makefile (revision 518335) +++ head/audio/asterisk-espeak/Makefile (revision 518336) @@ -1,50 +1,50 @@ # $FreeBSD$ PORTNAME= espeak PORTVERSION= 4.0 DISTVERSIONPREFIX= v PORTREVISION= 3 CATEGORIES= audio MAINTAINER= madpilot@FreeBSD.org COMMENT= Espeak dialplan application for Asterisk LICENSE= GPLv2 LIB_DEPENDS= libespeak.so:audio/espeak \ libsamplerate.so:audio/libsamplerate FLAVORS= asterisk13 asterisk16 -FLAVOR?= ${FLAVORS[1]} +FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- asterisk13_CONFLICTS_INSTALL= asterisk16-espeak asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 asterisk16_PKGNAMEPREFIX= asterisk16- asterisk16_CONFLICTS_INSTALL= asterisk13-espeak asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 USES= compiler gmake localbase INSTALL_TARGET= install samples USE_GITHUB= yes GH_ACCOUNT= zaf GH_PROJECT= Asterisk-eSpeak .include .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fblocks .endif post-patch: @${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \ ${WRKSRC}/app_espeak.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_espeak.so .include Index: head/audio/asterisk-flite/Makefile =================================================================== --- head/audio/asterisk-flite/Makefile (revision 518335) +++ head/audio/asterisk-flite/Makefile (revision 518336) @@ -1,49 +1,49 @@ # $FreeBSD$ PORTNAME= flite PORTVERSION= 3.0 DISTVERSIONPREFIX= v PORTREVISION= 3 CATEGORIES= audio MAINTAINER= madpilot@FreeBSD.org COMMENT= Flite dialplan application for Asterisk LICENSE= GPLv2 LIB_DEPENDS= libflite.so:audio/flite FLAVORS= asterisk13 asterisk16 -FLAVOR?= ${FLAVORS[1]} +FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- asterisk13_CONFLICTS_INSTALL= asterisk16-flite asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 asterisk16_PKGNAMEPREFIX= asterisk16- asterisk16_CONFLICTS_INSTALL= asterisk13-flite asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 USES= compiler gmake localbase INSTALL_TARGET= install samples USE_GITHUB= yes GH_ACCOUNT= zaf GH_PROJECT= Asterisk-Flite .include .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fblocks .endif post-patch: @${REINPLACE_CMD} -e '/ASTERISK_REGISTER_FILE/d' \ ${WRKSRC}/app_flite.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_flite.so .include Index: head/net/unison/Makefile =================================================================== --- head/net/unison/Makefile (revision 518335) +++ head/net/unison/Makefile (revision 518336) @@ -1,98 +1,98 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.51.2 DISTVERSIONPREFIX= v CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool LICENSE= GPLv3 FLAVORS= x11 nox11 -FLAVOR?= ${FLAVORS[1]} +FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 nox11_CONFLICTS_INSTALL= unison x11_CONFLICTS_INSTALL= unison-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 localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes 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 USE_GITHUB= yes GH_ACCOUNT= bcpierce00 DOCS= BUGS.txt NEWS README OPTIONS_DEFINE= DOCS FSMONITOR OPTIONS_DEFAULT?= FSMONITOR FSMONITOR_DESC= Compile and install fsmonitor plugin OPTIONS_SUB= YES FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .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-FSMONITOR-off: @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ ${WRKSRC}/Makefile.OCaml post-patch: .if ${FLAVOR} == nox11 @${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .else @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif .if ${FLAVOR} == 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} .if ${FLAVOR} == 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 Index: head/net/unison232/Makefile =================================================================== --- head/net/unison232/Makefile (revision 518335) +++ head/net/unison232/Makefile (revision 518336) @@ -1,84 +1,84 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.32.52 PORTREVISION= 10 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= mandree@FreeBSD.org # Implicit approval for port changes granted to Guido Falsi COMMENT= User-level file synchronization tool LICENSE= GPLv3 FLAVORS= x11 nox11 -FLAVOR?= ${FLAVORS[1]} +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 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 .if ${FLAVOR} == x11 post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml 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}${VERSIONSUFFIX} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR} .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 Index: head/net/unison240/Makefile =================================================================== --- head/net/unison240/Makefile (revision 518335) +++ head/net/unison240/Makefile (revision 518336) @@ -1,91 +1,91 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.40.128 PORTREVISION= 3 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 FLAVORS= x11 nox11 -FLAVOR?= ${FLAVORS[1]} +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 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 .if ${FLAVOR} == x11 post-patch: @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ ${WRKSRC}/Makefile.OCaml 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}${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 Index: head/net/unison248/Makefile =================================================================== --- head/net/unison248/Makefile (revision 518335) +++ head/net/unison248/Makefile (revision 518336) @@ -1,110 +1,110 @@ # Created by: Dan Pelleg # $FreeBSD$ PORTNAME= unison PORTVERSION= 2.48.15 PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= v4 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= User-level file synchronization tool LICENSE= GPLv3 FLAVORS= x11 nox11 -FLAVOR?= ${FLAVORS[1]} +FLAVOR?= ${FLAVORS:[1]} VERSIONSUFFIX= 248 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} VERSIONSUFFIX=${VERSIONSUFFIX} USES= gmake localbase USE_OCAML= yes WRKSRC_SUBDIR= src NO_OCAML_RUNDEPENDS=yes 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 USE_GITHUB= yes GH_ACCOUNT= bcpierce00 DOCS= BUGS.txt NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= DOCS FSMONITOR OPTIONS_DEFAULT?= FSMONITOR FSMONITOR_DESC= Compile and install fsmonitor plugin OPTIONS_SUB= YES FSMONITOR_LIB_DEPENDS= libinotify.so:devel/libinotify .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 SUB_LIST= PORTVERSION=${PORTVERSION} VERSIONSUFFIX=${VERSIONSUFFIX} USE_GNOME+= atk cairo gdkpixbuf2 glib20 gtk20 pango USES+= gettext-runtime gnome PLIST_SUB+= X11="" .endif post-patch-FSMONITOR-off: @${REINPLACE_CMD} -e 's/-include fsmonitor/#&/' \ ${WRKSRC}/Makefile.OCaml post-patch-FSMONITOR-on: @${REINPLACE_CMD} \ -e '/let suffix = if Util.osType/s/else "" in/else "${VERSIONSUFFIX}" in/' \ ${WRKSRC}/fswatch.ml post-patch: .if ${FLAVOR} == nox11 @${REINPLACE_CMD} -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .else @${REINPLACE_CMD} -Ee 's@(\+|/)(lablgtk2)@\1site-lib/\2@' \ -e 's/CFLAGS/COFLAGS/g' \ ${WRKSRC}/Makefile.OCaml ${WRKSRC}/fsmonitor/linux/Makefile .endif .if ${FLAVOR} == 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/${PORTNAME}${VERSIONSUFFIX} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .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-FSMONITOR-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-fsmonitor ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-fsmonitor${VERSIONSUFFIX} .include