Index: head/archivers/unarchiver/Makefile =================================================================== --- head/archivers/unarchiver/Makefile (revision 553939) +++ head/archivers/unarchiver/Makefile (revision 553940) @@ -1,49 +1,49 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= unar PORTVERSION= 1.10.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= archivers gnustep MASTER_SITES= http://wakaba.c3.cx/releases/TheUnarchiver/ DISTNAME= ${PORTNAME}${PORTVERSION}_src MAINTAINER= danfe@FreeBSD.org COMMENT= Unarchiver for a vast variety of file formats LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/License.txt BROKEN_powerpc64= fails to compile: Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now. # XXX: USES=gnustep overrides MAKEFILE we set below, so depend explicitly LIB_DEPENDS= libgnustep-base.so:lang/gnustep-base \ libicuuc.so:devel/icu \ libwavpack.so:audio/wavpack USES= gmake zip MAKEFILE= Makefile.freebsd WRKSRC= ${WRKDIR}/The\ Unarchiver BUILD_WRKSRC= ${WRKSRC}/XADMaster PLIST_FILES= bin/lsar bin/unar man/man1/lsar.1.gz man/man1/unar.1.gz PORTDOCS= README.md PORTEXAMPLES= lsar.bash_completion unar.bash_completion OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/XADMaster/??ar ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/Extra/??ar.1 ${STAGEDIR}${MANPREFIX}/man/man1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/Extra/??ar.bash_completion \ ${STAGEDIR}${EXAMPLESDIR} .include Index: head/audio/musicpd/Makefile =================================================================== --- head/audio/musicpd/Makefile (revision 553939) +++ head/audio/musicpd/Makefile (revision 553940) @@ -1,272 +1,273 @@ # $FreeBSD$ PORTNAME= musicpd PORTVERSION= 0.22.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} MAINTAINER= riggs@FreeBSD.org COMMENT= Remote-controllable music daemon LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_iostreams.so:devel/boost-libs \ libicudata.so:devel/icu USES= compiler:c++17-lang gnome meson pkgconfig python:build tar:xz USE_GNOME= glib20 USE_RC_SUBR= ${PORTNAME} MESON_ARGS= -Dauto_features=disabled \ -Dbzip2=enabled \ -Ddocumentation=enabled \ -Dhttpd=true \ -Dicu=enabled \ -Doss=enabled \ -Dpipe=true \ -Dsyslog=enabled \ -Dzlib=enabled CFLAGS+= -I${PREFIX}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= AUTHORS README.md NEWS SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS ID3TAG IPV6 ISO9660 SQLITE3 \ PROXYDB LAME VORBISENC ZZIP OPTIONS_RADIO= RESAMPLER ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_RADIO_RESAMPLER= SAMPLERATE SOXR OPTIONS_MULTI= DOCUMENTATION FILE_FORMAT OPTIONS_MULTI_FILE_FORMAT= \ ADPLUG AUDIOFILE FAAD FFMPEG FLAC FLUIDSYNTH \ GME MAD MIKMOD MODPLUG MPG123 MUSEPACK \ OPUS SIDPLAY2 SNDFILE TWOLAME \ VORBIS WAVPACK WILDMIDI OPTIONS_GROUP= ACCESS PLAYBACK OPTIONS_GROUP_ACCESS= CDPARANOIA CURL MMS NFS PLAYLISTS QOBUZ \ SMB SOUNDCLOUD TIDAL YAJL OPTIONS_GROUP_PLAYBACK= AO JACK OPENAL PULSEAUDIO \ SHOUTCAST SNDIO ADPLUG_DESC= AdPlug support FAAD_DESC= AAC/MP4 decoding via libfaad GME_DESC= GME support (video game music files) ISO9660_DESC= Direct support for ISO 9660 images PROXYDB_DESC= Proxy database support via libmpdclient LAME_DESC= Support for MP3 Icecast Streams PLAYLISTS_DESC= Enable extra playlist support (wma, RSS) QOBUZ_DESC= Streaming service support: Qobuz SIDPLAY2_DESC= Sidplay support (C64 mono and stereo files) SOUNDCLOUD_DESC=Streaming service support: SoundCloud TIDAL_DESC= Streaming service support: TIDAL (currently defunct) TWOLAME_DESC= TwoLAME support (mp2) VORBISENC_DESC= Ogg Vorbis encoder WILDMIDI_DESC= WildMIDI support (MIDI files) YAJL_DESC= JSON support via libyajl ZZIP_DESC= Support for zzip archives OPTIONS_DEFAULT=CURL FFMPEG FLAC ID3TAG \ PLAYLISTS SNDFILE VORBIS VORBISENC # Decoder plugins ADPLUG_MESON_ENABLED= adplug ADPLUG_LIB_DEPENDS= libadplug.so:audio/libadplug AUDIOFILE_MESON_ENABLED=audiofile AUDIOFILE_LIB_DEPENDS= libaudiofile.so:audio/libaudiofile FAAD_MESON_ENABLED= faad FAAD_LIB_DEPENDS= libfaad.so:audio/faad FFMPEG_MESON_ENABLED= ffmpeg FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FLAC_MESON_ENABLED= flac FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLUIDSYNTH_MESON_ENABLED= fluidsynth FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth GME_MESON_ENABLED= gme GME_LIB_DEPENDS= libgme.so:audio/libgme MAD_MESON_ENABLED= mad MAD_LIB_DEPENDS= libmad.so:audio/libmad MIKMOD_MESON_ENABLED= mikmod MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod MODPLUG_MESON_ENABLED= modplug MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MPG123_MESON_ENABLED= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MUSEPACK_MESON_ENABLED= mpcdec MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack NFS_MESON_ENABLED= nfs NFS_LIB_DEPENDS= libnfs.so:net/libnfs OPUS_MESON_ENABLED= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus \ libogg.so:audio/libogg PLAYLISTS_MESON_ENABLED=expat PLAYLISTS_LIB_DEPENDS= libexpat.so:textproc/expat2 SIDPLAY2_MESON_ENABLED= sidplay SIDPLAY2_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2 SIDPLAY2_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders SNDFILE_MESON_ENABLED= sndfile SNDFILE_LIB_DEPENDS= libsndfile.so:audio/libsndfile VORBIS_MESON_ENABLED= vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis WAVPACK_MESON_ENABLED= wavpack WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WILDMIDI_MESON_ENABLED= wildmidi WILDMIDI_LIB_DEPENDS= libWildMidi.so:audio/wildmidi # Encoder plugins VORBISENC_IMPLIES= VORBIS VORBISENC_MESON_ENABLED= vorbisenc VORBISENC_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis LAME_MESON_ENABLED= lame LAME_LIB_DEPENDS= libmp3lame.so:audio/lame TWOLAME_MESON_ENABLED= twolame TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame # Filter plugins SAMPLERATE_MESON_ENABLED= libsamplerate SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SOXR_MESON_ENABLED= soxr SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr # Output plugins AO_MESON_ENABLED= ao AO_LIB_DEPENDS= libao.so:audio/libao JACK_MESON_ENABLED= jack JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CXXFLAGS= -Wno-register OPENAL_MESON_ENABLED= openal OPENAL_USES= openal PULSEAUDIO_MESON_ENABLED= pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio SHOUTCAST_MESON_ENABLED=shout SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_IMPLIES= VORBIS SNDIO_MESON_ENABLED= sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio # Input plugins CDPARANOIA_MESON_ENABLED= cdio_paranoia CDPARANOIA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CURL_MESON_ENABLED= curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl MMS_MESON_ENABLED= mms MMS_LIB_DEPENDS= libmms.so:net/libmms SMB_MESON_ENABLED= smbclient SMB_USES= samba:lib # Archive plugins ZZIP_MESON_ENABLED= zzip ZZIP_LIB_DEPENDS= libzzip.so:devel/zziplib ISO9660_MESON_ENABLED= iso9660 ISO9660_LIB_DEPENDS= libiso9660.so:sysutils/libcdio # Database plugins SQLITE3_MESON_ENABLED= sqlite SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PROXYDB_MESON_ENABLED= libmpdclient PROXYDB_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient # Tag plugins ID3TAG_MESON_ENABLED= id3tag ID3TAG_LIB_DEPENDS= libid3tag.so:audio/libid3tag # Network support IPV6_MESON_ENABLED= ipv6 # Commercial service support QOBUZ_MESON_ENABLED= qobuz QOBUZ_LIB_DEPENDS= libgcrypt.so:security/libgcrypt QOBUZ_IMPLIES= CURL YAJL SOUNDCLOUD_MESON_ENABLED= soundcloud SOUNDCLOUD_IMPLIES= CURL YAJL TIDAL_MESON_ENABLED= tidal TIDAL_IMPLIES= CURL YAJL # Misc library suppore AVAHI_MESON_ON= -Dzeroconf=avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app MDNSRESPONDER_MESON_ON= -Dzeroconf=bonjour MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder YAJL_MESON_ENABLED= yajl YAJL_LIB_DEPENDS= libyajl.so:devel/yajl MPDUSER?= mpd MPDGROUP?= mpd USERS= ${MPDUSER} GROUPS= ${MPDGROUP} .include # Note that since the build system switch to meson, mpd fails to link with # GNU ld 2.17 in base. Also, meson does not allow to set the linker via # environment variables yet. # For gcc-based platforms, gcc and ld from ports are used due to the c++14 # requirement. For clang, we set the linker explicitly in meson.build. .if ${ARCH} == armv6 #lld may use movt/movw, doesn't work on armv6 BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils MPD_CLANG_LD= ${LOCALBASE}/bin/ld .else MPD_CLANG_LD= lld .endif post-patch: # Insert selected linker for clang @${REINPLACE_CMD} -e 's|%%MPD_CLANG_LD%%|${MPD_CLANG_LD}|' \ ${WRKSRC}/meson.build # Replace ~/ with /var/mpd/ and make musicpd run as mpd by default @${REINPLACE_CMD} -e 's,^#\([^"]*"\)~/,\1/var/mpd/,g' \ -e 's,^#\(user[^"]*"\)nobody,\1${MPDUSER},g' \ ${WRKSRC}/doc/mpdconf.example # Uncomment OSS audio output part from mpd.conf; dragons! start=$$(expr $$(${SED} -n '/^# type *"oss"/=' \ ${WRKSRC}/doc/mpdconf.example) - 1); \ finish=$$(for n in $$(${JOT} 10 $$start); do \ [ "$$(${SED} -n $${n}p ${WRKSRC}/doc/mpdconf.example)" = \ "#}" ] && ${ECHO_CMD} $$n || true; done); \ ${REINPLACE_CMD} -e "$${start},$${finish}s,^#,," \ ${WRKSRC}/doc/mpdconf.example # Fix man pages for executable names @${REINPLACE_CMD} \ -e 's#^``mpd#``${PORTNAME}#' \ -e 's#:: mpd#:: ${PORTNAME}#' \ -e 's#mpd(1)#${PORTNAME}(1)#' \ -e 's#/etc/mpd.conf#${PREFIX}/etc/${PORTNAME}.conf#' \ -e 's#mpd.conf#${PORTNAME}.conf#' \ -e 's#mpd.conf(5)#${PORTNAME}.conf(5)#' \ ${WRKSRC}/doc/mpd.1.rst ${WRKSRC}/doc/mpd.conf.5.rst @${REINPLACE_CMD} \ -e "s#'mpd'#'${PORTNAME}'#" \ -e "s#'mpd.conf'#'${PORTNAME}.conf'#" \ -e "s#'mpd.conf doc#'${PORTNAME}.conf doc#" \ ${WRKSRC}/doc/conf.py do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/mpd \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.1 \ ${STAGEDIR}${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/_build/doc/${PORTNAME}.conf.5 \ ${STAGEDIR}${PREFIX}/man/man5 ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include Index: head/audio/ncmpcpp/Makefile =================================================================== --- head/audio/ncmpcpp/Makefile (revision 553939) +++ head/audio/ncmpcpp/Makefile (revision 553940) @@ -1,56 +1,56 @@ # $FreeBSD$ PORTNAME= ncmpcpp DISTVERSION= 0.8.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio MASTER_SITES= https://ncmpcpp.rybczak.net/stable/ MAINTAINER= yamagi@yamagi.org COMMENT= Ncurses mpd client, clone of ncmpc with some new features LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \ libfftw3.so:math/fftw3 \ libicudata.so:devel/icu \ libicuuc.so:devel/icu \ libboost_filesystem.so:devel/boost-libs \ libcurl.so:ftp/curl USES= compiler:c++14-lang gnome iconv libtool localbase ncurses \ pkgconfig readline tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 LDFLAGS+= -lpthread CONFIGURE_ENV= BOOST_LIB_SUFFIX="" ncursesw_CFLAGS="-L${NCURSESLIB}" ncursesw_LIBS="-lncursesw" OPTIONS_DEFINE= CLOCK DOCS OUTPUTS TAGLIB UTF8 VISUALIZER OPTIONS_DEFAULT= CLOCK OUTPUTS TAGLIB UTF8 VISUALIZER CLOCK_DESC= clock-screen support TAGLIB_DESC= taglib support OUTPUTS_DESC= Enable outputs screen VISUALIZER_DESC= Enable music visualizer screen PLIST_FILES= bin/ncmpcpp \ man/man1/ncmpcpp.1.gz PORTDOCS= AUTHORS COPYING NEWS bindings config CLOCK_CONFIGURE_ENABLE= clock UTF8_CONFIGURE_ENABLE= unicode TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CONFIGURE_WITH= taglib OUTPUTS_CONFIGURE_ENABLE= outputs VISUALIZER_BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 VISUALIZER_CONFIGURE_ENABLE= visualizer post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ .include Index: head/databases/couchdb2/Makefile =================================================================== --- head/databases/couchdb2/Makefile (revision 553939) +++ head/databases/couchdb2/Makefile (revision 553940) @@ -1,103 +1,103 @@ # Created by: Dave Cottlehuber # $FreeBSD$ PORTNAME= couchdb2 DISTVERSION= 2.3.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} MAINTAINER= dch@FreeBSD.org COMMENT= JSON document database with HTTP API and scalable multi-master sync LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11 LICENSE_COMB= multi BUILD_DEPENDS= rebar:devel/rebar \ erlang-runtime21>=21.3:lang/erlang-runtime21 LIB_DEPENDS= libicudata.so:devel/icu \ libmozjs185.so:lang/spidermonkey185 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ erlang-runtime21>=21.3:lang/erlang-runtime21 USES= cpe gmake libtool ncurses python:run shebangfix USE_RC_SUBR= couchdb2 CPE_VENDOR= apache SHEBANG_FILES= rel/overlay/bin/couchup USERS= couchdb GROUPS= couchdb SUB_FILES= pkg-message SUB_LIST= APPDIR=${APPDIR} \ ERL_PATH=${LOCALBASE}/lib/erlang21/bin/erl \ PORTNAME=${PORTNAME} \ RELDIR=${RELDIR} PLIST_SUB= VERSION=${DISTVERSION} HAS_CONFIGURE= yes CONFIGURE_ARGS= --skip-deps --user ${USERS} --disable-docs --disable-fauxton ALL_TARGET= release MAKE_ENV= PATH=${LOCALBASE}/lib/erlang21/bin:${PATH} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DBDIR?= /var/db/${PORTNAME} LOGFILE?= /var/log/${PORTNAME}/couch.log APPDIR= ${LOCALBASE}/libexec/${PORTNAME} RELDIR= ${APPDIR}/releases/${DISTVERSION} post-patch: @${REINPLACE_CMD} \ -e 's,%%APPDIR%%,${APPDIR},g' \ -e 's,%%DATADIR%%,${DATADIR},g' \ -e 's,%%DBDIR%%,${DBDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ -e 's,%%PORTNAME%%,${PORTNAME},g' \ -e 's,%%WWWDIR%%,${WWWDIR},g' \ -e 's,$$COUCHDB_USER,${USERS},g' \ -e 's,$$LOG_FILE,${LOGFILE},g' \ ${WRKSRC}/configure pre-install: # relocate user-modifiable runtime configs to match hier(7) ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \ ${STAGEDIR}${ETCDIR}/local.ini.sample ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \ ${STAGEDIR}${ETCDIR}/vm.args.sample ${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 # prune build artefacts and surplus headers @${FIND} -E ${WRKSRC} -type f \ -regex '.*\.(a|buildinfo|c|cc|cmd|d|h|o|orig|1)' -delete # remove runtime dirs and files that were moved to match hier(7) @${RM} -r ${WRKSRC}/rel/couchdb/var \ ${WRKSRC}/rel/couchdb/etc/*.d \ ${WRKSRC}/rel/couchdb/etc/local.ini \ ${WRKSRC}/rel/couchdb/etc/vm.args \ ${WRKSRC}/rel/couchdb/releases/*/vm.args \ ${WRKSRC}/rel/couchdb/lib/couch-*/priv/couchjs \ ${WRKSRC}/share/server @${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/ (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR}) post-install: @${FIND} -E ${STAGEDIR} -type f \ \( -name couchjs -o -name *.so \) \ -exec ${STRIP_CMD} {} + @${MKDIR} \ ${STAGEDIR}/var/db/${PORTNAME} \ ${STAGEDIR}/var/log/${PORTNAME} # fauxton UI is a required component (cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) post-install-DOCS-on: (cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs) .include Index: head/databases/couchdb3/Makefile =================================================================== --- head/databases/couchdb3/Makefile (revision 553939) +++ head/databases/couchdb3/Makefile (revision 553940) @@ -1,116 +1,117 @@ # $FreeBSD$ PORTNAME= couchdb3 PORTREVISION= 1 DISTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} MAINTAINER= dch@FreeBSD.org COMMENT= JSON document database with HTTP API and scalable multi-master sync LICENSE= APACHE20 BSD3CLAUSE ISCL WTFPL OFL11 LICENSE_COMB= multi BUILD_DEPENDS= rebar:devel/rebar \ erlang-runtime22>=22.0:lang/erlang-runtime22 LIB_DEPENDS= libicudata.so:devel/icu \ libmozjs-60.so:lang/spidermonkey60 RUN_DEPENDS= erlang-runtime22>=22.0:lang/erlang-runtime22 USES= compiler:c++14-lang cpe gmake libtool ncurses USE_RC_SUBR= ${PORTNAME} CONFLICTS= couchdb[24]* CPE_VENDOR= apache USERS= couchdb GROUPS= couchdb SUB_FILES= pkg-message SUB_LIST= APPDIR=${APPDIR} \ ERL_PATH=${LOCALBASE}/lib/erlang22/bin/erl \ PORTNAME=${PORTNAME} \ RELDIR=${RELDIR} \ WWWDIR=${WWWDIR} PLIST_SUB= VERSION=${DISTVERSION} HAS_CONFIGURE= yes CONFIGURE_ARGS= --skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \ --spidermonkey-version 60 ALL_TARGET= release MAKE_ENV= PATH=${LOCALBASE}/lib/erlang22/bin:${PATH} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DBDIR?= /var/db/${PORTNAME} LOGDIR?= /var/log/${PORTNAME} LOGFILE?= ${LOGDIR}/couch.log APPDIR= ${LOCALBASE}/libexec/${PORTNAME} RELDIR= ${APPDIR}/releases/${DISTVERSION} .include .if ${OPSYS} == FreeBSD && ${ARCH} == i386 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod.cc .endif post-patch: @${REINPLACE_CMD} \ -e 's,%%APPDIR%%,${APPDIR},g' \ -e 's,%%DATADIR%%,${DATADIR},g' \ -e 's,%%DBDIR%%,${DBDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ -e 's,%%PORTNAME%%,${PORTNAME},g' \ -e 's,%%WWWDIR%%,${WWWDIR},g' \ -e 's,$$COUCHDB_USER,${USERS},g' \ -e 's,$$LOG_FILE,${LOGFILE},g' \ ${WRKSRC}/configure # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514 .if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200000 || ${ARCH} == i386) @${REINPLACE_CMD} \ -e 's,$$FLTO_FLAG ,,g' \ ${WRKSRC}/src/jiffy/rebar.config .endif pre-install: # relocate user-modifiable runtime configs to match hier(7) ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \ ${STAGEDIR}${ETCDIR}/local.ini.sample ${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \ ${STAGEDIR}${ETCDIR}/vm.args.sample ${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 # prune build artefacts and surplus headers ${FIND} -E ${WRKSRC} -type f \ -regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete # remove runtime dirs and files that were moved to match hier(7) ${RM} -rv ${WRKSRC}/rel/couchdb/var \ ${WRKSRC}/rel/couchdb/etc/*.d \ ${WRKSRC}/rel/couchdb/etc/local.ini \ ${WRKSRC}/rel/couchdb/etc/vm.args \ ${WRKSRC}/rel/couchdb/releases/*/vm.args \ ${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch*js @${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/ (cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR}) post-install: @${FIND} -E ${STAGEDIR} -type f \ \( -name couchjs -o -name *.so \) \ -exec ${STRIP_CMD} {} + @${MKDIR} \ ${STAGEDIR}${DBDIR} \ ${STAGEDIR}${LOGDIR} # fauxton UI is a required component (cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) post-install-DOCS-on: (cd ${WRKSRC}/share/docs/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/docs) .include Index: head/databases/evolution-data-server/Makefile =================================================================== --- head/databases/evolution-data-server/Makefile (revision 553939) +++ head/databases/evolution-data-server/Makefile (revision 553940) @@ -1,83 +1,84 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= evolution-data-server PORTVERSION= 3.38.1 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Data backends for the Evolution integrated mail/PIM suite LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libfribidi.so:converters/fribidi \ libgcr-base-3.so:security/gcr \ libgoa-1.0.so:net/gnome-online-accounts \ libgdata.so:devel/libgdata \ libical.so:devel/libical \ libnss3.so:security/nss \ libicudata.so:devel/icu \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libjson-glib-1.0.so:devel/json-glib \ libp11-kit.so:security/p11-kit \ libnspr4.so:devel/nspr \ libsecret-1.so:security/libsecret \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libcanberra.so:audio/libcanberra PORTSCOUT= limitw:1,even USES= bdb:5 cmake compiler:c++11-lib gettext gnome gperf \ iconv localbase pathfix pkgconfig python:3.6+,build\ sqlite tar:xz USE_CXXSTD= gnu++11 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2 USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_VALA_BINDINGS=ON \ -DENABLE_INTROSPECTION=ON \ -DENABLE_UOA=OFF CMAKE_ARGS+= -DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \ -DWITH_LIBDB_LIBS="-L${LOCALBASE}/lib -ldb-5" GLIB_SCHEMAS= org.gnome.evolution-data-server.addressbook.gschema.xml \ org.gnome.evolution-data-server.calendar.gschema.xml \ org.gnome.evolution-data-server.gschema.xml \ org.gnome.Evolution.DefaultSources.gschema.xml \ org.gnome.evolution.eds-shell.gschema.xml \ org.gnome.evolution.shell.network-config.gschema.xml PLIST_SUB= EVO_VERSION="1.2" OPTIONS_SUB= yes OPTIONS_DEFINE= WEATHER KERBEROS LDAP OPTIONS_DEFAULT=WEATHER KERBEROS LDAP KERBEROS_CMAKE_ON= -DWITH_KRB5=/usr KERBEROS_CMAKE_OFF= -DWITH_KRB5=OFF KERBEROS_USES= ssl LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF LDAP_USE= openldap=yes WEATHER_DESC= Weather calendar backend WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather WEATHER_CMAKE_BOOL= ENABLE_WEATHER .include post-patch: @${REINPLACE_CMD} -e 's| python3| ${PYTHON_VERSION}|g' \ ${WRKSRC}/CMakeLists.txt post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd .include Index: head/databases/firebird25-server/Makefile =================================================================== --- head/databases/firebird25-server/Makefile (revision 553939) +++ head/databases/firebird25-server/Makefile (revision 553940) @@ -1,217 +1,217 @@ # $FreeBSD$ PORTNAME= firebird PORTVERSION= 2.5.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= databases MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_8/ PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}.27089-0 DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT?= Firebird-2 relational database (server) LICENSE= IDPL IPL LICENSE_COMB= multi LICENSE_NAME_IDPL= Initial Developer's Public License LICENSE_NAME_IPL= InterBase Public License LICENSE_FILE_IDPL= ${WRKSRC}/builds/install/misc/IDPLicense.txt LICENSE_FILE_IPL= ${WRKSRC}/builds/install/misc/IPLicense.txt LICENSE_PERMS_IDPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_IPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libicuuc.so:devel/icu USES= cpe gmake pkgconfig tar:bzip2 USE_CXXSTD= gnu++98 GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --with-system-icu \ --prefix=${LOCALSTATEDIR} \ --exec-prefix=${PREFIX} \ --with-fbconf=${PREFIX}/${CONFDIR} \ --with-fbglock=${LOCALSTATEDIR} \ --with-fbhelp=${LOCALSTATEDIR}/help \ --with-fbintl=${LIBEXECDIR}/intl \ --with-fblog=${LOCALSTATEDIR} \ --with-fbmsg=${DATADIR} \ --with-fbplugins=${LIBEXECDIR}/plugins \ --with-fbsbin=${PREFIX}/sbin \ --with-fbsecure-db=${LOCALSTATEDIR} \ --with-fbudf=${LIBEXECDIR}/UDF CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" \ ac_cv_header_atomic_ops_h="no" \ ac_cv_lib_atomic_ops_main="no" CPPFLAGS+= -DU_NOEXCEPT= # For USE_CXXSTD=gnu++98 LOCALSTATEDIR= /var/db/firebird CONFDIR= etc/firebird LIBEXECDIR= ${PREFIX}/libexec/firebird PLIST_SUB= FIREBIRD_VERSION=${PORTVERSION} \ LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}" # Don't use ld for linking, use gcc LD= ${CC} # Don't strip binary files STRIP= ONLY_FOR_ARCHS= i386 amd64 # sparc64 fails due to lack of valid AtomicCounter implementation in # src/common/classes/fb_atomic.h; presumably other tier-2s would as well INSTALL_FB= ${INSTALL} ${COPY} IPCRM_CMD= /usr/bin/ipcrm IPCS_CMD= /usr/bin/ipcs IPCCHECK!= ${IPCRM_CMD} -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .if !defined(CLIENT_ONLY) # Server part stuff USES+= firebird CONFIGURE_ARGS+=--enable-superserver --without-editline ALL_TARGET= firebird_embedded firebird_server USE_RC_SUBR= firebird SUB_FILES= pkg-message UTIL_SBIN= fb_inet_server fb_lock_print fb_smp_server fbserver UTIL_BIN= fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \ nbackup UDF_SO= ib_udf.so fbudf.so UDF_SQL= src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql PKGINSTALL?= ${PKGDIR}/pkg-install-server .else # Client part stuff USES+= libedit CONFIGURE_ARGS+= --with-system-editline CONFIGURE_ENV+= ac_cv_lib_edit_readline="yes" ALL_TARGET= firebird_basic libfbembed libfbclient embed_isql embed_gpre \ embed_gdef embed_qli extlib USE_LDCONFIG= yes CLIENT_BIN= gpre isql-fb qli OPTIONS_DEFINE= DOCS DOCS_PORTDOCS= * FB_DOCS_FILES= WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \ ods11-index-structure.html FB_DOCS_DIRS= sql.extensions license upgrade .endif MAKE_ENV+= FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}" MAKE_ARGS+= PREFIX="${STAGEDIR}${PREFIX}" post-patch: ${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+ ${REINPLACE_CMD} -e \ 's|/isql|/isql-fb|g' -e \ 's|/gstat|/fbstat|g' -e \ 's|/gsplit|/fbsplit|g' ${WRKSRC}/builds/posix/make.defaults .include .if ${ARCH} == "amd64" CFLAGS+= -DAMD64 .endif .if !defined(CLIENT_ONLY) USERS= ${PORTNAME} GROUPS= ${USERS} .endif .ifndef WITHOUT_IPC_CLEANUP pre-build: .if !defined(CLIENT_ONLY) @${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif ${MAKE} -C ${WRKSRC}/extern/btyacc [ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \ ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build post-build: ${IPCS_CMD} -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build ${DIFF} -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build | \ ${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh ${SH} ${WRKDIR}/ipcrm.sh .endif do-install: .if !defined(CLIENT_ONLY) ${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/aliases.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf ${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \ ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf ${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${STAGEDIR}${LIBEXECDIR}/udf ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${STAGEDIR}${LIBEXECDIR}/plugins ${INSTALL_FB} -m 0660 ${WRKSRC}/gen/firebird/security2.fdb ${STAGEDIR}${LOCALSTATEDIR}/security2.fdb.sample ${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help ${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.so .else # defined CLIENT_ONLY ${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/install/misc/firebird.conf > ${WRKDIR}/firebird.conf @${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR} ${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample ${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \ ${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \ ${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2.5 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2 ${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2.5 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2 ${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so @${MKDIR} ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${STAGEDIR}${PREFIX}/include @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!} ${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR} ${LN} -sf README.user ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions ${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license ${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade .endif .include Index: head/databases/kbibtex/Makefile =================================================================== --- head/databases/kbibtex/Makefile (revision 553939) +++ head/databases/kbibtex/Makefile (revision 553940) @@ -1,39 +1,39 @@ # Created by: Markus Brueffer # $FreeBSD$ PORTNAME= kbibtex DISTVERSION= 0.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Bibliography editor for KDE LIB_DEPENDS= libicuuc.so:devel/icu \ libpoppler.so:graphics/poppler \ libpoppler-qt5.so:graphics/poppler-qt5 \ libqoauth-qt5.so:net/qoauth-qt5 USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \ iconv kde:5 qca qt:5 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm i18n iconthemes itemviews jobwidgets \ kio parts service solid sonnet texteditor textwidgets wallet \ widgetsaddons windowsystem xmlgui USE_QT= concurrent core dbus declarative gui location network \ printsupport webchannel widgets xml xmlpatterns \ buildtools_build qmake_build USE_LDCONFIG= yes OPTIONS_DEFINE= WEBENGINE OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE WEBENGINE_DESC= Add dependency on qt5-webengine WEBENGINE_USE= QT=webengine WEBENGINE_USE_OFF= QT=webkit WEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets .include Index: head/databases/kdb/Makefile =================================================================== --- head/databases/kdb/Makefile (revision 553939) +++ head/databases/kdb/Makefile (revision 553940) @@ -1,33 +1,33 @@ # $FreeBSD$ PORTNAME= kdb DISTVERSION= 3.2.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases kde MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Database connectivity and creation framework LIB_DEPENDS= libicuuc.so:devel/icu USES= cmake compiler:c++11-lang gettext kde:5 \ python qt:5 tar:xz USE_KDE= coreaddons ecm i18n USE_QT= core gui network widgets xml \ buildtools_build qmake_build # In the future, these options will be moved into slave ports OPTIONS_DEFINE= SQLITE MYSQL PGSQL OPTIONS_SUB= YES OPTIONS_DEFAULT= ${OPTIONS_DEFINE} SQLITE_USES= sqlite SQLITE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Sqlite MYSQL_USES= mysql MYSQL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_MySQL PGSQL_USES= pgsql PGSQL_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL .include Index: head/databases/mysql80-client/Makefile =================================================================== --- head/databases/mysql80-client/Makefile (revision 553939) +++ head/databases/mysql80-client/Makefile (revision 553940) @@ -1,49 +1,49 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql80-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${MASTERDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql8[1-9]-client-* \ mysql[0-79][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \ mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1 CLIENT_ONLY= yes OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLCLIENT_USE= OPENLDAP=yes OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so @${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21 .include "${MASTERDIR}/Makefile" Index: head/databases/mysql80-server/Makefile =================================================================== --- head/databases/mysql80-server/Makefile (revision 553939) +++ head/databases/mysql80-server/Makefile (revision 553940) @@ -1,206 +1,206 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME?= mysql PORTVERSION= 8.0.22 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-8.0 PKGNAMESUFFIX?= 80-server DISTNAME= ${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= joneum@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX} SLAVEDIRS= databases/mysql80-client USES= bison:build cmake:noninja compiler:c++14-lang cpe \ groff:run libedit localbase ncurses perl5 pkgconfig shebangfix ssl USE_CXXSTD= c++14 USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ libicutu.so:devel/icu \ liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libprotobuf.so:devel/protobuf \ ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_aarch64= libunwind.so:devel/libunwind LIB_DEPENDS_amd64= libunwind.so:devel/libunwind LIB_DEPENDS_i386= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind BUILD_DEPENDS= liblz4>0:archivers/liblz4 \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= libunwind>0:devel/libunwind BUILD_DEPENDS_amd64= libunwind>0:devel/libunwind BUILD_DEPENDS_i386= libunwind>0:devel/libunwind BUILD_DEPENDS_powerpc64= libunwind>0:devel/libunwind BUILD_DEPENDS_powerpc64le= libunwind>0:devel/libunwind CMAKE_BUILD_TYPE= Release CFLAGS+= -fPIC CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_SYSTEM_LIBS=1 \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ICU=system \ -DWITH_CURL=system \ -DWITH_ZLIB=system \ -DWITH_ZSTD=system \ -DWITH_PROTOBUF=system \ -DWITH_SSL=${OPENSSLBASE} \ -DBUILD_BUNDLED_ZLIB=0 \ -DBUILD_BUNDLED_LZ4=0 # The Mroonga, RocksDB, and TokuDB storage engines are disabled. # Mroonga is only buildable on little endian archs. # RocksDB is only buildable on little endian archs and requires POSIX timers. # TokuDB is only buildable on 64-bit little endian archs. CMAKE_ARGS+= -DWITHOUT_MROONGA_STORAGE_ENGINE=1 \ -DWITHOUT_ROCKSDB_STORAGE_ENGINE=1 \ -DWITHOUT_TOKUDB_STORAGE_ENGINE=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL IGNORE= You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} \ MYSQL80_LIBVER=${MYSQL80_LIBVER} # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:80 CONFLICTS_INSTALL= mysql8[1-9]-server-* \ mysql[0-79][0-9]-server-* \ mysqlwsrep* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample pkg-message USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \ mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1 MMAN8= mysqld.8 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" CMAKE_ARGS+= -DWITHOUT_CLIENTLIBS="ON" OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" .endif .include # Since 8.0.20 release innodb engine uses new memory alligned allocator # which is broken on i386 due to different size of types and caused a # 'static_assert(alignof(T) <= alignof(std::max_align_t))' error .if ${ARCH} == i386 CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1 .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} .endif post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include Index: head/databases/mysql80-server/files/patch-icu68 =================================================================== --- head/databases/mysql80-server/files/patch-icu68 (nonexistent) +++ head/databases/mysql80-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE' + my_getopt_skip_unknown = TRUE; + ^ + +--- sql/mysqld.cc.orig 2020-06-16 16:31:03 UTC ++++ sql/mysqld.cc +@@ -6910,7 +6912,7 @@ int mysqld_main(int argc, char **argv) + if (opt_keyring_migration_source || opt_keyring_migration_destination || + migrate_connect_options) { + Migrate_keyring mk; +- my_getopt_skip_unknown = TRUE; ++ my_getopt_skip_unknown = true; + if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source, + opt_keyring_migration_destination, opt_keyring_migration_user, + opt_keyring_migration_host, opt_keyring_migration_password, Property changes on: head/databases/mysql80-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/postgresql10-server/Makefile =================================================================== --- head/databases/postgresql10-server/Makefile (revision 553939) +++ head/databases/postgresql10-server/Makefile (revision 553940) @@ -1,26 +1,26 @@ # Created by: Marc G. Fournier # $FreeBSD$ DISTVERSION?= 10.14 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 0 +PORTREVISION?= 1 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_basebackup src/bin/pg_archivecleanup \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql13-server/Makefile" Index: head/databases/postgresql10-server/files/patch-icu68 =================================================================== --- head/databases/postgresql10-server/files/patch-icu68 (nonexistent) +++ head/databases/postgresql10-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,254 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +pg_collation.c:47:1: error: conflicting types for 'CollationCreate' +CollationCreate(const char *collname, Oid collnamespace, +^ +../../../src/include/catalog/pg_collation_fn.h:17:12: note: previous declaration is here +extern Oid CollationCreate(const char *collname, Oid collnamespace, + ^ +collationcmds.c:52:1: error: conflicting types for 'DefineCollation' +DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists) +^ +../../../src/include/commands/collationcmds.h:21:22: note: previous declaration is here +extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists); + ^ +dbcommands.c:780:1: error: conflicting types for 'dropdb' +dropdb(const char *dbname, bool missing_ok) +^ +../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here +extern void dropdb(const char *dbname, bool missing_ok); + ^ +dbcommands.c:1397:1: error: conflicting types for 'AlterDatabase' +AlterDatabase(ParseState *pstate, AlterDatabaseStmt *stmt, bool isTopLevel) +^ +../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here +extern Oid AlterDatabase(ParseState *pstate, AlterDatabaseStmt *stmt, bool isTopLevel); + ^ +dbcommands.c:2009:1: error: conflicting types for 'get_database_oid' +get_database_oid(const char *dbname, bool missing_ok) +^ +../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here +extern Oid get_database_oid(const char *dbname, bool missingok); + ^ +indxpath.c:3003:1: error: conflicting types for 'relation_has_unique_index_for' +relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, +^ +../../../../src/include/optimizer/paths.h:71:13: note: previous declaration is here +extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, + ^ +indxpath.c:3174:1: error: conflicting types for 'indexcol_is_bool_constant_for_query' +indexcol_is_bool_constant_for_query(IndexOptInfo *index, int indexcol) +^ +../../../../src/include/optimizer/paths.h:74:13: note: previous declaration is here +extern bool indexcol_is_bool_constant_for_query(IndexOptInfo *index, + ^ +indxpath.c:3223:1: error: conflicting types for 'match_index_to_operand' +match_index_to_operand(Node *operand, +^ +../../../../src/include/optimizer/paths.h:76:13: note: previous declaration is here +extern bool match_index_to_operand(Node *operand, int indexcol, + ^ +indxpath.c:3867:1: error: conflicting types for 'adjust_rowcompare_for_index' +adjust_rowcompare_for_index(RowCompareExpr *clause, +^ +../../../../src/include/optimizer/paths.h:82:14: note: previous declaration is here +extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause, + ^ +regis.c:31:1: error: conflicting types for 'RS_isRegis' +RS_isRegis(const char *str) +^ +../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here +bool RS_isRegis(const char *str); + ^ +regis.c:85:1: error: conflicting types for 'RS_compile' +RS_compile(Regis *r, bool issuffix, const char *str) +^ +../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here +void RS_compile(Regis *r, bool issuffix, const char *str); + ^ +regis.c:218:1: error: conflicting types for 'RS_execute' +RS_execute(Regis *r, char *str) +^ +../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here +bool RS_execute(Regis *r, char *str); + ^ +guc.c:433:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_duration = false; + ^ +../../../../src/include/utils/guc.h:233:13: note: previous declaration is here +extern bool log_duration; + ^ +guc.c:434:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_plan = false; + ^ +../../../../src/include/utils/guc.h:234:13: note: previous declaration is here +extern bool Debug_print_plan; + ^ +guc.c:435:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_parse = false; + ^ +../../../../src/include/utils/guc.h:235:13: note: previous declaration is here +extern bool Debug_print_parse; + ^ +guc.c:436:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_rewritten = false; + ^ +../../../../src/include/utils/guc.h:236:13: note: previous declaration is here +extern bool Debug_print_rewritten; + ^ +guc.c:437:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_pretty_print = true; + ^ +../../../../src/include/utils/guc.h:237:13: note: previous declaration is here +extern bool Debug_pretty_print; + ^ +guc.c:439:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_parser_stats = false; + ^ +../../../../src/include/utils/guc.h:239:13: note: previous declaration is here +extern bool log_parser_stats; + ^ +guc.c:440:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_planner_stats = false; + ^ +../../../../src/include/utils/guc.h:240:13: note: previous declaration is here +extern bool log_planner_stats; + ^ +guc.c:441:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_executor_stats = false; + ^ +../../../../src/include/utils/guc.h:241:13: note: previous declaration is here +extern bool log_executor_stats; + ^ +guc.c:442:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_statement_stats = false; /* this is sort of all three above + ^ +../../../../src/include/utils/guc.h:242:13: note: previous declaration is here +extern bool log_statement_stats; + ^ +guc.c:444:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_btree_build_stats = false; + ^ +../../../../src/include/utils/guc.h:243:13: note: previous declaration is here +extern bool log_btree_build_stats; + ^ +guc.c:448:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char') +bool check_function_bodies = true; + ^ +../../../../src/include/utils/guc.h:245:25: note: previous declaration is here +extern PGDLLIMPORT bool check_function_bodies; + ^ +guc.c:449:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char') +bool default_with_oids = false; + ^ +../../../../src/include/utils/guc.h:246:13: note: previous declaration is here +extern bool default_with_oids; + ^ +guc.c:450:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char') +bool session_auth_is_superuser; + ^ +../../../../src/include/utils/guc.h:247:13: note: previous declaration is here +extern bool session_auth_is_superuser; + ^ +guc.c:4707:1: error: conflicting types for 'SelectConfigFiles' +SelectConfigFiles(const char *userDoption, const char *progname) +^ +../../../../src/include/utils/guc.h:354:13: note: previous declaration is here +extern bool SelectConfigFiles(const char *userDoption, const char *progname); + ^ +guc.c:5097:1: error: conflicting types for 'AtEOXact_GUC' +AtEOXact_GUC(bool isCommit, int nestLevel) +^ +../../../../src/include/utils/guc.h:358:13: note: previous declaration is here +extern void AtEOXact_GUC(bool isCommit, int nestLevel); + ^ +guc.c:5515:1: error: conflicting types for 'parse_int' +parse_int(const char *value, int *result, int flags, const char **hintmsg) +^ +../../../../src/include/utils/guc.h:361:13: note: previous declaration is here +extern bool parse_int(const char *value, int *result, int flags, + ^ +guc.c:5601:1: error: conflicting types for 'parse_real' +parse_real(const char *value, double *result) +^ +../../../../src/include/utils/guc.h:363:13: note: previous declaration is here +extern bool parse_real(const char *value, double *result); + ^ +guc.c:5662:1: error: conflicting types for 'config_enum_lookup_by_name' +config_enum_lookup_by_name(struct config_enum *record, const char *value, +^ +../../../../src/include/utils/guc_tables.h:265:13: note: previous declaration is here +extern bool config_enum_lookup_by_name(struct config_enum *record, + ^ +guc.c:5930:1: error: conflicting types for 'set_config_option' +set_config_option(const char *name, const char *value, +^ +../../../../src/include/utils/guc.h:364:12: note: previous declaration is here +extern int set_config_option(const char *name, const char *value, + ^ +fatal error: too many errors emitted, stopping now [-ferror-limit=] + +--- src/backend/catalog/pg_collation.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/catalog/pg_collation.c +@@ -14,6 +14,8 @@ + */ + #include "postgres.h" + ++#include ++ + #include "access/genam.h" + #include "access/heapam.h" + #include "access/htup_details.h" +--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/commands/collationcmds.c +@@ -14,6 +14,8 @@ + */ + #include "postgres.h" + ++#include ++ + #include "access/heapam.h" + #include "access/htup_details.h" + #include "access/xact.h" +--- src/backend/commands/dbcommands.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/commands/dbcommands.c +@@ -19,6 +19,7 @@ + */ + #include "postgres.h" + ++#include + #include + #include + #include +--- src/backend/optimizer/path/indxpath.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/optimizer/path/indxpath.c +@@ -15,6 +15,7 @@ + */ + #include "postgres.h" + ++#include + #include + + #include "access/stratnum.h" +--- src/backend/tsearch/regis.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/tsearch/regis.c +@@ -14,6 +14,8 @@ + + #include "postgres.h" + ++#include ++ + #include "tsearch/dicts/regis.h" + #include "tsearch/ts_locale.h" + +--- src/backend/utils/misc/guc.c.orig 2020-08-10 21:19:16 UTC ++++ src/backend/utils/misc/guc.c +@@ -16,6 +16,8 @@ + */ + #include "postgres.h" + ++#include ++ + #include + #include + #include Property changes on: head/databases/postgresql10-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/postgresql11-server/Makefile =================================================================== --- head/databases/postgresql11-server/Makefile (revision 553939) +++ head/databases/postgresql11-server/Makefile (revision 553940) @@ -1,26 +1,26 @@ # Created by: Marc G. Fournier # $FreeBSD$ DISTVERSION?= 11.9 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 2 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_basebackup src/bin/pg_archivecleanup \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql13-server/Makefile" Index: head/databases/postgresql11-server/files/patch-icu68 =================================================================== --- head/databases/postgresql11-server/files/patch-icu68 (nonexistent) +++ head/databases/postgresql11-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +collationcmds.c:467:51: error: use of undeclared identifier 'TRUE' + uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); + ^ + +--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:17:40 UTC ++++ src/backend/commands/collationcmds.c +@@ -444,7 +444,7 @@ get_icu_language_tag(const char *localename) + UErrorCode status; + + status = U_ZERO_ERROR; +- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); ++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); + if (U_FAILURE(status)) + ereport(ERROR, + (errmsg("could not convert locale name \"%s\" to language tag: %s", Property changes on: head/databases/postgresql11-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/postgresql12-server/Makefile =================================================================== --- head/databases/postgresql12-server/Makefile (revision 553939) +++ head/databases/postgresql12-server/Makefile (revision 553940) @@ -1,27 +1,27 @@ # Created by: Marc G. Fournier # $FreeBSD$ DISTVERSION?= 12.4 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 1 +PORTREVISION?= 2 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql13-server/Makefile" Index: head/databases/postgresql12-server/files/patch-icu68 =================================================================== --- head/databases/postgresql12-server/files/patch-icu68 (nonexistent) +++ head/databases/postgresql12-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +collationcmds.c:467:51: error: use of undeclared identifier 'TRUE' + uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); + ^ + +--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:15:53 UTC ++++ src/backend/commands/collationcmds.c +@@ -463,7 +463,7 @@ get_icu_language_tag(const char *localename) + UErrorCode status; + + status = U_ZERO_ERROR; +- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); ++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); + if (U_FAILURE(status)) + ereport(ERROR, + (errmsg("could not convert locale name \"%s\" to language tag: %s", Property changes on: head/databases/postgresql12-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/postgresql13-server/Makefile =================================================================== --- head/databases/postgresql13-server/Makefile (revision 553939) +++ head/databases/postgresql13-server/Makefile (revision 553940) @@ -1,330 +1,330 @@ # Created by: Marc G. Fournier # $FreeBSD$ PORTNAME?= postgresql DISTVERSION?= 13.0 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= PostgreSQL is the most advanced open-source database available anywhere LICENSE= PostgreSQL .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 10 CONFLICTS+= ${PORTNAME}9* ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]* .else CONFLICTS+= ${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}1[0-9]* .endif WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql OPTIONS_SUB= yes PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USES+= tar:bzip2 cpe .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes .endif PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="-lpthread" \ LDFLAGS_SL="${LDFLAGS_SL}" LDFLAGS+= -lpthread MAKE_ENV= MAKELEVEL=0 PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade BUILD_DIRS?= src/port ${INSTALL_DIRS} INSTALL_TARGET?=install-strip .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif OPTIONS_SUB= yes .if defined(CLIENT_ONLY) OPTIONS_DEFINE+=LIBEDIT DOCS LIBEDIT_DESC= Use non-GPL libedit instead of readline .else MAKE_ENV+= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if defined(SERVER_ONLY) OPTIONS_DEFINE= DTRACE LDAP INTDATE TZDATA XML DOCS LDAP_DESC= Build with LDAP authentication support DTRACE_DESC= Build with DTrace probes TZDATA_DESC= Use internal timezone database XML_DESC= Build with XML data type DTRACE_CONFIGURE_ENABLE=dtrace DTRACE_LDFLAGS= -lelf DTRACE_INSTALL_TARGET= install .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 OPTIONS_DEFINE+= LLVM OPTIONS_DEFAULT+= LLVM LLVM_DESC= Build with support for JIT-compiling expressions OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} OPTIONS_EXCLUDE_powerpc64_12= LLVM .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS_DEFINE+= ICU ICU_DESC= Use ICU for unicode collation .else CONFIGURE_ARGS+=--with-icu LIB_DEPENDS+= libicudata.so:devel/icu USES+= pkgconfig .endif # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS_DEFINE+= INTDATE INTDATE_DESC= Builds with 64-bit date/time type OPTIONS_DEFAULT+= INTDATE .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS . if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 OPTIONS_RADIO= KRB5 OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 . endif KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages PAM_DESC= Build with PAM Support MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos GSSAPI_DESC= Build with GSSAPI support OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) OPTIONS_DEFINE+= SSL SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT+= SSL GSSAPI_CONFIGURE_WITH= gssapi .endif # !SLAVE_ONLY .if defined(CLIENT_ONLY) LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred LIBEDIT_USES= libedit LIBEDIT_USES_OFF= readline .endif # CLIENT_ONLY SSL_USES= ssl SSL_CONFIGURE_WITH= openssl PAM_CONFIGURE_WITH= pam XML_CONFIGURE_WITH= libxml XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 TZDATA_CONFIGURE_OFF= --with-system-tzdata=/usr/share/zoneinfo INTDATE_CONFIGURE_OFF= --disable-integer-datetimes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops DEBUG_CONFIGURE_ENABLE= debug PLIST_SUB+= PG_USER=${PG_USER} \ PG_USER_regex=\b${PG_USER}\b \ PG_GROUP=${PG_GROUP} \ PG_GROUP_regex=\b${PG_GROUP}\b SUB_LIST+= PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} .include .if ${ARCH} == "i386" USES+= compiler:gcc-c++11-lib .else USES+= compiler .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} < 10 . if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum) USES+= autoreconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= ${ICU_PATCHFILE}:icu LIB_DEPENDS+= libicudata.so:devel/icu . endif .endif # server && version < 10 .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 .if ${PORT_OPTIONS:MGSSAPI} .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . else CONFIGURE_ARGS+=--with-krb5 # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libkrb5.so.3:security/krb5 . endif . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} CONFIGURE_ARGS+=--with-krb5 . endif .endif # !SLAVE_ONLY # For testing files in FILESDIR .include .if ${PORT_OPTIONS:MLLVM} CONFIGURE_ARGS+= --with-llvm BUILD_DEPENDS+= llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION} BUILD_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} RUN_DEPENDS+= llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION} CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION} .endif # sync LLVM to the preferred compiler if possible # or else use a lower version compiler that is compatible .if ${COMPILER_VERSION} > ${LLVM_DEFAULT} # Highest LLVM version in ports: . if ${COMPILER_VERSION} <= 11 PG_LLVM_VERSION=${COMPILER_VERSION} PG_COMPILER_VERSION=${COMPILER_VERSION} . else PG_LLVM_VERSION=11 PG_COMPILER_VERSION=11 . endif .else PG_COMPILER_VERSION=${COMPILER_VERSION} PG_LLVM_VERSION=${LLVM_DEFAULT} .endif .if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11 . if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM} INSTALL_DIRS+= src/backend/jit/llvm . if ${COMPILER_VERSION} != ${PG_COMPILER_VERSION} LLVM_CONFIGURE_ARGS?= CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION} . endif . endif .endif .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} . endif post-patch: . if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} @${REINPLACE_CMD} \ -e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \ -e '/icu/s/_57//' \ ${WRKSRC}/configure.in . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include Index: head/databases/postgresql13-server/files/patch-icu68 =================================================================== --- head/databases/postgresql13-server/files/patch-icu68 (nonexistent) +++ head/databases/postgresql13-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +collationcmds.c:467:51: error: use of undeclared identifier 'TRUE' + uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); + ^ + +--- src/backend/commands/collationcmds.c.orig 2020-09-21 20:47:36 UTC ++++ src/backend/commands/collationcmds.c +@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localename) + UErrorCode status; + + status = U_ZERO_ERROR; +- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); ++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); + if (U_FAILURE(status)) + ereport(ERROR, + (errmsg("could not convert locale name \"%s\" to language tag: %s", Property changes on: head/databases/postgresql13-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/postgresql96-server/Makefile =================================================================== --- head/databases/postgresql96-server/Makefile (revision 553939) +++ head/databases/postgresql96-server/Makefile (revision 553940) @@ -1,25 +1,25 @@ # Created by: Marc G. Fournier # $FreeBSD$ DISTVERSION?= 9.6.19 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 0 +PORTREVISION?= 1 PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup src/bin/pg_archivecleanup \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_xlogdump src/bin/pg_upgrade ICU_PATCHFILE= pg-96b4-icu-2016-10-02.diff.gz OPTIONS_DEFAULT+=ICU .include "${.CURDIR}/../postgresql13-server/Makefile" Index: head/databases/postgresql96-server/files/patch-icu68 =================================================================== --- head/databases/postgresql96-server/files/patch-icu68 (nonexistent) +++ head/databases/postgresql96-server/files/patch-icu68 (revision 553940) @@ -0,0 +1,278 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +dbcommands.c:770:1: error: conflicting types for 'dropdb' +dropdb(const char *dbname, bool missing_ok) +^ +../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here +extern void dropdb(const char *dbname, bool missing_ok); + ^ +dbcommands.c:1367:1: error: conflicting types for 'AlterDatabase' +AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel) +^ +../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here +extern Oid AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel); + ^ +dbcommands.c:1977:1: error: conflicting types for 'get_database_oid' +get_database_oid(const char *dbname, bool missing_ok) +^ +../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here +extern Oid get_database_oid(const char *dbname, bool missingok); + ^ +indxpath.c:2917:1: error: conflicting types for 'relation_has_unique_index_for' +relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, +^ +../../../../src/include/optimizer/paths.h:66:13: note: previous declaration is here +extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, + ^ +indxpath.c:3091:1: error: conflicting types for 'match_index_to_operand' +match_index_to_operand(Node *operand, +^ +../../../../src/include/optimizer/paths.h:69:13: note: previous declaration is here +extern bool match_index_to_operand(Node *operand, int indexcol, + ^ +indxpath.c:3735:1: error: conflicting types for 'adjust_rowcompare_for_index' +adjust_rowcompare_for_index(RowCompareExpr *clause, +^ +../../../../src/include/optimizer/paths.h:75:14: note: previous declaration is here +extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause, + ^ +regis.c:31:1: error: conflicting types for 'RS_isRegis' +RS_isRegis(const char *str) +^ +../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here +bool RS_isRegis(const char *str); + ^ +regis.c:85:1: error: conflicting types for 'RS_compile' +RS_compile(Regis *r, bool issuffix, const char *str) +^ +../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here +void RS_compile(Regis *r, bool issuffix, const char *str); + ^ +regis.c:218:1: error: conflicting types for 'RS_execute' +RS_execute(Regis *r, char *str) +^ +../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here +bool RS_execute(Regis *r, char *str); + ^ +varlena.c:1845:1: error: conflicting types for 'varstr_sortsupport' +varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar) +^ +../../../../src/include/utils/builtins.h:849:13: note: previous declaration is here +extern void varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar); + ^ +varlena.c:3264:1: error: conflicting types for 'SplitIdentifierString' +SplitIdentifierString(char *rawstring, char separator, +^ +../../../../src/include/utils/builtins.h:859:13: note: previous declaration is here +extern bool SplitIdentifierString(char *rawstring, char separator, + ^ +varlena.c:3389:1: error: conflicting types for 'SplitDirectoriesString' +SplitDirectoriesString(char *rawstring, char separator, +^ +../../../../src/include/utils/builtins.h:861:13: note: previous declaration is here +extern bool SplitDirectoriesString(char *rawstring, char separator, + ^ +varlena.c:3510:1: error: conflicting types for 'SplitGUCList' +SplitGUCList(char *rawstring, char separator, +^ +../../../../src/include/utils/builtins.h:863:13: note: previous declaration is here +extern bool SplitGUCList(char *rawstring, char separator, + ^ +varlena.c:4022:1: error: conflicting types for 'replace_text_regexp' +replace_text_regexp(text *src_text, void *regexp, +^ +../../../../src/include/utils/builtins.h:866:14: note: previous declaration is here +extern text *replace_text_regexp(text *src_text, void *regexp, + ^ +In file included from varlena.c:5586: +./levenshtein.c:73:1: error: conflicting types for 'varstr_levenshtein' +varstr_levenshtein(const char *source, int slen, +^ +../../../../src/include/utils/builtins.h:850:12: note: previous declaration is here +extern int varstr_levenshtein(const char *source, int slen, + ^ +In file included from varlena.c:5588: +./levenshtein.c:68:1: error: conflicting types for 'varstr_levenshtein_less_equal' +varstr_levenshtein_less_equal(const char *source, int slen, +^ +../../../../src/include/utils/builtins.h:854:12: note: previous declaration is here +extern int varstr_levenshtein_less_equal(const char *source, int slen, + ^ +guc.c:408:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_duration = false; + ^ +../../../../src/include/utils/guc.h:233:13: note: previous declaration is here +extern bool log_duration; + ^ +guc.c:409:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_plan = false; + ^ +../../../../src/include/utils/guc.h:234:13: note: previous declaration is here +extern bool Debug_print_plan; + ^ +guc.c:410:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_parse = false; + ^ +../../../../src/include/utils/guc.h:235:13: note: previous declaration is here +extern bool Debug_print_parse; + ^ +guc.c:411:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_print_rewritten = false; + ^ +../../../../src/include/utils/guc.h:236:13: note: previous declaration is here +extern bool Debug_print_rewritten; + ^ +guc.c:412:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char') +bool Debug_pretty_print = true; + ^ +../../../../src/include/utils/guc.h:237:13: note: previous declaration is here +extern bool Debug_pretty_print; + ^ +guc.c:414:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_parser_stats = false; + ^ +../../../../src/include/utils/guc.h:239:13: note: previous declaration is here +extern bool log_parser_stats; + ^ +guc.c:415:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_planner_stats = false; + ^ +../../../../src/include/utils/guc.h:240:13: note: previous declaration is here +extern bool log_planner_stats; + ^ +guc.c:416:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_executor_stats = false; + ^ +../../../../src/include/utils/guc.h:241:13: note: previous declaration is here +extern bool log_executor_stats; + ^ +guc.c:417:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_statement_stats = false; /* this is sort of all three + ^ +../../../../src/include/utils/guc.h:242:13: note: previous declaration is here +extern bool log_statement_stats; + ^ +guc.c:419:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char') +bool log_btree_build_stats = false; + ^ +../../../../src/include/utils/guc.h:243:13: note: previous declaration is here +extern bool log_btree_build_stats; + ^ +guc.c:423:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char') +bool check_function_bodies = true; + ^ +../../../../src/include/utils/guc.h:245:25: note: previous declaration is here +extern PGDLLIMPORT bool check_function_bodies; + ^ +guc.c:424:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char') +bool default_with_oids = false; + ^ +../../../../src/include/utils/guc.h:246:13: note: previous declaration is here +extern bool default_with_oids; + ^ +guc.c:425:7: error: redefinition of 'SQL_inheritance' with a different type: 'bool' vs 'bool' (aka 'char') +bool SQL_inheritance = true; + ^ +../../../../src/include/utils/guc.h:247:13: note: previous declaration is here +extern bool SQL_inheritance; + ^ +guc.c:428:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char') +bool session_auth_is_superuser; + ^ +../../../../src/include/utils/guc.h:248:13: note: previous declaration is here +extern bool session_auth_is_superuser; + ^ +guc.c:4599:1: error: conflicting types for 'SelectConfigFiles' +SelectConfigFiles(const char *userDoption, const char *progname) +^ +../../../../src/include/utils/guc.h:355:13: note: previous declaration is here +extern bool SelectConfigFiles(const char *userDoption, const char *progname); + ^ +guc.c:4989:1: error: conflicting types for 'AtEOXact_GUC' +AtEOXact_GUC(bool isCommit, int nestLevel) +^ +../../../../src/include/utils/guc.h:359:13: note: previous declaration is here +extern void AtEOXact_GUC(bool isCommit, int nestLevel); + ^ +guc.c:5407:1: error: conflicting types for 'parse_int' +parse_int(const char *value, int *result, int flags, const char **hintmsg) +^ +../../../../src/include/utils/guc.h:362:13: note: previous declaration is here +extern bool parse_int(const char *value, int *result, int flags, + ^ +guc.c:5493:1: error: conflicting types for 'parse_real' +parse_real(const char *value, double *result) +^ +../../../../src/include/utils/guc.h:364:13: note: previous declaration is here +extern bool parse_real(const char *value, double *result); + ^ +guc.c:5554:1: error: conflicting types for 'config_enum_lookup_by_name' +config_enum_lookup_by_name(struct config_enum * record, const char *value, +^ +../../../../src/include/utils/guc_tables.h:264:13: note: previous declaration is here +extern bool config_enum_lookup_by_name(struct config_enum * record, + ^ +fatal error: too many errors emitted, stopping now [-ferror-limit=] + +--- src/backend/commands/dbcommands.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/commands/dbcommands.c +@@ -19,6 +19,7 @@ + */ + #include "postgres.h" + ++#include + #include + #include + #include +--- src/backend/optimizer/path/indxpath.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/optimizer/path/indxpath.c +@@ -15,6 +15,7 @@ + */ + #include "postgres.h" + ++#include + #include + + #include "access/stratnum.h" +--- src/backend/tsearch/regis.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/tsearch/regis.c +@@ -14,6 +14,8 @@ + + #include "postgres.h" + ++#include ++ + #include "tsearch/dicts/regis.h" + #include "tsearch/ts_locale.h" + +--- src/backend/utils/adt/levenshtein.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/utils/adt/levenshtein.c +@@ -23,6 +23,8 @@ + * + *------------------------------------------------------------------------- + */ ++#include ++ + #define MAX_LEVENSHTEIN_STRLEN 255 + + /* +--- src/backend/utils/adt/varlena.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/utils/adt/varlena.c +@@ -14,6 +14,7 @@ + */ + #include "postgres.h" + ++#include + #include + #include + +--- src/backend/utils/misc/guc.c.orig 2020-08-10 21:21:12 UTC ++++ src/backend/utils/misc/guc.c +@@ -16,6 +16,7 @@ + */ + #include "postgres.h" + ++#include + #include + #include + #include Property changes on: head/databases/postgresql96-server/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/sqlite3/Makefile =================================================================== --- head/databases/sqlite3/Makefile (revision 553939) +++ head/databases/sqlite3/Makefile (revision 553940) @@ -1,274 +1,275 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= sqlite3 DISTVERSION= 3.33.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= https://www.sqlite.org/2020/ http://www2.sqlite.org/2020/ http://www3.sqlite.org/2020/ DISTNAME= sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00 MAINTAINER= pavelivolkov@gmail.com COMMENT= SQL database engine in a C library LICENSE= PD USES= libtool pathfix USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip # Compilation Options For SQLite https://www.sqlite.org/compile.html OPTIONS_DEFINE= FTS4 URI URI_AUTHORITY METADATA \ DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \ EXTENSION ARMOR STMT DBPAGE DBSTAT FTS5 RBU NULL_TRIM \ LIKENOTBLOB STSHELL FTS3_TOKEN UNKNOWN_SQL SORT_REF \ NORMALIZE DQS TRUSTED_SCHEMA OPTIONS_SINGLE= RAMT OPTIONS_RADIO= STAT RL OPTIONS_GROUP= OPT_EXT OPT_FUNC UNICODE RTREEG OPTIONS_GROUP_OPT_EXT= JSON1 SESSION OPTIONS_GROUP_OPT_FUNC= OFFSET SER1 SOUNDEX OPT_EXT_DESC= Optional extensions OPT_FUNC_DESC= Optional functions URI_DESC= Enable use the URI filename URI_AUTHORITY_DESC= Allow convert URL into a UNC SOUNDEX_DESC= Enable the soundex() SQL function METADATA_DESC= Enable column metadata DIRECT_READ_DESC= File is read directly from disk MEMMAN_DESC= Allow it to release unused memory SECURE_DELETE_DESC= Overwrite deleted information with zeros UNLOCK_NOTIFY_DESC= Enable notification on unlocking EXTENSION_DESC= Allow loadable extensions STSHELL_DESC= Statically link libsqlite3 into shell NORMALIZE_DESC= Enable normalized sql function # https://www.sqlite.org/compile.html#dqs DQS_DESC= Double-quoted String Literals # https://sqlite.org/compile.html#enable_null_trim NULL_TRIM_DESC= Omits NULL columns at the ends of rows # http://www.sqlite.org/compile.html#enable_offset_sql_func OFFSET_DESC= Enable sqlite_offset() returning record's file offset # https://www.sqlite.org/compile.html#enable_deserialize SER1_DESC= Enable the sqlite3_[de]serialize() interface # https://www.sqlite.org/sessionintro.html SESSION_DESC= Enable the session extension # https://sqlite.org/compile.html#like_doesnt_match_blobs LIKENOTBLOB_DESC= LIKE does not match blobs # https://www.sqlite.org/compile.html#enable_api_armor ARMOR_DESC= Detect misuse of the API # http://sqlite.org/compile.html#enable_unknown_sql_function UNKNOWN_SQL_DESC= Suppress unknown function errors # https://www.sqlite.org/fts3.html # https://www.sqlite.org/compile.html#enable_fts3_parenthesis FTS4_DESC= Enable FTS3/4 (Full Text Search) module # https://www.sqlite.org/fts5.html FTS5_DESC= Enable version 5 full-text search engine # https://www.sqlite.org/compile.html#enable_fts3_tokenizer # https://www.sqlite.org/fts3.html#f3tknzr FTS3_TOKEN_DESC= Enable two-args version fts3_tokenizer # https://www.sqlite.org/json1.html JSON1_DESC= Enable the JSON1 extension # https://www.sqlite.org/rbu.html RBU_DESC= Enable the resumable bulk update # https://www.sqlite.org/c3ref/stmt_scanstatus.html STMT_DESC= Prepared statement scan status # https://www.sqlite.org/compile.html#enable_sorter_references SORT_REF_DESC= To use references in the sorter # https://www.sqlite.org/compile.html#trusted_schema TRUSTED_SCHEMA_DESC= SQL functions & virtual tables are considered unsafe # https://www.sqlite.org/tempfiles.html#tempstore OPTIONS_SINGLE_RAMT= TS0 TS1 TS2 TS3 RAMT_DESC= Where to store temporary file TS0_DESC= Always use temporary file TS1_DESC= File by default, change allowed PRAGMA TS2_DESC= Memory by default, change allowed PRAGMA TS3_DESC= Always use memory # https://www.sqlite.org/queryplanner-ng.html#qpstab OPTIONS_RADIO_STAT= STAT3 STAT4 STAT_DESC= Which query planner to use, stability or ... STAT3_DESC= Collect histogram data from leftmost column STAT4_DESC= Collect histogram data from all columns # https://sqlite.org/compile.html#enable_dbpage_vtab DBPAGE_DESC= Enable DBPAGE Virtual Table # https://www.sqlite.org/dbstat.html DBSTAT_DESC= Enable DBSTAT Virtual Table # https://www.sqlite.org/fts3.html#tokenizer OPTIONS_GROUP_UNICODE= ICU UNICODE61 UNICODE_DESC= Unicode support UNICODE61_DESC= Unicode Version 6.1 tokenizer # https://www.sqlite.org/rtree.html OPTIONS_GROUP_RTREEG= RTREE RTREE_INT GEOPOLY RTREEG_DESC= Index type for range queries RTREE_DESC= Enable R*Tree module RTREE_INT_DESC= Store 32-bit sig int (no float) coordinates # https://www.sqlite.org/geopoly.html GEOPOLY_DESC= Uses the GeoJSON notation (RFC-7946) GEOPOLY_IMPLIES= RTREE OPTIONS_RADIO_RL= READLINE LIBEDIT RL_DESC= Command line editing library OPTIONS_DEFAULT= FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \ EXTENSION TS1 UNICODE61 RTREE DBSTAT STSHELL LIBEDIT \ FTS3_TOKEN FTS5 DQS JSON1 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al. # RTREE used by graphics/mapnik, databases/spatialite # FTS3_TOKEN used by audio/clementine-player, mail/thunderbird, www/seamonkey # FTS5 used by sysutils/tracker # JSON1 used by net-im/py-matrix-synapse PLIST_FILES= bin/sqlite3 include/sqlite3.h include/sqlite3ext.h \ lib/libsqlite3.a lib/libsqlite3.so lib/libsqlite3.so.0 \ lib/libsqlite3.so.0.8.6 libdata/pkgconfig/sqlite3.pc \ man/man1/sqlite3.1.gz # The default numeric file permissions for newly created database files under unix. # If not specified, the default is 0644 which means that the files is globally # readable but only writable by the creator. .ifdef DEFAULT_FILE_PERMISSIONS CPPFLAGS+= -DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS} .endif # Use an in-ram database for temporary tables (never,no,yes,always), TS0_CPPFLAGS= -DSQLITE_TEMP_STORE=0 TS1_CPPFLAGS= -DSQLITE_TEMP_STORE=1 TS2_CPPFLAGS= -DSQLITE_TEMP_STORE=2 TS3_CPPFLAGS= -DSQLITE_TEMP_STORE=3 RTREE_CPPFLAGS= -DSQLITE_ENABLE_RTREE=1 RTREE_INT_CPPFLAGS= -DSQLITE_RTREE_INT_ONLY=1 GEOPOLY_CPPFLAGS= -DSQLITE_ENABLE_GEOPOLY=1 FTS4_CPPFLAGS= -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_FTS4=1 FTS5_CONFIGURE_ENABLE= fts5 FTS5_LIBS= -lm FTS3_TOKEN_CPPFLAGS= -DSQLITE_ENABLE_FTS3_TOKENIZER=1 SOUNDEX_CPPFLAGS= -DSQLITE_SOUNDEX=1 MEMMAN_CPPFLAGS= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1 SECURE_DELETE_CPPFLAGS= -DSQLITE_SECURE_DELETE=1 UNLOCK_NOTIFY_CPPFLAGS= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 METADATA_CPPFLAGS= -DSQLITE_ENABLE_COLUMN_METADATA=1 STAT3_CPPFLAGS= -DSQLITE_ENABLE_STAT3=1 STAT4_CPPFLAGS= -DSQLITE_ENABLE_STAT4=1 DBPAGE_CPPFLAGS= -DSQLITE_ENABLE_DBPAGE_VTAB=1 DBSTAT_CPPFLAGS= -DSQLITE_ENABLE_DBSTAT_VTAB=1 URI_CPPFLAGS= -DSQLITE_USE_URI=1 URI_AUTHORITY_CPPFLAGS= -DSQLITE_ALLOW_URI_AUTHORITY=1 DIRECT_READ_CPPFLAGS= -DSQLITE_DIRECT_OVERFLOW_READ=1 ARMOR_CPPFLAGS= -DSQLITE_ENABLE_API_ARMOR=1 STMT_CPPFLAGS= -DSQLITE_ENABLE_STMT_SCANSTATUS=1 EXTENSION_CONFIGURE_ENABLE= dynamic-extensions THREADS_CONFIGURE_ENABLE= threadsafe THREADS_LIBS= -lpthread TRUSTED_SCHEMA_CPPFLAGS= -DSQLITE_TRUSTED_SCHEMA=0 ICU_BUILD_DEPENDS= ${LOCALBASE}/bin/icu-config:devel/icu ICU_LIB_DEPENDS= libicudata.so:devel/icu ICU_CPPFLAGS= `${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1 ICU_LIBS= `${LOCALBASE}/bin/icu-config --ldflags` UNICODE61_CPPFLAGS= "" UNICODE61_CPPFLAGS_OFF= -DSQLITE_DISABLE_FTS3_UNICODE=1 LIBEDIT_CONFIGURE_ENABLE= editline LIBEDIT_USES= libedit READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline JSON1_CONFIGURE_ENABLE= json1 RBU_CPPFLAGS= -DSQLITE_ENABLE_RBU=1 LIKENOTBLOB_CPPFLAGS= -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 STSHELL_CONFIGURE_ENABLE= static-shell SESSION_CONFIGURE_ENABLE= session UNKNOWN_SQL_CPPFLAGS= -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION=1 NULL_TRIM_CPPFLAGS= -DSQLITE_ENABLE_NULL_TRIM=1 OFFSET_CPPFLAGS= -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1 SER1_CPPFLAGS= -DSQLITE_ENABLE_DESERIALIZE=1 SORT_REF_CPPFLAGS= -DSQLITE_ENABLE_SORTER_REFERENCES=1 NORMALIZE_CPPFLAGS= -DSQLITE_ENABLE_NORMALIZE=1 DQS_CPPFLAGS= -DSQLITE_DQS=3 DQS_CPPFLAGS_OFF= -DSQLITE_DQS=0 .include # Platform Configuration CPPFLAGS+= -DHAVE_ISNAN=1 -DHAVE_MALLOC_USABLE_SIZE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_USLEEP=1 -DHAVE_STRCHRNUL=1 CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 post-configure: @${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}" @${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}" @${ECHO_MSG} "===> CFLAGS=${CFLAGS}" @${ECHO_MSG} "===> LDFLAGS=${LDFLAGS}" @${ECHO_MSG} "===> LIBS=${LIBS}" post-build: .if ${ARCH}=="i386" @${ECHO_MSG} "===> WARNING: on ${ARCH} don't pass atof1-* tests" .endif post-stage: ${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" post-install: ${RM} ${STAGEDIR}${PREFIX}/include/msvc.h ${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so" # for compares with checksum from of the site sha1: checksum .if defined(SHA1) && !empty(SHA1) @sha1 -c ${SHA1} ${DISTDIR}/${ALLFILES} .else @sha1 ${DISTDIR}/${ALLFILES} .endif # For compare with checksum from of the site. Now, this is a NIST SHA3-256 hash. sha256 not suitable for compare. # But the creation of a new target does not justify the emergence of dependence on the perl5. # sha3sum maybe installed with p5-Digest-SHA3 port. # EXTRACT_DEPENDS=p5-Digest-SHA3:security/p5-Digest-SHA3; USES=perl5; USE_PERL5=extract; # @${PERL} -MDigest::SHA3 -le 'print Digest::SHA3->new(sha_256_hex)->add(<>)->hexdigest' < ${DISTDIR}/${ALLFILES} sha3: checksum @sha3sum -a 256 ${DISTDIR}/${ALLFILES} .include Index: head/databases/tarantool/Makefile =================================================================== --- head/databases/tarantool/Makefile (revision 553939) +++ head/databases/tarantool/Makefile (revision 553940) @@ -1,73 +1,74 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= tarantool PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= NoSQL database running in a Lua application server LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 powerpc64 sparc64 NOT_FOR_ARCHS_REASON= fails to build: Unsupported architecture BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libcurl.so:ftp/curl \ libicui18n.so:devel/icu \ libmsgpuck.so:devel/msgpuck \ libyaml.so:textproc/libyaml \ libzstd.so:archivers/zstd USES= cmake:noninja compiler:c++11-lang gettext-runtime gmake iconv perl5 readline ssl USE_PERL5= build BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed CMAKE_ARGS= -DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \ -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_MANDIR=${PREFIX}/man CMAKE_OFF= ENABLE_BUNDLED_LIBCURL \ ENABLE_BUNDLED_LIBYAML \ ENABLE_BUNDLED_MSGPUCK \ ENABLE_BUNDLED_ZSTD CMAKE_ON= ENABLE_DIST MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} PLIST_SUB= TT_DATADIR=${TT_DATADIR} \ TT_LOGDIR=${TT_LOGDIR} SUB_FILES= pkg-message GH_TUPLE= luafun:luafun:e248e00:luafun_luafun/third_party/luafun \ tarantool:decNumber:5ddfde1:tarantool_decNumber/third_party/decNumber \ tarantool:luajit:377198b:tarantool_luajit/third_party/luajit \ tarantool:luarocks:954c2f5:tarantool_luarocks/third_party/luarocks \ tarantool:serpent:879580f:tarantool_serpent/third_party/serpent \ tarantool:small:fcac155:tarantool_small/src/lib/small \ tarantool:test-run:d920322:tarantool_test_run/test-run USE_GITHUB= yes USERS= tarantool GROUPS= tarantool TT_DATADIR?= /var/db/tarantool TT_LOGDIR?= /var/log/tarantool TT_RUNDIR?= /var/run/tarantool OPTIONS_DEFINE= DEBUG DEBUG_CMAKE_BOOL= ENABLE_BACKTRACE post-patch: @${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' @${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake @${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/ .include Index: head/deskutils/calibre/Makefile =================================================================== --- head/deskutils/calibre/Makefile (revision 553939) +++ head/deskutils/calibre/Makefile (revision 553940) @@ -1,115 +1,115 @@ # Created by: stas # $FreeBSD$ PORTNAME= calibre PORTVERSION= 4.23.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Ebook management application LICENSE= GPLv3 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpoppler-qt5.so:graphics/poppler-qt5 \ libwmflite.so:graphics/libwmf \ libchm.so:misc/chmlib \ libicudata.so:devel/icu \ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ libfreetype.so:print/freetype2 \ libhunspell-1.7.so:textproc/hunspell \ libhyphen.so:textproc/hyphen BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ ${PY_PILLOW} RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ ${PY_PILLOW} \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \ pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info shebangfix \ ssl tar:xz xorg USE_RC_SUBR= calibre SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION} USE_PYQT= core gui network sip svg webengine widgets xmlpatterns USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl USE_GNOME= glib20 USE_XORG= xrender xext x11 EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f SHEBANG_GLOB= *.sh *.py *.recipe python_OLD_CMD= "/usr/bin/env python2" "/usr/bin/env python2" "/usr/bin/env python" /bin/python2 \ /usr/bin/python2 ${LOCALBASE}/bin/python3 WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ WITH_USB=yes \ CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \ XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \ XDG_CONFIG_HOME=${WRKDIR}/xdg-config \ XDG_UTILS_INSTALL_MODE=system \ QMAKE=${QMAKE} \ SIP_BIN=${SIP} \ SIP_DIR=${PYQT_SIPDIR} \ CALIBRE_PY3_PORT=1 post-patch: @${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \ -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ ${WRKSRC}/setup/install.py \ ${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \ ${WRKSRC}/src/calibre/gui2/preferences/tweaks.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \ ${STAGEDIR}${PREFIX}/share/icons/hicolor \ ${STAGEDIR}${PREFIX}/share/applications \ ${STAGEDIR}${PREFIX}/share/desktop-directories \ ${STAGEDIR}${PREFIX}/share/mime/packages # Create this file to avoid what looks like a bug in xdg-desktop-menu @${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list (cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} install --prefix ${PREFIX} \ --staging-root ${STAGEDIR}${PREFIX}) @${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \ ${STAGEDIR}${PREFIX}/share/applications/defaults.list @${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/3/* .include Index: head/deskutils/calibre/files/patch-icu68 =================================================================== --- head/deskutils/calibre/files/patch-icu68 (nonexistent) +++ head/deskutils/calibre/files/patch-icu68 (revision 553940) @@ -0,0 +1,97 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +src/calibre/utils/icu.c:246:29: error: use of undeclared identifier 'TRUE' + if (asz == 0) { found = TRUE; goto end; } + ^ +src/calibre/utils/icu.c:253:42: error: use of undeclared identifier 'TRUE' + if (pos != USEARCH_DONE) found = TRUE; + ^ + +--- src/calibre/utils/icu.c.orig 2020-08-21 01:39:18 UTC ++++ src/calibre/utils/icu.c +@@ -243,14 +243,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *ar + + a = python_to_icu(a_, &asz); + if (a == NULL) goto end; +- if (asz == 0) { found = TRUE; goto end; } ++ if (asz == 0) { found = true; goto end; } + b = python_to_icu(b_, &bsz); + if (b == NULL) goto end; + + search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status); + if (U_SUCCESS(status)) { + pos = usearch_first(search, &status); +- if (pos != USEARCH_DONE) found = TRUE; ++ if (pos != USEARCH_DONE) found = true; + } + end: + if (search != NULL) usearch_close(search); +--- src/calibre/utils/matcher.c.orig 2020-08-21 01:39:18 UTC ++++ src/calibre/utils/matcher.c +@@ -15,9 +15,6 @@ + #define inline + #endif + +-typedef unsigned char bool; +-#define TRUE 1 +-#define FALSE 0 + #define MAX(x, y) ((x > y) ? x : y) + #define nullfree(x) if(x != NULL) free(x); x = NULL; + +@@ -240,10 +237,10 @@ static bool create_searches(UStringSearch **searches, + U16_FWD_1(needle, i, needle_len); + if (pos == i) break; + searches[pos] = usearch_openFromCollator(needle + pos, i - pos, haystack, haystack_len, collator, NULL, &status); +- if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return FALSE; } ++ if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return false; } + } + +- return TRUE; ++ return true; + } + + static void free_searches(UStringSearch **searches, int32_t count) { +@@ -259,14 +256,14 @@ static bool match(UChar **items, int32_t *item_lengths + int32_t i = 0, maxhl = 0; + int32_t r = 0, *positions = NULL; + MatchInfo *matches = NULL; +- bool ok = FALSE; ++ bool ok = false; + MemoryItem ***memo = NULL; + int32_t needle_len = u_strlen(needle); + UStringSearch **searches = NULL; + + if (needle_len <= 0 || item_count <= 0) { + for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0; +- ok = TRUE; ++ ok = true; + goto end; + } + +@@ -289,7 +286,7 @@ static bool match(UChar **items, int32_t *item_lengths + + if (maxhl <= 0) { + for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0; +- ok = TRUE; ++ ok = true; + goto end; + } + +@@ -308,7 +305,7 @@ static bool match(UChar **items, int32_t *item_lengths + convert_positions(positions, final_positions + i * needle_char_len, matches[i].haystack, needle_char_len, needle_len, match_results[i].score); + } + +- ok = TRUE; ++ ok = true; + end: + nullfree(positions); + nullfree(stack.items); +@@ -401,7 +398,7 @@ static PyObject * + Matcher_calculate_scores(Matcher *self, PyObject *args) { + int32_t *final_positions = NULL, *p; + Match *matches = NULL; +- bool ok = FALSE; ++ bool ok = false; + uint32_t i = 0, needle_char_len = 0, j = 0; + PyObject *items = NULL, *score = NULL, *positions = NULL, *pneedle = NULL; + UChar *needle = NULL; Property changes on: head/deskutils/calibre/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/deskutils/osmo/Makefile =================================================================== --- head/deskutils/osmo/Makefile (revision 553939) +++ head/deskutils/osmo/Makefile (revision 553940) @@ -1,41 +1,41 @@ # Created by: Charlie Kester # $FreeBSD$ PORTNAME= osmo PORTVERSION= 0.4.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Personal organizer LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libical.so:devel/libical \ libnotify.so:devel/libnotify \ libgringotts.so:security/libgringotts \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libgspell-1.so:textproc/gspell \ libicui18n.so:devel/icu \ libsoup-2.4.so:devel/libsoup USES= compiler:c++11-lang gettext gmake gnome libarchive pkgconfig \ sqlite USE_GNOME= cairo gtk30 libxml2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib POFILES= bg ca cs da de el en_GB es fi fr gl gl_ES he hu it ja lt \ nl pl pt pt_BR ro ru sr sv te tr uk ur ur_PK zh_CN post-build: .for p in ${POFILES} (cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c ${p}.po -o ${p}.mo) .endfor .include Index: head/deskutils/peaclock/Makefile =================================================================== --- head/deskutils/peaclock/Makefile (revision 553939) +++ head/deskutils/peaclock/Makefile (revision 553940) @@ -1,23 +1,24 @@ # $FreeBSD$ PORTNAME= peaclock DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org COMMENT= Customizable clock, timer, and stopwatch for the terminal LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicui18n.so:devel/icu USES= cmake compiler:c++17-lang localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= octobanana CXXFLAGS+= -Wno-narrowing # https://github.com/octobanana/peaclock/issues/18 PLIST_FILES= bin/${PORTNAME} .include Index: head/devel/boost-libs/Makefile =================================================================== --- head/devel/boost-libs/Makefile (revision 553939) +++ head/devel/boost-libs/Makefile (revision 553940) @@ -1,59 +1,59 @@ # Created by: Alexander Churanov # $FreeBSD$ PORTNAME= boost-libs -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Free portable C++ libraries (without Boost.Python) BROKEN_sparc64= https://github.com/boostorg/context/commit/f2ef6326b6ed BUILD_DEPENDS+= bjam:devel/boost-jam OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS OPTIONS_MULTI= LOCALE OPTIONS_MULTI_LOCALE= ICONV ICU OPTIONS_DEFAULT= ICONV ICU ICONV_DESC= Boost.Locale with iconv encoding support ICU_DESC= Boost.Regex/Locale with ICU unicode support ICONV_USES= iconv ICONV_MAKE_ARGS= -sICONV_PATH=${ICONV_PREFIX} ICONV_MAKE_ARGS_OFF= boost.locale.iconv=off ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_MAKE_ARGS= -sICU_PATH=${LOCALBASE} ICU_MAKE_ARGS_OFF= boost.locale.icu=off .include "${.CURDIR}/../boost-all/common.mk" .include "${.CURDIR}/../boost-all/compiled.mk" MAKE_ARGS+= --without-python MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} MAKE_ARGS_gcc= xdll-path=${_GCC_RUNTIME} ALL_TARGET= stage do-install: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET} @${FIND} ${STAGEDIR}${PREFIX}/lib/cmake -type f -exec \ ${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' {} + # For some reasons BJAM forget about the links @cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX} # display pkg-message post-install: @${TOUCH} ${PKGMESSAGE} @${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} .include Index: head/devel/dee/Makefile =================================================================== --- head/devel/dee/Makefile (revision 553939) +++ head/devel/dee/Makefile (revision 553940) @@ -1,36 +1,36 @@ # Created by: Olivier Duchateau # $FreeBSD$ PORTNAME= dee PORTVERSION= 1.2.7 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= devel MASTER_SITES= https://launchpadlibrarian.net/151383425/ \ https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/ MAINTAINER= ports@FreeBSD.org COMMENT= Model to synchronize multiple instances over DBus LICENSE= GPLv3 EXTRA_PATCHES= ${FILESDIR}/dee-1.2.7-deprecated-g_type_class_add_private.patch:-p1 \ ${FILESDIR}/vapi-skip-properties.patch:-p1 BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libicutu.so:devel/icu USES= compiler:c11 gmake gnome libtool localbase pathfix pkgconfig \ python:3.5+ GNU_CONFIGURE= yes USE_GNOME= glib20 introspection:build pygobject3 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc-html \ --disable-tests \ --disable-gcov \ --enable-introspection=yes \ --without-html-dir MAKE_ARGS= PYTHON="${PYTHON_CMD}" .include Index: head/devel/icu/Makefile =================================================================== --- head/devel/icu/Makefile (revision 553939) +++ head/devel/icu/Makefile (revision 553940) @@ -1,50 +1,50 @@ # Created by: dwm # $FreeBSD$ PORTNAME= icu -DISTVERSION= 67_1 +DISTVERSION= 68_1 PORTREVISION?= 0 # keep for icu-lx PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \ SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION} DISTNAME= icu4c-${DISTVERSION}-src MAINTAINER= office@FreeBSD.org COMMENT?= International Components for Unicode (from IBM) LICENSE= ICU LICENSE_NAME= ICU license LICENSE_FILE= ${WRKSRC}/../LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-layoutex CONFIGURE_ARGS+=--with-data-packaging=archive \ --disable-renaming \ --disable-samples \ --enable-static CPPFLAGS+= -DICU_NO_USER_DATA_OVERRIDE MAKE_ARGS= VERBOSE=1 TEST_TARGET= check USES+= compiler:c++11-lib gmake pathfix python:build tar:tgz USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/icu/source ICUMAJOR= ${PORTVERSION:C/\..*//} PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/} .ifndef PKGNAMESUFFIX post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \ ${STAGEDIR}${PREFIX}/bin/*conv \ ${STAGEDIR}${PREFIX}/bin/icuinfo \ ${STAGEDIR}${PREFIX}/bin/derb \ ${STAGEDIR}${PREFIX}/bin/pkgdata @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* # Filename varies by endianness: icudtb.dat vs. icudtl.dat @(cd ${STAGEDIR}${PREFIX} && ${ECHO_CMD} \ ${DATADIR_REL}/${PORTVERSION:C/r.?/1/}/icudt*.dat >>${TMPPLIST}) .endif # PKGNAMESUFFIX .include Index: head/devel/icu/distinfo =================================================================== --- head/devel/icu/distinfo (revision 553939) +++ head/devel/icu/distinfo (revision 553940) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587585860 -SHA256 (icu4c-67_1-src.tgz) = 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc -SIZE (icu4c-67_1-src.tgz) = 24518055 +TIMESTAMP = 1603920072 +SHA256 (icu4c-68_1-src.tgz) = a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d +SIZE (icu4c-68_1-src.tgz) = 24722348 Index: head/devel/icu/pkg-plist =================================================================== --- head/devel/icu/pkg-plist (revision 553939) +++ head/devel/icu/pkg-plist (revision 553940) @@ -1,254 +1,255 @@ sbin/escapesrc sbin/icupkg sbin/gensprep sbin/gennorm2 sbin/gencmn sbin/genccode lib/libicudata.a lib/libicudata.so lib/libicudata.so.%%ICUMAJOR%% lib/libicudata.so.%%ICUVER%% lib/libicui18n.a lib/libicui18n.so lib/libicui18n.so.%%ICUMAJOR%% lib/libicui18n.so.%%ICUVER%% lib/libicuio.a lib/libicuio.so lib/libicuio.so.%%ICUMAJOR%% lib/libicuio.so.%%ICUVER%% lib/libicutest.a lib/libicutest.so lib/libicutest.so.%%ICUMAJOR%% lib/libicutest.so.%%ICUVER%% lib/libicutu.a lib/libicutu.so lib/libicutu.so.%%ICUMAJOR%% lib/libicutu.so.%%ICUVER%% lib/libicuuc.a lib/libicuuc.so lib/libicuuc.so.%%ICUMAJOR%% lib/libicuuc.so.%%ICUVER%% lib/icu/pkgdata.inc lib/icu/current lib/icu/Makefile.inc lib/icu/%%ICUVER%%/pkgdata.inc lib/icu/%%ICUVER%%/Makefile.inc libdata/pkgconfig/icu-io.pc libdata/pkgconfig/icu-i18n.pc libdata/pkgconfig/icu-uc.pc include/unicode/alphaindex.h include/unicode/appendable.h include/unicode/basictz.h include/unicode/brkiter.h include/unicode/bytestream.h include/unicode/bytestrie.h include/unicode/bytestriebuilder.h include/unicode/calendar.h include/unicode/caniter.h include/unicode/casemap.h include/unicode/char16ptr.h include/unicode/chariter.h include/unicode/choicfmt.h include/unicode/coleitr.h include/unicode/coll.h include/unicode/compactdecimalformat.h include/unicode/curramt.h include/unicode/currpinf.h include/unicode/currunit.h include/unicode/datefmt.h include/unicode/dbbi.h include/unicode/dcfmtsym.h include/unicode/decimfmt.h include/unicode/docmain.h include/unicode/dtfmtsym.h include/unicode/dtintrv.h include/unicode/dtitvfmt.h include/unicode/dtitvinf.h include/unicode/dtptngen.h include/unicode/dtrule.h include/unicode/edits.h include/unicode/enumset.h include/unicode/errorcode.h include/unicode/fieldpos.h include/unicode/filteredbrk.h include/unicode/fmtable.h include/unicode/format.h include/unicode/formattedvalue.h include/unicode/fpositer.h include/unicode/gender.h include/unicode/gregocal.h include/unicode/icudataver.h include/unicode/icuplug.h include/unicode/idna.h include/unicode/listformatter.h include/unicode/localebuilder.h include/unicode/localematcher.h include/unicode/localpointer.h include/unicode/locdspnm.h include/unicode/locid.h include/unicode/measfmt.h include/unicode/measunit.h include/unicode/measure.h include/unicode/messagepattern.h include/unicode/msgfmt.h include/unicode/normalizer2.h include/unicode/normlzr.h include/unicode/nounit.h include/unicode/numberformatter.h include/unicode/numberrangeformatter.h include/unicode/numfmt.h include/unicode/numsys.h include/unicode/parseerr.h include/unicode/parsepos.h include/unicode/platform.h include/unicode/plurfmt.h include/unicode/plurrule.h include/unicode/ptypes.h include/unicode/putil.h include/unicode/rbbi.h include/unicode/rbnf.h include/unicode/rbtz.h include/unicode/regex.h include/unicode/region.h include/unicode/reldatefmt.h include/unicode/rep.h include/unicode/resbund.h include/unicode/schriter.h include/unicode/scientificnumberformatter.h include/unicode/search.h include/unicode/selfmt.h include/unicode/simpleformatter.h include/unicode/simpletz.h include/unicode/smpdtfmt.h include/unicode/sortkey.h include/unicode/std_string.h include/unicode/strenum.h include/unicode/stringoptions.h include/unicode/stringpiece.h include/unicode/stringtriebuilder.h include/unicode/stsearch.h include/unicode/symtable.h include/unicode/tblcoll.h include/unicode/timezone.h include/unicode/tmunit.h include/unicode/tmutamt.h include/unicode/tmutfmt.h include/unicode/translit.h include/unicode/tzfmt.h include/unicode/tznames.h include/unicode/tzrule.h include/unicode/tztrans.h include/unicode/ubidi.h include/unicode/ubiditransform.h include/unicode/ubrk.h include/unicode/ucal.h include/unicode/ucasemap.h include/unicode/ucat.h include/unicode/uchar.h include/unicode/ucharstrie.h include/unicode/ucharstriebuilder.h include/unicode/uchriter.h include/unicode/uclean.h include/unicode/ucnv.h include/unicode/ucnv_cb.h include/unicode/ucnv_err.h include/unicode/ucnvsel.h include/unicode/ucol.h include/unicode/ucoleitr.h include/unicode/uconfig.h include/unicode/ucpmap.h include/unicode/ucptrie.h include/unicode/ucsdet.h include/unicode/ucurr.h include/unicode/udat.h include/unicode/udata.h include/unicode/udateintervalformat.h include/unicode/udatpg.h include/unicode/udisplaycontext.h include/unicode/uenum.h include/unicode/ufieldpositer.h include/unicode/uformattable.h include/unicode/uformattedvalue.h include/unicode/ugender.h include/unicode/uidna.h include/unicode/uiter.h include/unicode/uldnames.h include/unicode/ulistformatter.h include/unicode/uloc.h include/unicode/ulocdata.h include/unicode/umachine.h include/unicode/umisc.h include/unicode/umsg.h include/unicode/umutablecptrie.h include/unicode/unifilt.h include/unicode/unifunct.h include/unicode/unimatch.h include/unicode/unirepl.h include/unicode/uniset.h include/unicode/unistr.h include/unicode/unorm.h include/unicode/unorm2.h include/unicode/unum.h include/unicode/unumberformatter.h +include/unicode/unumberrangeformatter.h include/unicode/unumsys.h include/unicode/uobject.h include/unicode/upluralrules.h include/unicode/uregex.h include/unicode/uregion.h include/unicode/ureldatefmt.h include/unicode/urename.h include/unicode/urep.h include/unicode/ures.h include/unicode/uscript.h include/unicode/usearch.h include/unicode/uset.h include/unicode/usetiter.h include/unicode/ushape.h include/unicode/uspoof.h include/unicode/usprep.h include/unicode/ustdio.h include/unicode/ustream.h include/unicode/ustring.h include/unicode/ustringtrie.h include/unicode/utext.h include/unicode/utf.h include/unicode/utf16.h include/unicode/utf32.h include/unicode/utf8.h include/unicode/utf_old.h include/unicode/utmscale.h include/unicode/utrace.h include/unicode/utrans.h include/unicode/utypes.h include/unicode/uvernum.h include/unicode/uversion.h include/unicode/vtzone.h bin/uconv bin/pkgdata bin/makeconv bin/icuinfo bin/icu-config bin/genrb bin/gendict bin/gencnval bin/gencfu bin/genbrk bin/derb man/man1/derb.1.gz man/man1/genbrk.1.gz man/man1/gencfu.1.gz man/man1/gencnval.1.gz man/man1/gendict.1.gz man/man1/genrb.1.gz man/man1/icu-config.1.gz man/man1/makeconv.1.gz man/man1/pkgdata.1.gz man/man1/uconv.1.gz man/man8/genccode.8.gz man/man8/gencmn.8.gz man/man8/gensprep.8.gz man/man8/icupkg.8.gz %%DATADIR%%/%%ICUVER%%/install-sh %%DATADIR%%/%%ICUVER%%/mkinstalldirs %%DATADIR%%/%%ICUVER%%/LICENSE %%DATADIR%%/%%ICUVER%%/config/mh-bsd-gcc Index: head/devel/icu-le-hb/Makefile =================================================================== --- head/devel/icu-le-hb/Makefile (revision 553939) +++ head/devel/icu-le-hb/Makefile (revision 553940) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= icu-le-hb DISTVERSION= 1.0.3-3 DISTVERSIONSUFFIX= -gb8a3163 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= devel print MAINTAINER= office@FreeBSD.org COMMENT= ICU Layout Engine API on top of HarfBuzz shaping library LICENSE= ICU LICENSE_NAME= ICU license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libicuuc.so:devel/icu \ libharfbuzz.so:print/harfbuzz USE_GITHUB= yes GH_ACCOUNT= behdad USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig USE_CXXSTD= gnu++11 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip .include Index: head/devel/icu-le-hb/files/patch-icu68 =================================================================== --- head/devel/icu-le-hb/files/patch-icu68 (nonexistent) +++ head/devel/icu-le-hb/files/patch-icu68 (revision 553940) @@ -0,0 +1,53 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +LEFontInstance.cpp:82:39: error: use of undeclared identifier 'TRUE' + return mapCharToGlyph(ch, mapper, TRUE); + ^ +LEGlyphStorage.cpp:662:12: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +LEInsertionList.cpp:89:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +LEInsertionList.cpp:93:12: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ + +--- src/LEFontInstance.cpp.orig 2016-11-13 06:15:24 UTC ++++ src/LEFontInstance.cpp +@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode + + LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const + { +- return mapCharToGlyph(ch, mapper, TRUE); ++ return mapCharToGlyph(ch, mapper, true); + } + + LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const +--- src/LEGlyphStorage.cpp.orig 2016-11-13 06:15:24 UTC ++++ src/LEGlyphStorage.cpp +@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosi + // just got replaced by the insertion + fSrcIndex -= 1; + +- return FALSE; ++ return false; + } + + U_NAMESPACE_END +--- src/LEInsertionList.cpp.orig 2016-11-13 06:15:24 UTC ++++ src/LEInsertionList.cpp +@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCa + { + for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) { + if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) { +- return TRUE; ++ return true; + } + } + +- return FALSE; ++ return false; + } + + U_NAMESPACE_END Property changes on: head/devel/icu-le-hb/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/kiwix-lib/Makefile =================================================================== --- head/devel/kiwix-lib/Makefile (revision 553939) +++ head/devel/kiwix-lib/Makefile (revision 553940) @@ -1,39 +1,40 @@ # $FreeBSD$ PORTNAME= kiwix-lib DISTVERSION= 9.3.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= me@int19h.org COMMENT= Common code base for all Kiwix ports LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libzim.so:devel/libzim \ libpugixml.so:textproc/pugixml \ libaria2.so:www/aria2 \ libicui18n.so:devel/icu \ libicuuc.so:devel/icu \ libxapian.so:databases/xapian-core \ libctpp2.so:textproc/ctpp2 \ libcurl.so:ftp/curl \ libmicrohttpd.so:www/libmicrohttpd USES= compiler:c++11-lang meson pkgconfig python:3.6+ shebangfix USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= kiwix GH_TUPLE= kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \ kainjow:Mustache:a7eebc9:mustache MESON_ARGS= -Dctpp2-install-prefix=${LOCALBASE} CPPFLAGS+= -I${WRKSRC_mustache} CXXFLAGS+= -I${WRKSRC_mustache} SHEBANG_FILES= scripts/kiwix-compile-resources PLIST_SUB= PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//} .include Index: head/devel/libical/Makefile =================================================================== --- head/devel/libical/Makefile (revision 553939) +++ head/devel/libical/Makefile (revision 553940) @@ -1,45 +1,46 @@ # Created by: Joe Kelsey # $FreeBSD$ PORTNAME= libical DISTVERSION= 3.0.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/libical/libical/releases/download/v${PORTVERSION}/ MAINTAINER= desktop@FreeBSD.org COMMENT= Implementation of the IETF Calendaring and Scheduling protocols LICENSE= LGPL21 MPL20 LICENSE_COMB= dual BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc LIB_DEPENDS= libicuuc.so:devel/icu USES= cmake compiler:c++11-lib gnome pathfix perl5 pkgconfig USE_PERL5= build USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes CMAKE_ARGS= -DICAL_BUILD_DOCS=false CFLAGS_amd64= -fPIC OPTIONS_DEFINE= GLIB INTROSPECTION VALA OPTIONS_DEFAULT= GLIB INTROSPECTION VALA OPTIONS_SUB= yes VALA_DESC= Build VALA bindings VALA_BUILD_DEPENDS= valac:lang/vala VALA_CMAKE_BOOL= ICAL_GLIB_VAPI INTROSPECTION_DESC= Build GObject Introspection INTROSPECTION_USE= gnome=introspection:build INTROSPECTION_CMAKE_BOOL= GOBJECT_INTROSPECTION GLIB_DESC= Build GLib bindings GLIB_USE= GNOME=glib20,libxml2 GLIB_CMAKE_BOOL= ICAL_GLIB PLIST_SUB+= VERSION=${PORTVERSION} .include Index: head/devel/libical/files/patch-icu68 =================================================================== --- head/devel/libical/files/patch-icu68 (nonexistent) +++ head/devel/libical/files/patch-icu68 (revision 553940) @@ -0,0 +1,29 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +src/libical/icalrecur.c:1021:59: error: use of undeclared identifier 'FALSE' + en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); + ^ +src/libical/icalrecur.c:1414:63: error: use of undeclared identifier 'FALSE' + en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); + ^ + +--- src/libical/icalrecur.c.orig 2020-03-07 14:42:42 UTC ++++ src/libical/icalrecur.c +@@ -1018,7 +1018,7 @@ icalarray *icalrecurrencetype_rscale_supported_calenda + + calendars = icalarray_new(sizeof(const char **), 20); + +- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + cal = icalmemory_tmp_copy(cal); + icalarray_append(calendars, &cal); +@@ -1411,7 +1411,7 @@ static int initialize_rscale(icalrecur_iterator *impl) + } + + /* Check if specified calendar is supported */ +- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status); ++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status); + while ((cal = uenum_next(en, NULL, &status))) { + if (!strcmp(cal, rule.rscale)) { + is_hebrew = !strcmp(rule.rscale, "hebrew"); Property changes on: head/devel/libical/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libphonenumber/Makefile =================================================================== --- head/devel/libphonenumber/Makefile (revision 553939) +++ head/devel/libphonenumber/Makefile (revision 553940) @@ -1,26 +1,27 @@ # $FreeBSD$ PORTNAME= libphonenumber DISTVERSIONPREFIX= v DISTVERSION= 8.12.12 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Library for parsing, formatting, and validating phone numbers LICENSE= APACHE20 BUILD_DEPENDS= googletest>0:devel/googletest LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libicui18n.so:devel/icu \ libprotobuf.so:devel/protobuf USES= cmake:noninja compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= google CMAKE_ON= USE_STD_MAP WRKSRC_SUBDIR= cpp .include Index: head/devel/libzim/Makefile =================================================================== --- head/devel/libzim/Makefile (revision 553939) +++ head/devel/libzim/Makefile (revision 553940) @@ -1,25 +1,26 @@ # $FreeBSD$ PORTNAME= libzim PORTVERSION= 6.2.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Reference implementation of the ZIM specification LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicui18n.so:devel/icu \ libxapian.so:databases/xapian-core \ libzstd.so:archivers/zstd USES= compiler:c++11-lang meson pkgconfig python:3.4+ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openzim BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config PLIST_SUB= PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//} .include Index: head/devel/objecthash/Makefile =================================================================== --- head/devel/objecthash/Makefile (revision 553939) +++ head/devel/objecthash/Makefile (revision 553940) @@ -1,33 +1,33 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= objecthash PORTVERSION= 20160802 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org COMMENT= Cross-language way to cryptographically hash JSON objects LICENSE= APACHE20 LIB_DEPENDS= libicudata.so:devel/icu \ libjson-c.so:devel/json-c USES= pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= benlaurie GH_PROJECT= objecthash GH_TAGNAME= 770874c USE_LDCONFIG= yes ALL_TARGET= libobjecthash.so PLIST_FILES= include/objecthash.h lib/libobjecthash.so do-install: ${INSTALL_LIB} ${WRKSRC}/libobjecthash.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/objecthash.h ${STAGEDIR}${PREFIX}/include .include Index: head/devel/php72-intl/Makefile =================================================================== --- head/devel/php72-intl/Makefile (revision 553939) +++ head/devel/php72-intl/Makefile (revision 553940) @@ -1,16 +1,17 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/devel/php72-intl/files/patch-icu68 =================================================================== --- head/devel/php72-intl/files/patch-icu68 (nonexistent) +++ head/devel/php72-intl/files/patch-icu68 (revision 553940) @@ -0,0 +1,201 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' + collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' + collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' + zend_bool isLenient = FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' + UBool uret = FALSE; + ^ +ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' + tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); + ^ +ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' + tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, + ^ + +--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-30 05:15:54 UTC ++++ breakiterator/codepointiterator_internal.cpp +@@ -57,7 +57,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat + return *this; + } + +- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); ++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); + + //don't bother copying the character iterator, getText() is deprecated + clearCurrentCharIter(); +@@ -77,17 +77,17 @@ CodePointBreakIterator::~CodePointBreakIterator() + UBool CodePointBreakIterator::operator==(const BreakIterator& that) const + { + if (typeid(*this) != typeid(that)) { +- return FALSE; ++ return false; + } + + const CodePointBreakIterator& that2 = + static_cast(that); + + if (!utext_equals(this->fText, that2.fText)) { +- return FALSE; ++ return false; + } + +- return TRUE; ++ return true; + } + + CodePointBreakIterator* CodePointBreakIterator::clone(void) const +@@ -108,7 +108,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi + + UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const + { +- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); ++ return utext_clone(fillIn, this->fText, false, true, &status); + } + + void CodePointBreakIterator::setText(const UnicodeString &text) +@@ -127,7 +127,7 @@ void CodePointBreakIterator::setText(UText *text, UErr + return; + } + +- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, text, false, true, &status); + + clearCurrentCharIter(); + } +@@ -279,7 +279,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres + } + + int64_t pos = utext_getNativeIndex(this->fText); +- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, input, false, true, &status); + if (U_FAILURE(status)) { + return *this; + } +--- collator/collator_sort.c.orig 2020-09-30 05:15:54 UTC ++++ collator/collator_sort.c +@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE + */ + PHP_FUNCTION( collator_sort ) + { +- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) + */ + PHP_FUNCTION( collator_asort ) + { +- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +--- dateformat/dateformat_attr.c.orig 2020-09-30 05:15:54 UTC ++++ dateformat/dateformat_attr.c +@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern ) + UChar value_buf[64]; + uint32_t length = USIZE( value_buf ); + UChar* value = value_buf; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern ) + size_t value_len = 0; + int32_t slength = 0; + UChar* svalue = NULL; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + + DATE_FORMAT_METHOD_INIT_VARS; +@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient ) + */ + PHP_FUNCTION( datefmt_set_lenient ) + { +- zend_bool isLenient = FALSE; ++ zend_bool isLenient = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +--- normalizer/normalizer_normalize.c.orig 2020-09-30 05:15:54 UTC ++++ normalizer/normalizer_normalize.c +@@ -178,7 +178,7 @@ PHP_FUNCTION( normalizer_is_normalized ) + int uinput_len = 0; + UErrorCode status = U_ZERO_ERROR; + +- UBool uret = FALSE; ++ UBool uret = false; + + intl_error_reset( NULL ); + +--- timezone/timezone_class.cpp.orig 2020-09-30 05:15:54 UTC ++++ timezone/timezone_class.cpp +@@ -321,7 +321,7 @@ static HashTable *TimeZone_get_debug_info(zval *object + + int32_t rawOffset, dstOffset; + UDate now = Calendar::getNow(); +- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); ++ tz->getOffset(now, false, rawOffset, dstOffset, uec); + if (U_FAILURE(uec)) { + return debug_info; + } +--- timezone/timezone_methods.cpp.orig 2020-09-30 05:15:54 UTC ++++ timezone/timezone_methods.cpp +@@ -91,7 +91,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) + RETURN_NULL(); + } + +- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, ++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, + "intltz_from_date_time_zone"); + if (tz == NULL) { + RETURN_NULL(); Property changes on: head/devel/php72-intl/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/php73-intl/Makefile =================================================================== --- head/devel/php73-intl/Makefile (revision 553939) +++ head/devel/php73-intl/Makefile (revision 553940) @@ -1,16 +1,17 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/devel/php73-intl/files/patch-icu68 =================================================================== --- head/devel/php73-intl/files/patch-icu68 (nonexistent) +++ head/devel/php73-intl/files/patch-icu68 (revision 553940) @@ -0,0 +1,213 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' + collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' + collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' + zend_bool isLenient = FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' + UBool uret = FALSE; + ^ +ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' + tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); + ^ +ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' + tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, + ^ + +--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC ++++ breakiterator/codepointiterator_internal.cpp +@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat + return *this; + } + +- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); ++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); + + //don't bother copying the character iterator, getText() is deprecated + clearCurrentCharIter(); +@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator() + UBool CodePointBreakIterator::operator==(const BreakIterator& that) const + { + if (typeid(*this) != typeid(that)) { +- return FALSE; ++ return false; + } + + const CodePointBreakIterator& that2 = + static_cast(that); + + if (!utext_equals(this->fText, that2.fText)) { +- return FALSE; ++ return false; + } + +- return TRUE; ++ return true; + } + + CodePointBreakIterator* CodePointBreakIterator::clone(void) const +@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi + + UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const + { +- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); ++ return utext_clone(fillIn, this->fText, false, true, &status); + } + + void CodePointBreakIterator::setText(const UnicodeString &text) +@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr + return; + } + +- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, text, false, true, &status); + + clearCurrentCharIter(); + } +@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres + } + + int64_t pos = utext_getNativeIndex(this->fText); +- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, input, false, true, &status); + if (U_FAILURE(status)) { + return *this; + } +--- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC ++++ collator/collator_sort.c +@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE + */ + PHP_FUNCTION( collator_sort ) + { +- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) + */ + PHP_FUNCTION( collator_asort ) + { +- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +--- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC ++++ dateformat/dateformat_attr.c +@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern ) + UChar value_buf[64]; + uint32_t length = USIZE( value_buf ); + UChar* value = value_buf; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern ) + size_t value_len = 0; + int32_t slength = 0; + UChar* svalue = NULL; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + + DATE_FORMAT_METHOD_INIT_VARS; +@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient ) + */ + PHP_FUNCTION( datefmt_set_lenient ) + { +- zend_bool isLenient = FALSE; ++ zend_bool isLenient = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +--- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC ++++ normalizer/normalizer_normalize.c +@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const + const UNormalizer2 *norm = intl_get_normalizer(form, err); + + if(U_FAILURE(*err)) { +- return FALSE; ++ return false; + } + + return unorm2_isNormalized(norm, uinput, uinput_len, err); +@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized ) + int uinput_len = 0; + UErrorCode status = U_ZERO_ERROR; + +- UBool uret = FALSE; ++ UBool uret = false; + + intl_error_reset( NULL ); + +--- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC ++++ timezone/timezone_class.cpp +@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object + + int32_t rawOffset, dstOffset; + UDate now = Calendar::getNow(); +- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); ++ tz->getOffset(now, false, rawOffset, dstOffset, uec); + if (U_FAILURE(uec)) { + return debug_info; + } +--- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC ++++ timezone/timezone_methods.cpp +@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) + RETURN_NULL(); + } + +- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, ++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, + "intltz_from_date_time_zone"); + if (tz == NULL) { + RETURN_NULL(); Property changes on: head/devel/php73-intl/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/php74-intl/Makefile =================================================================== --- head/devel/php74-intl/Makefile (revision 553939) +++ head/devel/php74-intl/Makefile (revision 553940) @@ -1,16 +1,17 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/devel/php74-intl/files/patch-icu68 =================================================================== --- head/devel/php74-intl/files/patch-icu68 (nonexistent) +++ head/devel/php74-intl/files/patch-icu68 (revision 553940) @@ -0,0 +1,213 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' + collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' + collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' + zend_bool isLenient = FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' + UBool uret = FALSE; + ^ +ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' + tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); + ^ +ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' + tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, + ^ + +--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 10:17:14 UTC ++++ breakiterator/codepointiterator_internal.cpp +@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat + return *this; + } + +- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); ++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); + + //don't bother copying the character iterator, getText() is deprecated + clearCurrentCharIter(); +@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator() + UBool CodePointBreakIterator::operator==(const BreakIterator& that) const + { + if (typeid(*this) != typeid(that)) { +- return FALSE; ++ return false; + } + + const CodePointBreakIterator& that2 = + static_cast(that); + + if (!utext_equals(this->fText, that2.fText)) { +- return FALSE; ++ return false; + } + +- return TRUE; ++ return true; + } + + CodePointBreakIterator* CodePointBreakIterator::clone(void) const +@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi + + UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const + { +- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); ++ return utext_clone(fillIn, this->fText, false, true, &status); + } + + void CodePointBreakIterator::setText(const UnicodeString &text) +@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr + return; + } + +- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, text, false, true, &status); + + clearCurrentCharIter(); + } +@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres + } + + int64_t pos = utext_getNativeIndex(this->fText); +- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, input, false, true, &status); + if (U_FAILURE(status)) { + return *this; + } +--- collator/collator_sort.c.orig 2020-09-29 10:17:14 UTC ++++ collator/collator_sort.c +@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE + */ + PHP_FUNCTION( collator_sort ) + { +- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) + */ + PHP_FUNCTION( collator_asort ) + { +- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +--- dateformat/dateformat_attr.c.orig 2020-09-29 10:17:13 UTC ++++ dateformat/dateformat_attr.c +@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern ) + UChar value_buf[64]; + uint32_t length = USIZE( value_buf ); + UChar* value = value_buf; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern ) + size_t value_len = 0; + int32_t slength = 0; + UChar* svalue = NULL; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + + DATE_FORMAT_METHOD_INIT_VARS; +@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient ) + */ + PHP_FUNCTION( datefmt_set_lenient ) + { +- zend_bool isLenient = FALSE; ++ zend_bool isLenient = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +--- normalizer/normalizer_normalize.c.orig 2020-09-29 10:17:14 UTC ++++ normalizer/normalizer_normalize.c +@@ -90,7 +90,7 @@ static UBool intl_is_normalized(zend_long form, const + const UNormalizer2 *norm = intl_get_normalizer(form, err); + + if(U_FAILURE(*err)) { +- return FALSE; ++ return false; + } + + return unorm2_isNormalized(norm, uinput, uinput_len, err); +@@ -261,7 +261,7 @@ PHP_FUNCTION( normalizer_is_normalized ) + int uinput_len = 0; + UErrorCode status = U_ZERO_ERROR; + +- UBool uret = FALSE; ++ UBool uret = false; + + intl_error_reset( NULL ); + +--- timezone/timezone_class.cpp.orig 2020-09-29 10:17:14 UTC ++++ timezone/timezone_class.cpp +@@ -325,7 +325,7 @@ static HashTable *TimeZone_get_debug_info(zval *object + + int32_t rawOffset, dstOffset; + UDate now = Calendar::getNow(); +- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); ++ tz->getOffset(now, false, rawOffset, dstOffset, uec); + if (U_FAILURE(uec)) { + return debug_info; + } +--- timezone/timezone_methods.cpp.orig 2020-09-29 10:17:14 UTC ++++ timezone/timezone_methods.cpp +@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) + RETURN_NULL(); + } + +- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, ++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, + "intltz_from_date_time_zone"); + if (tz == NULL) { + RETURN_NULL(); Property changes on: head/devel/php74-intl/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/php80-intl/Makefile =================================================================== --- head/devel/php80-intl/Makefile (revision 553939) +++ head/devel/php80-intl/Makefile (revision 553940) @@ -1,16 +1,17 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php80 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 TEST_TARGET= test .include "${MASTERDIR}/Makefile" Index: head/devel/php80-intl/files/patch-icu68 =================================================================== --- head/devel/php80-intl/files/patch-icu68 (nonexistent) +++ head/devel/php80-intl/files/patch-icu68 (revision 553940) @@ -0,0 +1,222 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE' + return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE' + this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); + ^ +ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' + collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' + collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE' + zend_bool is_pattern_localized =FALSE; + ^ +ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE' + zend_bool isLenient = FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE' + UBool uret = FALSE; + ^ +ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE' + tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); + ^ +ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE' + tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, + ^ + +--- breakiterator/codepointiterator_internal.cpp.orig 2020-10-13 21:58:13 UTC ++++ breakiterator/codepointiterator_internal.cpp +@@ -56,7 +56,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat + return *this; + } + +- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec); ++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec); + + //don't bother copying the character iterator, getText() is deprecated + clearCurrentCharIter(); +@@ -76,17 +76,17 @@ CodePointBreakIterator::~CodePointBreakIterator() + UBool CodePointBreakIterator::operator==(const BreakIterator& that) const + { + if (typeid(*this) != typeid(that)) { +- return FALSE; ++ return false; + } + + const CodePointBreakIterator& that2 = + static_cast(that); + + if (!utext_equals(this->fText, that2.fText)) { +- return FALSE; ++ return false; + } + +- return TRUE; ++ return true; + } + + CodePointBreakIterator* CodePointBreakIterator::clone(void) const +@@ -107,7 +107,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi + + UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const + { +- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status); ++ return utext_clone(fillIn, this->fText, false, true, &status); + } + + void CodePointBreakIterator::setText(const UnicodeString &text) +@@ -126,7 +126,7 @@ void CodePointBreakIterator::setText(UText *text, UErr + return; + } + +- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, text, false, true, &status); + + clearCurrentCharIter(); + } +@@ -278,7 +278,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres + } + + int64_t pos = utext_getNativeIndex(this->fText); +- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status); ++ this->fText = utext_clone(this->fText, input, false, true, &status); + if (U_FAILURE(status)) { + return *this; + } +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE' + collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ +ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE' + collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + ^ + +--- collator/collator_sort.c.orig 2020-10-13 21:58:13 UTC ++++ collator/collator_sort.c +@@ -312,7 +312,7 @@ static void collator_sort_internal( int renumber, INTE + /* {{{ Sort array using specified collator. */ + PHP_FUNCTION( collator_sort ) + { +- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +@@ -495,7 +495,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys ) + /* {{{ Sort array using specified collator, maintaining index association. */ + PHP_FUNCTION( collator_asort ) + { +- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU ); ++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU ); + } + /* }}} */ + +--- dateformat/dateformat_attr.c.orig 2020-10-13 21:58:13 UTC ++++ dateformat/dateformat_attr.c +@@ -69,7 +69,7 @@ PHP_FUNCTION( datefmt_get_pattern ) + UChar value_buf[64]; + uint32_t length = USIZE( value_buf ); + UChar* value = value_buf; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +@@ -106,7 +106,7 @@ PHP_FUNCTION( datefmt_set_pattern ) + size_t value_len = 0; + int32_t slength = 0; + UChar* svalue = NULL; +- zend_bool is_pattern_localized =FALSE; ++ zend_bool is_pattern_localized = false; + + + DATE_FORMAT_METHOD_INIT_VARS; +@@ -184,7 +184,7 @@ PHP_FUNCTION( datefmt_is_lenient ) + /* {{{ Set formatter lenient. */ + PHP_FUNCTION( datefmt_set_lenient ) + { +- zend_bool isLenient = FALSE; ++ zend_bool isLenient = false; + + DATE_FORMAT_METHOD_INIT_VARS; + +--- normalizer/normalizer_normalize.c.orig 2020-10-13 21:58:13 UTC ++++ normalizer/normalizer_normalize.c +@@ -69,7 +69,7 @@ static UBool intl_is_normalized(zend_long form, const + const UNormalizer2 *norm = intl_get_normalizer(form, err); + + if(U_FAILURE(*err)) { +- return FALSE; ++ return false; + } + + return unorm2_isNormalized(norm, uinput, uinput_len, err); +@@ -226,7 +226,7 @@ PHP_FUNCTION( normalizer_is_normalized ) + int uinput_len = 0; + UErrorCode status = U_ZERO_ERROR; + +- UBool uret = FALSE; ++ UBool uret = false; + + intl_error_reset( NULL ); + +--- timezone/timezone_class.cpp.orig 2020-10-13 21:58:13 UTC ++++ timezone/timezone_class.cpp +@@ -327,7 +327,7 @@ static HashTable *TimeZone_get_debug_info(zend_object + + int32_t rawOffset, dstOffset; + UDate now = Calendar::getNow(); +- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec); ++ tz->getOffset(now, false, rawOffset, dstOffset, uec); + if (U_FAILURE(uec)) { + return debug_info; + } +--- timezone/timezone_methods.cpp.orig 2020-10-13 21:58:13 UTC ++++ timezone/timezone_methods.cpp +@@ -89,7 +89,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone) + RETURN_NULL(); + } + +- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL, ++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL, + "intltz_from_date_time_zone"); + if (tz == NULL) { + RETURN_NULL(); Property changes on: head/devel/php80-intl/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/py-pyicu/Makefile =================================================================== --- head/devel/py-pyicu/Makefile (revision 553939) +++ head/devel/py-pyicu/Makefile (revision 553940) @@ -1,33 +1,34 @@ # Created by: bland@FreeBSD.org # $FreeBSD$ PORTNAME= pyicu PORTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= PyICU-${PORTVERSION} MAINTAINER= bland@FreeBSD.org COMMENT= Python extension wrapping IBM's ICU C++ API #' LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicudata.so:devel/icu USES= compiler:c++11-lang python USE_CXXSTD= c++11 USE_PYTHON= distutils autoplist MAKE_ENV= PYICU_INCLUDES="${LOCALBASE}/include" \ PYICU_CFLAGS="${CXXFLAGS:ts:}" \ PYICU_LFLAGS="-L${LOCALBASE}/lib" CFLAGS+= -w -DPYICU_VER=\"${PORTVERSION}\" pre-configure: @if [ ! -e ${LOCALBASE}/lib/libicule.so ]; then \ ${REINPLACE_CMD} "s/, 'icule'//" ${WRKSRC}/${PYSETUP}; \ fi .include Index: head/devel/py-pyicu/files/patch-icu68 =================================================================== --- head/devel/py-pyicu/files/patch-icu68 (nonexistent) +++ head/devel/py-pyicu/files/patch-icu68 (revision 553940) @@ -0,0 +1,97 @@ +Regressed by https://github.com/unicode-org/icu/commit/0101e2632c34 +Fixed by https://github.com/ovalhub/pyicu/commit/b42d6a754729 + +measureunit.cpp:466:5: error: unknown type name 'NoUnit' + NoUnit *object; + ^ +measureunit.cpp:480:45: error: unexpected namespace name 'NoUnit': expected expression +DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit, + ^ +measureunit.cpp:480:1: error: use of undeclared identifier 'object' +DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit, +^ +./macros.h:199:33: note: expanded from macro 'DECLARE_TYPE' +PyObject *wrap_##name(icuClass *object, int flags) \ + ^ +measureunit.cpp:480:1: error: expected '(' for function-style cast or type construction +DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit, +^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +./macros.h:199:45: note: expanded from macro 'DECLARE_TYPE' +PyObject *wrap_##name(icuClass *object, int flags) \ + ~~~ ^ +measureunit.cpp:480:1: error: expected ';' after top level declarator +./macros.h:199:75: note: expanded from macro 'DECLARE_TYPE' +PyObject *wrap_##name(icuClass *object, int flags) \ + ^ +measureunit.cpp:956:23: error: unexpected namespace name 'NoUnit': expected expression + return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED); + ^ +measureunit.cpp:956:31: error: expected expression + return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED); + ^ +measureunit.cpp:961:25: error: unexpected namespace name 'NoUnit': expected expression + return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED); + ^ +measureunit.cpp:961:33: error: expected expression + return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED); + ^ +measureunit.cpp:966:25: error: unexpected namespace name 'NoUnit': expected expression + return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED); + ^ +measureunit.cpp:966:33: error: expected expression + return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED); + ^ +measureunit.cpp:1193:19: error: unexpected namespace name 'NoUnit': expected expression + REGISTER_TYPE(NoUnit, m); + ^ + +--- measureunit.cpp.orig 2019-10-03 17:11:03 UTC ++++ measureunit.cpp +@@ -463,7 +463,7 @@ DECLARE_TYPE(Measure, t_measure, UObject, Measure, abs + + class t_nounit : public _wrapper { + public: +- NoUnit *object; ++ MeasureUnit *object; + }; + + static PyObject *t_nounit_base(PyTypeObject *type); +@@ -477,7 +477,7 @@ static PyMethodDef t_nounit_methods[] = { + { NULL, NULL, 0, NULL } + }; + +-DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit, ++DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, MeasureUnit, + abstract_init, NULL); + + #endif +@@ -953,17 +953,17 @@ DEFINE_RICHCMP(Measure, t_measure); + + static PyObject *t_nounit_base(PyTypeObject *type) + { +- return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED); ++ return wrap_NoUnit((MeasureUnit *) NoUnit::base().clone(), T_OWNED); + } + + static PyObject *t_nounit_percent(PyTypeObject *type) + { +- return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED); ++ return wrap_NoUnit((MeasureUnit *) NoUnit::percent().clone(), T_OWNED); + } + + static PyObject *t_nounit_permille(PyTypeObject *type) + { +- return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED); ++ return wrap_NoUnit((MeasureUnit *) NoUnit::permille().clone(), T_OWNED); + } + + #endif +@@ -1190,7 +1190,7 @@ void _init_measureunit(PyObject *m) + INSTALL_TYPE(MeasureUnit, m); + INSTALL_TYPE(Measure, m); + #if U_ICU_VERSION_HEX >= VERSION_HEX(60, 0, 0) +- REGISTER_TYPE(NoUnit, m); ++ INSTALL_STRUCT(NoUnit, m); + #endif + REGISTER_TYPE(CurrencyUnit, m); + REGISTER_TYPE(CurrencyAmount, m); Property changes on: head/devel/py-pyicu/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/qt5-core/Makefile =================================================================== --- head/devel/qt5-core/Makefile (revision 553939) +++ head/devel/qt5-core/Makefile (revision 553940) @@ -1,79 +1,79 @@ # $FreeBSD$ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ libicui18n.so:devel/icu \ libpcre2-posix.so:devel/pcre2 \ libzstd.so:archivers/zstd USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base USE_GNOME= glib20 USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. # -no-feature-* adds QT_NO_* (for features which have no switch or # that need to be detected). CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ -no-egl -no-evdev \ -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ -no-libudev -no-xcb -no-xcb-xlib \ -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_BINARIES= yes QT_DEFINES= GLIB QT_CONFIG= glib icu MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr .include # FreeBSD base gained /etc/os-release in r354922, which # corresponds to __FreeBSD_version 1300060 .if ${OSVERSION} < 1300060 RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release post-patch: ${REINPLACE_CMD} -e '/readEtcFile/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ ${WRKSRC}/src/corelib/global/qglobal.cpp .endif post-configure: .for d in ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: # Allow qconfig.h to be customized by single ports. ${AWK} 'BEGIN{print "#include "}{print}' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h # Manually install qlalr cd ${WRKSRC}/src/tools/qlalr && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} # Cleanup qconfig.h and remove stray '#define QT_NO_FOO' ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include Index: head/devel/ticcutils/Makefile =================================================================== --- head/devel/ticcutils/Makefile (revision 553939) +++ head/devel/ticcutils/Makefile (revision 553940) @@ -1,36 +1,36 @@ # $FreeBSD$ PORTNAME= ticcutils DISTVERSIONPREFIX= v DISTVERSION= 0.20 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel textproc MAINTAINER= yuri@FreeBSD.org COMMENT= Generic utility library shared by the Tilburg University software LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libicui18n.so:devel/icu \ libtar.so:devel/libtar USES= autoreconf compiler:c++11-lib gmake gnome libtool localbase:ldflags pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static USE_GITHUB= yes GH_ACCOUNT= LanguageMachines USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check CFLAGS+= -D_THREAD_SAFE # configure on GCC-based architectures fails w/out this # Workaround for https://github.com/LanguageMachines/ticcutils/issues/18 (also see the patch files/patch-configure.ac) CXXFLAGS+= -DHAVE_BOOST_REGEX LDFLAGS+= -lboost_regex .include Index: head/dns/libpsl/Makefile =================================================================== --- head/dns/libpsl/Makefile (revision 553939) +++ head/dns/libpsl/Makefile (revision 553940) @@ -1,52 +1,53 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= libpsl PORTVERSION= 0.21.1 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= C library to handle the Public Suffix List LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= public_suffix_list>=0:dns/public_suffix_list \ xsltproc:textproc/libxslt USES= libtool localbase:ldflags pathfix pkgconfig python:build shebangfix tar:lz CONFIGURE_ARGS= --enable-man \ --with-psl-file=${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \ --with-psl-testfile=${LOCALBASE}/share/public_suffix_list/test_psl.txt GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_LOCALE= en_US.UTF-8 SHEBANG_FILES= src/psl-make-dafsa OPTIONS_DEFINE= NLS OPTIONS_SINGLE= IDNA OPTIONS_SINGLE_IDNA= ICU IDN IDN2 OPTIONS_DEFAULT=IDN2 ICU_DESC= Use devel/icu (IDNA2008 UTS\#46 library) IDN_DESC= Use dns/libidn (IDNA2003 library) IDN2_DESC= Use dns/libidn2 (IDNA2008 library) ICU_CONFIGURE_ON= --enable-builtin=libicu --enable-runtime=libicu ICU_LIB_DEPENDS= libicuuc.so:devel/icu IDN_CONFIGURE_ON= --enable-builtin=libidn --enable-runtime=libidn IDN_LIB_DEPENDS= libidn.so:dns/libidn \ libunistring.so:devel/libunistring IDN_USES= iconv IDN2_CONFIGURE_ON= --enable-builtin=libidn2 --enable-runtime=libidn2 IDN2_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring IDN2_USES= iconv NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-tools .include Index: head/editors/libreoffice/Makefile =================================================================== --- head/editors/libreoffice/Makefile (revision 553939) +++ head/editors/libreoffice/Makefile (revision 553940) @@ -1,331 +1,331 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${LOVERSION}/ \ https://dev-www.libreoffice.org/src/:src \ https://dev-www.libreoffice.org/extern/:ext DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-help-${DISTVERSION}${EXTRACT_SUFX} DIST_SUBDIR= libreoffice EXTRACT_ONLY:= ${DISTFILES} COMMENT= Full integrated office productivity suite BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ zip:archivers/zip \ ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ cppunit-config:devel/cppunit \ dmake:devel/dmake \ gperf>=3.1:devel/gperf \ mdds>=1.5:devel/mdds \ ucpp:devel/ucpp \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ bash:shells/bash \ gsed:textproc/gsed \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ flex>=0.26:textproc/flex LIB_DEPENDS= libapr-1.so:devel/apr1 \ libboost_date_time.so:devel/boost-libs \ libBox2D.so:misc/box2d \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ libltdl.so:devel/libltdl \ liborcus-0.15.so:devel/liborcus \ libplds4.so:devel/nspr \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ libgraphite2.so:graphics/graphite2 \ liblcms2.so:graphics/lcms2 \ libcdr-0.1.so:graphics/libcdr01 \ libepoxy.so:graphics/libepoxy \ libetonyek-0.1.so:graphics/libetonyek01 \ libfreehand-0.1.so:graphics/libfreehand \ libgltf-0.0.so:graphics/libgltf \ libwpg-0.3.so:graphics/libwpg03 \ libzmf-0.0.so:graphics/libzmf \ libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ libqrcodegencpp.so:graphics/qr-code-generator \ liblpsolve55.so:math/lp_solve \ libcmis-0.5.so:net/libcmis \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libmspub-0.1.so:print/libmspub01 \ libpagemaker-0.0.so:print/libpagemaker \ libnss3.so:security/nss \ libxmlsec1-nss.so:security/xmlsec1 \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ libhunspell-1.7.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ libepubgen-0.1.so:textproc/libepubgen \ libexttextcat-2.0.so:textproc/libexttextcat \ libmwaw-0.3.so:textproc/libmwaw03 \ libnumbertext-1.0.so:textproc/libnumbertext \ libodfgen-0.1.so:textproc/libodfgen01 \ libqxp-0.0.so:textproc/libqxp \ librevenge-0.0.so:textproc/librevenge \ libstaroffice-0.0.so:textproc/libstaroffice \ libvisio-0.1.so:textproc/libvisio01 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps \ libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt \ libmythes-1.2.so:textproc/mythes \ libraptor2.so:textproc/raptor2 \ librdf.so:textproc/redland \ libfontconfig.so:x11-fonts/fontconfig \ libxcb-icccm.so:x11/xcb-util-wm \ libserf-1.so:www/serf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \ ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g DISTFILES+= 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf:ext DISTFILES+= dtoa-20180411.tgz:src DISTFILES+= skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz:src NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= Unsupported host_cpu .if defined(PRERELEASE) MASTER_SITES+= https://dev-builds.libreoffice.org/pre-releases/src/ .endif CONFLICTS_INSTALL= libreoffice6 INSTALL_TARGET= distro-pack-install SHEBANG_GLOB= *.py GNU_CONFIGURE= yes USE_GL= gl glew glu USE_GNOME= glib20 USE_OPENLDAP= yes USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \ gettext-runtime gl gmake gnome jpeg mysql:client perl5 pkgconfig \ pkgconfig python:3.5+ shebangfix shared-mime-info ssl tar:xz xorg OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV OPTIONS_DEFAULT= CUPS MMEDIA OPTIONS_DEFAULT_FreeBSD_12= QT5 OPTIONS_DEFAULT_FreeBSD_13= QT5 OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} COINMP_DESC= Enable CoinMP (deprecated) math solver GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style) JAVA_DESC= Add Java support (XML filters, macros, DB connections) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) MMEDIA_DESC= Enable multimedia backend for Impress PGSQL_DESC= Build with PostgreSQL-SDBC driver QT5_DESC= Qt5 GUI toolkit support (default visual style) SDK_DESC= Build with SDK TEST_DESC= Run all regression tests WEBDAV_DESC= Enable WebDAV protocol COINMP_CONFIGURE_ENABLE= coinmp COINMP_CONFIGURE_ON= --with-system-coinmp COINMP_LIB_DEPENDS= libCoinMP.so:math/coinmp CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups DOCS_CONFIGURE_WITH= help GNOME_CONFIGURE_ENABLE= dbus dconf GNOME_IMPLIES= GTK3 GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 GTK3_USE= GNOME=gtk30,gtk-update-icon-cache GTK3_VARS= POST_PLIST=add-plist-gnome JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ ${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \ ${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVAJARDIR}/junit.jar:java/junit JAVA_CATEGORIES= java JAVA_CONFIGURE_ON= --with-ant-home=${LOCALBASE}/share/java/apache-ant \ --with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \ --with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \ --with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \ --with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \ --with-jdk-home="${JAVA_HOME}" \ --with-junit=${JAVAJARDIR}/junit.jar \ --with-hamcrest=${JAVAJARDIR}/hamcrest.jar \ --without-system-beanshell \ --without-system-jfreereport JAVA_CONFIGURE_WITH= java # XXX jni.h from GNU classpath causes ABI conflicts. JAVA_CONFLICTS_BUILD= classpath-[0-9]* JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip:src \ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src JAVA_USE= JAVA=yes JAVA_VARS= JAVA_BUILD=yes JAVA_VERSION=11+ KF5_CONFIGURE_ENABLE= kf5 KF5_USE= kde=config,coreaddons,i18n,kio,windowsystem KF5_USES= kde:5 KF5_IMPLIES= QT5 MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 MMEDIA_USE= GSTREAMER1=yes PGSQL_CONFIGURE_ENABLE= postgresql-sdbc PGSQL_CONFIGURE_WITH= gssapi krb5 PGSQL_USES= pgsql QT5_CONFIGURE_ENABLE= qt5 QT5_USE= qt=buildtools_build,core,gui,network,qmake_build,widgets,x11extras QT5_USES= qt:5 SDK_BUILD_DEPENDS= doxygen:devel/doxygen SDK_CONFIGURE_ENABLE= odk SDK_CONFIGURE_OFF= --without-doxygen SDK_CONFIGURE_ON= --with-doxygen=${LOCALBASE}/bin/doxygen SDK_DISTFILES= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext TEST_ALL_TARGET_OFF= build-nocheck TEST_CONFIGURE_ENABLE= cve-tests WEBDAV_CONFIGURE_ENABLE= neon WEBDAV_LIB_DEPENDS= libneon.so:www/neon CPPFLAGS+= -isystem ${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-dependency-tracking \ --disable-epm \ --disable-fetch-external \ --disable-firebird-sdbc \ --disable-mergelibs \ --disable-online-update \ --enable-cairo-canvas \ --enable-python=system \ --enable-release-build \ --disable-pdfium \ --exec-prefix=${PREFIX} \ --with-boost=${LOCALBASE} \ --with-build-version="FreeBSD ports ${PKGVERSION}" \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-os-version=${OSVERSION} \ --with-parallelism=${MAKE_JOBS_NUMBER} \ --with-system-cppunit \ --with-system-curl \ --with-system-dicts \ --with-system-libs \ --with-system-libxml \ --with-system-ucpp \ --with-system-zlib \ --with-vendor="FreeBSD ports" \ --without-fonts \ --without-myspell-dicts CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ FLEX=${LOCALBASE}/bin/flex \ GNUTAR="${TAR}" \ GPERF=${LOCALBASE}/bin/gperf \ ICU_CFLAGS="`icu-config --cflags`" \ ICU_LIBS="`icu-config --ldflags`" \ PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \ ac_cv_path_SED=${LOCALBASE}/bin/gsed MAKE_ARGS+= TMPDIR=${WRKDIR} MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}" MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed MAKE_ENV+= DISPLAY= MAKE_ENV+= verbose=1 .include .include .if ${ARCH:Mpowerpc*} CONFIGURE_ARGS+= --disable-skia .endif .if ${PORT_OPTIONS:MGTK3} WARNING= "GTK3 visual style is incomplete yet, build at your own risk" .endif .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-local-typedefs .else CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual .endif post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/shell/source/unix/exec/shellexec.cxx .if ${COMPILER_FEATURES:Mlibstdc++} ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk .endif pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun post-configure: @${TOUCH} ${WRKSRC}/src.downloaded post-install: @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s lib/libreoffice -type d -empty \ -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s bin lib man -not -type d >> ${TMPPLIST} .for subdir in appdata application-registry applications bash-completion icons mime mime-info @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST} .endfor post-install-SDK-on: .for subdir in include share share/doc share/idl @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor add-plist-gnome: .for subdir in gnome hicolor locolor @${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST} @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} .endfor .include Index: head/editors/libreoffice/files/patch-icu68 =================================================================== --- head/editors/libreoffice/files/patch-icu68 (nonexistent) +++ head/editors/libreoffice/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE' + body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + ^ + +--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC ++++ i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa + "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); + int32_t nZoneOffset, nDSTOffset; + UErrorCode status = U_ZERO_ERROR; +- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); ++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); Property changes on: head/editors/libreoffice/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/libreoffice6/Makefile =================================================================== --- head/editors/libreoffice6/Makefile (revision 553939) +++ head/editors/libreoffice6/Makefile (revision 553940) @@ -1,327 +1,327 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ https://dev-www.libreoffice.org/src/:src \ https://dev-www.libreoffice.org/extern/:ext DISTFILES= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-help-${LOVERSION}${EXTRACT_SUFX} DIST_SUBDIR= libreoffice EXTRACT_ONLY:= ${DISTFILES} PKGNAMESUFFIX= 6 COMMENT= Full integrated office productivity suite BUILD_DEPENDS= p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ zip:archivers/zip \ ${LOCALBASE}/include/sqlext.h:databases/unixODBC \ cppunit-config:devel/cppunit \ dmake:devel/dmake \ gperf>=3.1:devel/gperf \ mdds>=1.5:devel/mdds \ ucpp:devel/ucpp \ ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ vigra-config:graphics/vigra \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ bash:shells/bash \ gsed:textproc/gsed \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ flex>=0.26:textproc/flex LIB_DEPENDS= libapr-1.so:devel/apr1 \ libboost_date_time.so:devel/boost-libs \ libicutu.so:devel/icu \ liblangtag.so:devel/liblangtag \ libltdl.so:devel/libltdl \ liborcus-0.15.so:devel/liborcus \ libplds4.so:devel/nspr \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ libgraphite2.so:graphics/graphite2 \ liblcms2.so:graphics/lcms2 \ libcdr-0.1.so:graphics/libcdr01 \ libepoxy.so:graphics/libepoxy \ libetonyek-0.1.so:graphics/libetonyek01 \ libfreehand-0.1.so:graphics/libfreehand \ libgltf-0.0.so:graphics/libgltf \ libwpg-0.3.so:graphics/libwpg03 \ libzmf-0.0.so:graphics/libzmf \ libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ libqrcodegencpp.so:graphics/qr-code-generator \ libCoinMP.so:math/coinmp \ liblpsolve55.so:math/lp_solve \ libcmis-0.5.so:net/libcmis \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libmspub-0.1.so:print/libmspub01 \ libpagemaker-0.0.so:print/libpagemaker \ libnss3.so:security/nss \ libxmlsec1-nss.so:security/xmlsec1 \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ libhunspell-1.7.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ libepubgen-0.1.so:textproc/libepubgen \ libexttextcat-2.0.so:textproc/libexttextcat \ libmwaw-0.3.so:textproc/libmwaw03 \ libnumbertext-1.0.so:textproc/libnumbertext \ libodfgen-0.1.so:textproc/libodfgen01 \ libqxp-0.0.so:textproc/libqxp \ librevenge-0.0.so:textproc/librevenge \ libstaroffice-0.0.so:textproc/libstaroffice \ libvisio-0.1.so:textproc/libvisio01 \ libwpd-0.10.so:textproc/libwpd010 \ libwps-0.4.so:textproc/libwps \ libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt \ libmythes-1.2.so:textproc/mythes \ libraptor2.so:textproc/raptor2 \ librdf.so:textproc/redland \ libfontconfig.so:x11-fonts/fontconfig \ libxcb-icccm.so:x11/xcb-util-wm \ libserf-1.so:www/serf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/twemoji-color-font-ttf/TwitterColorEmoji-SVGinOT.ttf:x11-fonts/twemoji-color-font-ttf \ ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ ${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/share/fonts/LinLibertineG/LinLibertine_DR_G.ttf:x11-fonts/linuxlibertine-g DISTFILES+= 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf:ext NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= Unsupported host_cpu .if defined(PRERELEASE) MASTER_SITES+= https://dev-builds.libreoffice.org/pre-releases/src/ .endif CONFLICTS_INSTALL= libreoffice INSTALL_TARGET= distro-pack-install WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION} SHEBANG_GLOB= *.py GNU_CONFIGURE= yes USE_GL= gl glew glu USE_OPENLDAP= yes USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender USES= autoreconf:build bison compiler:c++14-lang cpe desktop-file-utils \ gettext-runtime gl gmake gnome jpeg mysql:client perl5 pkgconfig \ pkgconfig python shebangfix shared-mime-info ssl tar:xz xorg OPTIONS_DEFINE= CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV OPTIONS_DEFAULT= CUPS MMEDIA OPTIONS_DEFAULT_FreeBSD_12= QT5 OPTIONS_DEFAULT_FreeBSD_13= QT5 OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style) I18N_DESC= Build i18n resources JAVA_DESC= Add Java support (XML filters, macros, DB connections) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) MMEDIA_DESC= Enable multimedia backend for Impress PGSQL_DESC= Build with PostgreSQL-SDBC driver QT5_DESC= Qt5 GUI toolkit support (default visual style) SDK_DESC= Build with SDK TEST_DESC= Run all regression tests WEBDAV_DESC= Enable WebDAV protocol CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups DOCS_CONFIGURE_WITH= help GNOME_CONFIGURE_ENABLE= dbus dconf GNOME_IMPLIES= GTK3 GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=dconf GTK3_CONFIGURE_ENABLE= gtk3 GTK3_USE= GNOME=gtk30,gtk-update-icon-cache GTK3_VARS= POST_PLIST=add-plist-gnome I18N_CONFIGURE_WITH= lang=ALL I18N_DISTFILES= ${PORTNAME}-dictionaries-${LOVERSION}${EXTRACT_SUFX} \ ${PORTNAME}-translations-${LOVERSION}${EXTRACT_SUFX} I18N_EXTRACT_ONLY= ${I18N_DISTFILES} JAVA_BUILD_DEPENDS= ant:devel/apache-ant \ ${JAVAJARDIR}/commons-codec.jar:java/apache-commons-codec \ ${JAVAJARDIR}/commons-httpclient.jar:java/apache-commons-httpclient \ ${JAVAJARDIR}/commons-lang3.jar:java/apache-commons-lang3 \ ${JAVAJARDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVAJARDIR}/junit.jar:java/junit \ ${JAVAJARDIR}/bsh.jar:lang/bsh JAVA_CATEGORIES= java JAVA_CONFIGURE_ON= --with-ant-home=${LOCALBASE}/share/java/apache-ant \ --with-beanshell-jar=${JAVAJARDIR}/bsh.jar \ --with-commons-codec-jar=${JAVAJARDIR}/commons-codec.jar \ --with-commons-httpclient-jar=${JAVAJARDIR}/commons-httpclient.jar \ --with-commons-lang-jar=${JAVAJARDIR}/commons-lang3.jar \ --with-commons-logging-jar=${JAVAJARDIR}/commons-logging.jar \ --with-jdk-home="${JAVA_HOME}" \ --with-junit=${JAVAJARDIR}/junit.jar \ --with-hamcrest=${JAVAJARDIR}/hamcrest.jar \ --without-system-jfreereport JAVA_CONFIGURE_WITH= java # XXX jni.h from GNU classpath causes ABI conflicts. JAVA_CONFLICTS_BUILD= classpath-[0-9]* JAVA_DISTFILES= 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip:src \ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip:src \ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip:src \ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip:src \ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip:src \ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip:src \ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar:ext \ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip:src \ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip:src \ a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar:ext \ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip:src \ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip:src \ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip:src \ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip:src \ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip:src \ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip:src JAVA_USE= JAVA=yes JAVA_VARS= JAVA_BUILD=yes KF5_CONFIGURE_ENABLE= kf5 KF5_USE= kde=config,coreaddons,i18n,kio,windowsystem KF5_USES= kde:5 KF5_IMPLIES= QT5 MMEDIA_CONFIGURE_ENABLE= gstreamer-1-0 MMEDIA_USE= GSTREAMER1=yes PGSQL_CONFIGURE_ENABLE= postgresql-sdbc PGSQL_CONFIGURE_WITH= gssapi krb5 PGSQL_USES= pgsql QT5_CONFIGURE_ENABLE= qt5 QT5_USE= qt=buildtools_build,core,gui,network,qmake_build,widgets,x11extras QT5_USES= qt:5 SDK_BUILD_DEPENDS= doxygen:devel/doxygen SDK_CONFIGURE_ENABLE= odk SDK_CONFIGURE_OFF= --without-doxygen SDK_CONFIGURE_ON= --with-doxygen=${LOCALBASE}/bin/doxygen SDK_DISTFILES= 185d60944ea767075d27247c3162b3bc-unowinreg.dll:ext TEST_ALL_TARGET_OFF= build-nocheck TEST_CONFIGURE_ENABLE= cve-tests WEBDAV_CONFIGURE_ENABLE= neon WEBDAV_LIB_DEPENDS= libneon.so:www/neon CPPFLAGS+= -isystem ${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-dependency-tracking \ --disable-epm \ --disable-fetch-external \ --disable-firebird-sdbc \ --disable-mergelibs \ --disable-online-update \ --enable-cairo-canvas \ --enable-python=system \ --enable-release-build \ --disable-pdfium \ --exec-prefix=${PREFIX} \ --with-boost=${LOCALBASE} \ --with-build-version="FreeBSD ports ${PKGVERSION}" \ --with-external-dict-dir=${LOCALBASE}/share/hunspell \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-external-tar=${DISTDIR}/${DIST_SUBDIR} \ --with-external-thes-dir=${LOCALBASE}/share/mythes \ --with-os-version=${OSVERSION} \ --with-parallelism=${MAKE_JOBS_NUMBER} \ --with-system-cppunit \ --with-system-curl \ --with-system-dicts \ --with-system-libs \ --with-system-libxml \ --with-system-ucpp \ --with-system-zlib \ --with-vendor="FreeBSD ports" \ --without-fonts \ --without-myspell-dicts CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \ FLEX=${LOCALBASE}/bin/flex \ GNUTAR="${TAR}" \ GPERF=${LOCALBASE}/bin/gperf \ ICU_CFLAGS="`icu-config --cflags`" \ ICU_LIBS="`icu-config --ldflags`" \ PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \ PYTHON_LIBS="`${PYTHON_VERSION}-config --libs`" \ ac_cv_path_SED=${LOCALBASE}/bin/gsed MAKE_ARGS+= TMPDIR=${WRKDIR} MAKE_ENV+= CXXFLAGS_WARN="${CXXFLAGS_WARN}" MAKE_ENV+= GNUSED=${LOCALBASE}/bin/gsed MAKE_ENV+= DISPLAY= MAKE_ENV+= verbose=1 .include .include .if ${PORT_OPTIONS:MGTK3} WARNING= "GTK3 visual style is incomplete yet, build at your own risk" .endif .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS_WARN= -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-local-typedefs .else CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual .endif post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/shell/source/unix/exec/shellexec.cxx .if ${COMPILER_FEATURES:Mlibstdc++} ${REINPLACE_CMD} -e 's/gb_CC/gb_CXX/' ${WRKSRC}/solenv/gbuild/platform/unxgcc.mk .endif pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun post-configure: @${TOUCH} ${WRKSRC}/src.downloaded post-install: @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s lib/libreoffice -type d -empty \ -exec ${ECHO_CMD} "@dir {}" \; >> ${TMPPLIST} @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s bin lib man -not -type d >> ${TMPPLIST} .for subdir in appdata application-registry applications bash-completion icons mime mime-info @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s share/${subdir} -not -type d >> ${TMPPLIST} .endfor post-install-SDK-on: .for subdir in include share share/doc share/idl @cd ${STAGEDIR}${PREFIX} && \ ${FIND} -s ${subdir}/libreoffice -not -type d >> ${TMPPLIST} .endfor add-plist-gnome: .for subdir in gnome hicolor locolor @${ECHO_CMD} "@rmtry share/icons/${subdir}/icon-theme.cache" >> ${TMPPLIST} @${ECHO_CMD} "@postexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @${ECHO_CMD} "@postunexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/share/icons/${subdir} 2>/dev/null || ${TRUE}" >> ${TMPPLIST} .endfor .include Index: head/editors/libreoffice6/files/patch-icu68 =================================================================== --- head/editors/libreoffice6/files/patch-icu68 (nonexistent) +++ head/editors/libreoffice6/files/patch-icu68 (revision 553940) @@ -0,0 +1,31 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE' + body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); + ^ +svx/source/dialog/fntctrl.cxx:1017:24: error: use of undeclared identifier 'TRUE' + bTransparent = TRUE; + ^ + +--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC ++++ i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa + "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); + int32_t nZoneOffset, nDSTOffset; + UErrorCode status = U_ZERO_ERROR; +- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); ++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); +--- svx/source/dialog/fntctrl.cxx.orig 2020-10-07 12:23:42 UTC ++++ svx/source/dialog/fntctrl.cxx +@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSe + rCTLFont.SetFillColor( rColor ); + } + else +- bTransparent = TRUE; ++ bTransparent = true; + + rFont.SetTransparent( bTransparent ); + rCJKFont.SetTransparent( bTransparent ); Property changes on: head/editors/libreoffice6/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/poedit/Makefile =================================================================== --- head/editors/poedit/Makefile (revision 553939) +++ head/editors/poedit/Makefile (revision 553940) @@ -1,46 +1,46 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ # $MCom: ports/editors/poedit/Makefile,v 1.2 2006/10/05 07:03:09 mezz Exp $ PORTNAME= poedit PORTVERSION= 1.8.4 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= editors MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/ MAINTAINER= rodrigo@FreeBSD.org COMMENT= Gettext catalogs (.po files) editor LICENSE= BSD2CLAUSE BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \ libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ liblucene++.so:textproc/luceneplusplus USES= bdb compiler:c++11-lib desktop-file-utils gettext gmake gnome \ pkgconfig USE_WX= 3.0 WX_CONF_ARGS= absolute WITH_BDB_HIGHEST= yes GNU_CONFIGURE= yes CONFIGURE_ENV= WXRC="${WXRC_CMD}" INSTALLS_ICONS= yes CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include ## -stdlib=libc++ LDFLAGS+= -lpthread -L${BDB_LIB_DIR} -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS OPTIONS_SUB=yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e \ 's/for version in .*;/for version in ${BDB_VER};/ ; \ s/-ldb-$$version/-l${BDB_LIB_NAME}/' ${WRKSRC}/configure .include Index: head/finance/gnucash/Makefile =================================================================== --- head/finance/gnucash/Makefile (revision 553939) +++ head/finance/gnucash/Makefile (revision 553940) @@ -1,107 +1,108 @@ # $FreeBSD$ # $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ PORTNAME= gnucash PORTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Quicken-like money and finance manager LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual BUILD_DEPENDS= swig:devel/swig \ googletest>0:devel/googletest LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsecret-1.so:security/libsecret \ libsoup-2.4.so:devel/libsoup \ libguile-2.2.so:lang/guile2 \ libgc-threaded.so:devel/boehm-gc-threaded \ libboost_date_time.so:devel/boost-libs \ libicudata.so:devel/icu RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Finance-Quote>=0:finance/p5-Finance-Quote USES= cmake:insource compiler:c++11-lib desktop-file-utils \ gettext-tools gnome libtool localbase perl5 pkgconfig \ shebangfix tar:bzip2 xorg USE_XORG= x11 USE_CXXSTD= c++11 USE_GNOME= cairo gtk30 intltool libxml2 libxslt USE_LDCONFIG= yes INSTALLS_ICONS= yes CMAKE_ARGS= -DCOMPILE_GSCHEMAS=OFF \ -DENABLE_BINRELOC=OFF \ -DGNC_SHELL=/bin/sh SHEBANG_FILES= common/gnc-test-env.pl WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml \ org.gnucash.dialogs.checkprinting.gschema.xml \ org.gnucash.dialogs.commodities.gschema.xml \ org.gnucash.dialogs.export.csv.gschema.xml \ org.gnucash.dialogs.gschema.xml \ org.gnucash.dialogs.import.csv.gschema.xml \ org.gnucash.dialogs.import.generic.gschema.xml \ org.gnucash.dialogs.import.qif.gschema.xml \ org.gnucash.dialogs.reconcile.gschema.xml \ org.gnucash.dialogs.sxs.gschema.xml \ org.gnucash.dialogs.totd.gschema.xml \ org.gnucash.general.finance-quote.gschema.xml \ org.gnucash.gschema.xml \ org.gnucash.history.gschema.xml \ org.gnucash.warnings.gschema.xml \ org.gnucash.window.pages.account.tree.gschema.xml \ org.gnucash.window.pages.gschema.xml OPTIONS_DEFINE= AQBANKING DATABASE DOCS NLS OFX PYTHON OPTIONS_DEFAULT= AQBANKING OFX AQBANKING_DESC= AqBanking support (HBCI/OpenHBCI) DATABASE_DESC= Enable SQL database backends OFX_DESC= OFX support OPTIONS_SUB= yes AQBANKING_CMAKE_BOOL= WITH_AQBANKING AQBANKING_LIB_DEPENDS= libgwenhywfar.so:devel/gwenhywfar \ libgwengui-gtk3.so:devel/gwenhywfar-gtk3 \ libktoblzcheck.so:finance/ktoblzcheck \ libaqbanking.so:finance/aqbanking AQBANKING_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml DATABASE_CMAKE_BOOL= WITH_SQL DATABASE_BUILD_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers DATABASE_LIB_DEPENDS= libdbi.so:databases/libdbi DATABASE_RUN_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers NLS_CMAKE_BOOL_OFF= DISABLE_NLS NLS_USES= gettext-runtime OFX_CMAKE_BOOL= WITH_OFX OFX_LIB_DEPENDS= libofx.so:finance/libofx OFX_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml PYTHON_CMAKE_BOOL= WITH_PYTHON PYTHON_USES= python:3.3+ post-install: @(cd ${STAGEDIR}${DATADIR}/icons/hicolor && \ ${RMDIR} 16x16/apps 22x22/apps 22x22 24x24/apps 32x32/apps 32x32\ 48x48/apps 48x48 64x64/apps 64x64 96x96/apps 96x96 \ 128x128/apps 128x128 256x256/apps 256x256 scalable/apps scalable) @(cd ${STAGEDIR}${PREFIX}/share/icons/hicolor && \ ${RMDIR} 24x24/actions 16x16/actions) post-install-PYTHON-on: @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so .include Index: head/games/0ad/Makefile =================================================================== --- head/games/0ad/Makefile (revision 553939) +++ head/games/0ad/Makefile (revision 553940) @@ -1,92 +1,92 @@ # $FreeBSD$ PORTNAME= 0ad PORTVERSION= 0.0.23b -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ ${PORTNAME}-${PORTVERSION}-alpha-unix-data.tar.xz MAINTAINER= madpilot@FreeBSD.org COMMENT= Real-time strategy (RTS) game of ancient warfare DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-12-31 BUILD_DEPENDS= zip:archivers/zip \ cmake:devel/cmake LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libcurl.so:ftp/curl \ libgloox.so:net-im/gloox \ libminiupnpc.so:net/miniupnpc \ libnspr4.so:devel/nspr \ libenet.so:net/enet \ libtiff.so:graphics/tiff \ libsodium.so:security/libsodium USES= compiler:c++11-lib desktop-file-utils dos2unix gl gmake gnome \ iconv jpeg openal:al pkgconfig python:2.7,build sdl tar:xz xorg USE_GNOME= libxml2 USE_GL= gl USE_SDL= sdl2 USE_XORG= x11 xcursor WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release verbose=1 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 BUNDLE_LIBS= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) BINARY_ALIAS= python=${PYTHON_CMD} USE_WX= 3.0+ WX_COMPS= wx:lib MAKE_ENV+= JOBS=${_MAKE_JOBS} BROKEN_aarch64= fails to compile: no member named verifyHeapAccessDisassembly BROKEN_armv6= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_armv7= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp' PORTDATA= * .include post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ ${WRKSRC}/build/premake/premake5.lua ${WRKSRC}/build/premake/extern_libs5.lua .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} -e '1055,1251s/-rdynamic/-lssp_nonshared &/' \ -e '1441s/"execinfo",/& "ssp_nonshared",/' \ ${WRKSRC}/build/premake/premake5.lua .endif @${REINPLACE_CMD} 's,^\(Exec=\)/usr/local,\1${PREFIX},' \ ${WRKSRC}/build/resources/0ad.desktop @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/build/resources/0ad.sh pre-build: (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libmozjs38-ps-release.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/binaries/data && ${COPYTREE_SHARE} "config l10n tests tools" ${STAGEDIR}${DATADIR}) ${MKDIR} ${STAGEDIR}${DATADIR}/mods/public ${STAGEDIR}${DATADIR}/mods/mod ${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${STAGEDIR}${DATADIR}/mods/public --no-same-permissions ${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${STAGEDIR}${DATADIR}/mods/mod --no-same-permissions .include Index: head/games/0ad/files/patch-icu68 =================================================================== --- head/games/0ad/files/patch-icu68 (nonexistent) +++ head/games/0ad/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +../../../source/i18n/L10n.cpp:208:82: error: use of undeclared identifier 'TRUE' + currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE; + ^ + +--- source/i18n/L10n.cpp.orig 2018-04-10 18:13:32 UTC ++++ source/i18n/L10n.cpp +@@ -205,7 +205,7 @@ void L10n::ReevaluateCurrentLocaleAndReload() + else + { + GetDictionaryLocale(locale, currentLocale); +- currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE; ++ currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == true; + useLongStrings = false; + } + LoadDictionaryForCurrentLocale(); Property changes on: head/games/0ad/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/an/Makefile =================================================================== --- head/games/an/Makefile (revision 553939) +++ head/games/an/Makefile (revision 553940) @@ -1,25 +1,25 @@ # Created by: proff # $FreeBSD$ PORTNAME= an PORTVERSION= 1.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_${PORTVERSION}.orig MAINTAINER= ports@FreeBSD.org COMMENT= Fast anagram generator LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicuuc.so:devel/icu WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gmake tar:xz PLIST_FILES= bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz .include Index: head/games/easyrpg-player/Makefile =================================================================== --- head/games/easyrpg-player/Makefile (revision 553939) +++ head/games/easyrpg-player/Makefile (revision 553940) @@ -1,62 +1,63 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= easyrpg-player PORTVERSION= 0.6.2.3 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= RPG Maker 2000/2003 and EasyRPG games interpreter LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblcf.so:games/liblcf \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libspeexdsp.so:audio/speexdsp \ libmpg123.so:audio/mpg123 \ libsndfile.so:audio/libsndfile \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libopusfile.so:audio/opusfile \ libopus.so:audio/opus \ libWildMidi.so:audio/wildmidi \ libxmp.so:audio/libxmp \ libFLAC.so:audio/flac \ libmodplug.so:audio/libmodplug # these come from liblcf LIB_DEPENDS+= libicui18n.so:devel/icu \ libexpat.so:textproc/expat2 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= EasyRPG GH_PROJECT= Player USES= cmake:insource compiler:c++14-lang localbase:ldflags pkgconfig \ sdl xorg CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man \ -DPLAYER_AUDIO_BACKEND=SDL2_mixer \ -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE USE_XORG= pixman USE_SDL= sdl2 mixer2 PORTDOCS= AUTHORS.md README.md OPTIONS_DEFINE= DOCS post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions ${INSTALL_DATA} ${WRKSRC}/resources/unix/bash-completion/easyrpg-player \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include Index: head/games/liblcf/Makefile =================================================================== --- head/games/liblcf/Makefile (revision 553939) +++ head/games/liblcf/Makefile (revision 553940) @@ -1,36 +1,37 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= liblcf PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Library to handle RPG Maker 2000/2003 and EasyRPG projects LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicui18n.so:devel/icu \ libexpat.so:textproc/expat2 USE_GITHUB= yes GH_ACCOUNT= EasyRPG USES= cmake compiler:c++14-lang pkgconfig shared-mime-info USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_INSTALL_INCLUDEDIR=include \ -DDISABLE_UPDATE_MIMEDB=OFF PORTDOCS= AUTHORS.md README.md OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include Index: head/games/openrct2/Makefile =================================================================== --- head/games/openrct2/Makefile (revision 553939) +++ head/games/openrct2/Makefile (revision 553940) @@ -1,62 +1,63 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= openrct2 DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org COMMENT= Open source re-implementation of RollerCoaster Tycoon 2 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/licence.txt BROKEN_FreeBSD_12_powerpc64= fails to build: src/openrct2/util/Endian.h:9:24: error: unused function 'ORCT_Swapu16' BROKEN_FreeBSD_13_powerpc64= fails to build: openrct2/common.h:96:10: error: #error Unknown endianess! BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libpng.so:graphics/png \ libzip.so:archivers/libzip \ libspeexdsp.so:audio/speexdsp \ libfontconfig.so:x11-fonts/fontconfig \ libcurl.so:ftp/curl \ libfreetype.so:print/freetype2 \ libicuuc.so:devel/icu \ libbenchmark.so:devel/grpc \ libduktape.so:lang/duktape-lib USES= cmake compiler:c++17-lang desktop-file-utils gnome gl iconv \ localbase:ldflags pkgconfig sdl shared-mime-info ssl USE_GITHUB= yes GH_ACCOUNT= OpenRCT2 GH_PROJECT= OpenRCT2 GH_TUPLE= OpenRCT2:objects:v1.0.17:objects \ OpenRCT2:title-sequences:v0.1.2c:title_sequences USE_GL= gl USE_LDCONFIG= yes USE_SDL= sdl2 CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= DOWNLOAD_TITLE_SEQUENCES \ DOWNLOAD_OBJECTS PORTDATA= * PORTDOCS= changelog.txt contributors.md licence.txt openrct2.d.ts \ readme.txt scripting.md INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/src/openrct2/config/Config.cpp post-install: (cd ${WRKSRC_title_sequences}; \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/title) (cd ${WRKSRC_objects}; \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/object) .include Index: head/games/openttd/Makefile =================================================================== --- head/games/openttd/Makefile (revision 553939) +++ head/games/openttd/Makefile (revision 553940) @@ -1,144 +1,145 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= openttd DISTVERSION= 1.10.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 USES= cpe gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" MAKE_ARGS= VERBOSE=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS SUB_FILES= pkg-message PORTDOCS= README.md admin_network.md compiling_lang_files.md \ debugging_desyncs.md desync.md directory_structure.md \ changelog.txt elrail.svg elrail_tile.png elrail_track.png \ known-bugs.txt landscape.html landscape_externals.html \ landscape_grid.html logging_and_performance_metrics.md \ multiplayer.md obg_format.txt \ obm_format.txt obs_format.txt ottd-colourtext-palette.png \ tileh.png DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false OPTIONS_DEFINE= DOCS .if defined(WITH_MIDI_PLAYER) CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" .endif .if defined(WITH_MIDI_PLAYER_ARGS) CONFIGURE_ARGS+= --with-midi-arg="${WITH_MIDI_PLAYER_ARGS}" .endif .if defined(WITH_FLUIDSYNTH) LIB_DEPENDS+= libfluidsynth.so:audio/fluidsynth .else CONFIGURE_ARGS+= --without-fluidsynth .endif .if defined(WITH_DEDICATED_SERVER_ONLY) CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= ${PORTNAME} .else CONFIGURE_ARGS+= --with-sdl=sdl1 USES+= compiler:c++11-lib gnome sdl USE_CXXSTD= gnu++11 CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libicui18n.so:devel/icu \ libicu-le-hb.so:devel/icu-le-hb \ libiculx.so:devel/icu-lx \ libfontconfig.so:x11-fonts/fontconfig USE_SDL= sdl INSTALLS_ICONS= yes .endif .if defined(WITH_OPEN_GAME_FILES) RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:games/opengfx \ ${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:games/openmsx \ ${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:games/opensfx .endif .if defined(WITH_SAVE_PASSWORDS) EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords .endif .include pre-everything:: .if !defined(WITH_MIDI_PLAYER) @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player" .endif .if !defined(WITH_MIDI_PLAYER_ARGS) @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player" .endif .if !defined(WITH_FLUIDSYNTH) @${ECHO_MSG} "Define WITH_FLUIDSYNTH to enable new Fluidsynth music driver" .endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" .endif .if !defined(WITH_OPEN_GAME_FILES) @${ECHO_MSG} "Define WITH_OPEN_GAME_FILES to install with libre graphics, music, and sounds" .endif .if !defined(WITH_SAVE_PASSWORDS) @${ECHO_MSG} "Define WITH_SAVE_PASSWORDS to save passwords between server restarts" .endif post-extract: @${MV} ${WRKSRC}/README.md ${WRKSRC}/changelog.txt \ ${WRKSRC}/known-bugs.txt ${WRKSRC}/docs post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib @${REINPLACE_CMD} -e 's,OSX,${OPSYS:tu},' ${WRKSRC}/Makefile.grf.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ ${STAGEDIR}${DATADIR}/game ${STAGEDIR}${DATADIR}/lang \ ${STAGEDIR}${DATADIR}/scripts ${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${STAGEDIR}${DATADIR}/ai ${INSTALL_DATA} ${WRKSRC}/bin/baseset/* ${STAGEDIR}${DATADIR}/baseset ${INSTALL_DATA} ${WRKSRC}/bin/game/* ${STAGEDIR}${DATADIR}/game ${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ ${STAGEDIR}${MANPREFIX}/man/man6 .if !defined(WITH_DEDICATED_SERVER_ONLY) ${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps . for n in 16 32 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps ${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png . endfor .else @${REINPLACE_CMD} -E '/icons|pixmaps/d' ${TMPPLIST} .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} .include Index: head/games/openttd/files/patch-icu68 =================================================================== --- head/games/openttd/files/patch-icu68 (nonexistent) +++ head/games/openttd/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +src/gfx_layout.cpp:119:9: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ + +--- src/gfx_layout.cpp.orig 2020-08-09 17:56:38 UTC ++++ src/gfx_layout.cpp +@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &a + + le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const + { +- return FALSE; ++ return false; + } + + /** Property changes on: head/games/openttd/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/widelands/Makefile =================================================================== --- head/games/widelands/Makefile (revision 553939) +++ head/games/widelands/Makefile (revision 553940) @@ -1,46 +1,47 @@ # Created by: Bartosz Fabianowski # $FreeBSD$ PORTNAME= widelands DISTVERSION= build21 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \ https://mirror.amdmi3.ru/distfiles/ EXTRACT_SUFX= -source.tar.gz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Realtime strategy game inspired by Settlers II LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libicuuc.so:devel/icu \ libboost_regex.so:devel/boost-libs USES= cmake compiler:c++11-lib gettext gl python:build sdl CMAKE_ARGS= -DWL_INSTALL_BASEDIR="${PREFIX}" \ -DWL_INSTALL_DATADIR="${DATADIR}" \ -DWL_INSTALL_DOCDIR="${DOCSDIR}" \ -DWL_VERSION="${DISTVERSION}" \ -DWL_OPTIMIZE_FLAGS="" USE_GL= gl glew USE_SDL= sdl2 mixer2 image2 ttf2 PORTDATA= * PORTDOCS= * DESKTOP_ENTRIES="Widelands" \ "" \ "${DATADIR}/pics/wl-ico-64.png" \ "widelands" \ "Game;StrategyGame;" \ "" OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake .include Index: head/graphics/dcmtk/Makefile =================================================================== --- head/graphics/dcmtk/Makefile (revision 553939) +++ head/graphics/dcmtk/Makefile (revision 553940) @@ -1,33 +1,33 @@ # Created by: gahr # $FreeBSD$ PORTNAME= dcmtk DISTVERSIONPREFIX= ${PORTNAME:tu}- DISTVERSION= 3.6.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel MAINTAINER= yuri@FreeBSD.org COMMENT= DICOM ToolKit, libraries and applications for DICOM/MEDICOM standard LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libicuuc.so:devel/icu \ libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= compiler:c++11-lang cmake gnome jpeg ssl USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} USE_GNOME= libxml2 USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= DCMTK_WITH_DOXYGEN OPTIONS_DEFINE= DOCS PORTDOCS= * .include Index: head/graphics/imv/Makefile =================================================================== --- head/graphics/imv/Makefile (revision 553939) +++ head/graphics/imv/Makefile (revision 553940) @@ -1,99 +1,99 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= imv DISTVERSIONPREFIX= v DISTVERSION= 4.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org COMMENT= Simple image viewer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= a2x:textproc/asciidoc LIB_DEPENDS= libicuuc.so:devel/icu \ libxkbcommon.so:x11/libxkbcommon TEST_DEPENDS= ${LOCALBASE}/lib/libcmocka.so:sysutils/cmocka USES= compiler:c11 desktop-file-utils gettext-runtime gl gmake gnome \ pkgconfig USE_GITHUB= yes GH_ACCOUNT= eXeC64 USE_GL= gl USE_GNOME= cairo glib20 pango MAKE_ARGS= CONFIGPREFIX=${PREFIX}/etc \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_MAN="${INSTALL_MAN}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ MANPREFIX=${PREFIX}/man \ V=1 \ WINDOWS=${_IMV_WINDOWS} ALL_TARGET= imv doc TEST_TARGET= check PLIST_FILES= bin/imv \ bin/imv-msg \ etc/imv_config \ man/man1/imv-msg.1.gz \ man/man1/imv.1.gz \ man/man5/imv.5.gz \ share/applications/imv.desktop OPTIONS_DEFINE= FREEIMAGE JPEG NSGIF PNG SVG TIFF OPTIONS_DEFAULT= FREEIMAGE JPEG NSGIF PNG SVG TIFF WAYLAND X11 OPTIONS_MULTI= WINDOWS OPTIONS_MULTI_WINDOWS= WAYLAND X11 OPTIONS_SUB= yes FREEIMAGE_DESC= FreeImage backend (support for many image formats) NSGIF_DESC= NetSurf GIF backend (support for animated GIF) WINDOWS_DESC= Windowing system FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage FREEIMAGE_MAKE_ARGS_OFF= BACKEND_FREEIMAGE=no FREEIMAGE_MAKE_ARGS= BACKEND_FREEIMAGE=yes JPEG_LIB_DEPENDS= libturbojpeg.so:graphics/libjpeg-turbo JPEG_MAKE_ARGS_OFF= BACKEND_LIBJPEG=no JPEG_MAKE_ARGS= BACKEND_LIBJPEG=yes NSGIF_LIB_DEPENDS= libnsgif.so:graphics/libnsgif NSGIF_MAKE_ARGS_OFF= BACKEND_LIBNSGIF=no NSGIF_MAKE_ARGS= BACKEND_LIBNSGIF=yes PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MAKE_ARGS_OFF= BACKEND_LIBPNG=no PNG_MAKE_ARGS= BACKEND_LIBPNG=yes SVG_USE= GNOME=librsvg2 SVG_MAKE_ARGS_OFF= BACKEND_LIBRSVG=no SVG_MAKE_ARGS= BACKEND_LIBRSVG=yes TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MAKE_ARGS_OFF= BACKEND_LIBTIFF=no TIFF_MAKE_ARGS= BACKEND_LIBTIFF=yes WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-egl.so:graphics/wayland WAYLAND_USE= GL=egl WAYLAND_VARS= _IMV_WINDOWS=wayland X11_USES= xorg X11_USE= GL=glu \ XORG=x11,xcb X11_VARS= _IMV_WINDOWS=x11 .include .if ${PORT_OPTIONS:MWAYLAND} && ${PORT_OPTIONS:MX11} _IMV_WINDOWS= all PLIST_FILES+= bin/imv-wayland \ bin/imv-x11 .endif .include Index: head/graphics/libcdr01/Makefile =================================================================== --- head/graphics/libcdr01/Makefile (revision 553939) +++ head/graphics/libcdr01/Makefile (revision 553940) @@ -1,29 +1,30 @@ # $FreeBSD$ PORTNAME= libcdr PORTVERSION= 0.1.6 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= LODEV PKGNAMESUFFIX= 01 MAINTAINER= office@FreeBSD.org COMMENT= Library and tools for parsing Corel Draw file format LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING.MPL BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ librevenge-0.0.so:textproc/librevenge \ liblcms2.so:graphics/lcms2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs USES= compiler:c++11-lib libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wno-long-long .include Index: head/graphics/libcdr01/files/patch-icu68 =================================================================== --- head/graphics/libcdr01/files/patch-icu68 (nonexistent) +++ head/graphics/libcdr01/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +libcdr_utils.cpp:111:35: error: use of undeclared identifier 'TRUE' + ucsdet_enableInputFilter(csd, TRUE); + ^ + +--- src/lib/libcdr_utils.cpp.orig 2020-02-02 15:30:44 UTC ++++ src/lib/libcdr_utils.cpp +@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char + csd = ucsdet_open(&status); + if (U_FAILURE(status) || !csd) + return 0; +- ucsdet_enableInputFilter(csd, TRUE); ++ ucsdet_enableInputFilter(csd, true); + ucsdet_setText(csd, (const char *)buffer, bufferLength, &status); + if (U_FAILURE(status)) + throw libcdr::EncodingException(); Property changes on: head/graphics/libcdr01/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libfreehand/Makefile =================================================================== --- head/graphics/libfreehand/Makefile (revision 553939) +++ head/graphics/libfreehand/Makefile (revision 553940) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= libfreehand PORTVERSION= 0.1.2 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics MASTER_SITES= LODEV MAINTAINER= office@FreeBSD.org COMMENT= Library for interpreting and importing Adobe/Macromedia drawings LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs \ cppunit-config:devel/cppunit \ icu-config:devel/icu LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ librevenge-0.0.so:textproc/librevenge GNU_CONFIGURE= yes USES= compiler:c++11-lang gperf perl5 libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes USE_PERL5= build CONFIGURE_ARGS= --disable-werror --without-docs CPPFLAGS+= -I ${LOCALBASE}/include INSTALL_TARGET= install-strip .include Index: head/graphics/libzmf/Makefile =================================================================== --- head/graphics/libzmf/Makefile (revision 553939) +++ head/graphics/libzmf/Makefile (revision 553940) @@ -1,28 +1,28 @@ # $FreeBSD$ PORTNAME= libzmf PORTVERSION= 0.0.2 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MASTER_SITES= LODEV MAINTAINER= office@FreeBSD.org COMMENT= Library that parses the file format of Zoner Callisto/Draw documents LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ libpng.so:graphics/png \ librevenge-0.0.so:textproc/librevenge GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= compiler:c++11-lang libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include .include Index: head/graphics/maim/Makefile =================================================================== --- head/graphics/maim/Makefile (revision 553939) +++ head/graphics/maim/Makefile (revision 553940) @@ -1,36 +1,36 @@ # $FreeBSD$ PORTNAME= maim DISTVERSIONPREFIX= v DISTVERSION= 5.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= 0mp@FreeBSD.org COMMENT= Screenshot utility with performance improvements over scrot LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= libicuuc.so:devel/icu \ libImlib2.so:graphics/imlib2 \ libpng.so:graphics/png \ libslopy.so.7.5:x11/slop USES= cmake compiler:c++11-lang gl jpeg xorg USE_GITHUB= yes GH_ACCOUNT= naelstrof USE_GL= gl glut USE_XORG= ice sm x11 xcomposite xext xfixes xrandr xrender CMAKE_ARGS= -DSLOP_LIBRARIES=${LOCALBASE}/lib/libslopy.so PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/share/man/man1 .include Index: head/graphics/openfx-arena/Makefile =================================================================== --- head/graphics/openfx-arena/Makefile (revision 553939) +++ head/graphics/openfx-arena/Makefile (revision 553940) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= openfx-arena PORTVERSION= 2.3.14 DISTVERSIONPREFIX= Natron- -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org COMMENT= Extra OpenFX plugins for Natron LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= opencl>=0:devel/opencl LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libfontconfig.so:x11-fonts/fontconfig \ libcdr-0.1.so:graphics/libcdr01 \ librevenge-0.0.so:textproc/librevenge \ libpoppler-glib.so:graphics/poppler-glib \ liblcms2.so:graphics/lcms2 \ libMagick++-6.so:graphics/ImageMagick6 \ libzip.so:archivers/libzip \ libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libpcre.so:devel/pcre \ libffi.so:devel/libffi \ libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libharfbuzz.so:print/harfbuzz \ libgraphite2.so:graphics/graphite2 \ libicui18n.so:devel/icu \ liblqr-1.so:graphics/liblqr-1 \ libfftw3.so:math/fftw3 \ libltdl.so:devel/libltdl \ libpoppler.so:graphics/poppler USES= gl gmake gnome iconv xorg USE_GITHUB= yes GH_ACCOUNT= NatronGitHub GH_PROJECT= openfx-arena GH_TUPLE= NatronGitHub:openfx-supportext:e600cae:openfx_supportext/SupportExt \ NatronGitHub:openfx:a85dc34:openfx/OpenFX \ NatronGitHub:openfx-io:Natron-2.3.12:OpenFX_IO/OpenFX-IO \ NatronGitHub:SequenceParsing:9e8b77a:SequenceParsing/OpenFX-IO/IOSupport/SequenceParsing \ NatronGitHub:tinydir:3aae922:tinydir/OpenFX-IO/IOSupport/SequenceParsing/tinydir MAKE_ENV+= CONFIG=release USE_GL= gl USE_GNOME= libxml2 pango cairo librsvg2 USE_XORG+= x11 xcb xau xdamage xfixes xxf86vm xrender xext xdmcp pixman sm ice xt MAKE_ENV+= CONFIG=release post-extract: @${RMDIR} ${WRKSRC}/OpenFX-IO/openfx ${LN} -s ../OpenFX ${WRKSRC}/OpenFX-IO/openfx post-patch: @${REINPLACE_CMD} -e 's|/usr/OFX/Plugins|${PREFIX}/OFX/Plugins|g' \ ${WRKSRC}/OpenFX/Examples/Makefile.master \ ${WRKSRC}/OpenFX/Support/Plugins/Makefile.master \ ${WRKSRC}/OpenFX/HostSupport/src/ofxhPluginCache.cpp @${REINPLACE_CMD} -e 's|/Contents/$$(ARCH)|/Contents/FreeBSD-x86-64/|g' \ ${WRKSRC}/OpenFX/Support/Plugins/Makefile.master post-install: ${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/OFX/Plugins/Arena.ofx.bundle/Contents/FreeBSD-x86-64/Arena.ofx .include Index: head/graphics/osg/Makefile =================================================================== --- head/graphics/osg/Makefile (revision 553939) +++ head/graphics/osg/Makefile (revision 553940) @@ -1,157 +1,157 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= osg PORTVERSION= 3.6.5 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering LICENSE= OSGPL LICENSE_NAME= OpenSceneGraph Public License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph CONFLICTS_INSTALL=osg34-[0-9]* USES= alias cmake compiler:c11 jpeg gl pkgconfig xorg USE_GL= gl USE_XORG= x11 USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ OSG_SHLIBVER=161 \ OPENTHREADS_VERSION=3.3.1 \ OPENTHREADS_SHLIBVER=21 OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \ JASPER LIBLAS LUA NVTT OPENEXR PDF SDL ASIO \ SVG VNC XRANDR XINERAMA FONTCONFIG DCMTK COLLADA OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR XINERAMA FONTCONFIG OPTIONS_SUB= yes ASIO_DESC= ASIO support (resthttp plugin) GDAL_DESC= GDAL support GTA_DESC= GTA file format support LIBLAS_DESC= liblas support NVTT_DESC= Use NVidia texture tools SDL_DESC= Use SDL (joystick support in present3d) VNC_DESC= LibVNCServer support OPENCASCADE_DESC= OpenCASCADE format support DCMTK_DESC= DICOM format support COLLADA_DESC= COLLADA (dae) format support CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL CURL_VARS_OFF= FORCE_IGNORE+=CURL FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_VARS= FORCE_REQUIRE+=FFmpeg FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_VARS= FORCE_REQUIRE+=Freetype FREETYPE_VARS_OFF= FORCE_IGNORE+=Freetype FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CMAKE_BOOL= OSG_TEXT_USE_FONTCONFIG GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal GDAL_VARS= FORCE_REQUIRE+=GDAL GDAL_VARS_OFF= FORCE_IGNORE+=GDAL GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_VARS= FORCE_REQUIRE+=GIFLIB GIF_VARS_OFF= FORCE_IGNORE+=GIFLIB GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes GSTREAMER_VARS= FORCE_REQUIRE+="GStreamer GLIB" GSTREAMER_VARS_OFF= FORCE_IGNORE+="GStreamer GLIB" GSTREAMER_BROKEN= fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0 GTA_LIB_DEPENDS= libgta.so:devel/libgta GTA_VARS= FORCE_REQUIRE+=GTA GTA_VARS_OFF= FORCE_IGNORE+=GTA JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_VARS= FORCE_REQUIRE+=Jasper JASPER_VARS_OFF= FORCE_IGNORE+=Jasper LIBLAS_LIB_DEPENDS= liblas.so:devel/liblas LIBLAS_VARS= FORCE_REQUIRE+=LIBLAS LIBLAS_VARS_OFF= FORCE_IGNORE+=LIBLAS LUA_USES= lua:52 LUA_CMAKE_ON= -DOSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF LUA_VARS= FORCE_IGNORE+=Lua51 FORCE_REQUIRE+=Lua52 LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52" NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools NVTT_VARS= FORCE_REQUIRE+=NVTT NVTT_VARS_OFF= FORCE_IGNORE+=NVTT OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_USE= GNOME=cairo PDF_VARS= FORCE_REQUIRE+=Poppler-glib PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib SDL_USE= SDL=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 SVG_USE= GNOME=cairo SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VNC_VARS= FORCE_REQUIRE+=LibVNCServer VNC_VARS_OFF= FORCE_IGNORE+=LibVNCServer XRANDR_CMAKE_BOOL= OSGVIEWER_USE_XRANDR XRANDR_USE= XORG=xrandr XINERAMA_CMAKE_BOOL= OSGVIEWER_USE_XINERAMA XINERAMA_USE= XORG=xinerama #OPENCASCADE_LIB_DEPENDS=libTKBRep.so:cad/opencascade #OPENCASCADE_VARS= FORCE_REQUIRE+=OpenCascade #OPENCASCADE_VARS_OFF= FORCE_IGNORE+=OpenCascade #OPENCASCADE_CMAKE_ARGS= -DOPENCASCADE_LIBRARY_TYPE="Shared" DCMTK_LIB_DEPENDS= libdcmrt.so:graphics/dcmtk \ libxml2.so:textproc/libxml2 \ libicuuc.so:devel/icu DCMTK_USES= ssl DCMTK_VARS= FORCE_REQUIRE+=DCMTK DCMTK_VARS_OFF= FORCE_IGNORE+=DCMTK #ILMBASE_LIB_DEPENDS= ${LOCALBASE}/lib/libImath.so:graphics/ilmbase #ILMBASE_VARS= FORCE_REQUIRE+=ilmbase #ILMBASE_VARS_OFF= FORCE_IGNORE+=ilmbase COLLADA_LIB_DEPENDS= libcollada-dom2.5-dp.so:devel/collada-dom \ libboost_filesystem.so:devel/boost-libs COLLADA_VARS= FORCE_REQUIRE+=COLLADA COLLADA_VARS_OFF= FORCE_IGNORE+=COLLADA ASIO_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio ASIO_VARS= FORCE_REQUIRE+=Asio ASIO_VARS_OFF= FORCE_IGNORE+=Asio # GUI toolkits are only needed for building examples, which are not even installed FORCE_IGNORE= FLTK FOX wxWidgets GtkGl SDL2 # only for examples FORCE_IGNORE+= FBX Inventor # not in ports FORCE_IGNORE+= ilmbase # not used FORCE_IGNORE+= OpenCascade # detection broken FORCE_IGNORE+= ZeroConf # no avahi support yet FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight .include post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \ s|-pedantic||' ${WRKSRC}/CMakeLists.txt .for p in ${FORCE_REQUIRE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ ${WRKSRC}/CMakeLists.txt .endfor .for p in ${FORCE_IGNORE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \ ${WRKSRC}/CMakeLists.txt .endfor .include Index: head/graphics/tesseract/Makefile =================================================================== --- head/graphics/tesseract/Makefile (revision 553939) +++ head/graphics/tesseract/Makefile (revision 553940) @@ -1,66 +1,66 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= tesseract PORTVERSION= 4.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= pkubaj@FreeBSD.org COMMENT= Commercial quality open source OCR engine LICENSE= APACHE20 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= liblept.so:graphics/leptonica RUN_DEPENDS= tesseract-data>=0:graphics/tesseract-data USES= autoreconf compiler:c++11-lang gmake gnome localbase \ libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}-ocr CONFIGURE_ENV= LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" DATADIR= ${PREFIX}/share/tessdata PORTDATA= * PORTDOCS= AUTHORS ChangeLog README.md INSTALL_TARGET= install-strip SHEBANG_FILES= src/training/language-specific.sh \ src/training/tesstrain.sh OPTIONS_DEFINE= DOCS TOOLS OPTIONS_DEFINE_amd64=OPENMP OPTIONS_DEFINE_i386=OPENMP OPTIONS_DEFAULT=TOOLS OPTIONS_DEFAULT_amd64=OPENMP OPTIONS_DEFAULT_i386=OPENMP OPTIONS_SUB= yes OPENMP_CONFIGURE_ENABLE=openmp TOOLS_DESC= Include training tools TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ libfontconfig.so:x11-fonts/fontconfig TOOLS_USE= GNOME=cairo,glib20,pango post-patch: @${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure.ac post-build-TOOLS-on: @cd ${WRKSRC} && ${MAKE} training post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-TOOLS-on: @cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install .include Index: head/irc/znc/Makefile =================================================================== --- head/irc/znc/Makefile (revision 553939) +++ head/irc/znc/Makefile (revision 553940) @@ -1,79 +1,80 @@ # Created by: elvstone@gmail.com # $FreeBSD$ PORTNAME= znc PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= https://znc.in/releases/ \ https://znc.in/releases/archive/ MAINTAINER= dbaio@FreeBSD.org COMMENT= Advanced IRC bouncer LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++11-lib cpe cmake:run iconv pathfix pkgconfig python:3.5+ USE_RC_SUBR= znc SUB_FILES= pkg-message PORTDOCS= README.md USERS= znc GROUPS= znc OPTIONS_DEFINE= CHARSET CYRUS DEBUG DOCS IPV6 NLS OPENSSL PERL PYTHON TCL OPTIONS_DEFAULT= CHARSET OPENSSL PERL PYTHON OPTIONS_SUB= yes CHARSET_DESC= Character encoding support via ICU CYRUS_DESC= Cyrus SASL module DEBUG_DESC= Debugging support PERL_DESC= Perl scripting module PYTHON_DESC= Python scripting module TCL_DESC= Tcl scripting module CHARSET_CMAKE_BOOL= WANT_ICU CHARSET_LIB_DEPENDS= libicuuc.so:devel/icu CYRUS_CMAKE_BOOL= WANT_CYRUS CYRUS_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 DEBUG_VARS= CMAKE_BUILD_TYPE=Debug IPV6_CMAKE_BOOL= WANT_IPV6 NLS_CMAKE_BOOL= WANT_I18N NLS_LIB_DEPENDS= libboost_locale.so:devel/boost-libs NLS_USES= gettext OPENSSL_CMAKE_BOOL= WANT_OPENSSL OPENSSL_CMAKE_ON= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} OPENSSL_USES= ssl PERL_BUILD_DEPENDS= swig>=3.0.0:devel/swig PERL_CMAKE_BOOL= WANT_PERL WANT_SWIG PERL_USE= perl5=build,run PERL_USES= perl5 PYTHON_CMAKE_BOOL= WANT_PYTHON WANT_SWIG PYTHON_CMAKE_ON= -DWANT_PYTHON_VERSION:STRING=python-${PYTHON_VER} PYTHON_BUILD_DEPENDS= swig>=3.0.0:devel/swig PYTHON_IMPLIES= CHARSET PYTHON_USE= perl5=build PYTHON_USES= perl5 TCL_CMAKE_BOOL= WANT_TCL TCL_USES= tcl post-patch: @${REINPLACE_CMD} -e 's|python3|python${PYTHON_VER}|g' \ ${WRKSRC}/znc-buildmod.cmake.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor post-install-NLS-off: @${RM} -r ${STAGEDIR}${DATADIR}/translations post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} .include Index: head/irc/znc-push/Makefile =================================================================== --- head/irc/znc-push/Makefile (revision 553939) +++ head/irc/znc-push/Makefile (revision 553940) @@ -1,48 +1,49 @@ # $FreeBSD$ PORTNAME= znc-push DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-173 DISTVERSIONSUFFIX= -g78d0385 +PORTREVISION= 1 CATEGORIES= irc MAINTAINER= dor.bsd@xm0.uk COMMENT= Push notification service module for ZNC LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= znc:irc/znc LIB_DEPENDS= libicudata.so:devel/icu RUN_DEPENDS= znc:irc/znc USES= compiler:c++11-lang gmake localbase:ldflags ssl USE_GITHUB= yes GH_ACCOUNT= jreese MAKE_ENV= version=${PORTVERSION} # v2.0.0-{rc,dev} are ancient release candidates from 2014 for the seemingly # abandoned Python branch. PORTSCOUT= skipv:v2.0.0-rc,v2.0.0-dev PLIST_FILES= lib/znc/push.so PORTDOCS= *.md OPTIONS_DEFINE= CURL DOCS CURL_DESC= Use curl for HTTP requests CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_MAKE_ENV= curl=yes do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/znc ${INSTALL_PROGRAM} ${WRKSRC}/push.so ${STAGEDIR}${PREFIX}/lib/znc/push.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/znc/push.so do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/README.md ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR} .include Index: head/java/openjfx14/Makefile =================================================================== --- head/java/openjfx14/Makefile (revision 553939) +++ head/java/openjfx14/Makefile (revision 553940) @@ -1,165 +1,166 @@ # $FreeBSD$ PORTNAME= openjfx DISTVERSION= 14.0.2.1+1 +PORTREVISION= 1 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.7.1/:queries \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.7.1/:queryparser \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.7.1/:sandbox \ https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/:antlr PKGNAMESUFFIX= 14 DISTFILES= lucene-core-7.7.1.jar:core \ lucene-grouping-7.7.1.jar:grouping \ lucene-queries-7.7.1.jar:queries \ lucene-queryparser-7.7.1.jar:queryparser \ lucene-sandbox-7.7.1.jar:sandbox \ antlr4-4.7.2-complete.jar:antlr MAINTAINER= mikael@FreeBSD.org COMMENT= JavaFX SDK overlay for OpenJDK 11 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 BUILD_DEPENDS= zip:archivers/zip \ apache-ant>0:devel/apache-ant \ gradle62>=6.2:devel/gradle62 \ ${JAVALIBDIR}/junit.jar:java/junit LIB_DEPENDS= libasound.so:audio/alsa-lib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \ sqlite xorg USE_GITHUB= yes GH_ACCOUNT= openjdk GH_PROJECT= jfx USE_GL= gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango USE_JAVA= yes JAVA_VERSION= 11 USE_LDCONFIG= yes USE_XORG= x11 xtst xxf86vm CFLAGS+= -Wno-unused-command-line-argument PLIST_SUB= INSTALLDIR=${_INSTALLDIR} OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT OPTIONS_DEFAULT= MEDIA WEBKIT OPTIONS_SUB= yes MEDIA_DESC= Media module SWT_DESC= SWT support MEDIA_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libsndio.so:audio/sndio MEDIA_USES= gmake MEDIA_VARS= COMPILE_MEDIA=true SWT_BUILD_DEPENDS= swt>0:x11-toolkits/swt SWT_RUN_DEPENDS= swt>0:x11-toolkits/swt SWT_VARS= COMPILE_SWT=true TEST_USES= display:test TEST_VARS= AWT_TEST=true FULL_TEST=true # Gradle calls CMake during the build WEBKIT_IMPLIES= MEDIA WEBKIT_BUILD_DEPENDS= cmake:devel/cmake WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu WEBKIT_USES= bison gmake gperf perl5 python:3.5+,build WEBKIT_USE= GNOME=libxslt,libxml2 \ PERL5=build \ RUBY=yes \ XORG=xcomposite,xdamage,xfixes,xrender,xt WEBKIT_VARS= RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle _GRADLE_ENV= CC=${WRKDIR}/bin/ccwrapper \ CXX=${WRKDIR}/bin/cxxwrapper \ GRADLE_USER_HOME=${WRKDIR}/gradle-home \ JAVA_VERSION=${JAVA_VERSION} _GRADLE_RUN= ${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon _INSTALLDIR= ${PREFIX}/${PKGBASE} post-extract: ${MKDIR} ${WRKDIR}/jars .for f in core grouping queries queryparser sandbox ${CP} ${DISTDIR}/lucene-${f}-7.7.1.jar ${WRKDIR}/jars .endfor ${CP} ${DISTDIR}/antlr4-4.7.2-complete.jar ${WRKDIR}/jars # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the # Linux versions. Prepare the tree, so that we only see the changes # from Linux's Makefile in our own patches. pre-patch: @${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \ ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd @${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \ ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd post-patch: @${MKDIR} ${WRKDIR}/bin @${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper @${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper @${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper @${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \ -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \ ${WRKSRC}/buildSrc/bsd.gradle # Add a *BSD native audio sink to GStreamer-lite instead of using the # bundled ALSA sink. Currently we add an sndio sink, but this is an extension # point for eventually adding an OSS backend (or others) as an option as well. # If you add a new one make sure it registers itself as "bsdaudiosink" as defined # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp @${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \ ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \ ${LN} -s gstsndio.c gstbsdaudio.c && \ ${LN} -s sndiosink.c bsdaudiosink.c # Pull Java dependencies from LOCALBASE @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle # Remove bundled libraries. We use the system's versions instead. @cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \ ${RM} -r icu libxml libxslt sqlite @${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu @cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \ ${RM} -r glib libffi do-configure: @${MKDIR} ${WRKDIR}/gradle-home @${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties @${ECHO_CMD} "JFX_DEPS_URL = ${WRKDIR}/jars" > ${WRKSRC}/gradle.properties .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST @${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties .endfor @${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle # the java doc are not installed on FreeBSD so exclude the javadoc task # as it'll fail otherwise do-build: @cd ${WRKSRC} && ${SETENV} ${_GRADLE_RUN} zips --exclude-task javadoc # it's not recommended to install openjfx inside openjdk directory do-install: @${MKDIR} ${STAGEDIR}${_INSTALLDIR} \ ${STAGEDIR}${_INSTALLDIR}/lib \ ${STAGEDIR}${_INSTALLDIR}/jmods ${INSTALL_DATA} ${WRKSRC}/build/javafx-exports.zip ${STAGEDIR}${_INSTALLDIR} (cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/lib) @${MV} ${STAGEDIR}${_INSTALLDIR}/lib/src.zip ${STAGEDIR}${_INSTALLDIR}/lib/javafx-src.zip (cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/jmods) @${FIND} ${STAGEDIR}${_INSTALLDIR}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \; do-test-TEST-on: @cd ${WRKSRC} && ${_GRADLE_RUN} check test .include Index: head/java/openjfx14/files/patch-icu68 =================================================================== --- head/java/openjfx14/files/patch-icu68 (nonexistent) +++ head/java/openjfx14/files/patch-icu68 (revision 553940) @@ -0,0 +1,167 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.cpp:27: +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-3c72abbe-47.cpp:3: +modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp:242:45: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converter.get(), TRUE); + ^ + +--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h +@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp +@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -239,7 +239,7 @@ void TextCodecICU::createICUConverter() const + UErrorCode error = U_ZERO_ERROR; + m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close }; + if (m_converter) +- ucnv_setFallback(m_converter.get(), TRUE); ++ ucnv_setFallback(m_converter.get(), true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error) Property changes on: head/java/openjfx14/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/java/openjfx8-devel/Makefile =================================================================== --- head/java/openjfx8-devel/Makefile (revision 553939) +++ head/java/openjfx8-devel/Makefile (revision 553940) @@ -1,151 +1,151 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= openjfx8 DISTVERSION= 8u202-b07 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \ http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/ PKGNAMESUFFIX= -devel MAINTAINER= ports@FreeBSD.org COMMENT= JavaFX SDK overlay for OpenJDK 8 BROKEN= Does not build with glib 2.66.0 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= No longer maintained upstream EXPIRATION_DATE= 2020-11-30 ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= apache-ant>0:devel/apache-ant \ antlr3>0:devel/antlr3 \ gradle4>=4.8:devel/gradle4 \ ${JAVALIBDIR}/junit.jar:java/junit LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 USES= gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig \ sqlite xorg USE_GL= gl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango USE_JAVA= yes JAVA_VERSION= 1.8 USE_LDCONFIG= yes USE_XORG= x11 xtst xxf86vm CFLAGS+= -fcommon -Wno-unused-command-line-argument WRKSRC= ${WRKDIR}/rt-${DISTVERSION} PLIST_SUB= ARCH=${ARCH} \ JAVA_HOME=${JAVA_HOME} OPTIONS_DEFINE= MEDIA SWT TEST WEBKIT OPTIONS_DEFAULT= MEDIA WEBKIT OPTIONS_SUB= yes MEDIA_DESC= Media module SWT_DESC= SWT support MEDIA_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libsndio.so:audio/sndio MEDIA_USES= gmake MEDIA_VARS= COMPILE_MEDIA=true SWT_BUILD_DEPENDS= swt>0:x11-toolkits/swt SWT_RUN_DEPENDS= swt>0:x11-toolkits/swt SWT_VARS= COMPILE_SWT=true TEST_USES= display:test TEST_VARS= AWT_TEST=true FULL_TEST=true # Gradle calls CMake during the build WEBKIT_IMPLIES= MEDIA WEBKIT_BUILD_DEPENDS= cmake:devel/cmake WEBKIT_LIB_DEPENDS= libicui18n.so:devel/icu WEBKIT_USES= bison compiler:c++14-lang gmake gperf perl5 python:2.7,build WEBKIT_USE= GNOME=libxslt,libxml2 \ PERL5=build \ RUBY=yes \ XORG=xcomposite,xdamage,xfixes,xrender,xt WEBKIT_VARS= RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle _GRADLE_ENV= CC=${WRKDIR}/bin/ccwrapper \ CXX=${WRKDIR}/bin/cxxwrapper \ GRADLE_USER_HOME=${WRKDIR}/gradle-home _GRADLE_RUN= ${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon # NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar # already exists on your system. This is not a problem in Poudriere # or Synth but something to be aware of if you're trying to build this # port in a non-pristine environment. # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the # Linux versions. Prepare the tree, so that we only see the changes # from Linux's Makefile in our own patches. pre-patch: @${CP} -r ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/linux \ ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/bsd @${CP} -r ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/linux \ ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd post-patch: @${MKDIR} ${WRKDIR}/bin @${PRINTF} '#!/bin/sh\nexec ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper @${PRINTF} '#!/bin/sh\nexec ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper @${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper @${SED} -e 's@/linux@/freebsd@g' -e 's@-DLINUX@-DFREEBSD@g' -e 's@LINUX@BSD@g' \ -e 's@linux_@bsd_@g' -e 's@"-static-libgcc", "-static-libstdc++",@@g' \ -e 's@"gcc"@"${WRKDIR}/bin/ccwrapper"@g' -e 's@"g\+\+"@"${WRKDIR}/bin/cxxwrapper"@g' \ ${WRKSRC}/buildSrc/linux.gradle > ${WRKSRC}/buildSrc/bsd.gradle # Add a *BSD native audio sink to GStreamer-lite instead of using the # bundled ALSA sink. Currently we add an sndio sink, but this is an extension # point for eventually adding an OSS backend (or others) as an option as well. # If you add a new one make sure it registers itself as "bsdaudiosink" as defined # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp @${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \ ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio @cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \ ${LN} -s gstsndio.c gstbsdaudio.c && \ ${LN} -s sndiosink.c bsdaudiosink.c # Pull Java dependencies from LOCALBASE @${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \ ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle # Remove bundled libraries. We use the system's versions instead. @cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \ ${RM} -r icu libxml libxslt sqlite @${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/WTF/icu @cd ${WRKSRC}/modules/media/src/main/native/gstreamer/3rd_party && \ ${RM} -r glib libffi post-patch-SWT-off: @${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt do-configure: @${MKDIR} ${WRKDIR}/gradle-home @${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST @${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties .endfor @${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle do-build: @cd ${WRKSRC} && ${_GRADLE_RUN} zips do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME} @${TAR} -C ${STAGEDIR}${JAVA_HOME} \ -xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip @${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \; do-test-TEST-on: @cd ${WRKSRC} && ${_GRADLE_RUN} check test .include Index: head/lang/gnustep-base/Makefile =================================================================== --- head/lang/gnustep-base/Makefile (revision 553939) +++ head/lang/gnustep-base/Makefile (revision 553940) @@ -1,81 +1,81 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= gnustep-base DISTVERSIONPREFIX= base- DISTVERSION= 1_26_0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= lang devel gnustep MAINTAINER= ports@FreeBSD.org COMMENT= GNUstep Foundation library LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi BROKEN_FreeBSD_11_powerpc64= fails to link: ld.lld: error: /usr/src/lib/csu/common/crtend.c:55: relocation R_PPC64_ADDR16_DS out of range: -32776 is not in [-32768, 32767] BROKEN_FreeBSD_12_powerpc64= fails to link: ld.lld: error: /usr/src/lib/csu/common/crtend.c:55: relocation R_PPC64_ADDR16_DS out of range: -32776 is not in [-32768, 32767] LIB_DEPENDS+= libffi.so:devel/libffi LIB_DEPENDS+= libxml2.so:textproc/libxml2 LIB_DEPENDS+= libxslt.so:textproc/libxslt LIB_DEPENDS+= libgmp.so:math/gmp LIB_DEPENDS+= libgcrypt.so:security/libgcrypt RUN_DEPENDS+= ${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:devel/gnustep-make USES= pkgconfig iconv gnustep USE_GNUSTEP= build USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} USE_GITHUB= yes GH_ACCOUNT= gnustep GH_PROJECT= libs-base GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs --disable-mixedabi --with-installation-domain=SYSTEM CONFIGURE_ENV= OBJCFLAGS='-fobjc-runtime=gnustep-2.0 -fblocks' MAKE_FLAGS= OPTFLAG="${CFLAGS}" ETCDIR= ${LOCALBASE}/etc STAGEHEADER= ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers PLIST_SUB+= BASEVERSION=${PORTVERSION:R} OPTIONS_DEFINE= ICU GNUTLS OPTIONS_RADIO= ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNS OPTIONS_DEFAULT= ICU GNUTLS AVAHI OPTIONS_SUB= yes ZEROCONF_DESC= Zeroconf (Bonjour) support AVAHI_DESC= Zeroconf via Avahi (preferred) MDNS_DESC= Zeroconf via mDNSResponder ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CONFIGURE_OFF= --disable-icu GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_OFF= --disable-tls .include .if ${PORT_OPTIONS:MAVAHI} CONFIGURE_ARGS+= --with-zeroconf-api=avahi LIB_DEPENDS+= libavahi-client.so:net/avahi-app .elif ${PORT_OPTIONS:MMDNS} CONFIGURE_ARGS+= --with-zeroconf-api=mdns LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder .else CONFIGURE_ARGS+= --disable-zeroconf .endif post-extract: @${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/| ; \ s|HAVE_TLS|HAVE_GNUTLS|" ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${FILESDIR}/gdomap_if ${STAGEDIR}${ETCDIR} .include Index: head/lang/gnustep-base/files/patch-icu68 =================================================================== --- head/lang/gnustep-base/files/patch-icu68 (nonexistent) +++ head/lang/gnustep-base/files/patch-icu68 (revision 553940) @@ -0,0 +1,185 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +GSICUString.m:71:18: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:80:18: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +GSICUString.m:104:18: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:113:18: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +GSICUString.m:135:10: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSICUString.m:170:66: error: use of undeclared identifier 'TRUE' + UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE); + ^ +NSRegularExpression.m:185:29: error: use of undeclared identifier 'FALSE' + utext_clone(&str->txt, t, FALSE, TRUE, &s); + ^ +NSRegularExpression.m:185:36: error: use of undeclared identifier 'TRUE' + utext_clone(&str->txt, t, FALSE, TRUE, &s); + ^ +NSRegularExpression.m:842:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:842:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:876:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:876:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:914:34: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:914:40: error: use of undeclared identifier 'TRUE' + utext_clone(&ret->txt, output, TRUE, TRUE, &s); + ^ +NSRegularExpression.m:291:14: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +NSRegularExpression.m:368:36: error: use of undeclared identifier 'FALSE' + uregex_useAnchoringBounds(r, FALSE, &s); + ^ +NSRegularExpression.m:372:38: error: use of undeclared identifier 'TRUE' + uregex_useTransparentBounds(r, TRUE, &s); + ^ + +--- Source/GSICUString.m.orig 2019-01-06 22:33:45 UTC ++++ Source/GSICUString.m +@@ -68,7 +68,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * to match it. + */ + ut->chunkOffset = nativeIndex - nativeStart; +- return TRUE; ++ return true; + } + + if (nativeIndex >= length && nativeLimit >= length) +@@ -77,7 +77,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * Limit it to point just after the last character. + */ + ut->chunkOffset = ut->chunkLength; +- return FALSE; ++ return false; + } + + /* Set up to fill the chunk with characters from the string +@@ -101,7 +101,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * to match it. + */ + ut->chunkOffset = nativeIndex - nativeStart; +- return TRUE; ++ return true; + } + + if (nativeIndex <= 0 && nativeStart <= 0) +@@ -110,7 +110,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + * Limit it to position of the first character. + */ + ut->chunkOffset = 0; +- return FALSE; ++ return false; + } + + nativeLimit = nativeIndex; +@@ -132,7 +132,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB + ut->chunkNativeStart = nativeStart; + ut->nativeIndexingLimit = r.length; + ut->chunkLength = r.length; +- return TRUE; ++ return true; + } + + /** +@@ -167,7 +167,7 @@ UTextNSMutableStringReplace(UText *ut, + // Setting the chunk length to 0 here forces UTextNSStringAccess to fetch + // the data from the string object. + ut->chunkLength = 0; +- UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE); ++ UTextNSStringAccess(ut, r.location + [replacement length] + 1, true); + ut->chunkOffset++; + + [replacement release]; +--- Source/NSRegularExpression.m.orig 2019-01-06 22:33:45 UTC ++++ Source/NSRegularExpression.m +@@ -182,7 +182,7 @@ NSRegularExpressionOptionsToURegexpFlags(NSRegularExpr + return nil; + } + str = [GSUTextString new]; +- utext_clone(&str->txt, t, FALSE, TRUE, &s); ++ utext_clone(&str->txt, t, false, true, &s); + return [str autorelease]; + } + #else +@@ -288,7 +288,7 @@ callback(const void *context, int32_t steps) + + if (NULL == context) + { +- return FALSE; ++ return false; + } + CALL_BLOCK(block, nil, NSMatchingProgress, &stop); + return stop; +@@ -365,11 +365,11 @@ setupRegex(URegularExpression *regex, + uregex_setRegion(r, range.location, range.location+range.length, &s); + if (options & NSMatchingWithoutAnchoringBounds) + { +- uregex_useAnchoringBounds(r, FALSE, &s); ++ uregex_useAnchoringBounds(r, false, &s); + } + if (options & NSMatchingWithTransparentBounds) + { +- uregex_useTransparentBounds(r, TRUE, &s); ++ uregex_useTransparentBounds(r, true, &s); + } + uregex_setTimeLimit(r, _workLimit, &s); + if (U_FAILURE(s)) +@@ -401,11 +401,11 @@ setupRegex(URegularExpression *regex, + uregex_setRegion(r, range.location, range.location+range.length, &s); + if (options & NSMatchingWithoutAnchoringBounds) + { +- uregex_useAnchoringBounds(r, FALSE, &s); ++ uregex_useAnchoringBounds(r, false, &s); + } + if (options & NSMatchingWithTransparentBounds) + { +- uregex_useTransparentBounds(r, TRUE, &s); ++ uregex_useTransparentBounds(r, true, &s); + } + uregex_setTimeLimit(r, _workLimit, &s); + if (U_FAILURE(s)) +@@ -839,7 +839,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return 0; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + [string setString: ret]; + [ret release]; + uregex_close(r); +@@ -873,7 +873,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return nil; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + uregex_close(r); + + utext_close(&txt); +@@ -911,7 +911,7 @@ prepareResult(NSRegularExpression *regex, + DESTROY(ret); + return nil; + } +- utext_clone(&ret->txt, output, TRUE, TRUE, &s); ++ utext_clone(&ret->txt, output, true, true, &s); + uregex_close(r); + + utext_close(&txt); Property changes on: head/lang/gnustep-base/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/hermes/Makefile =================================================================== --- head/lang/hermes/Makefile (revision 553939) +++ head/lang/hermes/Makefile (revision 553940) @@ -1,41 +1,42 @@ # $FreeBSD$ PORTNAME= hermes DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= lang PKGNAMESUFFIX= -javascript-engine MAINTAINER= yuri@FreeBSD.org COMMENT= JavaScript engine LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= https://github.com/facebook/hermes/issues/356 LIB_DEPENDS= libicui18n.so:devel/icu TEST_DEPENDS= zip:archivers/zip USES= cmake compiler:c++11-lang python:test USE_GITHUB= yes GH_ACCOUNT= facebook USE_LDCONFIG= yes CMAKE_OFF= HERMES_ENABLE_TEST_SUITE BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1201518 BROKEN= needs pthread_getname_np from OSVERSION 1201518 or above .endif do-test: # some tests are known to fail: https://github.com/facebook/hermes/issues/347 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHERMES_ENABLE_TEST_SUITE:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-hermes .include Index: head/lang/parrot/Makefile =================================================================== --- head/lang/parrot/Makefile (revision 553939) +++ head/lang/parrot/Makefile (revision 553940) @@ -1,57 +1,57 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= parrot PORTVERSION= 8.1.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= lang MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/supported/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= perl@FreeBSD.org COMMENT= Virtual machine for dynamic languages LICENSE= ART20 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ pcre-config:devel/pcre LIB_DEPENDS= libgmp.so:math/gmp \ libicudata.so:devel/icu OPTIONS_DEFINE= DOCS ALL_TARGET= installable CONFIGURE_ARGS= --cc=${CC} --cxx=${CXX} --link=${CXX} \ --ccflags="${CFLAGS}" \ --ld=${CC} --ldflags="${LDFLAGS}" \ --gc=gms --inline --optimize --parrot_is_shared --verbose \ --prefix=${PREFIX} \ --icu-config=${LOCALBASE}/bin/icu-config \ --lex=${LOCALBASE}/bin/flex \ --yacc=${LOCALBASE}/bin/bison CONFIGURE_SCRIPT= Configure.pl INSTALL_TARGET= install-dev TEST_TARGET= test MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USES= bison gmake localbase:ldflags perl5 shebangfix tar:bzip2 SHEBANG_FILES= tools/dev/create_language.pl \ tools/dev/gen_makefile.pl \ tools/dev/pprof2cg.pl \ tools/dev/reconfigure.pl perl_OLD_CMD= perl BINARY_WRAPPERS= gm4 DOCSDIR= share/doc/${PORTNAME}/${PORTVERSION} PLIST_SUB= PARROT_VER="${PORTVERSION}" do-configure: (cd ${WRKSRC} && ${PERL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/inst_libparrot.so.${PORTVERSION} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \ ${STAGEDIR}${PREFIX}/lib/libparrot.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib/parrot/${PORTVERSION}/dynext/*.so .include Index: head/lang/spidermonkey52/Makefile =================================================================== --- head/lang/spidermonkey52/Makefile (revision 553939) +++ head/lang/spidermonkey52/Makefile (revision 553940) @@ -1,101 +1,101 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= spidermonkey PORTVERSION= 52.9.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} DISTNAME= firefox-${PORTVERSION}esr.source MAINTAINER= kwm@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 52-esr BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 LIB_DEPENDS= libnspr4.so:devel/nspr \ libffi.so:devel/libffi \ libicudata.so:devel/icu HAS_CONFIGURE= yes USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \ python:2.7,build tar:xz # python:2.7,build readline tar:xz USE_LDCONFIG= yes SP_VER= 52 WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/js/src PATCH_WRKSRC= ${WRKDIR}/firefox-${PORTVERSION}esr/ INCLUDE= .cargo Makefile.in build* config* gradle* js memory nsprpub/config INCLUDE+= mfbt modules moz* python taskcluster testing EXTRACT_AFTER_ARGS+= ${INCLUDE:S|^|firefox-${PORTVERSION}esr/|} CONFIGURE_ARGS= --with-pthreads \ --prefix=${PREFIX:Q} \ --target=${CONFIGURE_TARGET} \ --with-intl-api \ --with-system-zlib \ --disable-gold \ --with-system-icu \ --with-system-nspr CONFIGURE_ENV= HOST_CC=${CC} HOST_CXX=${CXX} OPTIONS_DEFINE= DEBUG GCZEAL JEMALLOC OPTIMIZE READLINE UTF8 DTRACE OPTIONS_DEFAULT=METHODJIT OPTIMIZE READLINE OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug debug-symbols DTRACE_CONFIGURE_ENABLE=dtrace profiling DTRACE_LIBS= -lelf GCZEAL_DESC= Enable Zealous garbage collecting GCZEAL_CONFIGURE_ENABLE=gczeal JEMALLOC_DESC= Use jemalloc as memory allocator JEMALLOC_CONFIGURE_ENABLE= jemalloc OPTIMIZE_DESC= Enable compiler optimizations OPTIMIZE_CONFIGURE_ENABLE= optimize READLINE_DESC= Link js shell to the readline library READLINE_USES= readline READLINE_CONFIGURE_ENABLE= readline UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 UTF8_CFLAGS= -DJS_C_STRINGS_ARE_UTF8 .include .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .endif post-patch: # Skip some tests because bundled icu differs from system @${RM} ${WRKSRC}/tests/Intl/Date/toLocaleDateString_timeZone.js \ ${WRKSRC}/tests/Intl/DateTimeFormat/format.js \ ${WRKSRC}/tests/Intl/DateTimeFormat/format_timeZone.js \ ${WRKSRC}/tests/Intl/NumberFormat/StringBuffer.js pre-configure: cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13 # The directory needs to exist, or configure freaks out: @${MKDIR} ${WRKSRC:H:H}/intl/icu/source/common/unicode ${LN} -s ${LOCALBASE}/include/unicode/uvernum.h \ ${WRKSRC:H:H}/intl/icu/source/common/unicode/ regression-test: build @${ECHO_MSG} -n "===> Running jstests.py: " @cd ${WRKSRC} && ${SETENV} LANG=C TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \ -d -s --no-progress ./js/src/shell/js post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs ${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1 .if ! ${PORT_OPTIONS:MDTRACE} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.* .endif .include Index: head/lang/spidermonkey60/Makefile =================================================================== --- head/lang/spidermonkey60/Makefile (revision 553939) +++ head/lang/spidermonkey60/Makefile (revision 553940) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= spidermonkey DISTVERSION= 60.9.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER= tcberner@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 60-esr LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Requires python2 to build EXPIRATION_DATE= 2020-12-31 BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 LIB_DEPENDS= libnspr4.so:devel/nspr \ libffi.so:devel/libffi \ libicudata.so:devel/icu HAS_CONFIGURE= yes USES= compiler:c++14-lang gmake localbase pathfix pkgconfig \ python:2.7,build tar:xz USE_LDCONFIG= yes SP_VER= 60 WRKSRC= ${WRKDIR}/firefox-${DISTVERSION} PATCH_WRKSRC= ${WRKDIR}/firefox-${DISTVERSION}/ CONFIGURE_OUTSOURCE= yes CONFIGURE_SCRIPT= ../firefox-${DISTVERSION}/js/src/configure CONFIGURE_ARGS= --with-pthreads \ --prefix=${PREFIX:Q} \ --target=${CONFIGURE_TARGET} \ --with-intl-api \ --with-system-zlib \ --disable-gold \ --disable-debug \ --disable-debug-symbols \ --disable-jemalloc \ --with-system-icu \ --with-system-nspr \ --enable-shared-js \ --enable-optimize \ --enable-readline CONFIGURE_ENV= HOST_CC=${CC} HOST_CXX=${CXX} .include .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .endif .if ${ARCH} == i386 # ld: error: undefined symbol: __atomic_load USE_GCC= 9+ .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs ${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.* .include Index: head/lang/spidermonkey78/Makefile =================================================================== --- head/lang/spidermonkey78/Makefile (revision 553939) +++ head/lang/spidermonkey78/Makefile (revision 553940) @@ -1,86 +1,86 @@ # $FreeBSD$ PORTNAME= spidermonkey DISTVERSION= 78.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source PKGNAMESUFFIX= ${SP_VER} DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER= swills@FreeBSD.org COMMENT= Standalone JavaScript based from Mozilla 78-esr LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/clang++90:devel/llvm90 \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ autoconf-2.13:devel/autoconf213 \ rust-cbindgen>=0.8.7:devel/rust-cbindgen LIB_DEPENDS= libffi.so:devel/libffi \ libicudata.so:devel/icu \ libnspr4.so:devel/nspr USES= compiler:c++17-lang gmake localbase pathfix pkgconfig python:build \ readline tar:xz USE_LDCONFIG= yes SP_VER= 78 HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/firefox-${DISTVERSION} PATCH_WRKSRC= ${WRKDIR}/firefox-${DISTVERSION}/ CONFIGURE_OUTSOURCE= yes CONFIGURE_SCRIPT= ../firefox-${DISTVERSION}/js/src/configure CONFIGURE_ARGS= --disable-debug \ --disable-debug-symbols \ --disable-gold \ --disable-jemalloc \ --disable-tests \ --enable-optimize \ --enable-readline \ --enable-shared-js \ --prefix=${PREFIX:Q} \ --target=${CONFIGURE_TARGET} \ --with-intl-api \ --with-system-icu \ --with-system-nspr \ --with-system-zlib CONFIGURE_ENV= HOST_CC=${CC} \ HOST_CXX=${CXX} CONFIGURE_ENV+= LLVM_CONFIG=llvm-config90 \ LLVM_OBJDUMP=llvm-objdump90 BINARY_ALIAS= python3=${PYTHON_CMD} PLIST_SUB= SP_VER=${SP_VER} .include .if ${ARCH} == amd64 CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif # Require newer Clang than what's in base system unless user opted out .if ${CHOSEN_COMPILER_TYPE} == gcc USE_GCC= yes .elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) CPP= ${LOCALBASE}/bin/clang-cpp90 CC= ${LOCALBASE}/bin/clang90 CXX= ${LOCALBASE}/bin/clang++90 BUILD_DEPENDS+= ${LOCALBASE}/bin/clang90:devel/llvm90 .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs ${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js${SP_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.* .include Index: head/mail/cyrus-imapd30/Makefile =================================================================== --- head/mail/cyrus-imapd30/Makefile (revision 553939) +++ head/mail/cyrus-imapd30/Makefile (revision 553940) @@ -1,219 +1,220 @@ # $FreeBSD$ PORTNAME= cyrus-imapd PORTVERSION= 3.0.14 +PORTREVISION= 1 #PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 30 MAINTAINER= ume@FreeBSD.org COMMENT= Cyrus mail server, supporting POP3 and IMAP4 protocols LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libicuuc.so:devel/icu \ libjansson.so:devel/jansson \ libpcre.so:devel/pcre CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl USE_RC_SUBR= imapd GNU_CONFIGURE= yes CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --libexecdir=${CYRUS_PREFIX}/libexec \ --sbindir=${CYRUS_PREFIX}/sbin \ --sysconfdir=${PREFIX}/etc \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL} CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \ MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \ DOCS OPTIONS_DEFAULT= AUTOCREATE IDLED SQLITE SQUAT OPTIONS_SUB= yes AUTOCREATE_DESC= Enable autocreate support AUTOCREATE_CONFIGURE_ENABLE= autocreate BACKUP_DESC= Enable backup support (experimental) BACKUP_CONFIGURE_ENABLE=backup CLAMAV_DESC= Use ClamAV CLAMAV_CONFIGURE_WITH= clamav CLAMAV_LIB_DEPENDS= libclamav.so:security/clamav HTTP_DESC= Enable HTTP support HTTP_CONFIGURE_ENABLE= http HTTP_LIB_DEPENDS= libical.so:devel/libical \ libnghttp2.so:www/libnghttp2 \ libshp.so:devel/shapelib \ libbrotlidec.so:archivers/brotli # Need additional patch to opendkim #HTTP_LIB_DEPENDS+= libopendkim.so:mail/opendkim #HTTP_CPPFLAGS+= -I${LOCALBASE}/include/opendkim HTTP_USES= gnome HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} LMDB_DESC= Use LMDB backend LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb LMDB_CONFIGURE_WITH= lmdb MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql NNTP_DESC= Enable NNTP support NNTP_CONFIGURE_ENABLE= nntp PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} REPLICATION_DESC= Enable replication (experimental) REPLICATION_CONFIGURE_ENABLE=replication SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_BROKEN_OFF= SQLITE is required SQUAT_DESC= Enable Squat support SQUAT_CONFIGURE_OFF= --disable-squat XAPIAN_DESC= Enable Xapian support XAPIAN_CONFIGURE_ENABLE=xapian XAPIAN_LIB_DEPENDS= libxapian.so:databases/xapian-core XAPIAN_BUILD_DEPENDS= rsync:net/rsync XAPIAN_RUN_DEPENDS= ${XAPIAN_BUILD_DEPENDS} OPTIONS_RADIO= GSSAPI READLINE OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT .if exists(/usr/lib/libkrb5.a) OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm READLINE_GNU_RUN_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu READLINE_PERL_DESC= Use Term::Readline::Perl for cyradm READLINE_PERL_RUN_DEPENDS= p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl MANDIRS= ${CYRUS_PREFIX}/man PORTDOCS= * SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN_MAN1= httptest imtest installsieve lmtptest mupdatetest nntptest \ pop3test sieveshell sivtest smtptest MAN_MAN3= imclient MAN_MAN5= cyrus.conf imapd.conf krb.equiv CYRUS_MAN8= arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \ ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \ cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \ cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \ master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \ restore smmapd timsieved tls_prune unexpunge CYRUS_PERL_MAN1=cyradm CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \ Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve .include .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE} USES+= sqlite .endif .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ !${PORT_OPTIONS:MGSSAPI_MIT} CONFIGURE_ARGS+=--disable-gssapi .endif .if ${PORT_OPTIONS:MHTTP} CYRUS_MAN8+= ctl_zoneinfo httpd .endif .if ${PORT_OPTIONS:MNNTP} CYRUS_MAN8+= fetchnews nntpd .endif .if ${PORT_OPTIONS:MREPLICATION} CYRUS_MAN8+= sync_client sync_reset sync_server .endif .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN} CYRUS_MAN8+= squatter PLIST_SUB+= SQUATTER="" .else PLIST_SUB+= SQUATTER="@comment " .endif post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec @${REINPLACE_CMD} \ -e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \ -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \ ${WRKSRC}/Makefile.in post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf .for s in 1 3 5 . for m in ${MAN_MAN${s}} @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for s in 1 3 . for m in ${CYRUS_PERL_MAN${s}} @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for m in ${CYRUS_MAN8} @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! ( -path */html/_sources* -o -name .buildinfo )" ${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source .include Index: head/mail/cyrus-imapd32/Makefile =================================================================== --- head/mail/cyrus-imapd32/Makefile (revision 553939) +++ head/mail/cyrus-imapd32/Makefile (revision 553940) @@ -1,227 +1,228 @@ # $FreeBSD$ PORTNAME= cyrus-imapd PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/ PKGNAMESUFFIX= 32 MAINTAINER= ume@FreeBSD.org COMMENT= Cyrus mail server, supporting POP3 and IMAP4 protocols LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 \ libicuuc.so:devel/icu \ libjansson.so:devel/jansson \ libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid CONFLICTS_INSTALL= cyrus-imapd-2.* cyrus-imapd2* USES= compiler:c11 cpe gmake libtool perl5 pkgconfig ssl USE_RC_SUBR= imapd GNU_CONFIGURE= yes CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --libexecdir=${CYRUS_PREFIX}/libexec \ --sbindir=${CYRUS_PREFIX}/sbin \ --sysconfdir=${PREFIX}/etc \ --with-cyrus-user=${CYRUS_USER} \ --with-sasl=${LOCALBASE} \ --with-com_err \ --with-openssl=${OPENSSLBASE} \ --with-perl=${PERL} CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes USES+= shebangfix SHEBANG_FILES= imap/promdatagen snmp/snmpgen tools/config2header \ tools/masssievec tools/mkimap perl/sieve/scripts/*.pl CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP MURDER \ MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \ DOCS OPTIONS_DEFAULT= AUTOCREATE IDLED SQLITE SQUAT OPTIONS_SUB= yes AUTOCREATE_DESC= Enable autocreate support AUTOCREATE_CONFIGURE_ENABLE= autocreate BACKUP_DESC= Enable backup support (experimental) BACKUP_CONFIGURE_ENABLE=backup CLAMAV_DESC= Use ClamAV CLAMAV_CONFIGURE_WITH= clamav CLAMAV_LIB_DEPENDS= libclamav.so:security/clamav HTTP_DESC= Enable HTTP support HTTP_CONFIGURE_ENABLE= http HTTP_LIB_DEPENDS= libical.so:devel/libical \ libnghttp2.so:www/libnghttp2 \ libshp.so:devel/shapelib \ libbrotlidec.so:archivers/brotli # Need additional patch to opendkim #HTTP_LIB_DEPENDS+= libopendkim.so:mail/opendkim #HTTP_CPPFLAGS+= -I${LOCALBASE}/include/opendkim HTTP_USES= gnome HTTP_USE= GNOME=libxml2 IDLED_DESC= Enable IMAP idled support IDLED_CONFIGURE_ENABLE= idled LDAP_DESC= Enable LDAP support (experimental) LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql NNTP_DESC= Enable NNTP support NNTP_CONFIGURE_ENABLE= nntp PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} REPLICATION_DESC= Enable replication (experimental) REPLICATION_CONFIGURE_ENABLE=replication #SRS_DESC= Enable Sender Rewriting Scheme support #SRS_CONFIGURE_ENABLE= srs #SRS_LIB_DEPENDS= libsrs2.so:mail/libsrs2 SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_ON= --with-snmp=${LOCALBASE} SNMP_CONFIGURE_OFF= --with-snmp=no SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_BROKEN_OFF= SQLITE is required SQUAT_DESC= Enable Squat support SQUAT_CONFIGURE_OFF= --disable-squat XAPIAN_DESC= Enable Xapian support XAPIAN_CONFIGURE_ENABLE=xapian XAPIAN_LIB_DEPENDS= libxapian.so:databases/xapian-core XAPIAN_BUILD_DEPENDS= rsync:net/rsync XAPIAN_RUN_DEPENDS= ${XAPIAN_BUILD_DEPENDS} OPTIONS_RADIO= GSSAPI READLINE OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT .if exists(/usr/lib/libkrb5.a) OPTIONS_RADIO_GSSAPI+= GSSAPI_BASE OPTIONS_DEFAULT+= GSSAPI_BASE .endif GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags GSSAPI_HEIMDAL_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit OPTIONS_RADIO_READLINE= READLINE_GNU READLINE_PERL READLINE_GNU_DESC= Use Term::Readline::GNU for cyradm READLINE_GNU_RUN_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu READLINE_PERL_DESC= Use Term::Readline::Perl for cyradm READLINE_PERL_RUN_DEPENDS= p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl MANDIRS= ${CYRUS_PREFIX}/man PORTDOCS= * SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus MAN_MAN1= httptest imtest installsieve lmtptest mupdatetest nntptest \ pop3test sieveshell sivtest smtptest MAN_MAN3= imclient MAN_MAN5= cyrus.conf imapd.conf krb.equiv CYRUS_MAN8= arbitron backupd chk_cyrus ctl_backups ctl_conversationsdb \ ctl_cyrusdb ctl_deliver ctl_mboxlist cvt_cyrusdb cyr_backup \ cyr_buildinfo cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \ cyr_synclog cyr_virusscan deliver fud idled imapd ipurge lmtpd \ master mbexamine mbpath mbtool notifyd pop3d quota reconstruct \ restore smmapd timsieved tls_prune unexpunge CYRUS_PERL_MAN1=cyradm CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \ Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE} USES+= sqlite .endif .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ !${PORT_OPTIONS:MGSSAPI_MIT} CONFIGURE_ARGS+=--disable-gssapi .endif .if ${PORT_OPTIONS:MHTTP} CYRUS_MAN8+= ctl_zoneinfo httpd .endif .if ${PORT_OPTIONS:MNNTP} CYRUS_MAN8+= fetchnews nntpd .endif .if ${PORT_OPTIONS:MREPLICATION} CYRUS_MAN8+= sync_client sync_reset sync_server .endif .if ${PORT_OPTIONS:MSQUAT} || ${PORT_OPTIONS:MXAPIAN} CYRUS_MAN8+= squatter PLIST_SUB+= SQUATTER="" .else PLIST_SUB+= SQUATTER="@comment " .endif post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ ${WRKSRC}/tools/mkimap @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec @${REINPLACE_CMD} \ -e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \ -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \ ${WRKSRC}/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/IMAP/IMAP.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cyrus/SIEVE/managesieve/managesieve.so ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} ${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \ ${WRKSRC}/doc/examples/cyrus_conf/normal.conf \ > ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ ${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ ${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf .for s in 1 3 5 . for m in ${MAN_MAN${s}} @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for s in 1 3 . for m in ${CYRUS_PERL_MAN${s}} @${ECHO_CMD} ${SITE_MAN${s}}/${m}.${s}.gz >> ${TMPPLIST} . endfor .endfor .for m in ${CYRUS_MAN8} @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ "! ( -path */html/_sources* -o -name .buildinfo )" ${RM} -r ${STAGEDIR}${DOCSDIR}/rst ${STAGEDIR}${DOCSDIR}/source .include Index: head/mail/dovecot/Makefile =================================================================== --- head/mail/dovecot/Makefile (revision 553939) +++ head/mail/dovecot/Makefile (revision 553940) @@ -1,162 +1,163 @@ # Created by: Nagy, Attila # $FreeBSD$ ###################################################################### # Anytime PORTVERSION changes please bump PORTREVISION of: # # - mail/dovecot-pigeonhole. See ports/146029 for an explanation. # # - mail/dovecot-fts-xapian. # ###################################################################### PORTNAME= dovecot PORTVERSION= 2.3.11.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ MAINTAINER= ler@FreeBSD.org COMMENT= Secure, fast and powerful IMAP and POP3 server LICENSE= LGPL21 MIT LICENSE_COMB= dual LIB_DEPENDS= libzstd.so:archivers/zstd USES= cpe iconv libtool pkgconfig ssl USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow \ --with-ssl=openssl \ --with-docs USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} OPTIONS_DEFINE= LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP OPTIONS_SUB= yes OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT LZ4_DESC= LZ4 compression support VPOPMAIL_DESC= vpopmail support DB_DESC= Database support CDB_DESC= CDB database support FTS_DESC= Full text search plugins ICU_DESC= Use libicu for FTS unicode normalization LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support TEXTCAT_DESC= Libexttextcat FTS support GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 # General options LIBSODIUM_DESC= support libsodium based crypts (ARGON2I/ARGON2ID) LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium LIBWRAP_CONFIGURE_WITH= libwrap LUA_CONFIGURE_WITH= lua LUA_USES= lua LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 VPOPMAIL_BUILD_DEPENDS= vpopmail>=0:mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite # FTS ICU_CONFIGURE_WITH= icu ICU_LIB_DEPENDS= libicui18n.so:devel/icu LUCENE_CONFIGURE_WITH= lucene stemmer LUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene SOLR_CONFIGURE_WITH= solr SOLR_LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 TEXTCAT_CONFIGURE_WITH= textcat TEXTCAT_LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat # GSSAPI GSSAPI_NONE_CONFIGURE_ON= --without-gssapi GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit DOCS= AUTHORS COPYING INSTALL NEWS TODO README PORTDOCS= * PORTEXAMPLES= * # Default requirement for dovecot rc script _REQUIRE= LOGIN LDAP_VARS= _REQUIRE+=slapd MYSQL_VARS= _REQUIRE+=mysql PGSQL_VARS= _REQUIRE+=postgresql SUB_LIST+= REQUIRE="${_REQUIRE}" SUB_FILES+= pkg-message CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} post-patch: @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* \ ${WRKSRC}/doc/example-config/*.conf.ext @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in # Install the sample config files into ETCDIR/example-config/ @${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \ ${WRKSRC}/doc/example-config/Makefile.in \ ${WRKSRC}/doc/example-config/conf.d/Makefile.in post-patch-LUA-on: @${REINPLACE_CMD} -e '/^libdovecot_lua_la_DEPENDENCIES =/ s|LUA_LIBS|true|' \ ${WRKSRC}/src/lib-lua/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/mail/dovecot-fts-xapian/Makefile =================================================================== --- head/mail/dovecot-fts-xapian/Makefile (revision 553939) +++ head/mail/dovecot-fts-xapian/Makefile (revision 553940) @@ -1,34 +1,35 @@ # $FreeBSD$ PORTNAME= fts-xapian PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= mail PKGNAMEPREFIX= dovecot- MAINTAINER= juraj@lutter.sk COMMENT= Dovecot FTS plugin based on Xapian LICENSE= LGPL21 BUILD_DEPENDS= dovecot>=2.3.7:mail/dovecot LIB_DEPENDS= libxapian.so:databases/xapian-core \ libicuuc.so:devel/icu \ libsqlite3.so:databases/sqlite3 RUN_DEPENDS= dovecot>=2.3.7:mail/dovecot USES= autoreconf compiler:c++11-lang libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= grosjo GNU_CONFIGURE= yes PLIST_FILES= lib/dovecot/lib21_fts_xapian_plugin.a \ lib/dovecot/lib21_fts_xapian_plugin.so post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib21_fts_xapian_plugin.so .include Index: head/mail/evolution/Makefile =================================================================== --- head/mail/evolution/Makefile (revision 553939) +++ head/mail/evolution/Makefile (revision 553940) @@ -1,137 +1,137 @@ # Created by: Ade Lovett # $FreeBSD$ PORTNAME= evolution PORTVERSION= 3.38.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Integrated mail, calendar and address book distributed suite LICENSE= GFDL GPLv2+ LGPL21+ MPL11 OPENLDAP LICENSE_COMB= multi LICENSE_NAME_OPENLDAP= OpenLDAP Public License LICENSE_FILE_OPENLDAP= ${WRKSRC}/COPYING.OPENLDAP LICENSE_PERMS_OPENLDAP= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= itstool:textproc/itstool \ iso-codes>=0:misc/iso-codes \ highlight:textproc/highlight LIB_DEPENDS= libnss3.so:security/nss \ libgcr-base-3.so:security/gcr \ libgtkspell3-3.so:textproc/gtkspell3 \ libgnome-autoar-gtk-0.so:archivers/gnome-autoar \ libsoup-2.4.so:devel/libsoup \ libicuuc.so:devel/icu \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libnspr4.so:devel/nspr \ libical.so:devel/libical \ libsecret-1.so:security/libsecret \ libenchant.so:textproc/enchant \ libenchant-2.so:textproc/enchant2 \ libfribidi.so:converters/fribidi \ libp11-kit.so:security/p11-kit \ libcryptui.so:security/libcryptui \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify \ libgspell-1.so:textproc/gspell RUN_DEPENDS= highlight:textproc/highlight \ iso-codes>=0:misc/iso-codes PORTSCOUT= limitw:1,even USES= compiler:c11 desktop-file-utils cmake gettext gnome \ iconv:wchar_t sqlite libarchive localbase pathfix pkgconfig \ tar:xz xorg USE_GNOME= cairo evolutiondataserver3 gnomedesktop3 intltool GNU_CONFIGURE= yes USE_XORG= x11 INSTALLS_ICONS= yes USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_TEXT_HIGHLIGHT=YES \ -DWITH_ENCHANT_VERSION=2 \ -DVERSION_COMMENT="FreeBSD GNOME Team" GLIB_SCHEMAS= org.gnome.evolution.addressbook.gschema.xml \ org.gnome.evolution.bogofilter.gschema.xml \ org.gnome.evolution.calendar.gschema.xml \ org.gnome.evolution.gschema.xml \ org.gnome.evolution.importer.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ org.gnome.evolution.plugin.attachment-reminder.gschema.xml \ org.gnome.evolution.plugin.autocontacts.gschema.xml \ org.gnome.evolution.plugin.email-custom-header.gschema.xml \ org.gnome.evolution.plugin.external-editor.gschema.xml \ org.gnome.evolution.plugin.face-picture.gschema.xml \ org.gnome.evolution.plugin.itip.gschema.xml \ org.gnome.evolution.plugin.mail-notification.gschema.xml \ org.gnome.evolution.plugin.prefer-plain.gschema.xml \ org.gnome.evolution.plugin.publish-calendar.gschema.xml \ org.gnome.evolution.plugin.templates.gschema.xml \ org.gnome.evolution.shell.gschema.xml \ org.gnome.evolution.spamassassin.gschema.xml \ org.gnome.evolution.text-highlight.gschema.xml EVO_VERSION= 3.24 PLIST_SUB= VERSION=${EVO_VERSION} \ PORTVERSION=2.12 OPTIONS_SUB= yes OPTIONS_DEFINE= LDAP WEATHER CANBERRA PST YTNEF MAPS OPTIONS_DEFAULT=LDAP WEATHER CANBERRA BOGOFILTER SPAM_DESC= Spam filter support OPTIONS_GROUP= SPAM OPTIONS_GROUP_SPAM=SPAMASSASSIN BOGOFILTER LDAP_CMAKE_ON= -DWITH_OPENLDAP=${LOCALBASE} LDAP_CMAKE_OFF= -DWITH_OPENLDAP=OFF LDAP_USE= OPENLDAP=yes YTNEF_DESC= Support MS Outlook TNEF format YTNEF_LIB_DEPENDS= libytnef.so:converters/ytnef YTNEF_CMAKE_BOOL= ENABLE_YTNEF WEATHER_DESC= Weather calendar backend WEATHER_LIB_DEPENDS= libgweather-3.so:net/libgweather WEATHER_CMAKE_BOOL= ENABLE_WEATHER SPAMASSASSIN_DESC= SpamAssassin spam filtering SPAMASSASSIN_CMAKE_ON= -DWITH_SPAMASSASSIN=${LOCALBASE}/spamassassin \ -DWITH_SA_LEARN=${LOCALBASE}/bin/sa-learn SPAMASSASSIN_CMAKE_OFF= -DWITH_SPAMASSASSIN=NO SPAMASSASSIN_BUILD_DEPENDS= spamassassin:mail/spamassassin SPAMASSASSIN_RUN_DEPENDS= spamassassin:mail/spamassassin BOGOFILTER_DESC= Bogofilter spam filtering BOGOFILTER_CMAKE_ON= -DWITH_BOGOFILTER=${LOCALBASE}/bin/bogofilter BOGOFILTER_CMAKE_OFF= -DWITH_BOGOFILTER=OFF BOGOFILTER_BUILD_DEPENDS= bogofilter:mail/bogofilter BOGOFILTER_RUN_DEPENDS= bogofilter:mail/bogofilter CANBERRA_DESC= Canberra theme audio plugin CANBERRA_LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 CANBERRA_CMAKE_BOOL= ENABLE_CANBERRA PST_DESC= Outlook .pst importer PST_CMAKE_BOOL= ENABLE_PST_IMPORT PST_BUILD_DEPENDS= libpst>=0.6.58_1:mail/libpst PST_RUN_DEPENDS= libpst>=0.6.58_1:mail/libpst MAPS_DESC= Contact maps MAPS_CMAKE_BOOL= ENABLE_CONTACT_MAPS MAPS_LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libgeocode-glib.so:net/geocode-glib \ libcogl.so:graphics/cogl \ libclutter-1.0.so:graphics/clutter \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libchamplain-0.12.so:graphics/libchamplain MAPS_USES= gl xorg MAPS_USE= xorg=xcomposite,xdamage,xext,xfixes,xi,xrandr gl=egl .include Index: head/mail/evolution-ews/Makefile =================================================================== --- head/mail/evolution-ews/Makefile (revision 553939) +++ head/mail/evolution-ews/Makefile (revision 553940) @@ -1,35 +1,36 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= evolution-ews PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Evolution Microsoft Exchange plugin through Exchange Web Services LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evolution>=3.0.0:mail/evolution LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libfribidi.so:converters/fribidi \ libicuuc.so:devel/icu \ libmspack.so:archivers/libmspack \ libsecret-1.so:security/libsecret \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libical.so:devel/libical \ libjson-glib-1.0.so:devel/json-glib RUN_DEPENDS= evolution>=3.0.0:mail/evolution PORTSCOUT= limitw:1,even USES= bdb:5 compiler:c11 cmake gettext gnome localbase pathfix \ pkgconfig sqlite tar:xz USE_GNOME= cairo gdkpixbuf2 evolutiondataserver3 intltool .include Index: head/mail/exim/Makefile =================================================================== --- head/mail/exim/Makefile (revision 553939) +++ head/mail/exim/Makefile (revision 553940) @@ -1,646 +1,646 @@ # Created by: markm@FreeBSD.org # $FreeBSD$ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= mail MASTER_SITES= EXIM:exim MASTER_SITE_SUBDIR= /exim4/:exim \ /exim4/fixes/:exim \ /exim4/old/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim DIST_SUBDIR= exim EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= fluffy@FreeBSD.org COMMENT?= High performance MTA for Unix systems on the Internet LICENSE= GPLv2 USES= compiler cpe tar:bzip2 perl5 USE_CSTD= c99 USE_PERL5= run # Exim build system is job unsafe atm MAKE_JOBS_UNSAFE= yes # One can tune the following "hidden" knobs: # - EXIM_USER: user exim is running as; # - EXIM_GROUP: ditto for the group; # - LOGDIR: where Exim logs will be put; # - LOG_FILE_PATH: path where '%s' will be substituted with # the target name (main, reject, etc); # - CONFIG_FILE_PATH: path to the default configuration file; # - ALT_CONFIG_PREFIX: path to the default prefix for all # configuration files, excluding the main one; # will be effective only when WITH_ALT_CONFIG_PREFIX # will be set via OPTIONS. .if make(makesum) && !defined(FETCH_ALL) .error "You forgot to define FETCH_ALL to create the sane distinfo" .endif .include "options" OPTIONS_SUB= yes AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 BDB_USES= bdb DMARC_LIB_DEPENDS= libopendmarc.so:mail/opendmarc EMBEDDED_PERL_USE= perl5=run,build EXIMON_USES= xorg EXIMON_USE= xorg=x11,xaw,xext,xmu,xt GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls ICONV_USES= iconv:lib,build INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql OPENLDAP_USE= openldap=yes PGSQL_LIB_DEPENDS= libicudata.so:devel/icu PGSQL_USES= pgsql pkgconfig REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:security/cyrus-sasl2-saslauthd SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:mail/spamassassin SPF_LIB_DEPENDS= libspf2.so:mail/libspf2 SQLITE_LIB_DEPENDS= libicudata.so:devel/icu SQLITE_USES= pkgconfig sqlite .include # OCSP is supported for openssl only .if ${PORT_OPTIONS:MOCSP} .if ! ${PORT_OPTIONS:MTLS} IGNORE= you cannot enable OCSP stapling without TLS support .elif ${PORT_OPTIONS:MGNUTLS} IGNORE= you cannot enable OCSP stapling with gnutls .endif .endif # DMARC implies SPF and DKIM .if ${PORT_OPTIONS:MDMARC} .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} IGNORE= you cannot enable DMARC without SPF and DKIM support .endif .endif # ARC implies SPF and DKIM .if ${PORT_OPTIONS:MARC} .if ! ${PORT_OPTIONS:MSPF} || ! ${PORT_OPTIONS:MDKIM} IGNORE= you cannot enable ARC without SPF and DKIM support .endif .endif # DANE implies DNSSEC .if ${PORT_OPTIONS:MDANE} .if ! ${PORT_OPTIONS:MDNSSEC} || ! ${PORT_OPTIONS:MTLS} IGNORE= you cannot enable DANE without DNSSEC support or without TLS support .endif .endif .if ${PORT_OPTIONS:MSA_EXIM} || defined(FETCH_ALL) MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ SF/sa-exim/sa-exim/${SA_EXIM_VERSION}:sa_exim DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf .endif EXIM_VERSION= 4.94 SA_EXIM_VERSION=4.2.1 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h` .if !defined(EXIMON_ONLY) PLIST_SUB+= EXIM="" .if defined(PKGNAMESUFFIX) CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.* .endif .for suffix in -ldap2 -mysql -postgresql -sa-exim -sqlite .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != ${suffix} CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}${suffix}-4.* .endif .endfor .if ${PORT_OPTIONS:MEXIMON} CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-monitor-4.* .endif PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES .else # !EXIMON_ONLY PLIST_SUB+= EXIM="@comment " PORT_OPTIONS+= EXIMON PKGMESSAGE= ${WRKDIR}/pkg-message EXIM_INSTALL_ARG+= "eximon" "eximon.bin" .endif # !EXIMON_ONLY PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING PORTDOC_FILES= ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \ OptionLists.txt README README.SIEVE dbm.discuss.txt \ experimental-spec.txt filter.txt spec.txt PORT_EXAMPLES= convert4r3 convert4r4 transport-filter.pl DAILY_SCRIPTS= 150.exim-tidydb 460.exim-mail-rejects MAKE_ENV+= OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}" DUMMY_LDFLAGS="${DUMMY_LDFLAGS}" STRIP_COMMAND="${STRIP_CMD}" EXIM_USER?= mailnull EXIM_GROUP?= mail # Default user/group are system ones, so we don't want to check them .if ${EXIM_USER} != "mailnull" USERS= ${EXIM_USER} .endif .if ${EXIM_GROUP} != "mail" GROUPS= ${EXIM_GROUP} .endif LOGDIR?= /var/log/exim LOG_FILE_PATH?= ${LOGDIR}/%slog CONFIG_FILE_PATH?= ${PREFIX}/etc/exim/configure ALT_CONFIG_PREFIX?= ${PREFIX}/etc/exim/ EXIM_DYNAMIC_LDFLAGS= -fPIC -rdynamic -Wl,--export-dynamic SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ -e 's,%%EXIM_USER%%,${EXIM_USER},g' \ -e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \ -e 's,%%LOGDIR%%,${LOGDIR},g' SEDLIST+= -e 's,XX_CFLAGS_XX,${CFLAGS:S/,/\\,/g},' \ -e 's,XX_PREFIX_XX,${PREFIX:S/,/\\,/g},' \ -e 's,XX_LOCALBASE_XX,${LOCALBASE:S/,/\\,/g},' \ -e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH:S/,/\\,/g},' \ -e 's,XX_CONFIG_FILE_PATH_XX,${CONFIG_FILE_PATH:S/,/\\,/g},' \ -e 's,XX_ALT_CONFIG_PREFIX_XX,${ALT_CONFIG_PREFIX:S/,/\\,/g},' \ -e 's,XX_EXIM_USER_XX,${EXIM_USER:S/,/\\,/g},' \ -e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP:S/,/\\,/g},' \ -e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET:S/,/\\,/g},' \ -e 's,XX_DYNAMIC_LDFLAGS_XX,${EXIM_DYNAMIC_LDFLAGS:S/,/\\,/g},' PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}-${PORTREVISION}" \ EXIM_USER=${EXIM_USER} \ EXIM_GROUP=${EXIM_GROUP} \ LOGDIR="${LOGDIR:S/^\///}" # Exim refuses to run local deliveries as root by default. You can # add other users to this colon-separated list that cannot be # overridden at runtime below, but are advised not to remove "root". #WITH_FIXED_NEVER_USERS= root:daemon:bin # When Exim is decoding MIME "words" in header lines it converts any foreign # character sets to the one that is set in the headers_charset option. # The default setting is defined by this setting: WITH_DEFAULT_CHARSET?= ISO-8859-1 # You should not need to fiddle with anything below this point. LIB_DEPENDS+= libpcre.so:devel/pcre .if ! ${PORT_OPTIONS:MDKIM} SEDLIST+= -e 's,^\# (DISABLE_DKIM=),\1,' .endif .if ${PORT_OPTIONS:MLISTMATCH_RHS} SEDLIST+= -e 's,^\# (EXPAND_LISTMATCH_RHS=),\1,' .endif .if ${PORT_OPTIONS:MDCC} SEDLIST+= -e 's,^\# (EXPERIMENTAL_DCC=),\1,' .endif .if ${PORT_OPTIONS:MPROXY} SEDLIST+= -e 's,^\# (SUPPORT_PROXY=),\1,' .endif .if ${PORT_OPTIONS:MCERTNAMES} SEDLIST+= -e 's,^\# (EXPERIMENTAL_CERTNAMES=),\1,' .endif .if ${PORT_OPTIONS:MDSN} SEDLIST+= -e 's,^\# (EXPERIMENTAL_DSN=),\1,' .endif .if !${PORT_OPTIONS:MDANE} SEDLIST+= -e 's,^(SUPPORT_DANE=),\#\1,' .endif .if ${PORT_OPTIONS:MARC} SEDLIST+= -e 's,^\# (EXPERIMENTAL_ARC=),\1,' .endif .if !${PORT_OPTIONS:MEVENT} SEDLIST+= -e 's,^\# (DISABLE_EVENT=),\1,' .endif .if ${PORT_OPTIONS:MINTERNATIONAL} SEDLIST+= -e 's,^\# (SUPPORT_I18N=),\1,' \ -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,' .else SEDLIST+= -e 's,XX_IDN_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MSOCKS} SEDLIST+= -e 's,^\# (SUPPORT_SOCKS=),\1,' .endif .if !${PORT_OPTIONS:MPRDR} SEDLIST+= -e 's,^\# (DISABLE_PRDR=),\1,' .endif .if !${PORT_OPTIONS:MOCSP} SEDLIST+= -e 's,^\# (DISABLE_OCSP=),\1,' .endif .if !${PORT_OPTIONS:MDNSSEC} SEDLIST+= -e 's,^\# (DISABLE_DNSSEC=),\1,' .endif .if ${PORT_OPTIONS:MDMARC} SEDLIST+= -e 's,XX_DMARC_LIBS_XX,-L${LOCALBASE}/lib -lopendmarc,' \ -e 's,^\# (SUPPORT_DMARC=),\1,' .else SEDLIST+= -e 's,XX_DMARC_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MWISHLIST} EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` .endif .if ${PORT_OPTIONS:MFIXED_NEVER_USERS} SEDLIST+= -e 's,^(FIXED_NEVER_USERS=).*,\1${WITH_FIXED_NEVER_USERS:S/,/\\,/g},' .endif .if ${PORT_OPTIONS:MEXIMON} SEDLIST+= -e 's,^\# (EXIM_MONITOR=),\1,' .endif .if ${PORT_OPTIONS:MTLS} .if ! ${PORT_OPTIONS:MGNUTLS} USES+= ssl SEDLIST+= -e 's,^\# (USE_OPENSSL=),\1,' SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lssl[[:space:]]),\1,' .else SEDLIST+= -e 's,^\# (USE_GNUTLS=),\1,' SEDLIST+= -e 's,^\# (TLS_LIBS=.*-lgnutls[[:space:]]),\1,' .endif .else # TLS support SEDLIST+= -e 's,^\# (DISABLE_TLS=),\1,' .endif .if ${PORT_OPTIONS:MEMBEDDED_PERL} SEDLIST+= -e 's,^\# (EXIM_PERL=),\1,' .endif .if ${PORT_OPTIONS:MTCP_WRAPPERS} SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \ -e 's,^\# (USE_TCP_WRAPPERS=),\1,' .else SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MICONV} SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib ${ICONV_LIB},' \ -e 's,^\# (HAVE_ICONV=),\1,' .else SEDLIST+= -e 's,XX_ICONV_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:tl} != "auto" WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif .if ${PORT_OPTIONS:MOPENLDAP} LDAP_LIB_TYPE= OPENLDAP2 SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -llber -lldap,' \ -e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include,' \ -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE:S/,/\\,/g},' \ -e 's,^\# (LOOKUP_LDAP=),\1,' .else SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ -e 's,^(LDAP_LIB_TYPE=),\# \1,' .endif .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER= 2 3 DB_LIBS= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} DB_INCLUDES= -I${BDB_INCLUDE_DIR} .else DB_LIBS= DB_INCLUDES= SEDLIST+= -e 's,^(DBMLIB=),\# \1,' .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},' .if ${PORT_OPTIONS:MLMDB} _LMDB_LIBS= -L${LOCALBASE}/lib -llmdb _LMDB_INCLUDES= -I${LOCALBASE}/include SEDLIST+= -e 's,^\# (EXPERIMENTAL_LMDB=),\1,' .else _LMDB_LIBS= _LMDB_INCLUDES= .endif SEDLIST+= -e 's,XX_LMDB_LIBS_XX,${_LMDB_LIBS:S/,/\\,/g},' \ -e 's,XX_LMDB_INCLUDES_XX,${_LMDB_INCLUDES:S/,/\\,/g},' .if ${PORT_OPTIONS:MMYSQL} SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \ -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \ -e 's,^\# (LOOKUP_MYSQL=),\1,' .else SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' .endif .if ${PORT_OPTIONS:MSASLAUTHD} SASLAUTHD_SOCKET?= /var/run/saslauthd/mux SEDLIST+= -e 's,^\# (CYRUS_SASLAUTHD_SOCKET=).*,\1${SASLAUTHD_SOCKET:S/,/\\,/g},' .endif .if ${PORT_OPTIONS:MPAM} SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' \ -e 's,^\# (SUPPORT_PAM=),\1,' .else SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MAUTH_CRAM_MD5} SEDLIST+= -e 's,^\# (AUTH_CRAM_MD5=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_PLAINTEXT} SEDLIST+= -e 's,^\# (AUTH_PLAINTEXT=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_DOVECOT} SEDLIST+= -e 's,^\# (AUTH_DOVECOT=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_SPA} SEDLIST+= -e 's,^\# (AUTH_SPA=),\1,' .endif .if ${PORT_OPTIONS:MAUTH_SASL} SEDLIST+= -e 's,^\# (AUTH_CYRUS_SASL=),\1,' \ -e 's,^\# (AUTH_LIBS=.*-lsasl2),\1,' .endif .if ${PORT_OPTIONS:MAUTH_RADIUS} WITH_RADIUS_TYPE?= RADLIB .if ${WITH_RADIUS_TYPE:tl} == radlib SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-lradius,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,' .elif ${WITH_RADIUS_TYPE:tl} == radiusclient LIB_DEPENDS+= libfreeradius-client.so:net/freeradius-client SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lfreeradius-client,' \ -e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient/radiusclient.conf,' \ -e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENTNEW,' .else IGNORE= the variable WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT .endif .else SEDLIST+= -e 's,XX_RADIUS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MPGSQL} SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lpq,' \ -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/pgsql,' \ -e 's,^\# (LOOKUP_PGSQL=),\1,' .else SEDLIST+= -e 's,XX_PGSQL_[^ ]*_XX,,' .endif .if ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MMYSQL} && !defined(LDAP_LIB_TYPE) && \ ! ${PORT_OPTIONS:MBDB} && ! ${PORT_OPTIONS:MLMDB} SEDLIST+= -e 's,^(LOOKUP_LIBS=),\# \1,' \ -e 's,^(LOOKUP_INCLUDE=),\# \1,' .endif .if ! ${PORT_OPTIONS:MDNSDB} SEDLIST+= -e 's,^(LOOKUP_DNSDB=),\# \1,' .endif .if ${PORT_OPTIONS:MMAILDIR} SEDLIST+= -e 's,^\# (SUPPORT_MAILDIR=),\1,' .endif .if ${PORT_OPTIONS:MMAILSTORE} SEDLIST+= -e 's,^\# (SUPPORT_MAILSTORE=),\1,' .endif .if ${PORT_OPTIONS:MMBX} SEDLIST+= -e 's,^\# (SUPPORT_MBX=),\1,' .endif .if ${PORT_OPTIONS:MCDB} SEDLIST+= -e 's,^\# (LOOKUP_CDB=),\1,' .endif .if ${PORT_OPTIONS:MDSEARCH} SEDLIST+= -e 's,^\# (LOOKUP_DSEARCH=),\1,' .endif .if ! ${PORT_OPTIONS:MLSEARCH} SEDLIST+= -e 's,^(LOOKUP_LSEARCH=),\# \1,' .endif .if ${PORT_OPTIONS:MNIS} SEDLIST+= -e 's,^\# (LOOKUP_NIS=),\1,' .endif .if ${PORT_OPTIONS:MPASSWD} SEDLIST+= -e 's,^\# (LOOKUP_PASSWD=),\1,' .endif .if ${PORT_OPTIONS:MSQLITE} SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,`pkg-config --static --libs sqlite3`,' \ -e 's,XX_SQLITE_FLAGS_XX,`pkg-config --cflags sqlite3`,' \ -e 's,^\# (LOOKUP_SQLITE=),\1,' .else SEDLIST+= -e 's,XX_SQLITE_LIBS_XX,,' \ -e 's,XX_SQLITE_FLAGS_XX,,' .endif .if ${PORT_OPTIONS:MREDIS} SEDLIST+= -e 's,XX_REDIS_LIBS_XX,-L${LOCALBASE}/lib -lhiredis,' \ -e 's,^\# (LOOKUP_REDIS=),\1,' \ -e 's,^\# (REDIS=),\1,' .else SEDLIST+= -e 's,XX_REDIS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MLMTP} SEDLIST+= -e 's,^\# (TRANSPORT_LMTP=),\1,' .endif .if ! ${PORT_OPTIONS:MALT_CONFIG_PREFIX} SEDLIST+= -e 's,^(ALT_CONFIG_PREFIX=),\# \1,' .endif .if ${PORT_OPTIONS:MSPF} SEDLIST+= -e 's,XX_SPF_FLAGS_XX,-DSPF,' \ -e 's,XX_SPF_LIBS_XX,-L${LOCALBASE}/lib -lspf2 -lpthread,' \ -e 's,^\# (SUPPORT_SPF=),\1,' .else SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ -e 's,XX_SPF_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MSRS} LIB_DEPENDS+= libsrs_alt.so:mail/libsrs_alt SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS,' \ -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' .endif .if ${PORT_OPTIONS:MREADLINE} SEDLIST+= -e 's,^\# (USE_READLINE=),\1,' .endif .if ${PORT_OPTIONS:MCONTENT_SCAN} SEDLIST+= -e 's,^\# (WITH_CONTENT_SCAN=),\1,' .endif .if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON} USE_RC_SUBR= exim PLIST_SUB+= EXIMDAEMON="" SUB_LIST+= LOGDIR="${LOGDIR}" .else PLIST_SUB+= EXIMDAEMON="@comment " .endif .if ${PORT_OPTIONS:MIPV6} SEDLIST+= -e 's,^\# (HAVE_IPV6=),\1,' .endif .if ${PORT_OPTIONS:MDISABLE_D_OPT} SEDLIST+= -e 's,^\# (DISABLE_D_OPTION=),\1,' .else .if defined(WHITELIST_D_MACROS) SEDLIST+= -e 's,^\# (WHITELIST_D_MACROS=).*$$,\1${WHITELIST_D_MACROS:S/,/\\,/g},' .endif .endif .if defined(TRUSTED_CONFIG_LIST) SEDLIST+= -e 's,^\# (TRUSTED_CONFIG_LIST=).*$$,\1${TRUSTED_CONFIG_LIST:S/,/\\,/g},' .endif .if ${PORT_OPTIONS:MQUEUEFILE} SEDLIST+= -e 's,^\# (EXPERIMENTAL_QUEUEFILE=),\1,' .endif MAKE_ENV+= INSTALL_ARG="${EXIM_INSTALL_ARG}" DUMMY_LDFLAGS!= ${ECHO_CMD} ${LDFLAGS} | ${SED} -e 's|-Wl,-rpath|-Wl,-DUMMYrpath|g; s|-rpath|-Wl,-rpath|g; s|-DUMMYrpath|-rpath|g' pre-everything:: @${ECHO} 'Exim now drops privileges when alternate configuration' @${ECHO} 'files are used. You can set make variable TRUSTED_CONFIG_LIST' @${ECHO} 'to specify the list of configuration files for which' @${ECHO} 'root privileges will be retained.' @${ECHO} '' @${ECHO} 'You can whitelist some macros using the make variable' @${ECHO} 'WHITELIST_D_MACROS. This is useful if you are running' @${ECHO} 'with DISABLE_D_OPT set, but macros whitelisting will be' @${ECHO} 'removed in some future Exim release, so it is better' @${ECHO} 'to use TRUSTED_CONFIG_LIST to set the list of trusted' @${ECHO} 'configuration files.' .if empty(.MAKEFLAGS:M-s) && ${PORT_OPTIONS:MWISHLIST} @${ECHO} '' @${ECHO} 'Included extra patches:' @${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \ -exec ${SED} -ne 's,^# , ,p' {} \; @${ECHO} '' .endif post-extract: .if ${PORT_OPTIONS:MSA_EXIM} @cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} @@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.c ${WRKSRC}/Local @@${CP} ${WRKDIR}/sa-exim-${SA_EXIM_VERSION}/sa-exim.conf ${WRKSRC}/Local .endif do-configure: @${MKDIR} ${WRKSRC}/Local @${SED} -E ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile .if ${PORT_OPTIONS:MEXIMON} @${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf .endif @${REINPLACE_CMD} -E ${SEDLIST} ${WRKSRC}/src/configure.default @${REINPLACE_CMD} -e 's!$$(LDFLAGS)!$$(DUMMY_LDFLAGS) -L$${LOCALBASE}/lib!' ${WRKSRC}/OS/Makefile-Base @${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number (${OPSYS}))\\n\\t"/' \ ${WRKSRC}/src/globals.c @${REINPLACE_CMD} -e 's/Exim version %s \(#%s \)\{0,1\}/&(${OPSYS} ${OSREL}) /' ${WRKSRC}/src/exim.c @${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c @${REINPLACE_CMD} -E -e 's/^(PERL_COMMAND=).*/\1${PERL:S,/,\/,g}/' \ -e 's/^(CC=).*/\1${CC:S,/,\/,g}/' ${WRKSRC}/OS/Makefile-Default .if ${PORT_OPTIONS:MSA_EXIM} @${REINPLACE_CMD} -E -e 's/^\# (HAVE_LOCAL_SCAN=).*/\1yes/' \ ${WRKSRC}/OS/Makefile-Default @${REINPLACE_CMD} -E -e 's/^(LOCAL_SCAN_SOURCE=).*/\1Local\/sa-exim.c/' \ ${WRKSRC}/OS/Makefile-Default @{ \ ${ECHO_CMD} "char *version=\"${SA_EXIM_VERSION}\";"; \ ${ECHO_CMD} "#define SPAMC_LOCATION \"${LOCALBASE}/bin/spamc\""; \ ${ECHO_CMD} "#define SPAMASSASSIN_CONF \"${PREFIX}/etc/exim/sa-exim.conf\""; \ } > ${WRKSRC}/Local/sa-exim.h @${REINPLACE_CMD} -e 's,/usr/bin/spamc,${LOCALBASE}/bin/spamc,' \ ${WRKSRC}/Local/sa-exim.conf .endif @${REINPLACE_CMD} -E -e 's/XX_STRIPCMD_XX/${STRIP_CMD:S,/,\/,g}/' \ ${WRKSRC}/OS/Makefile-FreeBSD @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} configure) post-build: .for script in ${DAILY_SCRIPTS} @${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh > ${WRKDIR}/${script}.sh .endfor @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > \ ${WRKDIR}/POST-INSTALL-NOTES @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES.clamd > ${WRKDIR}/POST-INSTALL-NOTES.clamd @${SED} ${SED_SCRIPT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES @[ ! -f ${PKGDIR}/pkg-message ] || ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message .if !defined(EXIMON_ONLY) post-install: .if ${PORT_OPTIONS:MDAEMON} ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily .for script in ${DAILY_SCRIPTS} ${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script} .endfor .endif @${MKDIR} -m 750 ${STAGEDIR}${LOGDIR} ${INSTALL_MAN} ${WRKSRC}/doc/exim.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES.clamd ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOC_BASE} ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .for docfile in ${PORTDOC_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for example in ${PORT_EXAMPLES} ${INSTALL_SCRIPT} ${WRKSRC}/build-${OPSYS}-${ARCH}/${example} ${STAGEDIR}${EXAMPLESDIR} .endfor .endif .if ${PORT_OPTIONS:MSA_EXIM} ${INSTALL_DATA} ${WRKSRC}/Local/sa-exim.conf \ ${STAGEDIR}${PREFIX}/etc/exim/sa-exim.conf.sample .endif .endif # ! defined(EXIMON_ONLY) .include # If using clang, avoid too many warnings due to Exim code style .if ${CHOSEN_COMPILER_TYPE} == "clang" EXIM_WARN_FLAGS?= -Wno-logical-op-parentheses -Wno-macro-redefined -Wno-parentheses -Wno-dangling-else .endif CFLAGS+= ${EXIM_WARN_FLAGS} .include Index: head/mail/libvmime/Makefile =================================================================== --- head/mail/libvmime/Makefile (revision 553939) +++ head/mail/libvmime/Makefile (revision 553940) @@ -1,36 +1,36 @@ # Created by: delphij@FreeBSD.org # $FreeBSD$ PORTNAME= libvmime PORTVERSION= 0.9.2 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail MAINTAINER= sunpoet@FreeBSD.org COMMENT= All-in-one Internet mail library LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgnutls.so:security/gnutls \ libgsasl.so:security/libgsasl USES= cmake:noninja compiler:c++11-lib pkgconfig CMAKE_ARGS= -DLIB_SUFFIX="" CMAKE_OFF= VMIME_BUILD_SAMPLES VMIME_SHARED_PTR_USE_BOOST CMAKE_ON= VMIME_SHARED_PTR_USE_CXX USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= kisli GH_PROJECT= vmime OPTIONS_DEFINE= ICU ICU_DESC= Use icu instead of iconv for charset conversion ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_USES_OFF= iconv .include Index: head/mail/postfix/Makefile =================================================================== --- head/mail/postfix/Makefile (revision 553939) +++ head/mail/postfix/Makefile (revision 553940) @@ -1,379 +1,379 @@ # Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix DISTVERSION= 3.5.7 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ http://de.postfix.org/ftpmirror/ \ http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ http://www.artfiles.org/postfix.org/postfix-release/ \ http://mirror.lhsolutions.nl/postfix-release/ \ ftp://postfix.mirrors.pair.com/ MASTER_SITES:= ${MASTER_SITES:S|$|official/|} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ohauer@FreeBSD.org COMMENT?= Secure alternative to widely-used Sendmail LICENSE= IPL10 EPL LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_NAME_IPL10= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept PORTSCOUT= limit:^3\.5\. CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* sendmail-8.* sendmail+*-8.* \ postfix-current-* USERS= postfix GROUPS= mail maildrop postfix USES= shebangfix cpe SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix USE_SUBMAKE= yes SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" OPTIONS_SUB= yes OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \ LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT?= BLACKLISTD EAI PCRE TLS BDB_USES= bdb BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb EAI_LIB_DEPENDS= libicuuc.so:devel/icu LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES?= mysql PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite TLS_USES= ssl BLACKLISTD_DESC= Enable blacklistd support (FreeBSD 11.0 and later only) CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= LDAP client-to-server SASL auth LMDB_DESC= LMDB maps TEST_DESC= SMTP/LMTP test server and generator SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) RG1_DESC= Kerberos network authentication protocol type SASLKRB5_DESC= If your SASL req. Kerberos5, select this SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this .include HTML1= body_checks.5.html bounce.5.html postfix-power.png \ scache.8.html tlsmgr.8.html STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local \ master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \ qmgr qmqpd scache showq smtp smtpd spawn tlsmgr tlsproxy \ trivial-rewrite verify virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" .if ${PORT_OPTIONS:MINST_BASE} .if defined(SASL_SLAVE) PKGNAMESUFFIX= -base-sasl .else PKGNAMESUFFIX= -base .endif PREFIX= /usr ETCDIR= /etc/postfix PLIST_SUB+= BMAN="share/" .else PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} # check if mailwrapper supports $LOCALBASE .if ${OPSYS} == FreeBSD SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX="${LOCALBASE}" .else SUB_LIST+= USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX="" .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * READMEDIR= ${DOCSDIR} .else READMEDIR= no .endif # dynamic direcory location DAEMONDIR= ${PREFIX}/libexec/postfix SHLIB_DIRECTORY=${PREFIX}/lib/postfix # new proposed location is ETCDIR (see README_FILES/INSTALL) # keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR META_DIRECTORY= ${DAEMONDIR} SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ DAEMONDIR="${DAEMONDIR}" META_DIRECTORY="${META_DIRECTORY}" SUB_FILES+= pkg-install pkg-message mailer.conf.postfix POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ -DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \ -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \ -DDEF_README_DIR=\\\"${READMEDIR}\\\" \ -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \ -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \ -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \ -DDEF_MAIL_OWNER=\\\"postfix\\\" \ -DDEF_SGID_GROUP=\\\"maildrop\\\" \ -Wmissing-prototypes -Wformat -Wno-comment # Default requirement for postfix rc script _REQUIRE= LOGIN cleanvar dovecot # always build with Dovecot SASL support, Cyrus is optional # see Postfix HISTORY 20051222 POSTFIX_CCARGS+= -DUSE_SASL_AUTH # Email Address Internationalization (EAI, RFC 6531..6533) .if ${PORT_OPTIONS:MEAI} POSTFIX_CCARGS+= -DHAS_EAI -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -licuuc .else POSTFIX_CCARGS+= -DNO_EAI .endif .if ${PORT_OPTIONS:MPCRE} DYN_EXT+= pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre-config --libs`" .else POSTFIX_CCARGS+= -DNO_PCRE .endif .if ${PORT_OPTIONS:MSASL} POSTFIX_CCARGS+= -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .else POSTFIX_CCARGS+= -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\" .endif .if ${PORT_OPTIONS:MSASLKRB5} POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif .if ${PORT_OPTIONS:MSASLKMIT} POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err .endif .if ${PORT_OPTIONS:MTLS} POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} # XXX LDFLAGS possible breaks dynamic building POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .else POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MBDB} POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MBLACKLISTD} . if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else IGNORE= blacklistd is only supported on FreeBSD >= 11.0 . endif .endif .if ${PORT_OPTIONS:MMYSQL} DYN_EXT+= mysql POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql POSTFIX_DYN_AUXLIBS+= "AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm" _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} DYN_EXT+= pgsql POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq" _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MSQLITE} DYN_EXT+= sqlite POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .endif .if ${PORT_OPTIONS:MLDAP} DYN_EXT+= ldap . if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} . endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber" _REQUIRE+= slapd . if ${PORT_OPTIONS:MLDAP_SASL} . if ! ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 . endif WANT_OPENLDAP_SASL= yes POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL . endif .endif .if ${PORT_OPTIONS:MCDB} DYN_EXT+= cdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb" .endif .if ${PORT_OPTIONS:MNIS} POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 .endif .if ${PORT_OPTIONS:MLMDB} DYN_EXT+= lmdb POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" .endif # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\ s!(_directory = )/usr/!\1${PREFIX}/!g;\ s!^(data_directory = /var/)lib/!\1db/!g;\ s!^\#(mynetworks_style = host)!\1!g;\ s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\ s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\ s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ s!^(setgid_group =)!\1 maildrop!g;\ s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\ s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ s!(:|= )/etc/postfix!\1$$config_directory!g;\ s!/etc/postfix!${ETCDIR}!g;\ s!^(sample_directory =)!\1 ${ETCDIR}!g;\ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; pre-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \ ${ECHO_MSG}; \ sleep 5; \ fi .endif @${ECHO_CMD} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -E -e '${REINPLACE}' post-patch: .for f in ${HTML1} @${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files .endfor @${ECHO_CMD} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files @${ECHO_CMD} '$$command_directory/posttls-finger:f:root:-:755' \ >> ${WRKSRC}/conf/postfix-files do-configure: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ shared=yes shlib_directory=${SHLIB_DIRECTORY} \ dynamicmaps=yes \ ${POSTFIX_DYN_AUXLIBS} \ AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO_CMD} "all: default" >> Makefile) pre-install-INST_BASE-on: ${MKDIR} ${STAGEDIR}/etc/rc.d do-install: @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ install_root=${STAGEDIR} tempdir=${WRKDIR} \ shlib_directory=${SHLIB_DIRECTORY} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ meta_directory=${META_DIRECTORY} \ html_directory=${READMEDIR} \ mailq_path=${PREFIX}/bin/mailq \ manpage_directory=${MANPREFIX}/man \ newaliases_path=${PREFIX}/bin/newaliases \ readme_directory=${READMEDIR} \ sendmail_path=${PREFIX}/sbin/sendmail ) ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1 # == do not overwrite existing config ${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample ${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} # == chop dynamicmaps.cf entries into dedicated .cf files # for future sub-packages support .for f in ${DYN_EXT} # adjust dynamicmaps.cf ${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \ > ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \ ${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf # adjust / generate postfix-files for dynamic modules ${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \ ${PRINTF} '# Do not edit this file.\ \n$$shlib_directory/postfix-${f}.so:f:root:-:755\ \n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\ \n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \ > ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files .endfor # Fix compressed man pages and strip executables ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* -@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so do-install-TEST-on: ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/mail/postfix-current/Makefile =================================================================== --- head/mail/postfix-current/Makefile (revision 553939) +++ head/mail/postfix-current/Makefile (revision 553940) @@ -1,382 +1,382 @@ # Created by: Torsten Blum # $FreeBSD$ PORTNAME= postfix DISTVERSION= 3.6-20201026 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 6 CATEGORIES= mail MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \ http://de.postfix.org/ftpmirror/ \ http://cdn.postfix.johnriley.me/mirrors/postfix-release/ \ http://www.artfiles.org/postfix.org/postfix-release/ \ http://mirror.lhsolutions.nl/postfix-release/ \ ftp://postfix.mirrors.pair.com/ MASTER_SITES:= ${MASTER_SITES:S|$|experimental/|} #MASTER_SITES:= ${MASTER_SITES:S|$|official/|} PKGNAMESUFFIX?= -current DIST_SUBDIR= ${PORTNAME} MAINTAINER= ohauer@FreeBSD.org COMMENT= Experimental Postfix version LICENSE= IPL10 EPL LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_NAME_IPL10= IBM PUBLIC LICENSE VERSION 1.0 LICENSE_PERMS_IPL10= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* sendmail-8.* sendmail+*-8.* \ postfix-3.* postfix-base-3.* postfix-sasl-3.* USERS= postfix GROUPS= mail maildrop postfix USES= shebangfix cpe ssl SHEBANG_FILES= auxiliary/qshape/qshape.pl USE_RC_SUBR= postfix USE_SUBMAKE= yes SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" OPTIONS_SUB= yes OPTIONS_DEFINE= BDB BLACKLISTD CDB DOCS EAI INST_BASE LDAP LDAP_SASL \ LMDB MYSQL NIS PCRE PGSQL SASL SQLITE TEST TLS OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT?= BLACKLISTD EAI PCRE TLS BDB_USES= bdb BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb EAI_LIB_DEPENDS= libicuuc.so:devel/icu LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES?= mysql PCRE_LIB_DEPENDS= libpcre.so:devel/pcre PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite BLACKLISTD_DESC= Enable blacklistd support (FreeBSD 11.0 and later only) CDB_DESC= CDB maps lookups EAI_DESC= Email Address Internationalization (SMTPUTF8) support INST_BASE_DESC= Install into /usr and /etc/postfix LDAP_DESC= LDAP maps (uses WITH_OPENLDAP_VER) LDAP_SASL_DESC= LDAP client-to-server SASL auth LMDB_DESC= LMDB maps TEST_DESC= SMTP/LMTP test server and generator SASL_DESC= Cyrus SASL support (Dovecot SASL is always built in) RG1_DESC= Kerberos network authentication protocol type SASLKRB5_DESC= If your SASL req. Kerberos5, select this SASLKMIT_DESC= If your SASL req. MIT Kerberos5, select this .include HTML1= body_checks.5.html bounce.5.html postfix-power.png \ scache.8.html tlsmgr.8.html STRIP_LIBEXEC= anvil bounce cleanup discard dnsblog error flush lmtp local \ master nqmgr oqmgr pickup pipe postlogd postscreen proxymap \ qmgr qmqpd scache showq smtp smtpd spawn tlsmgr tlsproxy \ trivial-rewrite verify virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= pie=yes CC="${CC}" OPT="${CFLAGS}" .if ${SSL_DEFAULT} == base BROKEN_FreeBSD_11= error: OpenSSL-1.1.1 is the minimum supported version .endif .if ${PORT_OPTIONS:MINST_BASE} .if defined(SASL_SLAVE) PKGNAMESUFFIX= -current-base-sasl2 .else PKGNAMESUFFIX= -current-base .endif PREFIX= /usr ETCDIR= /etc/postfix PLIST_SUB+= BMAN="share/" .else PLIST_SUB+= BMAN="" .endif PLIST_SUB+= PFETC=${ETCDIR} # check if mailwrapper supports $LOCALBASE .if ${OPSYS} == FreeBSD SUB_LIST+= USE_LOCALBASE_MAILER_CONF="yes" MC_PREFIX="${LOCALBASE}" .else SUB_LIST+= USE_LOCALBASE_MAILER_CONF="no" MC_PREFIX="" .endif .if ${PORT_OPTIONS:MDOCS} PORTDOCS= * READMEDIR= ${DOCSDIR} .else READMEDIR= no .endif # dynamic direcory location DAEMONDIR= ${PREFIX}/libexec/postfix SHLIB_DIRECTORY=${PREFIX}/lib/postfix # new proposed location is ETCDIR (see README_FILES/INSTALL) # keep compatiblity with Postfix 2.6 .. 2.11 and use DAEMOMDIR META_DIRECTORY= ${DAEMONDIR} SUB_LIST+= REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" \ DAEMONDIR="${DAEMONDIR}" META_DIRECTORY="${META_DIRECTORY}" SUB_FILES+= pkg-install pkg-message mailer.conf.postfix POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \ -DDEF_META_DIR=\\\"${META_DIRECTORY}\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ -DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \ -DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \ -DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \ -DDEF_README_DIR=\\\"${READMEDIR}\\\" \ -DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \ -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \ -DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \ -DDEF_MAIL_OWNER=\\\"postfix\\\" \ -DDEF_SGID_GROUP=\\\"maildrop\\\" \ -Wmissing-prototypes -Wformat -Wno-comment # Default requirement for postfix rc script _REQUIRE= LOGIN cleanvar dovecot # always build with Dovecot SASL support, Cyrus is optional # see Postfix HISTORY 20051222 POSTFIX_CCARGS+= -DUSE_SASL_AUTH # Email Address Internationalization (EAI, RFC 6531..6533) .if ${PORT_OPTIONS:MEAI} POSTFIX_CCARGS+= -DHAS_EAI -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -licuuc .else POSTFIX_CCARGS+= -DNO_EAI .endif .if ${PORT_OPTIONS:MPCRE} DYN_EXT+= pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PCRE=`${LOCALBASE}/bin/pcre-config --libs`" .else POSTFIX_CCARGS+= -DNO_PCRE .endif .if ${PORT_OPTIONS:MSASL} POSTFIX_CCARGS+= -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt .else POSTFIX_CCARGS+= -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\" .endif .if ${PORT_OPTIONS:MSASLKRB5} POSTFIX_AUXLIBS+= -lkrb5 -lhx509 -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif .if ${PORT_OPTIONS:MSASLKMIT} POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err .endif .if ${PORT_OPTIONS:MTLS} POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} # XXX LDFLAGS possible breaks dynamic building POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto .else POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MBDB} POSTFIX_CCARGS+= -I${BDB_INCLUDE_DIR} POSTFIX_AUXLIBS+= -L${BDB_LIB_DIR} -l${BDB_LIB_NAME} .endif .if ${PORT_OPTIONS:MBLACKLISTD} . if ${OPSYS} == FreeBSD POSTFIX_AUXLIBS+= -lblacklist . else IGNORE= blacklistd is only supported on FreeBSD >= 11.0 . endif .endif .if ${PORT_OPTIONS:MMYSQL} DYN_EXT+= mysql POSTFIX_CCARGS+= -DHAS_MYSQL -I${LOCALBASE}/include/mysql POSTFIX_DYN_AUXLIBS+= "AUXLIBS_MYSQL=-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lm" _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} DYN_EXT+= pgsql POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_PGSQL=-L${LOCALBASE}/lib -lpq" _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MSQLITE} DYN_EXT+= sqlite POSTFIX_CCARGS+= -DHAS_SQLITE -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_SQLITE=-L${LOCALBASE}/lib -lsqlite3 -lpthread" .endif .if ${PORT_OPTIONS:MLDAP} DYN_EXT+= ldap . if defined(WITH_OPENLDAP_VER) WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} . endif POSTFIX_CCARGS+= -DHAS_LDAP -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LDAP=-L${LOCALBASE}/lib -lldap -L${LOCALBASE}/lib -llber" _REQUIRE+= slapd . if ${PORT_OPTIONS:MLDAP_SASL} . if ! ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 . endif WANT_OPENLDAP_SASL= yes POSTFIX_CCARGS+= -I${LOCALBASE}/include/sasl -DUSE_LDAP_SASL . endif .endif .if ${PORT_OPTIONS:MCDB} DYN_EXT+= cdb POSTFIX_CCARGS+= -DHAS_CDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_CDB=-L${LOCALBASE}/lib -lcdb" .endif .if ${PORT_OPTIONS:MNIS} POSTFIX_CCARGS+= -DHAS_NIS _REQUIRE+= ypserv .endif .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 .endif .if ${PORT_OPTIONS:MLMDB} DYN_EXT+= lmdb POSTFIX_CCARGS+= -DHAS_LMDB -I${LOCALBASE}/include POSTFIX_DYN_AUXLIBS+= "AUXLIBS_LMDB=-L${LOCALBASE}/lib -llmdb" .endif # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\ s!(_directory = )/usr/!\1${PREFIX}/!g;\ s!^(data_directory = /var/)lib/!\1db/!g;\ s!^\#(mynetworks_style = host)!\1!g;\ s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\ s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\ s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ s!^(setgid_group =)!\1 maildrop!g;\ s!^(manpage_directory =)!\1 ${MANPREFIX}/man!g;\ s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ s!(:|= )/etc/postfix!\1$$config_directory!g;\ s!/etc/postfix!${ETCDIR}!g;\ s!^(sample_directory =)!\1 ${ETCDIR}!g;\ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!; pre-patch: .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a) @if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \ ${ECHO_MSG}; \ sleep 5; \ fi .endif @${ECHO_CMD} 'See header_checks.5.html' \ > ${WRKSRC}/html/body_checks.5.html @${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \ ${WRKSRC}/src/global/mail_params.h @${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \ -type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \ ${REINPLACE_CMD} -E -e '${REINPLACE}' post-patch: .for f in ${HTML1} @${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files .endfor @${ECHO_CMD} '$$manpage_directory/man1/posttls-finger.1:f:root:-:644' \ >> ${WRKSRC}/conf/postfix-files @${ECHO_CMD} '$$command_directory/posttls-finger:f:root:-:755' \ >> ${WRKSRC}/conf/postfix-files do-configure: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles \ ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ shared=yes shlib_directory=${SHLIB_DIRECTORY} \ dynamicmaps=yes \ ${POSTFIX_DYN_AUXLIBS} \ AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO_CMD} "all: default" >> Makefile) pre-install-INST_BASE-on: ${MKDIR} ${STAGEDIR}/etc/rc.d do-install: @(cd ${WRKSRC} && ${MAKE} non-interactive-package \ install_root=${STAGEDIR} tempdir=${WRKDIR} \ shlib_directory=${SHLIB_DIRECTORY} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ meta_directory=${META_DIRECTORY} \ html_directory=${READMEDIR} \ mailq_path=${PREFIX}/bin/mailq \ manpage_directory=${MANPREFIX}/man \ newaliases_path=${PREFIX}/bin/newaliases \ readme_directory=${READMEDIR} \ sendmail_path=${PREFIX}/sbin/sendmail ) ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${STAGEDIR}${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1 # == do not overwrite existing config ${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample ${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR} # == chop dynamicmaps.cf entries into dedicated .cf files # for future sub-packages support .for f in ${DYN_EXT} # adjust dynamicmaps.cf ${GREP} -e "^#" -e "^${f}" ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf \ > ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf.d/${f}.cf && \ ${SED} -i '' -e '/${f}/d' ${STAGEDIR}${META_DIRECTORY}/dynamicmaps.cf # adjust / generate postfix-files for dynamic modules ${SED} -i '' -e '/postfix-${f}.so/d' ${STAGEDIR}${META_DIRECTORY}/postfix-files && \ ${PRINTF} '# Do not edit this file.\ \n$$shlib_directory/postfix-${f}.so:f:root:-:755\ \n$$meta_directory/postfix-files.d/${f}-files:f:root:-:644\ \n$$meta_directory/dynamicmaps.cf.d/${f}.cf:f:root:-:644\n' \ > ${STAGEDIR}${META_DIRECTORY}/postfix-files.d/${f}-files .endfor # Fix compressed man pages and strip executables ${SED} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${STAGEDIR}${META_DIRECTORY}/postfix-files -@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|} -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* -@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so do-install-TEST-on: ${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/mail/rspamd/Makefile =================================================================== --- head/mail/rspamd/Makefile (revision 553939) +++ head/mail/rspamd/Makefile (revision 553940) @@ -1,105 +1,106 @@ # $FreeBSD$ PORTNAME= rspamd PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libpcre.so:devel/pcre \ libicui18n.so:devel/icu \ libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss USES= cmake gnome perl5 pkgconfig \ sqlite ssl USE_LDCONFIG= yes USE_PERL5= build run USE_GNOME= glib20 CONFLICTS_INSTALL= rspamd-devel USERS= rspamd GROUPS= rspamd OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT OPTIONS_DEFINE_amd64= HYPERSCAN OPTIONS_DEFAULT_amd64= LUAJIT OPTIONS_DEFAULT_armv7= LUAJIT OPTIONS_DEFAULT_i386= LUAJIT OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_DEFAULT_powerpc64= LUAJIT OPTIONS_DEFAULT_powerpc64le= LUAJIT OPTIONS_SUB= yes BLAS_DESC= Use OpenBLAS to accelerate KANN CGP_DESC= Install Communigate Pro(tm) helper GPERF_DESC= Google perf-tools profiling HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) LUAJIT_DESC= Use LuaJIT instead of standard Lua SUB_FILES= pkg-message rspamd.newsyslog.conf.sample PLIST_SUB+= ETCDIR=etc/rspamd \ RSPAMDVERSION=${PORTVERSION} CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DLOGDIR=/var/log/rspamd \ -DDBDIR=/var/db/rspamd \ -DRUNDIR=/var/run/rspamd \ -DMANDIR=${MANPREFIX}/man \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DBUILD_PORT=yes \ -DLIBDIR=${PREFIX}/lib/rspamd USE_GITHUB= yes USE_RC_SUBR= rspamd BLAS_CMAKE_ON= -DENABLE_BLAS=ON BLAS_LIB_DEPENDS= libblis.so:math/blis liblapack.so:math/lapack BLAS_USES= blaslapack:openblas GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_USES_OFF= lua:51 CGP_RUN_DEPENDS+= \ p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ p5-AnyEvent>=0:devel/p5-AnyEvent \ p5-EV>=0:devel/p5-EV \ p5-JSON-XS>=0:converters/p5-JSON-XS .include .if ${ARCH:Mpowerpc*} LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty USES+= compiler:gcc-c++11-lib .else USES+= compiler:c11 .endif post-install: @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d post-install-CGP-on: ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper .include Index: head/mail/rspamd-devel/Makefile =================================================================== --- head/mail/rspamd-devel/Makefile (revision 553939) +++ head/mail/rspamd-devel/Makefile (revision 553940) @@ -1,109 +1,110 @@ # $FreeBSD$ PORTNAME= rspamd PORTVERSION= 2.6.a1.20200929 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -devel MAINTAINER= vsevolod@FreeBSD.org COMMENT= Fast spam filtering system dev version LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libpcre.so:devel/pcre \ libicui18n.so:devel/icu \ libsodium.so:security/libsodium BUILD_DEPENDS= ragel:devel/ragel RUN_DEPENDS= ca_root_nss>=3.*:security/ca_root_nss USES= cmake gnome perl5 pkgconfig sqlite ssl USE_LDCONFIG= yes USE_PERL5= build run USE_GNOME= glib20 CONFLICTS_INSTALL= rspamd USERS= rspamd GROUPS= rspamd OPTIONS_DEFINE= BLAS CGP GPERF LUAJIT OPTIONS_DEFINE_amd64= HYPERSCAN OPTIONS_DEFAULT_amd64= LUAJIT OPTIONS_DEFAULT_armv7= LUAJIT OPTIONS_DEFAULT_i386= LUAJIT OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_DEFAULT_powerpc64= LUAJIT OPTIONS_DEFAULT_powerpc64le= LUAJIT OPTIONS_SUB= yes BLAS_DESC= Use OpenBLAS to accelerate KANN CGP_DESC= Install Communigate Pro(tm) helper GPERF_DESC= Google perf-tools profiling HYPERSCAN_DESC= Use hyperscan optimizations (amd64 only) LUAJIT_DESC= Use LuaJIT instead of standard Lua SUB_FILES= pkg-message rspamd.newsyslog.conf.sample PLIST_SUB+= ETCDIR=etc/rspamd \ RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/} CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DLOGDIR=/var/log/rspamd \ -DDBDIR=/var/db/rspamd \ -DRUNDIR=/var/run/rspamd \ -DMANDIR=${MANPREFIX}/man \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DBUILD_PORT=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DDEBUG=ON \ -DGIT_ID=${GH_TAGNAME} USE_GITHUB= yes GH_TAGNAME= 80b8f0e DEBUG_FLAGS= -g -O0 USE_RC_SUBR= rspamd BLAS_CMAKE_ON= -DENABLE_BLAS=ON BLAS_LIB_DEPENDS= libblis.so:math/blis liblapack.so:math/lapack BLAS_USES= blaslapack:openblas GPERF_CMAKE_ON= -DENABLE_GPERF_TOOLS=ON GPERF_LIB_DEPENDS= libprofiler.so:devel/google-perftools HYPERSCAN_CMAKE_ON= -DENABLE_HYPERSCAN=ON HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit LUAJIT_USES_OFF= lua:51 CGP_RUN_DEPENDS+= \ p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \ p5-AnyEvent>=0:devel/p5-AnyEvent \ p5-EV>=0:devel/p5-EV \ p5-JSON-XS>=0:converters/p5-JSON-XS .include .if ${ARCH:Mpowerpc*} LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty USES+= compiler:gcc-c++11-lib .else USES+= compiler:c11 .endif post-install: @${MKDIR} \ ${STAGEDIR}/var/log/rspamd \ ${STAGEDIR}/var/db/rspamd \ ${STAGEDIR}/var/run/rspamd ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.conf.sample # Linux specific ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf ${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf ${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d ${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d post-install-CGP-on: ${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper .include Index: head/mail/sendmail/Makefile =================================================================== --- head/mail/sendmail/Makefile (revision 553939) +++ head/mail/sendmail/Makefile (revision 553940) @@ -1,375 +1,375 @@ # $FreeBSD$ PORTNAME= sendmail PORTVERSION= 8.16.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= Reliable, highly configurable mail transfer agent with utilities LICENSE= Sendmail LICENSE_NAME= Sendmail License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* USERS= smmsp GROUPS= smmsp USES= cpe uidfix groff MAKE_ARGS= UBINOWN=${UID} UBINGRP=${GID} \ SBINOWN=${UID} SBINGRP=${GID} \ GBINOWN=${UID} GBINGRP=${GID} \ MANOWN=${UID} MANGRP=${GID} \ CFOWN=${UID} CFGRP=${GID} \ MSPQOWN=${UID} \ LIBMODE=0644 UBINMODE=0755 GBINMODE=2755 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCS= KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \ sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==} \ MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==} SUB_FILES= pkg-message WCONF= ${WRKSRC}/devtools/Site SITE= ${FILESDIR}/site.config.m4.pre4 PLIST= ${WRKDIR}/.PLIST.more LMAN1= mailq.1 newaliases.1 vacation.1 LMAN5= aliases.5 LMAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \ mail.local.8 rmail.8 editmap.8 SENDMAIL= ${PREFIX}/sbin/sendmail BASEMAIL= /usr/libexec/sendmail/sendmail MILTER_SOVER?= 6 OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS DANE SASL SASLAUTHD LDAP \ BDB GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ PICKY_HELO_CHECK MILTER DOCS OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS DANE SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support TLS_DESC= SMTP-TLS and SMTPS support DANE_DESC= Enable DANE support SASLAUTHD_DESC= SASLAUTHD support BDB_DESC= Berkeley DB version 4+ support GDBM_DESC= GNU dbm library support (option COMPAT needed) SOCKETMAP_DESC= Enable socketmap feature BLACKLISTD_DESC= Enable blacklistd support CYRUSLOOKUP_DESC= Enable cyruslookup feature PICKY_HELO_CHECK_DESC= Enable picky HELO check MILTER_DESC= Enable milter support SMTPUTF8_DESC= Enable unicode address support TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd DANE_IMPLIES= TLS LDAP_USE= OPENLDAP=yes LDAP_PREVENTS= DANE BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2} .endif .if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX) IPCCHECK!= ipcrm -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .endif .if ${PORT_OPTIONS:MBDB} BDB_SUFFIX= +${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MLDAP} LDAP_SUFFIX?= +ldap CONFLICTS+= sendmail-sasl2-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MSASL} SASL_SUFFIX?= +sasl2 CONFLICTS+= sendmail-ldap-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MCYRUSLOOKUP} .if ! ${PORT_OPTIONS:MSOCKETMAP} IGNORE= option CYRUSLOOKUP requires option SOCKETMAP .else EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch .endif .endif .if ${PORT_OPTIONS:MTLS} TLS_SUFFIX?= +tls CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* .endif MAKE_PKGNAMES= for i in "" +tls; do \ for j in "" +sasl2; do \ for k in "" +ldap; do \ for l in "" +db48 +db5 +db6; do \ echo "sendmail$${i}$${j}$${k}$${l}-8.*" ;\ done done done done ALL_PKGNAMES!= ${MAKE_PKGNAMES} CONFLICTS2!= ${MAKE_PKGNAMES} | ${GREP} -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8." CONFLICTS+= ${CONFLICTS2} # Build site.config.m4 SITE+= ${FILESDIR}/site.config.m4 .if ${PORT_OPTIONS:MIPV6} SITE+= ${FILESDIR}/site.config.m4.ipv6 .endif .if ${PORT_OPTIONS:MDANE} SITE+= ${FILESDIR}/site.config.m4.dane .endif .if ${PORT_OPTIONS:MSASL} SITE+= ${FILESDIR}/site.config.m4.sasl2 .endif .if ${PORT_OPTIONS:MLDAP} SITE+= ${FILESDIR}/site.config.m4.ldap .endif .if ${PORT_OPTIONS:MBLACKLISTD} SITE+= ${FILESDIR}/site.config.m4.blacklistd .endif .if ${PORT_OPTIONS:MSMTPUTF8} SITE+= ${FILESDIR}/site.config.m4.smtputf8 .endif .if ${PORT_OPTIONS:MMILTER} SITE+= ${FILESDIR}/site.config.m4.milter .endif .if ${PORT_OPTIONS:MGDBM} NO_PACKAGE= GPLv3 license conflict SITE+= ${FILESDIR}/site.config.m4.gdbm .endif SED_SCRIPT= -e "s|\`-O'|\`${CFLAGS}'|" \ -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' .if ! ${PORT_OPTIONS:MNIS} SED_SCRIPT+= -e "s;-DNIS ;;" .endif do-configure: .if ${PORT_OPTIONS:MGDBM} @(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \ ${ECHO_MSG} "===> option COMPAT is missing in databases/gdbm."; \ ${FALSE}; \ fi) .endif .if ${PORT_OPTIONS:MBLACKLISTD} @(if [ ! -e "${DESTDIR}/usr/lib/libblacklist.so" ] ; then \ ${ECHO_MSG} "===> libblacklist.so not found. Please update to FreeBSD 11"; \ ${FALSE}; \ fi) .endif ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ ${SITE} > ${WCONF}/site.config.m4 .if ${PORT_OPTIONS:MBDB} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-I${BDB_INCLUDE_DIR}'\'')' \ >> ${WCONF}/site.config.m4 ${ECHO_CMD} \ 'APPENDDEF(`confLIBDIRS'\'', `-L${LOCALBASE}/lib'\'')' \ >> ${WCONF}/site.config.m4 .for i in sendmail editmap makemap praliases vacation ${ECHO_CMD} \ 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BDB_LIB_NAME}'\'')' \ >> ${WCONF}/site.config.m4 .endfor .endif .if ${PORT_OPTIONS:MSOCKETMAP} ${ECHO_CMD} \ 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DSOCKETMAP'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ${PORT_OPTIONS:MPICKY_HELO_CHECK} ${ECHO_CMD} \ 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MSHMEM} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MSEM} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SEM=0'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MLA} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \ >> ${WCONF}/site.config.m4 .endif post-build: (cd ${WRKSRC}/doc/op && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt) pre-install: ${MKDIR} ${STAGEDIR}/etc/mail @${CAT} ${PKGDIR}/pkg-plist >${PLIST} @cd ${WRKSRC} && ${FIND} cf -type f | \ ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} .if ${PORT_OPTIONS:MDOCS} .for i in ${DOCS} @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST} .endfor .if ${PORT_OPTIONS:MCYRUSLOOKUP} @${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST} .endif .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail @${SED} \ -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ ${FILESDIR}/mailer.conf \ > ${STAGEDIR}${PREFIX}/etc/mail/mailer.conf.sendmail # We want mail.local and rmail for our system. # the build install catmans only, we have to fix this. post-install: (cd ${WRKSRC}/mail.local && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install) (cd ${WRKSRC}/rmail && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install) .for i in ${LMAN8} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/ .endfor .for i in ${LMAN5} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man5/ .endfor .for i in ${LMAN1} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail ${TAR} -C ${WRKSRC} -cf - cf | \ ${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf - ${RM} ${STAGEDIR}${PREFIX}/man/cat*/* # final perm of sendmail is 2555 (see plist), needed for strip cmd ${CHMOD} 755 ${STAGEDIR}${PREFIX}/sbin/sendmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/* post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps ${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${STAGEDIR}${DOCSDIR}/op.txt ${INSTALL_DATA} ${WRKSRC}/devtools/README ${STAGEDIR}${DOCSDIR}/DEVTOOLS ${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL ${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL ${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH .if ${PORT_OPTIONS:MCYRUSLOOKUP} ${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP .endif mailer.base: @${SED} \ -e "s=\([ ]\)/.*$$=\\1${BASEMAIL}=" \ ${FILESDIR}/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \ ${DESTDIR}/etc/mail/mailer.conf mailer.conf: .if exists(${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail) @${CP} -v ${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail \ ${DESTDIR}${PREFIX}/etc/mail/mailer.conf .else @${MKDIR} ${DESTDIR}${PREFIX}/etc/mail @${SED} \ -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ ${FILESDIR}/mailer.conf \ > ${DESTDIR}${PREFIX}/etc/mail/mailer.conf .endif # create sumbit.cf on older systems # submit.cf: ${DESTDIR}/etc/mail/submit.cf ${DESTDIR}/etc/mail/submit.mc: ${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \ ${DESTDIR}/etc/mail/submit.mc ${DESTDIR}/etc/mail/submit.cf: ${DESTDIR}/etc/mail/submit.mc @( cd ${DESTDIR}/etc/mail && ${MAKE} \ SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \ SENDMAIL_MC=submit ) # create basics for smtp-auth # howto-sasldb: @${ECHO_CMD} "# Links:" @${ECHO_CMD} "#" @${ECHO_CMD} "# http://www.sendmail.org/~gshapiro/" @${ECHO_CMD} "# http://www.sendmail.org/~ca/email/auth.html" @${ECHO_CMD} "# http://www.bme.ogi.edu/~pchytil/linux/sendmail/" @${ECHO_CMD} "# http://blue-labs.org/software/sm-pgsql/" @${ECHO_CMD} "# http://www.falkotimme.com/howtos/sendmail_smtp_auth_tls/" @${ECHO_CMD} "#" # create certificates for TLS/SSL # tls-install: ${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \ ${SH} ${FILESDIR}/tls-install.sh help: @${ECHO_CMD} "# additional targets:" @${ECHO_CMD} "#" @${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf" @${ECHO_CMD} "# for sendmail from ports" @${ECHO_CMD} "make mailer.conf" @${ECHO_CMD} "# for sendmail in the base" @${ECHO_CMD} "make mailer.base" @${ECHO_CMD} "#" @${ECHO_CMD} "# show howto for configuring sasldb" @${ECHO_CMD} "make howto-sasldb" @${ECHO_CMD} "#" @${ECHO_CMD} "# create a self-signed certificate" @${ECHO_CMD} "make tls-install" @${ECHO_CMD} "#" .include .if ${PORT_OPTIONS:MTLS} .if ${SSL_DEFAULT} != base SITE+= ${FILESDIR}/site.config.m4.ssl .endif SITE+= ${FILESDIR}/site.config.m4.tls .endif .if exists(${FILESDIR}/site.config.m4.local) SITE+= ${FILESDIR}/site.config.m4.local .endif .if ${PREFIX} == "/usr" pre-everything:: @${ECHO_CMD} "#" @${ECHO_CMD} "# You can't override the base sendmail this way." @${ECHO_CMD} "# your version FreeBSD use mailwrapper." @${ECHO_CMD} "#" @${ECHO_CMD} "# Please install with normal PREFIX" @${ECHO_CMD} "# and activate the port version with" @${ECHO_CMD} "# cd /usr/local/etc/mail && cp mailer.conf.sendmail mailer.conf" @${ECHO_CMD} "#" @${FALSE} .endif .include Index: head/mail/sendmail-devel/Makefile =================================================================== --- head/mail/sendmail-devel/Makefile (revision 553939) +++ head/mail/sendmail-devel/Makefile (revision 553940) @@ -1,364 +1,365 @@ # $FreeBSD$ PORTNAME= sendmail PORTVERSION= 8.16.0.50 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= dinoex@FreeBSD.org COMMENT= Reliable, highly configurable mail transfer agent with utilities LICENSE= Sendmail LICENSE_NAME= Sendmail License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept CONFLICTS?= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* USERS= smmsp GROUPS= smmsp USES= cpe uidfix groff MAKE_ARGS= UBINOWN=${UID} UBINGRP=${GID} \ SBINOWN=${UID} SBINGRP=${GID} \ GBINOWN=${UID} GBINGRP=${GID} \ MANOWN=${UID} MANGRP=${GID} \ CFOWN=${UID} CFGRP=${GID} \ MSPQOWN=${UID} \ LIBMODE=0644 UBINMODE=0755 GBINMODE=2755 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCS= KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \ sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==} \ MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==} SUB_FILES= pkg-message WCONF= ${WRKSRC}/devtools/Site SITE= ${FILESDIR}/site.config.m4.pre4 PLIST= ${WRKDIR}/.PLIST.more LMAN1= mailq.1 newaliases.1 vacation.1 LMAN5= aliases.5 LMAN8= sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \ mail.local.8 rmail.8 editmap.8 SENDMAIL= ${PREFIX}/sbin/sendmail BASEMAIL= /usr/libexec/sendmail/sendmail MILTER_SOVER?= 6 OPTIONS_DEFINE?= SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB \ GDBM SOCKETMAP CYRUSLOOKUP BLACKLISTD SMTPUTF8 \ PICKY_HELO_CHECK MILTER DOCS OPTIONS_DEFAULT?= SHMEM SEM LA NIS TLS SASL SASLAUTHD BDB1 \ BLACKLISTD PICKY_HELO_CHECK MILTER NO_OPTIONS_SORT=yes SHMEM_DESC= System V shared memory support LA_DESC= load averages support TLS_DESC= SMTP-TLS and SMTPS support SASLAUTHD_DESC= SASLAUTHD support BDB_DESC= Berkeley DB version 4+ support GDBM_DESC= GNU dbm library support (option COMPAT needed) SOCKETMAP_DESC= Enable socketmap feature BLACKLISTD_DESC= Enable blacklistd support CYRUSLOOKUP_DESC= Enable cyruslookup feature PICKY_HELO_CHECK_DESC= Enable picky HELO check MILTER_DESC= Enable milter support SMTPUTF8_DESC= Enable unicode address support TLS_USES= ssl SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLAUTHD_RUN_DEPENDS= saslauthd:security/cyrus-sasl2-saslauthd LDAP_USE= OPENLDAP=yes BDB_USES= bdb GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm GDBM_CONFIGURE_WITH= compat SMTPUTF8_LIB_DEPENDS= libidn2.so:dns/libidn2 libicui18n.so:devel/icu .include .if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX) IPCCHECK!= ipcrm -q 0 2>&1 || true .if ${IPCCHECK:Mimplemented} IGNORE= your system does not support sysvipc .endif .endif .if ${PORT_OPTIONS:MBDB} BDB_SUFFIX= +${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MLDAP} LDAP_SUFFIX?= +ldap CONFLICTS+= sendmail-sasl2-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MSASL} SASL_SUFFIX?= +sasl2 CONFLICTS+= sendmail-ldap-8.* sendmail-tls-8.* .endif .if ${PORT_OPTIONS:MCYRUSLOOKUP} .if ! ${PORT_OPTIONS:MSOCKETMAP} IGNORE= option CYRUSLOOKUP requires option SOCKETMAP .else EXTRA_PATCHES+= ${FILESDIR}/cyruslookup.patch .endif .endif .if ${PORT_OPTIONS:MTLS} TLS_SUFFIX?= +tls CONFLICTS+= sendmail-ldap-8.* sendmail-sasl2-8.* .endif MAKE_PKGNAMES= for i in "" +tls; do \ for j in "" +sasl2; do \ for k in "" +ldap; do \ for l in "" +db48 +db5 +db6; do \ echo "sendmail$${i}$${j}$${k}$${l}-8.*" ;\ done done done done ALL_PKGNAMES!= ${MAKE_PKGNAMES} CONFLICTS2!= ${MAKE_PKGNAMES} | ${GREP} -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8." CONFLICTS+= ${CONFLICTS2} # Build site.config.m4 SITE+= ${FILESDIR}/site.config.m4 .if ${PORT_OPTIONS:MIPV6} SITE+= ${FILESDIR}/site.config.m4.ipv6 .endif .if ${PORT_OPTIONS:MSASL} SITE+= ${FILESDIR}/site.config.m4.sasl2 .endif .if ${PORT_OPTIONS:MLDAP} SITE+= ${FILESDIR}/site.config.m4.ldap .endif .if ${PORT_OPTIONS:MBLACKLISTD} SITE+= ${FILESDIR}/site.config.m4.blacklistd .endif .if ${PORT_OPTIONS:MSMTPUTF8} SITE+= ${FILESDIR}/site.config.m4.smtputf8 .endif .if ${PORT_OPTIONS:MMILTER} SITE+= ${FILESDIR}/site.config.m4.milter .endif .if ${PORT_OPTIONS:MGDBM} NO_PACKAGE= GPLv3 license conflict SITE+= ${FILESDIR}/site.config.m4.gdbm .endif SED_SCRIPT= -e "s|\`-O'|\`${CFLAGS}'|" \ -e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|' .if ! ${PORT_OPTIONS:MNIS} SED_SCRIPT+= -e "s;-DNIS ;;" .endif do-configure: .if ${PORT_OPTIONS:MGDBM} @(if [ ! -e "${LOCALBASE}/lib/libgdbm_compat.so" ] ; then \ ${ECHO_MSG} "===> option COMPAT is missing in databases/gdbm."; \ ${FALSE}; \ fi) .endif .if ${PORT_OPTIONS:MBLACKLISTD} @(if [ ! -e "${DESTDIR}/usr/lib/libblacklist.so" ] ; then \ ${ECHO_MSG} "===> libblacklist.so not found. Please update to FreeBSD 11"; \ ${FALSE}; \ fi) .endif ${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD ${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ -e "s=%%LOCALBASE%%=${LOCALBASE}=g" \ ${SITE} > ${WCONF}/site.config.m4 .if ${PORT_OPTIONS:MBDB} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-I${BDB_INCLUDE_DIR}'\'')' \ >> ${WCONF}/site.config.m4 ${ECHO_CMD} \ 'APPENDDEF(`confLIBDIRS'\'', `-L${LOCALBASE}/lib'\'')' \ >> ${WCONF}/site.config.m4 .for i in sendmail editmap makemap praliases vacation ${ECHO_CMD} \ 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BDB_LIB_NAME}'\'')' \ >> ${WCONF}/site.config.m4 .endfor .endif .if ${PORT_OPTIONS:MSOCKETMAP} ${ECHO_CMD} \ 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DSOCKETMAP'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ${PORT_OPTIONS:MPICKY_HELO_CHECK} ${ECHO_CMD} \ 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MSHMEM} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MSEM} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SEM=0'\'')' \ >> ${WCONF}/site.config.m4 .endif .if ! ${PORT_OPTIONS:MLA} ${ECHO_CMD} \ 'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \ >> ${WCONF}/site.config.m4 .endif post-build: (cd ${WRKSRC}/doc/op && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt) pre-install: ${MKDIR} ${STAGEDIR}/etc/mail @${CAT} ${PKGDIR}/pkg-plist >${PLIST} @cd ${WRKSRC} && ${FIND} cf -type f | \ ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} .if ${PORT_OPTIONS:MDOCS} .for i in ${DOCS} @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST} .endfor .if ${PORT_OPTIONS:MCYRUSLOOKUP} @${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST} .endif .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail @${SED} \ -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ ${FILESDIR}/mailer.conf \ > ${STAGEDIR}${PREFIX}/etc/mail/mailer.conf.sendmail # We want mail.local and rmail for our system. # the build install catmans only, we have to fix this. post-install: (cd ${WRKSRC}/mail.local && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install) (cd ${WRKSRC}/rmail && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install) .for i in ${LMAN8} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/ .endfor .for i in ${LMAN5} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man5/ .endfor .for i in ${LMAN1} ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail ${TAR} -C ${WRKSRC} -cf - cf | \ ${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf - ${RM} ${STAGEDIR}${PREFIX}/man/cat*/* # final perm of sendmail is 2555 (see plist), needed for strip cmd ${CHMOD} 755 ${STAGEDIR}${PREFIX}/sbin/sendmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/* post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps ${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${STAGEDIR}${DOCSDIR}/op.txt ${INSTALL_DATA} ${WRKSRC}/devtools/README ${STAGEDIR}${DOCSDIR}/DEVTOOLS ${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL ${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL ${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH .if ${PORT_OPTIONS:MCYRUSLOOKUP} ${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP .endif mailer.base: @${SED} \ -e "s=\([ ]\)/.*$$=\\1${BASEMAIL}=" \ ${FILESDIR}/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new ${MV} ${DESTDIR}/etc/mail/mailer.conf.new \ ${DESTDIR}/etc/mail/mailer.conf mailer.conf: .if exists(${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail) @${CP} -v ${DESTDIR}${PREFIX}/etc/mail/mailer.conf.sendmail \ ${DESTDIR}${PREFIX}/etc/mail/mailer.conf .else @${MKDIR} ${DESTDIR}${PREFIX}/etc/mail @${SED} \ -e "s=\([ ]\)/.*$$=\\1${SENDMAIL}=" \ ${FILESDIR}/mailer.conf \ > ${DESTDIR}${PREFIX}/etc/mail/mailer.conf .endif # create sumbit.cf on older systems # submit.cf: ${DESTDIR}/etc/mail/submit.cf ${DESTDIR}/etc/mail/submit.mc: ${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \ ${DESTDIR}/etc/mail/submit.mc ${DESTDIR}/etc/mail/submit.cf: ${DESTDIR}/etc/mail/submit.mc @( cd ${DESTDIR}/etc/mail && ${MAKE} \ SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \ SENDMAIL_MC=submit ) # create basics for smtp-auth # howto-sasldb: @${ECHO_CMD} "# Links:" @${ECHO_CMD} "#" @${ECHO_CMD} "# http://www.sendmail.org/~gshapiro/" @${ECHO_CMD} "# http://www.sendmail.org/~ca/email/auth.html" @${ECHO_CMD} "# http://www.bme.ogi.edu/~pchytil/linux/sendmail/" @${ECHO_CMD} "# http://blue-labs.org/software/sm-pgsql/" @${ECHO_CMD} "# http://www.falkotimme.com/howtos/sendmail_smtp_auth_tls/" @${ECHO_CMD} "#" # create certificates for TLS/SSL # tls-install: ${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \ ${SH} ${FILESDIR}/tls-install.sh help: @${ECHO_CMD} "# additional targets:" @${ECHO_CMD} "#" @${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf" @${ECHO_CMD} "# for sendmail from ports" @${ECHO_CMD} "make mailer.conf" @${ECHO_CMD} "# for sendmail in the base" @${ECHO_CMD} "make mailer.base" @${ECHO_CMD} "#" @${ECHO_CMD} "# show howto for configuring sasldb" @${ECHO_CMD} "make howto-sasldb" @${ECHO_CMD} "#" @${ECHO_CMD} "# create a self-signed certificate" @${ECHO_CMD} "make tls-install" @${ECHO_CMD} "#" .include .if ${PORT_OPTIONS:MTLS} .if ${SSL_DEFAULT} != base SITE+= ${FILESDIR}/site.config.m4.ssl .endif SITE+= ${FILESDIR}/site.config.m4.tls .endif .if exists(${FILESDIR}/site.config.m4.local) SITE+= ${FILESDIR}/site.config.m4.local .endif .if ${PREFIX} == "/usr" pre-everything:: @${ECHO_CMD} "#" @${ECHO_CMD} "# You can't override the base sendmail this way." @${ECHO_CMD} "# your version FreeBSD use mailwrapper." @${ECHO_CMD} "#" @${ECHO_CMD} "# Please install with normal PREFIX" @${ECHO_CMD} "# and activate the port version with" @${ECHO_CMD} "# cd /usr/local/etc/mail && cp mailer.conf.sendmail mailer.conf" @${ECHO_CMD} "#" @${FALSE} .endif .include Index: head/mail/thunderbird/Makefile =================================================================== --- head/mail/thunderbird/Makefile (revision 553939) +++ head/mail/thunderbird/Makefile (revision 553940) @@ -1,79 +1,80 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= thunderbird DISTVERSION= 78.4.0 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.56:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.6:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip LIB_DEPENDS= libjson-c.so:devel/json-c \ libbotan-2.so:security/botan2 SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= -sqlite USES= tar:xz MOZ_OPTIONS= --enable-application=comm/mail --enable-official-branding MOZ_OPTIONS+= --with-system-bz2 --with-system-jsonc --with-system-botan MOZ_MK_OPTIONS= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 PORTNAME_ICON= ${MOZILLA}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar .else MOZ_OPTIONS+= --disable-calendar .endif post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON:R}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/comm/mail/app/nsMailApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} .include Index: head/math/R/Makefile =================================================================== --- head/math/R/Makefile (revision 553939) +++ head/math/R/Makefile (revision 553940) @@ -1,152 +1,153 @@ # Created by: Maurice Castro # $FreeBSD$ PORTNAME= R DISTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} MAINTAINER= jrm@FreeBSD.org COMMENT= Language for statistical computing and graphics LICENSE= GPLv2 ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le BUILD_DEPENDS= texi2any:print/texinfo LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre2-8.so:devel/pcre2 RUN_DEPENDS= gmake:devel/gmake # R packages may require GNU make # possible TODO # - Use --with-recommended-packages=no by default # - Add an option for recommended packages # - Create ports for each of the recommended packages # - Create a meta-port for the recommended packages USES= compiler:c++11-lang gmake iconv libtool localbase pathfix perl5 \ readline:port USE_LDCONFIG= ${PREFIX}/lib/R/lib USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-java \ --enable-R-shlib \ --with-readline \ rdocdir=${DOCSDIR} INSTALL_TARGET= install-strip PLIST_SUB= FULLVER=${DISTVERSION} MAJORVER=${_MAJORVER} OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11 OPTIONS_DEFINE_amd64= FLANG OPENMP OPTIONS_DEFINE_i386= OPENMP OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \ RPROF TCLTK TIFF X11 OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_i386= OPENMP OPTIONS_GROUP= NEEDX11 OPTIONS_GROUP_NEEDX11= CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF OPTIONS_SINGLE= BLAS OPTIONS_SINGLE_BLAS= ATLAS NETLIB OPENBLAS RBLAS OPTIONS_SUB= YES ATLAS_DESC= ATLAS BLAS implementation CAIROPANGO_DESC= Cairo graphics device and Pango multi-language text FLANG_DESC= Use experimental flang Fortran compiler GHOSTSCRIPT_DESC= Graphics device for bitmap files via Ghostscript JPEG_DESC= JPEG graphics device LDOUBLE_DESC= Long double data type LETTER_DESC= US letter paper MEMPROF_DESC= Memory profiling via Rprofmem() and tracemem() NEEDX11_DESC= Require X11 NETLIB_DESC= Netlib BLAS implementation OPENBLAS_DESC= OpenBLAS BLAS implementation PNG_DESC= PNG graphics device RBLAS_DESC= Use R-bundled BLAS implementation RPROF_DESC= R profiling via Rprof() TEXDOCS_DESC= Build/Install TeX-dependent documentation files X11_DESC= X11 graphics device ATLAS_USES= blaslapack:atlas ATLAS_CONFIGURE_ON= --disable-BLAS-shlib CAIROPANGO_IMPLIES= X11 CAIROPANGO_USES= gettext gnome jpeg pkgconfig CAIROPANGO_USE= GNOME=cairo,pango CAIROPANGO_CONFIGURE_WITH= cairo FLANG_PREVENTS= ATLAS NETLIB OPENBLAS FLANG_LIB_DEPENDS= libpgmath.so:math/libpgmath FLANG_USES= fortran:flang GHOSTSCRIPT_IMPLIES= X11 GHOSTSCRIPT_USES= ghostscript ICU_LIB_DEPENDS= libicui18n.so:devel/icu ICU_CONFIGURE_WITH= ICU INFO_INSTALL_TARGET= install-info INFO_INFO= R-admin R-data R-exts R-FAQ R-intro R-ints \ R-lang JPEG_IMPLIES= X11 JPEG_USES= jpeg pkgconfig JPEG_CONFIGURE_WITH= jpeglib JPEG_CONFIGURE_ENV= r_cv_header_jpeglib_h=yes LDOUBLE_CONFIGURE_ENABLE= long-double LETTER_CONFIGURE_ENV= R_PAPERSIZE=letter MEMPROF_CONFIGURE_ENABLE= memory-profiling NETLIB_USES= blaslapack:netlib NETLIB_CONFIGURE_ON= --disable-BLAS-shlib NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls OPENBLAS_USES= blaslapack:openblas OPENBLAS_CONFIGURE_ON= --disable-BLAS-shlib OPENMP_CONFIGURE_ENABLE= openmp PNG_IMPLIES= X11 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= libpng RBLAS_CONFIGURE_ON= --enable-BLAS-shlib \ --without-blas \ --without-lapack RBLAS_CONFIGURE_OFF= --with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \ --with-lapack="${LAPACKLIB}" RBLAS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \ ${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in RPROF_CONFIGURE_ENABLE= R-profiling TCLTK_IMPLIES= X11 TCLTK_USES= tcl tk TCLTK_CONFIGURE_WITH= tcltk TEXDOCS_USE= TEX=dvipsk:build,kpathsea:build,pdftex:build .for i in KPSEWHICH MAKEINDEX PDFLATEX PDFTEX TEX TEXI2DVI TEXDOCS_CONFIGURE_ENV_OFF+= ac_cv_path_${i}="" .endfor TEXDOCS_INSTALL_TARGET= install-pdf TIFF_IMPLIES= X11 TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= libtiff X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext,xmu,xscrnsaver,xt X11_CONFIGURE_WITH= x _MAJORVER= ${DISTVERSION:R:R} .include .if ! ${PORT_OPTIONS:MFLANG} USES+= fortran .endif post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure @${REINPLACE_CMD} \ -e "s|%%FULLVER%%|${DISTVERSION}|" \ -e "s|%%MAJORVER%%|${_MAJORVER}|" \ ${WRKSRC}/src/main/Makefile.in \ ${WRKSRC}/src/extra/blas/Makefile.in \ ${WRKSRC}/src/modules/lapack/Makefile.in post-install-RBLAS-off: @${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc post-install-RBLAS-on: @${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc .include Index: head/math/libqalculate/Makefile =================================================================== --- head/math/libqalculate/Makefile (revision 553939) +++ head/math/libqalculate/Makefile (revision 553940) @@ -1,37 +1,38 @@ # Created by: Sergey Akifyev # $FreeBSD$ PORTNAME= libqalculate PORTVERSION= 3.11.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/ MAINTAINER= jhale@FreeBSD.org COMMENT= Multi-purpose desktop calculator (backend library) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicuuc.so:devel/icu \ libcurl.so:ftp/curl \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr USES= compiler:c++14-lang gettext gmake gnome iconv libtool \ localbase ncurses pathfix pkgconfig readline:port USE_GNOME= intltool libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS OPTIONS_SUB= yes post-patch-NLS-off: @${REINPLACE_CMD} -e '/^SUBDIRS =/s|po ||g' ${WRKSRC}/Makefile.in post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s|docs||g' ${WRKSRC}/Makefile.in .include Index: head/math/py-rpy2/Makefile =================================================================== --- head/math/py-rpy2/Makefile (revision 553939) +++ head/math/py-rpy2/Makefile (revision 553940) @@ -1,38 +1,39 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= rpy2 PORTVERSION= 3.3.6 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python interface to the R Programming Language LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/gpl-2.0.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} LIB_DEPENDS= libR.so:math/R \ libicui18n.so:devel/icu \ libpcre.so:devel/pcre RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.10.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=0:devel/py-tzlocal@${PY_FLAVOR} USES= compiler:c11 fortran python:3.6+ readline USE_PYTHON= autoplist concurrent distutils MAKE_ENV= RPY2_CFFI_MODE=BOTH PLIST_FILES= ${PYTHON_SITELIBDIR}/__pycache__/_rinterface_cffi_abi.cpython-${PYTHON_SUFFIX}.${PYTHON_PYOEXTENSION} \ ${PYTHON_SITELIBDIR}/__pycache__/_rinterface_cffi_abi.cpython-${PYTHON_SUFFIX}.pyc \ ${PYTHON_SITELIBDIR}/_rinterface_cffi_abi.py post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_rinterface_cffi_api.abi3.so .include Index: head/math/sage/Makefile =================================================================== --- head/math/sage/Makefile (revision 553939) +++ head/math/sage/Makefile (revision 553940) @@ -1,573 +1,574 @@ # Created by: Stephen Montgomery-Smith # $FreeBSD$ PORTNAME= sage PORTVERSION= 9.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://mirrors.xmission.com/sage/src/ \ http://mirrors.xmission.com/sage/src/ \ https://www-ftp.lip6.fr/pub/math/sagemath/src/ \ https://mirrors.mit.edu/sage/src/ \ https://files.sagemath.org/src/ \ ftp://www-ftp.lip6.fr/pub/math/sagemath/src/ #MASTER_SITES= ftp://www-ftp.lip6.fr/pub/math/sagemath/devel/ PKGNAMESUFFIX= -math MAINTAINER= thierry@FreeBSD.org COMMENT= Open source Mathematics software LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= bash:shells/bash \ dash:shells/dash \ cmake:devel/cmake \ dreadnaut:math/nauty \ ${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}gmpy2-devel>0:math/py-gmpy2-devel@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}Jinja2>0i:devel/py-Jinja2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jupyter_core>0:devel/py-jupyter_core@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jupyter_client>0:devel/py-jupyter_client@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>0:devel/py-prompt_toolkit@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\ fflas-ffpack-config:math/fflas-ffpack \ fricas>0:math/fricas \ gfan:math/gfan \ git:devel/git \ gp2c:math/gp2c \ jmol:science/jmol \ libatomic_ops>0:devel/libatomic_ops \ MathJax>0:www/mathjax \ maxima>0:math/maxima \ p5-XML-Writer>0:textproc/p5-XML-Writer \ p5-XML-LibXML>0:textproc/p5-XML-LibXML \ p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT\ p5-File-Slurp>0:devel/p5-File-Slurp \ p5-JSON>0:converters/p5-JSON \ p5-SVG>0:textproc/p5-SVG \ p5-MongoDB>0:databases/p5-MongoDB \ p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\ palp>0:math/palp \ pandoc:textproc/hs-pandoc \ pari-elldata>0:math/pari_elldata\ pari-galdata>0:math/pari_galdata\ pari-galpol>0:math/pari_galpol \ pari-nftables>0:math/pari_nftables \ pari-seadata>0:math/pari_seadata\ QuadraticSieve:math/flintqs \ ninja:devel/ninja \ gpatch:devel/patch \ rubiks>0:math/rubiks \ sympow:math/sympow \ tachyon:graphics/tachyon \ three.js>0:www/threejs \ yasm:devel/yasm \ gtar:archivers/gtar \ convert:graphics/ImageMagick6 \ ffmpeg:multimedia/ffmpeg \ ${LOCALBASE}/lib/libBLT.a:x11-toolkits/blt LIB_DEPENDS= libarb.so:math/arb \ libboost_thread.so:devel/boost-libs \ libbraiding.so:math/libbraiding \ libbrial.so:math/brial \ libCbc.so:math/cbc \ libcdd.so:math/cddlib \ libcliquer.so:math/cliquer \ libcurl.so:ftp/curl \ libeantic.so:math/e-antic \ libec.so:math/eclib \ libecl.so:lang/ecl \ libecm.so:math/gmp-ecm \ libflint.so:math/flint2 \ libfplll.so:math/fplll \ libfreetype.so:print/freetype2 \ libgc.so:devel/boehm-gc \ libgc-threaded.so:devel/boehm-gc-threaded\ libgf2x.so:math/gf2x \ libgivaro.so:math/givaro \ libglpk.so:math/glpk \ libgap.so:math/gap \ libgmp.so:math/gmp \ libgsl.so:math/gsl \ libhomfly.so:math/libhomfly \ libiml.so:math/iml \ libisl.so:devel/isl \ libLfunction.so:math/lcalc \ libffi.so:devel/libffi \ libgd.so:graphics/gd \ libgiac.so:math/giacxcas \ liblinbox.so:math/linbox \ liblrcalc.so:math/lrcalc \ liblrs.so:math/lrslib \ libm4ri.so:math/m4ri \ libm4rie.so:math/m4rie \ libmpc.so:math/mpc \ libmpfi.so:math/mpfi \ libmpfr.so:math/mpfr \ libmpir.so:math/mpir \ libntl.so:math/ntl \ libpari.so:math/pari \ libpcre.so:devel/pcre \ libplanarity.so:math/planarity \ libpng.so:graphics/png \ libppl.so:devel/ppl \ libpynac.so:math/pynac \ libR.so:math/R \ librw.so:math/rankwidth \ libSingular.so:math/singular \ libamd.so:math/suitesparse \ libsemigroups.so:math/libsemigroups \ libsymmetrica.so:math/symmetrica\ libzmq.so:net/libzmq4 \ libzn_poly-0.9.so:math/zn_poly \ libqd.so:math/qd \ libisl.so:devel/isl \ libblas.so:math/blas \ libicuuc.so:devel/icu \ libtiff.so:graphics/tiff \ liblapack.so:math/lapack \ libedit.so:devel/libedit \ libwebp.so:graphics/webp \ libpcre2-8.so:devel/pcre2 \ libgdbm.so:databases/gdbm \ liblcms2.so:graphics/lcms2 \ libopenjp2.so:graphics/openjpeg RUN_DEPENDS= bash:shells/bash \ dreadnaut:math/nauty \ ${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}backcall>0:devel/py-backcall@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}gmpy2-devel>0:math/py-gmpy2-devel@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipykernel5>0:devel/py-ipykernel5@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ipywidgets>0:devel/py-ipywidgets@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jupyter_core>0:devel/py-jupyter_core@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}jupyter_client>0:devel/py-jupyter_client@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}notebook>0:www/py-notebook@${PY_FLAVOR}\ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>0:devel/py-prompt_toolkit@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pycparser>0:devel/py-pycparser@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyrsistent>0:devel/py-pyrsistent@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-applehelp>0:textproc/py-sphinxcontrib-applehelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-devhelp>0:textproc/py-sphinxcontrib-devhelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-htmlhelp>0:textproc/py-sphinxcontrib-htmlhelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-jsmath>0:textproc/py-sphinxcontrib-jsmath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-qthelp>0:textproc/py-sphinxcontrib-qthelp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-serializinghtml>0:textproc/py-sphinxcontrib-serializinghtml@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-websupport>0:textproc/py-sphinxcontrib-websupport@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>0:devel/py-widgetsnbextension@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}zipp>0:devel/py-zipp@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\ fflas-ffpack-config:math/fflas-ffpack \ fricas>0:math/fricas \ gfan:math/gfan \ git:devel/git \ gp2c:math/gp2c \ jmol:science/jmol \ MathJax>0:www/mathjax \ maxima>0:math/maxima \ p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\ palp>0:math/palp \ pandoc:textproc/hs-pandoc \ pari-elldata>0:math/pari_elldata\ pari-galdata>0:math/pari_galdata\ pari-galpol>0:math/pari_galpol \ pari-nftables>0:math/pari_nftables \ pari-seadata>0:math/pari_seadata\ QuadraticSieve:math/flintqs \ rubiks>0:math/rubiks \ sympow:math/sympow \ tachyon:graphics/tachyon \ three.js>0:www/threejs \ yasm:devel/yasm \ pixz:archivers/pixz USES= autoreconf blaslapack:openblas compiler:c++11-lib fortran \ gettext gmake gnome iconv jpeg libtool localbase ncurses perl5 \ pkgconfig python:3.6+ readline shebangfix sqlite tk xorg USE_TEX= latex:build pdftex:build tex:build USE_XORG= x11 xext xscrnsaver USE_GNOME= cairo glib20 pango USE_PYTHON= cython USE_JAVA= yes # for science/jmol CONFLICTS= ${PYTHON_PKGNAMEPREFIX}wheel-0.* SHEBANG_FILES= . SHEBANG_LANG+= dash dash_OLD_CMD= /bin/dash dash_CMD= ${LOCALBASE}/bin/dash DISABLE_BINUTILS= yes LIBS= -lomp -pthread .if !defined{WITH_DEBUG} LDFLAGS+= -s .endif BLDDIR= ${WRKDIR}/build GNU_CONFIGURE= yes CONFIGURE_ENV= SAGE_PORT=yes CC=${CC} GCC=${CC} CXX=${CXX} AS=${AS} LD=${LD} \ SAGE_LOCAL=${PREFIX} SAGE_DESTDIR=${BLDDIR}/ \ DESTDIR=${BLDDIR}/${PREFIX} PATCH=${LOCALBASE}/bin/gpatch CONFIGURE_ARGS= --with-system-gcc=force \ --with-system-python3=yes \ --with-python=${PYTHON_CMD} \ --enable-build-as-root \ --disable-download-from-upstream-url \ --localstatedir=/var MAKE_ENV= MAKE=${GMAKE} DESTDIR=${BLDDIR} ALL_TARGET= build REINPLACE_ARGS= -i '' BINARY_ALIAS= patch=${LOCALBASE}/bin/gpatch OPTIONS_SUB= yes PLIST_SUB= VER=${DISTVERSION} SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PORTDOCS= * .include WSDIR= ${BLDDIR}${PREFIX} SPKG_INST= configure.ac configure build/sage_bootstrap/uninstall.py \ build/make/install src/bin/sage-env PY2FIX= bin lib/${PYTHON_VERSION} DOC2FIX= .pickle .doctree SE2FIX= ^ECLDIR= ^SINGULAR MAXIMA_PREFIX SHR2FIX= GAP_ROOT_DIR PPLPY_DOCS SINGULARPATH STG2FIX= bin/sage-env-config \ share/jupyter/kernels/sagemath/kernel.json BADLN= kernels/sagemath/doc nbextensions/jsmol \ nbextensions/mathjax nbextensions/threejs # External dependencies not yet handled by SageMath # Note: do not use wheel from ports PY_LIBS= alabaster attrs babel backcall bleach certifi cffi cvxopt cycler \ cypari cysignals cython dateutil decorator defusedxml docutils \ entrypoints fpylll gmpy2 html5lib imagesize importlib_metadata ipykernel ipython \ ipython_genutils ipywidgets itsdangerous jedi jinja2 jsonschema jupyter_client \ jupyter_core kiwisolver markupsafe matplotlib mistune mpmath \ nbconvert nbformat networkx nose notebook numpy packaging pandocfilters \ parso pathpy pexpect pickleshare pillow pkgconfig pplpy \ prometheus_client prompt_toolkit psutil ptyprocess pybind11 pycparser pyparsing \ pygments pyrsistent pytz pyzmq requests rpy2 scandir scipy send2trash simplegeneric \ six snowballstemmer sphinx sphinxcontrib_applehelp sphinxcontrib_devhelp sphinxcontrib_htmlhelp sphinxcontrib_jsmath sphinxcontrib_qthelp sphinxcontrib_serializinghtml sphinxcontrib_websupport sympy terminado testpath tornado traitlets \ tzlocal vcversioner wcwidth webencodings widgetsnbextension zipp zope_interface JS_LIBS= jmol mathjax threejs SPKGCM4= e_antic ecl gap libhomfly linbox maxima pynac rubiks singular post-patch: ${CP} ${FILESDIR}/psutil__arch__bsd__freebsd_socks.c.patch \ ${WRKSRC}/build/pkgs/psutil/patches/ .for sp in ${SPKGCM4} ${CP} ${FILESDIR}/${sp}_spkg-configure.m4 \ ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4 .endfor .for sp in ${PY_LIBS} ${CP} ${FILESDIR}/py_libs_spkg-configure.m4 \ ${WRKSRC}/build/pkgs/${sp:C/pari2/pari/}/spkg-configure.m4 .endfor #.for sp in ${PY_FILES} # ${SED} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \ # > ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4 #.endfor .for sp in ${JS_LIBS} ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \ > ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4 .endfor pre-configure: ${REINPLACE_CMD} -e 's|SAGE_LOCAL="$$prefix"|SAGE_LOCAL="${WSDIR}"|' \ -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e 's|SAGE_LOCAL="@prefix@"|SAGE_LOCAL="${WSDIR}"|' \ ${WRKSRC}/src/bin/sage-env-config.in ${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|' \ ${WRKSRC}/build/pkgs/tachyon/patches/Make-arch.patch ${REINPLACE_CMD} -e '/SUITESPARSE_INC_DIR/s|$${SAGE_LOCAL}/include|${LOCALBASE}/include/suitesparse|'\ ${WRKSRC}/build/pkgs/cvxopt/spkg-install.in ${REINPLACE_CMD} -e 's|exec python3|exec ${PYTHON_CMD}|' \ -e 's|exec "$$SAGE_LOCAL"/bin/python3|exec ${PYTHON_CMD}|' \ ${WRKSRC}/src/bin/sage .for f in ${PY_LIBS} ${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|;s|py_libs|${f}|' \ ${WRKSRC}/build/pkgs/${f}/spkg-configure.m4 .endfor ${REINPLACE_CMD} -e 's|import attrs|import attr|' \ ${WRKSRC}/build/pkgs/attrs/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import cypari|import cypari2|' \ ${WRKSRC}/build/pkgs/cypari/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import ipython|import IPython|' \ ${WRKSRC}/build/pkgs/ipython/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import pathpy|import path|' \ ${WRKSRC}/build/pkgs/pathpy/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import pillow|import PIL|' \ ${WRKSRC}/build/pkgs/pillow/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import pplpy|import ppl|' \ ${WRKSRC}/build/pkgs/pplpy/spkg-configure.m4 ${REINPLACE_CMD} -e 's|import pyzmq|import zmq|' \ ${WRKSRC}/build/pkgs/pyzmq/spkg-configure.m4 .for f in applehelp devhelp htmlhelp jsmath qthelp serializinghtml websupport ${REINPLACE_CMD} -e 's|import sphinxcontrib_|import sphinxcontrib.|' \ ${WRKSRC}/build/pkgs/sphinxcontrib_${f}/spkg-configure.m4 .endfor ${REINPLACE_CMD} -e 's|import zope_interface|import zope.interface|' \ ${WRKSRC}/build/pkgs/zope_interface/spkg-configure.m4 ${REINPLACE_CMD} -e '/GAP_ROOT=/s|$$SAGE_LOCAL|${LOCALBASE}|' \ ${WRKSRC}/build/pkgs/gap_packages/spkg-install.in ${REINPLACE_CMD} -e "/os.path.join/s|SAGE_LOCAL|'${LOCALBASE}'|"\ ${WRKSRC}/src/sage/libs/gap/util.pyx ${REINPLACE_CMD} -e "/os.path.join(SAGE_LOCAL/s|SAGE_LOCAL|'${LOCALBASE}'|" \ ${WRKSRC}/src/sage/env.py ${REINPLACE_CMD} -e "/^library_dirs/s|SAGE_LOCAL|'${LOCALBASE}'|" \ ${WRKSRC}/src/setup.py .for f in ${SHR2FIX} ${REINPLACE_CMD} -e "/${f}/s|SAGE_SHARE|'${LOCALBASE}/share/'|" \ ${WRKSRC}/src/sage/env.py .endfor ${REINPLACE_CMD} -e "/JMOL_DIR/s|SAGE_SHARE|'${JAVASHAREDIR}'|" \ -e "/JMOL_DIR/s|jmol|classes|" \ ${WRKSRC}/src/sage/env.py ${REINPLACE_CMD} -e "/JSMOL_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \ -e "/JSMOL_DIR/s|jsmol|JSmol|" \ ${WRKSRC}/src/sage/env.py ${REINPLACE_CMD} -e "/MATHJAX_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \ -e "/MATHJAX_DIR/s|mathjax|MathJax|" \ ${WRKSRC}/src/sage/env.py ${REINPLACE_CMD} -e "/THREEJS_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \ ${WRKSRC}/src/sage/env.py .for f in ${SE2FIX} ${REINPLACE_CMD} -e '/${f}/s|$$SAGE_LOCAL|${LOCALBASE}|' \ ${WRKSRC}/src/bin/sage-env .endfor ${REINPLACE_CMD} -e '/LDFLAGS=/s|-rpath,$$SAGE_LOCAL|-rpath,${LOCALBASE}|' \ ${WRKSRC}/src/bin/sage-env .for f in ${SPKG_INST} ${REINPLACE_CMD} -e 's|/var/lib/sage|/share/libdata/${PORTNAME}|' \ ${WRKSRC}/${f} .endfor (cd ${WRKSRC} && ./bootstrap) ${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig # Removed thereafter post-build: .if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} doc) .endif .for d in ${PY2FIX} ${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "${WSDIR}/bin/python" {} \; |\ ${XARGS} ${SED} -i "" -e 's|${WSDIR}/bin/pytho.*|${PYTHON_CMD}|' .endfor .for d in ${PY2FIX} ${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "/usr/bin/env python" {} \; |\ ${XARGS} ${SED} -i "" -e 's|/usr/bin/env pytho.*|${PYTHON_CMD}|' .endfor ${FIND} ${BLDDIR}/${PYTHON_LIBDIR} -type d -name __pycache__ | \ ${XARGS} ${RM} -r .for f in ${DOC2FIX} ${FIND} ${BLDDIR}${DOCSDIR} -type f -name "*${f}" | ${XARGS} \ ${SED} -i "" -e 's|${BLDDIR}||g' .endfor .for f in ${STG2FIX} ${SED} -i "" -e 's|${BLDDIR}||g' ${BLDDIR}${PREFIX}/${f} .endfor ${RM} ${BLDDIR}${PYTHON_CMD} ${BADLN:C|^|${BLDDIR}${PREFIX}/share/jupyter/|} ${RM} -r ${BLDDIR}${PREFIX}/var ${RM} ${BLDDIR}${PREFIX}/lib64 ${BLDDIR}${PREFIX}/lib/pkgconfig/blas.pc \ ${BLDDIR}${PREFIX}/lib/pkgconfig/cblas.pc \ ${BLDDIR}${PREFIX}/lib/pkgconfig/gsl.pc \ ${BLDDIR}${PREFIX}/lib/pkgconfig/lapack.pc # Cannot use a package system for pip and setuptools ${RM} ${BLDDIR}${PREFIX}/bin/easy_install* ${BLDDIR}${PREFIX}/bin/pip* ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/pip-* ${BLDDIR}${PYTHON_SITELIBDIR}/pip/ ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/setuptools* \ ${BLDDIR}${PYTHON_SITELIBDIR}/easy_install.py \ ${BLDDIR}${PYTHON_SITELIBDIR}/pkg_resources \ ${BLDDIR}${PYTHON_SITELIBDIR}/__pycache__/easy_install* # Remove CONFLICTS with lang/python3 ${RM} ${BLDDIR}${PREFIX}/bin/python ${BLDDIR}${PREFIX}/bin/python3 ${REINPLACE_CMD} -e '/exec/s|python3|${PYTHON_VERSION}|' ${BLDDIR}${PREFIX}/bin/sage # ${TRUE} because compilation of some .py fails: compileall.py -q to see errors (cd ${WSDIR} && (${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} || \ ${TRUE})) ${FIND} ${BLDDIR}${PREFIX} -name "*.bak" -delete # See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html .if exists(${PYTHON_SITELIBDIR}/path.py-7.1.dist-info/WHEEL) PLIST_SUB+= EGG="@comment " WHEEL="" .else PLIST_SUB+= EGG="" WHEEL="@comment " .endif do-install: cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pduml ${STAGEDIR} # Remove bad links ${LN} -sf ${DOCSDIR} \ ${STAGEDIR}${PREFIX}/share/jupyter/kernels/sagemath/doc ${LN} -sf ${LOCALBASE}/www/JSmol \ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/jsmol ${LN} -sf ${LOCALBASE}/www/MathJax \ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/mathjax ${LN} -sf ${LOCALBASE}/www/threejs \ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/threejs post-install: ${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc .include Index: head/misc/sword/Makefile =================================================================== --- head/misc/sword/Makefile (revision 553939) +++ head/misc/sword/Makefile (revision 553940) @@ -1,46 +1,46 @@ # Created by: Willem van Engen # $FreeBSD$ PORTNAME= sword PORTVERSION= 1.8.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= misc MASTER_SITES= http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= Framework for manipulating Bible texts LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf \ --with-zlib INSTALL_TARGET= install-strip CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 SUB_FILES= pkg-message PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CLUCENE CURL OPTIONS_DEFAULT= CLUCENE CURL CLUCENE_DESC= Include indexing capability CLUCENE_LIB_DEPENDS= libclucene-core.so:textproc/clucene \ libicudata.so:devel/icu CLUCENE_USES= compiler:c++11-lib CLUCENE_CONFIGURE_WITH= clucene=${LOCALBASE} icu CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_WITH= curl post-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config) ${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \ ${STAGEDIR}${PREFIX}/etc/sword.conf.sample .include Index: head/misc/xiphos/Makefile =================================================================== --- head/misc/xiphos/Makefile (revision 553939) +++ head/misc/xiphos/Makefile (revision 553940) @@ -1,43 +1,44 @@ # $FreeBSD$ PORTNAME= xiphos DISTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= misc gnome # Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be # built as they miss the file ${WRKSRC}/cmake/source_version.txt. # See also: https://github.com/crosswire/xiphos/issues/1037 MASTER_SITES= https://github.com/crosswire/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Bible interface utilizing the sword framework LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= appstream-util:devel/appstream-glib \ desktop-file-validate:devel/desktop-file-utils \ itstool:textproc/itstool \ yelp-build:textproc/yelp-tools LIB_DEPENDS= libbiblesync.so:misc/biblesync \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libenchant.so:textproc/enchant \ libicui18n.so:devel/icu \ libminizip.so:archivers/minizip \ libsoup-2.4.so:devel/libsoup \ libsword.so:misc/sword \ libuuid.so:misc/e2fsprogs-libuuid \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 # gettext is always needed, even if NLS is off USES= cmake compiler:c11 gettext gnome pkgconfig USE_GNOME= cairo gconf2 gtk30 gtkhtml4 intltool libgsf INSTALLS_ICONS= yes CMAKE_OFF= EPUB CMAKE_ON= GTKHTML OPTIONS_DEFINE= NLS OPTIONS_SUB= NLS .include Index: head/multimedia/aegisub/Makefile =================================================================== --- head/multimedia/aegisub/Makefile (revision 553939) +++ head/multimedia/aegisub/Makefile (revision 553940) @@ -1,93 +1,93 @@ # Created by: Leinier Cruz Salfran # $FreeBSD$ PORTNAME= aegisub PORTVERSION= 3.2.2 -PORTREVISION= 47 +PORTREVISION= 48 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp2.aegisub.org/pub/archives/releases/source/ MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform subtitle editor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENCE BROKEN_aarch64= Fails to compile: no support for this architecture (yet) NOT_FOR_ARCHS= powerpc64 powerpc64le NOT_FOR_ARCHS_REASON_powerpc64= No support for PowerPC 64 bit mode NOT_FOR_ARCHS_REASON_powerpc64le= No support for PowerPC 64 bit mode LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ libass.so:multimedia/libass \ libfontconfig.so:x11-fonts/fontconfig USES= compiler:c++11-lib desktop-file-utils gettext gl gmake gnome \ iconv localbase pkgconfig tar:xz USE_GNOME= intltool USE_WX= 3.0 WX_CONF_ARGS= absolute USE_GL= gl USE_CSTD= c99 USE_CXXSTD= c++11 CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 LDFLAGS+= -Wl,--as-needed # freetype GNU_CONFIGURE= yes CONFIGURE_ENV= ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \ agi_cv_with_iconv=yes CONFIGURE_ARGS= --disable-compiler-flags \ --disable-gcc-prec \ --disable-sanity-checks \ --disable-update-checker \ --without-libc++ \ ${ICONV_CONFIGURE_ARG} INSTALLS_ICONS= yes PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \ PULSEAUDIO OPTIONS_DEFAULT= FFMPEG FFTW HUNSPELL PULSEAUDIO ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --without-alsa FFMPEG_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMPEG_CONFIGURE_OFF= --without-ffms FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 HUNSPELL_LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell OPENAL_USES= openal OPENAL_CONFIGURE_OFF= --without-openal PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CONFIGURE_OFF=\ --without-portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF=\ --without-libpulse # src/audio_display.o: undefined reference to symbol '__atomic_load_8@@LIBATOMIC_1.0' .if empty(CFLAGS:M-march=*) CFLAGS+= ${CFLAGS_${ARCH}_${CHOSEN_COMPILER_TYPE}} CFLAGS_i386_gcc= -march=pentium .endif post-patch: @${REINPLACE_CMD} -e \ 's| -O3||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|".*build/|"./build/|' ${WRKSRC}/build/version.sh @${REINPLACE_CMD} -e \ 's|^CC=|CC?=| ; \ /^CCOPT_/s|=.*|=| ; \ /^CCDEBUG/s|=.*|=|' ${WRKSRC}/vendor/luajit/src/Makefile post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ automation/v4-docs ${STAGEDIR}${DOCSDIR}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aegisub-* .include Index: head/multimedia/subtitlecomposer/Makefile =================================================================== --- head/multimedia/subtitlecomposer/Makefile (revision 553939) +++ head/multimedia/subtitlecomposer/Makefile (revision 553940) @@ -1,65 +1,65 @@ # $FreeBSD$ PORTNAME= subtitlecomposer PORTVERSION= 0.7.0 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia kde MAINTAINER= makc@FreeBSD.org COMMENT= Subtitle editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicui18n.so:devel/icu \ libavcodec.so:multimedia/ffmpeg USES= compiler:c++11-lang cmake desktop-file-utils gettext \ kde:5 pkgconfig qt:5 shared-mime-info USE_KDE= auth codecs config configwidgets coreaddons ecm_build i18n \ kio kross sonnet textwidgets widgetsaddons xmlgui USE_QT= buildtools_build qmake_build core gui widgets USE_GITHUB= yes GH_ACCOUNT= maxrd2 GH_PROJECT= SubtitleComposer PORTSCOUT= ignore:continuous OPTIONS_GROUP= VIDEO VIDEO_DESC= Video players OPTIONS_GROUP_VIDEO= GSTREAMER MPLAYER MPV PHONON XINE OPTIONS_DEFAULT= PHONON OPTIONS_SUB= yes # Requires PocketSphinx-5prealpha SPHINX_DESC= Speech recognition via PocketSphinx SPHINX_LIB_DEPENDS= libpocketsphinx.so:audio/pocketsphinx CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON GSTREAMER_USES= gnome GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes GSTREAMER_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON MPLAYER_DESC= Install MPlayer MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPV_DESC= Multimedia support via MPV MPV_LIB_DEPENDS= libmpv.so:multimedia/mpv MPV_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_MPV=ON PHONON_USE= QT=phonon4 PHONON_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON XINE_LIB_DEPENDS= libxine.so:multimedia/libxine XINE_USES= xorg XINE_USE= XORG=x11,xcb XINE_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Xine=ON post-patch: ${RM} ${WRKSRC}/cmake/FindICU.cmake ${REINPLACE_CMD} '/include /s,locale,clocale,' \ ${WRKSRC}/src/videoplayerplugins/mpv/mpvbackend.cpp .include Index: head/net/freerdp/Makefile =================================================================== --- head/net/freerdp/Makefile (revision 553939) +++ head/net/freerdp/Makefile (revision 553940) @@ -1,170 +1,170 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= freerdp DISTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net comms MASTER_SITES= https://pub.freerdp.com/releases/ \ https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/ MAINTAINER= kevans@FreeBSD.org COMMENT= Free implementation of Remote Desktop Protocol LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl-devel BROKEN_SSL_REASON_libressl-devel= fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st' LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libepoll-shim.so:devel/libepoll-shim \ libudev.so:devel/libudev-devd \ libuuid.so:misc/e2fsprogs-libuuid USES= alias cmake compiler:c++11-lib cpe gettext gnome localbase pathfix pkgconfig ssl USE_LDCONFIG= yes CPE_VENDOR= freerdp_project PATCHVERSION= ${PORTVERSION} MAJORVERSION= ${PORTVERSION:R:R} PLIST_SUB+= PATCHVERSION="${PATCHVERSION}" PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" CMAKE_ARGS+= -DWITH_CHANNELS:BOOL=ON \ -DWITH_DIRECTFB:BOOL=OFF \ -DWITH_DSP_EXPERIMENTAL:BOOL=OFF \ -DWITH_DSP_FFMPEG:BOOL=OFF -DWITH_GPROF:BOOL=OFF \ -DWITH_GSTREAMER_0_10:BOOL=OFF -DWITH_IPP:BOOL=OFF \ -DWITH_JPEG:BOOL=OFF -DWITH_LIBSYSTEMD:BOOL=OFF \ -DWITH_MBEDTLS:BOOL=OFF -DWITH_OPENSLES=OFF \ -DWITH_OPENSSL:BOOL=ON -DWITH_OSS=ON \ -DWITH_PROFILER:BOOL=OFF -DWITH_SAMPLE:BOOL=OFF \ -DWITH_SANITIZE_ADDRESS:BOOL=OFF \ -DWITH_SANITIZE_MEMORY:BOOL=OFF \ -DWITH_SANITIZE_THREAD:BOOL=OFF -DWITH_SERVER:BOOL=OFF \ -DWITH_SERVER_INTERFACE:BOOL=OFF \ -DWITH_SMARTCARD_INSPECT:BOOL=OFF \ -DWITH_THIRD_PARTY:BOOL=OFF \ -DWITH_VALGRIND_MEMCHECK:BOOL=OFF -DWITH_X264:BOOL=OFF \ -DWITH_ZLIB:BOOL=ON \ -DCHANNEL_URBDRC_CLIENT:BOOL=ON \ ${CMAKE_ARGS_${ARCH}} CMAKE_ARGS_aarch64= -DWITH_NEON=ON CFLAGS_aarch64= -D__ARM_NEON__=__ARM_NEON # clang OPTIONS_DEFINE= ALSA CUPS FAAC FAAD FFMPEG GSM \ GSTREAMER ICU KERBEROS LAME MANPAGES OPENH264 \ PCSC PULSEAUDIO SOXR WAYLAND X11 OPTIONS_DEFAULT= CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11 OPTIONS_SUB= yes OPTIONS_DEFINE_armv6= NEON OPTIONS_DEFINE_armv7= NEON OPTIONS_DEFINE_amd64= SSE OPTIONS_DEFINE_i386= SSE OPTIONS_DEFAULT_amd64= SSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= WITH_ALSA CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CMAKE_BOOL= WITH_CUPS FAAC_LIB_DEPENDS= libfaac.so:audio/faac FAAC_CMAKE_BOOL= WITH_FAAC FAAD_LIB_DEPENDS= libfaad.so:audio/faad FAAD_CMAKE_BOOL= WITH_FAAD2 FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= WITH_FFMPEG GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CMAKE_BOOL= WITH_GSM GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 GSTREAMER_USES= gnome xorg GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1 ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_CMAKE_BOOL= WITH_ICU KERBEROS_CMAKE_BOOL= WITH_GSSAPI_HEIMDAL LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CMAKE_BOOL= WITH_LAME MANPAGES_BUILD_DEPENDS= xmlto:textproc/xmlto MANPAGES_CMAKE_BOOL= WITH_MANPAGES MANPAGES_CMAKE_OFF= -DWITH_MANPAGES=OFF NEON_DESC= Enable Media Processing Engine instructions NEON_CMAKE_BOOL= WITH_NEON .if ! ${CFLAGS:M-march*} NEON_CFLAGS= -march=armv7-a .endif OPENH264_DESC= H.264 video codec support via OpenH264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CMAKE_BOOL= WITH_OPENH264 PCSC_DESC= Smart card support (smart card device redirection) PCSC_LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite PCSC_CMAKE_BOOL= WITH_PCSC PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WITH_PULSE SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr SOXR_CMAKE_BOOL= WITH_SOXR SSE_CMAKE_BOOL= WITH_SSE2 WAYLAND_DESC= Build FreeRDP Wayland client WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_CMAKE_BOOL= WITH_WAYLAND X11_DESC= Build FreeRDP X11 client X11_CMAKE_ON= -DWITH_X11:BOOL=ON -DWITH_XCURSOR:BOOL=ON \ -DWITH_XEXT:BOOL=ON -DWITH_XFIXES:BOOL=ON \ -DWITH_XI:BOOL=ON -DWITH_XINERAMA:BOOL=ON \ -DWITH_XKBFILE:BOOL=ON -DWITH_XRANDR:BOOL=ON \ -DWITH_XRENDER:BOOL=ON -DWITH_XSHM:BOOL=ON \ -DWITH_XV:BOOL=ON X11_CMAKE_OFF= -DWITH_X11:BOOL=OFF -DWITH_XKBFILE:BOOL=OFF X11_USES= xorg X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv post-patch: @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \ ${WRKSRC}/winpr/CMakeLists.txt @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \ ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \ ${WRKSRC}/client/CMakeLists.txt \ ${WRKSRC}/winpr/CMakeLists.txt \ ${WRKSRC}/uwac/CMakeLists.txt \ ${WRKSRC}/server/CMakeLists.txt \ ${WRKSRC}/server/shadow/CMakeLists.txt \ ${WRKSRC}/libfreerdp/CMakeLists.txt @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/cmake/FindGSM.cmake \ ${WRKSRC}/libfreerdp/codec/dsp.c pre-configure: ${CP} ${FILESDIR}/mntent.h ${WRKSRC}/rdtk/include ${CP} ${FILESDIR}/mntent_compat.c ${WRKSRC}/channels/rdpdr/client .include Index: head/net/openldap24-server/Makefile =================================================================== --- head/net/openldap24-server/Makefile (revision 553939) +++ head/net/openldap24-server/Makefile (revision 553940) @@ -1,660 +1,660 @@ # Created by: Xin LI # $FreeBSD$ PORTNAME= openldap DISTVERSION= 2.4.51 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ http://repository.linagora.org/OpenLDAP/openldap-release/ \ ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \ ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \ ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \ ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \ ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \ http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ MASTER_SITE_SUBDIR= openldap-release .if defined(CLIENT_ONLY) .if ${CLIENT_ONLY} == sasl PKGNAMESUFFIX= -sasl-client .else PKGNAMESUFFIX= -client .endif .else PKGNAMESUFFIX?= -server .endif MAINTAINER= delphij@FreeBSD.org .if defined(CLIENT_ONLY) .if ${CLIENT_ONLY} == sasl COMMENT= Open source LDAP client implementation with SASL2 support .else COMMENT= Open source LDAP client implementation .endif .else COMMENT= Open source LDAP server implementation .endif LICENSE= OPENLDAP LICENSE_NAME= OpenLDAP Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept .if defined(CLIENT_ONLY) .if ${CLIENT_ONLY} == sasl CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].* .else CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif .endif GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen USES= cpe libtool:keepla ssl tar:tgz .if !defined(CLIENT_ONLY) USERS= ldap GROUPS= ldap LDAP_USER?= ldap LDAP_GROUP?= ldap .endif WANT_OPENLDAP_VER?= 24 .if ${WANT_OPENLDAP_VER} != 24 BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 10.14 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG FETCH GSSAPI FETCH_DESC= Enable fetch(3) support GSSAPI_DESC= With GSSAPI support (implies SASL support) .if defined(CLIENT_ONLY) OPTIONS_DEFINE+= DOCS .else OPTIONS_DEFINE+= DYNACL ACI BDB MDB DNSSRV PASSWD PERL RELAY SHELL OPTIONS_DEFINE+= SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS OPTIONS_DEFINE+= ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL OPTIONS_DEFINE+= LMPASSWD OPTIONS_DEFINE+= PBKDF2 OPTIONS_DEFINE+= OUTLOOK OPTIONS_DEFINE+= LASTBIND OPTIONS_DEFINE+= KQUEUE OPTIONS_DEFAULT= MDB SYNCPROV DYNAMIC_BACKENDS DYNACL_DESC= Run-time loadable ACL (experimental) ACI_DESC= Per-object ACI (experimental) BDB_DESC= With BerkeleyDB backend (DEPRECATED) MDB_DESC= With Memory-Mapped DB backend DNSSRV_DESC= With Dnssrv backend PASSWD_DESC= With Passwd backend PERL_DESC= With Perl backend RELAY_DESC= With Relay backend SHELL_DESC= With Shell backend (disables threading) SOCK_DESC= With Sock backend ODBC_DESC= With SQL backend RLOOKUPS_DESC= With reverse lookups of client hostnames SLP_DESC= With SLPv2 (RFC 2608) support SLAPI_DESC= With Netscape SLAPI plugin API (experimental) TCP_WRAPPERS_DESC= With tcp wrapper support ACCESSLOG_DESC= With In-Directory Access Logging overlay AUDITLOG_DESC= With Audit Logging overlay COLLECT_DESC= With Collect overy Services overlay CONSTRAINT_DESC= With Attribute Constraint overlay DDS_DESC= With Dynamic Directory Services overlay DEREF_DESC= With Dereference overlay DYNGROUP_DESC= With Dynamic Group overlay DYNLIST_DESC= With Dynamic List overlay MEMBEROF_DESC= With Reverse Group Membership overlay PPOLICY_DESC= With Password Policy overlay PROXYCACHE_DESC= With Proxy Cache overlay REFINT_DESC= With Referential Integrity overlay RETCODE_DESC= With Return Code testing overlay RWM_DESC= With Rewrite/Remap overlay SASL_DESC= With (Cyrus) SASL2 support SEQMOD_DESC= With Sequential Modify overlay SSSVLV_DESC= With ServerSideSort/VLV overlay SYNCPROV_DESC= With Syncrepl Provider overlay TRANSLUCENT_DESC= With Translucent Proxy overlay UNIQUE_DESC= With attribute Uniqueness overlay VALSORT_DESC= With Value Sorting overlay SMBPWD_DESC= With Samba Password hashes overlay SHA2_DESC= With SHA2 Password hashes overlay LMPASSWD_DESC= With LM hash password support (DEPRECATED) PBKDF2_DESC= With PBKDF2 hash password support DYNAMIC_BACKENDS_DESC= Build dynamic backends OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental) LASTBIND_DESC= With lastbind overlay KQUEUE_DESC= With kqueue support (experimental) .endif .if defined(CLIENT_ONLY) OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT} OPENLDAP_PKGFILESUFX= .client .else OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} OPENLDAP_PKGFILESUFX= .endif CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g' .include .if defined(CLIENT_ONLY) PORTDOCS= CHANGES drafts rfc .if ${CLIENT_ONLY} == sasl PORT_OPTIONS+= SASL .endif .if defined(USE_OPENLDAP) BROKEN= you have USE_OPENLDAP variable defined either in environment or in make(1) arguments; please undefine and try again .endif .else USE_OPENLDAP= yes WANT_OPENLDAP_VER= 24 LIB_DEPENDS+= libicudata.so:devel/icu .if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL) PORT_OPTIONS+= SASL .endif .if ${PORT_OPTIONS:MSASL} WANT_OPENLDAP_SASL= yes CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* PKGNAMESUFFIX= -sasl-server .if ${PORT_OPTIONS:MGSSAPI} RUN_DEPENDS+= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi .endif .else CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif .endif DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} SCHEMATA= collective corba core cosine duaconf dyngroup \ inetorgperson java misc \ nis openldap pmi ppolicy LDAP_RUN_DIR?= /var/run/openldap LOCALSTATEDIR?= /var/db DATABASEDIR?= ${LOCALSTATEDIR}/openldap-data SUB_LIST+= LDAP_RUN_DIR=${LDAP_RUN_DIR} \ LDAP_USER=${LDAP_USER} \ LDAP_GROUP=${LDAP_GROUP} \ DATABASEDIR=${DATABASEDIR} \ PKGNAME=${PKGNAME} CONFIGURE_ARGS= --with-threads=posix \ --with-tls=openssl \ --disable-dependency-tracking \ --enable-dynamic .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl .else CONFIGURE_ARGS+= --without-cyrus-sasl .endif .if defined(CLIENT_ONLY) # client specific configuration CONFIGURE_ARGS+= --disable-slapd \ --disable-monitor \ --disable-bdb \ --disable-relay \ --disable-syncprov SUB_FILES+= pkg-message.client PKGMESSAGE= ${WRKSRC}/pkg-message.client USE_LDCONFIG= yes .else # server specific configuration USE_LDCONFIG= ${PREFIX}/libexec/openldap SUB_FILES+= pkg-message pkg-deinstall USE_RC_SUBR= slapd EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} LIB_DEPENDS+= libltdl.so:devel/libltdl CONFIGURE_ARGS+= --enable-modules PLIST_SUB+= MODULES="" .else PLIST_SUB+= MODULES="@comment " .endif SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} BACKEND_ENABLE= "mod" BACKEND_PLIST= "" SED_MODULES+= -e 's/\# *\(modulepath\)/\1/' \ -e 's/\# *\(moduleload[ ]*back_bdb\)/\1/' .else BACKEND_ENABLE= "yes" BACKEND_PLIST= "@comment " .endif OVERLAY_ENABLE= yes CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --enable-crypt \ --enable-ldap=${BACKEND_ENABLE} \ --enable-meta=${BACKEND_ENABLE} \ --enable-rewrite \ --enable-null=${BACKEND_ENABLE} \ --enable-monitor=${BACKEND_ENABLE} PLIST_SUB+= BACKEND=${BACKEND_PLIST} .if ${PORT_OPTIONS:MACCESSLOG} CONFIGURE_ARGS+= --enable-accesslog=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MAUDITLOG} CONFIGURE_ARGS+= --enable-auditlog=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MCOLLECT} CONFIGURE_ARGS+= --enable-collect=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MCONSTRAINT} CONFIGURE_ARGS+= --enable-constraint=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDDS} CONFIGURE_ARGS+= --enable-dds=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug=yes .endif MAKE_ENV+= STRIP=${STRIP} .if ${PORT_OPTIONS:MDEREF} CONFIGURE_ARGS+= --enable-deref=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDYNGROUP} CONFIGURE_ARGS+= --enable-dyngroup=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDYNLIST} CONFIGURE_ARGS+= --enable-dynlist=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MLMPASSWD} CONFIGURE_ARGS+= --enable-lmpasswd .endif .if ${PORT_OPTIONS:MMEMBEROF} CONFIGURE_ARGS+= --enable-memberof=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MPPOLICY} CONFIGURE_ARGS+= --enable-ppolicy=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MPROXYCACHE} CONFIGURE_ARGS+= --enable-proxycache=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MREFINT} CONFIGURE_ARGS+= --enable-refint=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MRETCODE} CONFIGURE_ARGS+= --enable-retcode=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MRWM} CONFIGURE_ARGS+= --enable-rwm=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MSEQMOD} CONFIGURE_ARGS+= --enable-seqmod=${OVERLAY_ENABLE} .else CONFIGURE_ARGS+= --disable-seqmod .endif .if ${PORT_OPTIONS:MSSSVLV} CONFIGURE_ARGS+= --enable-sssvlv=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MSYNCPROV} CONFIGURE_ARGS+= --enable-syncprov=${OVERLAY_ENABLE} .else CONFIGURE_ARGS+= --disable-syncprov .endif .if ${PORT_OPTIONS:MTRANSLUCENT} CONFIGURE_ARGS+= --enable-translucent=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MUNIQUE} CONFIGURE_ARGS+= --enable-unique=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MVALSORT} CONFIGURE_ARGS+= --enable-valsort=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MACI} CONFIGURE_ARGS+= --enable-aci .endif .if ${PORT_OPTIONS:MDYNACL} CONFIGURE_ARGS+= --enable-dynacl .endif .if ${PORT_OPTIONS:MLASTBIND} CONFIGURE_ARGS+= --enable-lastbind .endif .if !${PORT_OPTIONS:MBDB} CONFIGURE_ARGS+= --disable-bdb \ --disable-hdb PLIST_SUB+= BACK_BDB="@comment " \ BACK_HDB="@comment " .else USES+= bdb INVALID_BDB_VER= 6 CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ --enable-hdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ BACK_HDB=${BACKEND_PLIST} CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \ -e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},' .endif .if ${PORT_OPTIONS:MDNSSRV} CONFIGURE_ARGS+= --enable-dnssrv=${BACKEND_ENABLE} PLIST_SUB+= BACK_DNSSRV=${BACKEND_PLIST} .else PLIST_SUB+= BACK_DNSSRV="@comment " .endif .if ${PORT_OPTIONS:MMDB} CONFIGURE_ARGS+= --enable-mdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_MDB=${BACKEND_PLIST} .else PLIST_SUB+= BACK_MDB="@comment " .endif .if ${PORT_OPTIONS:MPASSWD} CONFIGURE_ARGS+= --enable-passwd=${BACKEND_ENABLE} PLIST_SUB+= BACK_PASSWD=${BACKEND_PLIST} .else PLIST_SUB+= BACK_PASSWD="@comment " .endif .if ${PORT_OPTIONS:MRELAY} CONFIGURE_ARGS+= --enable-relay=${BACKEND_ENABLE} PLIST_SUB+= BACK_RELAY=${BACKEND_PLIST} .else PLIST_SUB+= BACK_RELAY="@comment " .endif .if ${PORT_OPTIONS:MSHELL} CONFIGURE_ARGS+= --without-threads --enable-shell=${BACKEND_ENABLE} PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SHELL="@comment " WANT_OPENLDAP_THREADS= yes .endif .if ${PORT_OPTIONS:MSOCK} CONFIGURE_ARGS+= --enable-sock=${BACKEND_ENABLE} PLIST_SUB+= BACK_SOCK=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SOCK="@comment " .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE} CONFIGURE_ENV+= PERLBIN="${PERL}" PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} .else PLIST_SUB+= BACK_PERL="@comment " .endif .if ${PORT_OPTIONS:MSASL} CONFIGURE_ARGS+= --enable-spasswd .endif .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} LIB_DEPENDS+= libodbc.so:databases/unixODBC LDFLAGS+= -L${LOCALBASE}/lib .else PLIST_SUB+= BACK_SQL="@comment " .endif .if ${PORT_OPTIONS:MSMBPWD} PLIST_SUB+= SMBPWD="" .else PLIST_SUB+= SMBPWD="@comment " .endif .if ${PORT_OPTIONS:MSHA2} PLIST_SUB+= SHA2="" .else PLIST_SUB+= SHA2="@comment " .endif .if ${PORT_OPTIONS:MPBKDF2} PLIST_SUB+= PBKDF2="" .else PLIST_SUB+= PBKDF2="@comment " .endif .if ${PORT_OPTIONS:MLASTBIND} PLIST_SUB+= LASTBIND="" .else PLIST_SUB+= LASTBIND="@comment " .endif .if ${PORT_OPTIONS:MRLOOKUPS} CONFIGURE_ARGS+= --enable-rlookups PLIST_SUB+= RLOOKUPS="" .else PLIST_SUB+= RLOOKUPS="@comment " .endif .if ${PORT_OPTIONS:MSLAPI} CONFIGURE_ARGS+= --enable-slapi PLIST_SUB+= SLAPI="" USE_LDCONFIG= yes .else PLIST_SUB+= SLAPI="@comment " .endif .if ${PORT_OPTIONS:MSLP} CONFIGURE_ARGS+= --enable-slp LIB_DEPENDS+= libslp.so:net/openslp .endif # Include tcp-wrapper support .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-wrappers .endif # Force using caseIgnoreOrderingMatch on 'name' attribute. # This may be a violation of RFC 4519 2.18 definition. # See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html .if ${PORT_OPTIONS:MOUTLOOK} EXTRA_PATCHES+= ${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c .endif .if ${PORT_OPTIONS:MKQUEUE} BUILD_DEPENDS+= autoconf>0:devel/autoconf EXTRA_PATCHES+= ${FILESDIR}/extrapatch-ITS6300 .endif # end of client/server specific configuration .endif .if defined(WITH_CLDAP) CPPFLAGS+= -DLDAP_CONNECTIONLESS .endif CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if defined(CLIENT_ONLY) .else SUB_LIST+= RC_DIR=${PREFIX} \ LDAP_RUN_DIR=${LDAP_RUN_DIR} \ DATABASEDIR=${DATABASEDIR} .endif PLIST_SUB+= ${SUB_LIST} PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR} PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR} .include .if !${PORT_OPTIONS:MFETCH} CONFIGURE_ARGS+= --without-fetch .else . if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported . endif .endif post-patch: @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf @${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \ -e 's|^CC =.*|CC = ${CC}|g' \ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \ ${WRKSRC}/contrib/slapd-modules/*/*/Makefile .if defined(CONFIGURE_SED) @${REINPLACE_CMD} -E ${CONFIGURE_SED} \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi .if ${PORT_OPTIONS:MKQUEUE} @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf) .endif .if !defined(CLIENT_ONLY) test: build @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) post-build: @${DO_NADA} .if ${PORT_OPTIONS:MSMBPWD} @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} DEFS="-DDO_SAMBA" prefix="${PREFIX}" all) .endif .if ${PORT_OPTIONS:MSHA2} @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" all) .endif .if ${PORT_OPTIONS:MPBKDF2} @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" all) .endif .if ${PORT_OPTIONS:MLASTBIND} @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/lastbind && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" all) .endif .endif pre-install: .if !defined(CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${DATABASEDIR} .endif post-install: .if defined(CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} for dir in drafts rfc; do \ ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \ ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \ done for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \ done for library in lber ldap ldap_r; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \ done .else ${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR} .if ${PORT_OPTIONS:MSMBPWD} (cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a .endif .if ${PORT_OPTIONS:MSHA2} (cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a .endif .if ${PORT_OPTIONS:MPBKDF2} (cd ${WRKSRC}/contrib/slapd-modules/passwd/pbkdf2 && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-pbkdf2.a .endif .if ${PORT_OPTIONS:MLASTBIND} (cd ${WRKSRC}/contrib/slapd-modules/lastbind && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} prefix="${PREFIX}" install) ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/lastbind.a .endif .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2} || ${PORT_OPTIONS:MPBKDF2} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so .endif .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap .endif .endif # defined(CLIENT_ONLY) .include Index: head/net/samba412/Makefile =================================================================== --- head/net/samba412/Makefile (revision 553939) +++ head/net/samba412/Makefile (revision 553940) @@ -1,668 +1,668 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME= ${SAMBA4_BASENAME}412 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER= timur@FreeBSD.org COMMENT= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* samba41[013-9]-4.1* p5-Parse-Pidl-4.* USES= cpe EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.12.9 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_BINDDNSDIR= ${SAMBA4_LOCKDIR}/bind-dns SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_PAMDIR= ${PREFIX}/lib SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/private" \ --with-pammodulesdir="${SAMBA4_PAMDIR}" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-bind-dns-dir=${SAMBA4_BINDDNSDIR} \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # XXX: Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES+= compiler:c++11-lang iconv localbase:ldflags \ perl5 pkgconfig shebangfix ssl waf gettext-runtime USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} ############################################################################## OPTIONS_SUB= yes OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DOCS FAM GPGME \ LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP # This shouldn't be default in the release OPTIONS_DEFINE+= DEVELOPER MANDOC #OPTIONS_DEFINE+= MEMORY_DEBUG OPTIONS_GROUP= VFS OPTIONS_GROUP_VFS= FRUIT GLUSTERFS OPTIONS_SINGLE= GSSAPI ZEROCONF OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT #GSSAPI_HEIMDAL OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER OPTIONS_RADIO= DNS OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND916 # Make those default options OPTIONS_DEFAULT= AD_DC ADS DOCS FAM LDAP \ QUOTAS SYSLOG UTMP PROFILE \ FRUIT GSSAPI_BUILTIN AVAHI ############################################################################## AD_DC_DESC= Active Directory Domain Controller ADS_DESC= Active Directory client(implies LDAP) CLUSTER_DESC= Clustering support DEVELOPER_DESC= With developer framework(implies NTVFS) FAM_DESC= File Alteration Monitor GPGME_DESC= GpgME support LDAP_DESC= LDAP client LIBZFS_DESC= LibZFS SPOTLIGHT_DESC= Spotlight server-side search support MANDOC_DESC= Build manpages from DOCBOOK templates MEMORY_DEBUG_DESC= Debug memory allocator NTVFS_DESC= Build *DEPRECATED* NTVFS file server PICKY_DEVELOPER_DESC= Treat compiler warnings as errors(implies DEVELOPER) PROFILE_DESC= Profiling data QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting VFS_DESC= VFS modules GLUSTERFS_DESC= GlusterFS support FRUIT_DESC= MacOSX and TimeMachine support GSSAPI_BUILTIN_DESC= GSSAPI support via bundled Heimdal ZEROCONF_DESC= Zero configuration networking ZEROCONF_NONE_DESC= Zeroconf support is absent DNS_DESC= DNS frontend BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend BIND916_DESC= Use Bind 9.16 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC ############################################################################## # XXX: Unconditional dependencies which can't be switched off(if present in # the system) # Iconv(picked up unconditionaly) LIB_DEPENDS+= libiconv.so:converters/libiconv # unwind LIB_DEPENDS+= libunwind.so:devel/libunwind # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency LIB_DEPENDS+= libreadline.so:devel/readline # popt LIB_DEPENDS+= libpopt.so:devel/popt # inotify LIB_DEPENDS+= libinotify.so:devel/libinotify # GNUTLS LIB_DEPENDS+= libgnutls.so:security/gnutls LIB_DEPENDS+= libgcrypt.so:security/libgcrypt # NFSv4 ACL glue LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl # Jansson BUILD_DEPENDS+= jansson>=2.10:devel/jansson RUN_DEPENDS+= jansson>=2.10:devel/jansson # tasn1 BUILD_DEPENDS+= libtasn1>=3.8:security/libtasn1 RUN_DEPENDS+= libtasn1>=3.8:security/libtasn1 # External Samba dependencies # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp # Libarchive SAMBA4_BUNDLED_LIBS+= !libarchive BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive ### Bundled libraries SAMBA4_BUNDLED_CMOCKA?= no SAMBA4_BUNDLED_TALLOC?= no SAMBA4_BUNDLED_TEVENT?= no SAMBA4_BUNDLED_TDB?= no SAMBA4_BUNDLED_LDB?= yes # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka CONFLICTS_INSTALL+= cmocka-1.* PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="" SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="" .else SAMBA4_BUNDLED_LIBS+= !cmocka BUILD_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka TEST_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment " SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " .endif # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc CONFLICTS_INSTALL+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else SAMBA4_BUNDLED_LIBS+= !talloc BUILD_DEPENDS+= talloc>=2.3.1:devel/talloc RUN_DEPENDS+= talloc>=2.3.1:devel/talloc PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " .endif # tevent .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= tevent CONFLICTS_INSTALL+= tevent-* tevent1-* PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" .else SAMBA4_BUNDLED_LIBS+= !tevent BUILD_DEPENDS+= tevent>=0.10.2:devel/tevent RUN_DEPENDS+= tevent>=0.10.2:devel/tevent PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " .endif # tdb .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= tdb CONFLICTS_INSTALL+= tdb-* tdb1-* PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else SAMBA4_BUNDLED_LIBS+= !tdb BUILD_DEPENDS+= tdb>=1.4.3:databases/tdb RUN_DEPENDS+= tdb>=1.4.3:databases/tdb PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif # ldb .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LDB= yes SAMBA4_BUNDLED_LIBS+= ldb PLIST_SUB+= SAMBA4_BUNDLED_LDB="" SUB_LIST+= SAMBA4_BUNDLED_LDB="" SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules .else SAMBA4_BUNDLED_LIBS+= !ldb BUILD_DEPENDS+= ldb21>=2.1.2:databases/ldb21 RUN_DEPENDS+= ldb21>=2.1.2:databases/ldb21 PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules .endif .if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes) \ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \ || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes) SAMBA4_BUNDLED_LIBS+= replace .endif # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err # Set the test environment variables TEST_USES= python TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA1SUM=/sbin/sha1 \ SHA256SUM=/sbin/sha256 \ MD5SUM=/sbin/md5 \ PYTHONDONTWRITEBYTECODE=1 TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark # External Python modules TEST_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} TEST_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} ############################################################################## CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --with-regedit \ --disable-rpath \ --without-lttng \ --without-gettext \ --enable-pthreadpool \ --without-fake-kaserver \ --without-systemd \ --with-libarchive \ --with-acl-support \ --with-sendfile-support \ --disable-ctdb-tests # ${ICONV_CONFIGURE_BASE} ############################################################################## FRUIT_PREVENTS= ZEROCONF_NONE FRUIT_PREVENTS_MSG= MacOSX support requires Zeroconf(AVAHI or MDNSRESPONDER) FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit FRUIT_PLIST_FILES+= man/man8/vfs_fruit.8.gz GLUSTERFS_CONFIGURE_ENABLE= glusterfs GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz ############################################################################## ZEROCONF_NONE_VARS= MAKE_ENV+=ZEROCONF=none AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_VARS= SAMBA4_SERVICES+=avahi_daemon MDNSRESPONDER_CONFIGURE_ENABLE= dnssd MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_VARS= SAMBA4_SERVICES+=mdnsd ############################################################################## BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 BIND916_RUN_DEPENDS= bind916>=9.16.0.0:dns/bind916 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate ############################################################################## MEMORY_DEBUG_IMPLIES= DEBUG MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`" MEMORY_DEBUG_LIB_DEPENDS= libjemalloc.so.2:devel/jemalloc # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 PICKY_DEVELOPER_IMPLIES= DEVELOPER PICKY_DEVELOPER_CONFIGURE_ON= --picky-developer DEVELOPER_IMPLIES= NTVFS DEVELOPER_CONFIGURE_ON= --enable-developer --enable-selftest --abi-check-disable DEVELOPER_CONFIGURE_ENV= WAF_CMD_FORMAT=string DEVELOPER_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} DEVELOPER_BUILD_DEPENDS= ${GDB_CMD}:devel/gdb \ ${SAMBA4_LMDB_DEPENDS} DEVELOPER_TEST_DEPENDS= ${GDB_CMD}:devel/gdb DEVELOPER_VARS_OFF= GDB_CMD=true # XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it # if you don't know what you are doing NTVFS_IMPLIES= AD_DC NTVFS_CONFIGURE_WITH= ntvfs-fileserver NTVFS_PLIST_FILES= ${SAMBA4_MODULEDIR}/service/smb.so \ lib/samba4/private/libntvfs-samba4.so ############################################################################## CLUSTER_CONFIGURE_WITH= cluster-support CUPS_CONFIGURE_ENABLE= cups iprint CUPS_LIB_DEPENDS= libcups.so:print/cups # https://bugzilla.samba.org/show_bug.cgi?id=9545 FAM_USES= fam FAM_CONFIGURE_WITH= fam GPGME_CONFIGURE_WITH= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme PROFILE_CONFIGURE_WITH= profiling-data QUOTAS_CONFIGURE_WITH= quotas SPOTLIGHT_CONFIGURE_ENABLE= spotlight SPOTLIGHT_BUILD_DEPENDS= tracker>=1.4.1:sysutils/tracker SPOTLIGHT_RUN_DEPENDS= tracker>=1.4.1:sysutils/tracker # ICU SPOTLIGHT_LIB_DEPENDS+= libicuuc.so:devel/icu SPOTLIGHT_USES= bison gnome SPOTLIGHT_USE= gnome=glib20 SYSLOG_CONFIGURE_WITH= syslog UTMP_CONFIGURE_WITH= utmp AD_DC_CONFIGURE_OFF= --without-ad-dc AD_DC_BUILD_DEPENDS= ${SAMBA4_LMDB_DEPENDS} AD_DC_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} ADS_IMPLIES= LDAP ADS_CONFIGURE_WITH= ads dnsupdate LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_USE= OPENLDAP=yes LDAP_VARS= SAMBA4_MODULES+=idmap_ldap GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \ --with-experimental-mit-ad-dc GSSAPI_MIT_USES= gssapi:mit GSSAPI_HEIMDAL_CONFIGURE_ON= --with-system-heimdalkrb5 ${GSSAPIBASEDIR} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_PREVENTS= AD_DC GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LIBZFS_CONFIGURE_WITH= libzfs LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" ############################################################################## .include ############################################################################## .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime .endif .if ${WANT_EXP_MODULES:Mvfs_snapper} # snapper needs dbus LIB_DEPENDS+= libdbus-1.so:devel/dbus LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .endif SAMBA4_MODULES+= vfs_freebsd SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 .if ${PORT_OPTIONS:MADS} SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif .if ${PORT_OPTIONS:MDEVELOPER} SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject .endif # Python bindings .if defined(NO_PYTHON) USES+= python:build,test CONFIGURE_ARGS+= --disable-python PLIST_SUB+= SAMBA4_PYTHON="@comment " SUB_LIST+= SAMBA4_PYTHON="@comment " .else USES+= python:3.5+ PLIST_SUB+= SAMBA4_PYTHON="" SUB_LIST+= SAMBA4_PYTHON="" # Don't cache Python modules CONFIGURE_ARGS+= --nopycache MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 . if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= pytalloc-util . else SAMBA4_BUNDLED_LIBS+= !pytalloc-util . endif . if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= pytevent . else SAMBA4_BUNDLED_LIBS+= !pytevent . endif . if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= pytdb . else SAMBA4_BUNDLED_LIBS+= !pytdb . endif . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util . else SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util . endif # samba-tool requires those for *upgrade . if ${PORT_OPTIONS:MAD_DC} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} . if ${PORT_OPTIONS:MGPGME} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gpgme>=1.14.0:security/py-gpgme@${PY_FLAVOR} . endif . endif .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Hack for nss-info_* -> nss_info/* modules # Add selected modules to the plist .for module in ${SAMBA4_MODULES} PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so .endfor .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --verbose --enable-debug MAKE_ARGS+= --verbose DEBUG_FLAGS?= -g -ggdb3 -O0 .endif ############################################################################## .include ############################################################################## # Implemented in the gcrypt on AMD64 .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni .else CONFIGURE_ARGS+= --accel-aes=none .endif # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) # LMDB SAMBA4_LMDB_DEPENDS= lmdb>=0.9.16:databases/lmdb PLIST_FILES+= lib/samba4/private/libldb-mdb-int-samba4.so \ ${SAMBA4_MODULEDIR}/ldb/mdb.so . endif .endif .if ${PORT_OPTIONS:MGSSAPI_MIT} PLIST_FILES+= ${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \ man/man8/winbind_krb5_localauth.8.gz . if ${PORT_OPTIONS:MAD_DC} PLIST_FILES+= lib/samba4/krb5/plugins/kdb/samba.so . endif .endif # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) CFLAGS_amd64+= -fno-omit-frame-pointer # No fancy color error messages CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics .endif # Allow rpcgen to find proper CPP MAKE_ENV+= RPCGEN_CPP="${CPP}" #.if ${readline_ARGS} == port #CFLAGS+= -D_FUNCTION_DEF #.endif # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" \ SAMBA4_SERVICES="${SAMBA4_SERVICES}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD PORTDOCS= README.FreeBSD post-extract: @${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: .if ! ${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS} @${ECHO_CMD}; \ ${ECHO_MSG} "===> NTVFS option requires AD_DC to be set"; \ ${ECHO_CMD}; \ ${FALSE} .endif @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build-MANDOC-off: ${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/ ${CP} -rp ${BUILD_WRKSRC}/docs/manpages ${BUILD_WRKSRC}/bin/default/docs-xml/ .for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/scripting/man/samba-gpupdate.8 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/oLschema2ldif/oLschema2ldif.1 \ lib/tdb/man/tdbdump.8 \ lib/tdb/man/tdbbackup.8 \ lib/tdb/man/tdbtool.8 \ lib/talloc/man/talloc.3 \ lib/tdb/man/tdbrestore.8 \ lib/ldb/man/ldbadd.1 \ lib/ldb/man/ldbsearch.1 \ lib/ldb/man/ldbmodify.1 \ lib/ldb/man/ldbrename.1 \ lib/ldb/man/ldbdel.1 \ lib/ldb/man/ldbedit.1 \ docs-xml/manpages/vfs_freebsd.8 ${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} .endfor .if ${PORT_OPTIONS:MCLUSTER} ${MKDIR} ${BUILD_WRKSRC}/bin/default/ctdb/ . for man in ctdb_diagnostics.1 ctdb.1 ctdbd_wrapper.1 ctdbd.1 ltdbtool.1 onnode.1 ping_pong.1 \ ctdb.conf.5 ctdb.sysconfig.5 ctdb-script.options.5 \ ctdb.7 ctdb-statistics.7 ctdb-tunables.7 ${INSTALL_MAN} ${FILESDIR}/man/${man} ${BUILD_WRKSRC}/bin/default/ctdb/ . endfor .endif post-install-rm-junk: ${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name __pycache__ \ -type d -print0 | ${XARGS} -0 -n 1 -t ${RM} -r post-install-fix-manpages: .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8 ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f} .endfor .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes . for f in ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1 ${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/samba-${f} . endfor .endif .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes . for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8 ${MV} ${STAGEDIR}${PREFIX}/man/man8/${f} ${STAGEDIR}${PREFIX}/man/man8/samba-${f} . endfor .endif post-install: post-install-rm-junk post-install-fix-manpages ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} ${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_BINDDNSDIR}" ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if !defined(WITH_DEBUG) -${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin ${STAGEDIR}${PREFIX}/libexec \ -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} -${FIND} ${STAGEDIR}${PREFIX}/lib -name '*.so*' \ -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} .endif post-install-FRUIT-off: ${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so ${RM} ${STAGEDIR}${PREFIX}/man/man8/vfs_fruit.8 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} .endfor post-install-CLUSTER-on: ${LN} -nfs ../../../../share/ctdb/events/legacy/00.ctdb.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/00.ctdb.script ${LN} -nfs ../../../../share/ctdb/events/legacy/10.interface.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/10.interface.script ${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script ${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script .include Index: head/net/samba413/Makefile =================================================================== --- head/net/samba413/Makefile (revision 553939) +++ head/net/samba413/Makefile (revision 553940) @@ -1,668 +1,668 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ PORTNAME= ${SAMBA4_BASENAME}413 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER= timur@FreeBSD.org COMMENT= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-9]-4.* samba41[0-24-9]-4.1* p5-Parse-Pidl-4.* USES= cpe EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.13.1 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} CPE_VENDOR= samba CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} SAMBA4_BINDDNSDIR= ${SAMBA4_LOCKDIR}/bind-dns SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private SAMBA4_PAMDIR= ${PREFIX}/lib SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} SAMBA4_CONFDIR= ${PREFIX}/etc SAMBA4_CONFIG= smb4.conf CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --sysconfdir="${SAMBA4_CONFDIR}" \ --includedir="${SAMBA4_INCLUDEDIR}" \ --datadir="${DATADIR}" \ --libdir="${SAMBA4_LIBDIR}" \ --with-privatelibdir="${SAMBA4_LIBDIR}/private" \ --with-pammodulesdir="${SAMBA4_PAMDIR}" \ --with-modulesdir="${SAMBA4_MODULEDIR}" \ --with-pkgconfigdir="${PKGCONFIGDIR}" \ --localstatedir="${VARDIR}" \ --with-piddir="${SAMBA4_RUNDIR}" \ --with-sockets-dir="${SAMBA4_RUNDIR}" \ --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ --with-lockdir="${SAMBA4_LOCKDIR}" \ --with-statedir="${SAMBA4_LOCKDIR}" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-bind-dns-dir=${SAMBA4_BINDDNSDIR} \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" # XXX: Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" USES+= compiler:c++11-lang iconv localbase:ldflags \ perl5 pkgconfig shebangfix ssl waf gettext-runtime USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} ############################################################################## OPTIONS_SUB= yes OPTIONS_DEFINE= AD_DC ADS CLUSTER CUPS DOCS FAM GPGME \ LDAP NTVFS PROFILE QUOTAS SPOTLIGHT SYSLOG UTMP # This shouldn't be default in the release OPTIONS_DEFINE+= DEVELOPER MANDOC #OPTIONS_DEFINE+= MEMORY_DEBUG OPTIONS_GROUP= VFS OPTIONS_GROUP_VFS= FRUIT GLUSTERFS OPTIONS_SINGLE= GSSAPI ZEROCONF OPTIONS_SINGLE_GSSAPI= GSSAPI_BUILTIN GSSAPI_MIT #GSSAPI_HEIMDAL OPTIONS_SINGLE_ZEROCONF= ZEROCONF_NONE AVAHI MDNSRESPONDER OPTIONS_RADIO= DNS OPTIONS_RADIO_DNS= NSUPDATE BIND911 BIND916 # Make those default options OPTIONS_DEFAULT= AD_DC ADS DOCS FAM LDAP \ QUOTAS SYSLOG UTMP PROFILE \ FRUIT GSSAPI_BUILTIN AVAHI ############################################################################## AD_DC_DESC= Active Directory Domain Controller ADS_DESC= Active Directory client(implies LDAP) CLUSTER_DESC= Clustering support DEVELOPER_DESC= With developer framework(implies NTVFS) FAM_DESC= File Alteration Monitor GPGME_DESC= GpgME support LDAP_DESC= LDAP client LIBZFS_DESC= LibZFS SPOTLIGHT_DESC= Spotlight server-side search support MANDOC_DESC= Build manpages from DOCBOOK templates MEMORY_DEBUG_DESC= Debug memory allocator NTVFS_DESC= Build *DEPRECATED* NTVFS file server PICKY_DEVELOPER_DESC= Treat compiler warnings as errors(implies DEVELOPER) PROFILE_DESC= Profiling data QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting VFS_DESC= VFS modules GLUSTERFS_DESC= GlusterFS support FRUIT_DESC= MacOSX and TimeMachine support GSSAPI_BUILTIN_DESC= GSSAPI support via bundled Heimdal ZEROCONF_DESC= Zero configuration networking ZEROCONF_NONE_DESC= Zeroconf support is absent DNS_DESC= DNS frontend BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend BIND916_DESC= Use Bind 9.16 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC ############################################################################## # XXX: Unconditional dependencies which can't be switched off(if present in # the system) # Iconv(picked up unconditionaly) LIB_DEPENDS+= libiconv.so:converters/libiconv # unwind LIB_DEPENDS+= libunwind.so:devel/libunwind # Readline(sponsored by Python) # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency LIB_DEPENDS+= libreadline.so:devel/readline # popt LIB_DEPENDS+= libpopt.so:devel/popt # inotify LIB_DEPENDS+= libinotify.so:devel/libinotify # GNUTLS LIB_DEPENDS+= libgnutls.so:security/gnutls LIB_DEPENDS+= libgcrypt.so:security/libgcrypt # NFSv4 ACL glue LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl # Jansson BUILD_DEPENDS+= jansson>=2.10:devel/jansson RUN_DEPENDS+= jansson>=2.10:devel/jansson # tasn1 BUILD_DEPENDS+= libtasn1>=3.8:security/libtasn1 RUN_DEPENDS+= libtasn1>=3.8:security/libtasn1 # External Samba dependencies # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp # Libarchive SAMBA4_BUNDLED_LIBS+= !libarchive BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive ### Bundled libraries SAMBA4_BUNDLED_CMOCKA?= no SAMBA4_BUNDLED_TALLOC?= no SAMBA4_BUNDLED_TEVENT?= no SAMBA4_BUNDLED_TDB?= no SAMBA4_BUNDLED_LDB?= yes # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka CONFLICTS_INSTALL+= cmocka-1.* PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="" SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="" .else SAMBA4_BUNDLED_LIBS+= !cmocka BUILD_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka TEST_DEPENDS+= cmocka>=1.1.3:sysutils/cmocka PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment " SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " .endif # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc CONFLICTS_INSTALL+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else SAMBA4_BUNDLED_LIBS+= !talloc BUILD_DEPENDS+= talloc>=2.3.1:devel/talloc RUN_DEPENDS+= talloc>=2.3.1:devel/talloc PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " .endif # tevent .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= tevent CONFLICTS_INSTALL+= tevent-* tevent1-* PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" .else SAMBA4_BUNDLED_LIBS+= !tevent BUILD_DEPENDS+= tevent>=0.10.2:devel/tevent RUN_DEPENDS+= tevent>=0.10.2:devel/tevent PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " .endif # tdb .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= tdb CONFLICTS_INSTALL+= tdb-* tdb1-* PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else SAMBA4_BUNDLED_LIBS+= !tdb BUILD_DEPENDS+= tdb>=1.4.3:databases/tdb RUN_DEPENDS+= tdb>=1.4.3:databases/tdb PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif # ldb .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LDB= yes SAMBA4_BUNDLED_LIBS+= ldb PLIST_SUB+= SAMBA4_BUNDLED_LDB="" SUB_LIST+= SAMBA4_BUNDLED_LDB="" SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules .else SAMBA4_BUNDLED_LIBS+= !ldb BUILD_DEPENDS+= ldb22>=2.2.0:databases/ldb22 RUN_DEPENDS+= ldb22>=2.2.0:databases/ldb22 PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules .endif .if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes) \ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \ || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes) SAMBA4_BUNDLED_LIBS+= replace .endif # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err # Set the test environment variables TEST_USES= python TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA1SUM=/sbin/sha1 \ SHA256SUM=/sbin/sha256 \ MD5SUM=/sbin/md5 \ PYTHONDONTWRITEBYTECODE=1 TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark # External Python modules TEST_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} TEST_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} ############################################################################## CONFIGURE_ARGS+= \ --with-pam \ --with-iconv \ --with-winbind \ --with-regedit \ --disable-rpath \ --without-lttng \ --without-gettext \ --enable-pthreadpool \ --without-fake-kaserver \ --without-systemd \ --with-libarchive \ --with-acl-support \ --with-sendfile-support \ --disable-ctdb-tests # ${ICONV_CONFIGURE_BASE} ############################################################################## FRUIT_PREVENTS= ZEROCONF_NONE FRUIT_PREVENTS_MSG= MacOSX support requires Zeroconf(AVAHI or MDNSRESPONDER) FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit FRUIT_PLIST_FILES+= man/man8/vfs_fruit.8.gz GLUSTERFS_CONFIGURE_ENABLE= glusterfs GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz ############################################################################## ZEROCONF_NONE_VARS= MAKE_ENV+=ZEROCONF=none AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_VARS= SAMBA4_SERVICES+=avahi_daemon MDNSRESPONDER_CONFIGURE_ENABLE= dnssd MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_VARS= SAMBA4_SERVICES+=mdnsd ############################################################################## BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 BIND916_RUN_DEPENDS= bind916>=9.16.0.0:dns/bind916 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate ############################################################################## MEMORY_DEBUG_IMPLIES= DEBUG MEMORY_DEBUG_CONFIGURE_ENV= ADDITIONAL_CFLAGS="-DENABLE_JEMALLOC `pkg-config --cflags jemalloc`" ADDITIONAL_LDFLAGS="`pkg-config --libs jemalloc`" MEMORY_DEBUG_LIB_DEPENDS= libjemalloc.so.2:devel/jemalloc # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 PICKY_DEVELOPER_IMPLIES= DEVELOPER PICKY_DEVELOPER_CONFIGURE_ON= --picky-developer DEVELOPER_IMPLIES= NTVFS DEVELOPER_CONFIGURE_ON= --enable-developer --enable-selftest --abi-check-disable DEVELOPER_CONFIGURE_ENV= WAF_CMD_FORMAT=string DEVELOPER_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} DEVELOPER_BUILD_DEPENDS= ${GDB_CMD}:devel/gdb \ ${SAMBA4_LMDB_DEPENDS} DEVELOPER_TEST_DEPENDS= ${GDB_CMD}:devel/gdb DEVELOPER_VARS_OFF= GDB_CMD=true # XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it # if you don't know what you are doing NTVFS_IMPLIES= AD_DC NTVFS_CONFIGURE_WITH= ntvfs-fileserver NTVFS_PLIST_FILES= ${SAMBA4_MODULEDIR}/service/smb.so \ lib/samba4/private/libntvfs-samba4.so ############################################################################## CLUSTER_CONFIGURE_WITH= cluster-support CUPS_CONFIGURE_ENABLE= cups iprint CUPS_LIB_DEPENDS= libcups.so:print/cups # https://bugzilla.samba.org/show_bug.cgi?id=9545 FAM_USES= fam FAM_CONFIGURE_WITH= fam GPGME_CONFIGURE_WITH= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme PROFILE_CONFIGURE_WITH= profiling-data QUOTAS_CONFIGURE_WITH= quotas SPOTLIGHT_CONFIGURE_ENABLE= spotlight SPOTLIGHT_BUILD_DEPENDS= tracker>=1.4.1:sysutils/tracker SPOTLIGHT_RUN_DEPENDS= tracker>=1.4.1:sysutils/tracker # ICU SPOTLIGHT_LIB_DEPENDS+= libicuuc.so:devel/icu SPOTLIGHT_USES= bison gnome SPOTLIGHT_USE= gnome=glib20 SYSLOG_CONFIGURE_WITH= syslog UTMP_CONFIGURE_WITH= utmp AD_DC_CONFIGURE_OFF= --without-ad-dc AD_DC_BUILD_DEPENDS= ${SAMBA4_LMDB_DEPENDS} AD_DC_RUN_DEPENDS= ${SAMBA4_LMDB_DEPENDS} ADS_IMPLIES= LDAP ADS_CONFIGURE_WITH= ads dnsupdate LDAP_CONFIGURE_WITH= ldap LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_USE= OPENLDAP=yes LDAP_VARS= SAMBA4_MODULES+=idmap_ldap GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \ --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \ --with-experimental-mit-ad-dc GSSAPI_MIT_USES= gssapi:mit GSSAPI_HEIMDAL_CONFIGURE_ON= --with-system-heimdalkrb5 ${GSSAPIBASEDIR} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_PREVENTS= AD_DC GSSAPI_HEIMDAL_PREVENTS_MSG= GSSAPI_HEIMDAL and AD_DC enable conflicting options LIBZFS_CONFIGURE_WITH= libzfs LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" ############################################################################## .include ############################################################################## .if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime .endif .if ${WANT_EXP_MODULES:Mvfs_snapper} # snapper needs dbus LIB_DEPENDS+= libdbus-1.so:devel/dbus LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .endif SAMBA4_MODULES+= vfs_freebsd SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 .if ${PORT_OPTIONS:MADS} SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif .if ${PORT_OPTIONS:MDEVELOPER} SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject .endif # Python bindings .if defined(NO_PYTHON) USES+= python:build,test CONFIGURE_ARGS+= --disable-python PLIST_SUB+= SAMBA4_PYTHON="@comment " SUB_LIST+= SAMBA4_PYTHON="@comment " .else USES+= python:3.6+ PLIST_SUB+= SAMBA4_PYTHON="" SUB_LIST+= SAMBA4_PYTHON="" # Don't cache Python modules CONFIGURE_ARGS+= --nopycache MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 . if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= pytalloc-util . else SAMBA4_BUNDLED_LIBS+= !pytalloc-util . endif . if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= pytevent . else SAMBA4_BUNDLED_LIBS+= !pytevent . endif . if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= pytdb . else SAMBA4_BUNDLED_LIBS+= !pytdb . endif . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util . else SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util . endif # samba-tool requires those for *upgrade . if ${PORT_OPTIONS:MAD_DC} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} . if ${PORT_OPTIONS:MGPGME} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gpgme>=1.14.0:security/py-gpgme@${PY_FLAVOR} . endif . endif .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif # XXX: Hack for nss-info_* -> nss_info/* modules # Add selected modules to the plist .for module in ${SAMBA4_MODULES} PLIST_FILES+= ${SAMBA4_MODULEDIR}/${module:C|_|/|:C|-|_|}.so .endfor .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --verbose --enable-debug MAKE_ARGS+= --verbose DEBUG_FLAGS?= -g -ggdb3 -O0 .endif ############################################################################## .include ############################################################################## # Implemented in the gcrypt on AMD64 .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --accel-aes=intelaesni .else CONFIGURE_ARGS+= --accel-aes=none .endif # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe . if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) # LMDB SAMBA4_LMDB_DEPENDS= lmdb>=0.9.16:databases/lmdb PLIST_FILES+= lib/samba4/private/libldb-mdb-int-samba4.so \ ${SAMBA4_MODULEDIR}/ldb/mdb.so . endif .endif .if ${PORT_OPTIONS:MGSSAPI_MIT} PLIST_FILES+= ${SAMBA4_MODULEDIR}/krb5/winbind_krb5_localauth.so \ man/man8/winbind_krb5_localauth.8.gz . if ${PORT_OPTIONS:MAD_DC} PLIST_FILES+= lib/samba4/krb5/plugins/kdb/samba.so . endif .endif # for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) CFLAGS_amd64+= -fno-omit-frame-pointer # No fancy color error messages CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics .endif # Allow rpcgen to find proper CPP MAKE_ENV+= RPCGEN_CPP="${CPP}" #.if ${readline_ARGS} == port #CFLAGS+= -D_FUNCTION_DEF #.endif # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ SAMBA4_BINDDNSDIR="${SAMBA4_BINDDNSDIR}" \ SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ SAMBA4_CONFIG="${SAMBA4_CONFIG}" \ SAMBA4_SERVICES="${SAMBA4_SERVICES}" PLIST_SUB+= ${SAMBA4_SUB} SUB_LIST+= ${SAMBA4_SUB} USE_RC_SUBR= samba_server SUB_FILES= pkg-message README.FreeBSD PORTDOCS= README.FreeBSD post-extract: @${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: .if ! ${PORT_OPTIONS:MAD_DC} && ${PORT_OPTIONS:MNTVFS} @${ECHO_CMD}; \ ${ECHO_MSG} "===> NTVFS option requires AD_DC to be set"; \ ${ECHO_CMD}; \ ${FALSE} .endif @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build-MANDOC-off: ${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/ ${CP} -rp ${BUILD_WRKSRC}/docs/manpages ${BUILD_WRKSRC}/bin/default/docs-xml/ .for man in libcli/nbt/man/nmblookup4.1 \ librpc/tools/ndrdump.1 \ source4/lib/registry/man/regdiff.1 \ source4/lib/registry/man/regpatch.1 \ source4/lib/registry/man/regshell.1 \ source4/lib/registry/man/regtree.1 \ source4/scripting/man/samba-gpupdate.8 \ source4/torture/man/gentest.1 \ source4/torture/man/locktest.1 \ source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ source4/utils/oLschema2ldif/oLschema2ldif.1 \ lib/tdb/man/tdbdump.8 \ lib/tdb/man/tdbbackup.8 \ lib/tdb/man/tdbtool.8 \ lib/talloc/man/talloc.3 \ lib/tdb/man/tdbrestore.8 \ lib/ldb/man/ldbadd.1 \ lib/ldb/man/ldbsearch.1 \ lib/ldb/man/ldbmodify.1 \ lib/ldb/man/ldbrename.1 \ lib/ldb/man/ldbdel.1 \ lib/ldb/man/ldbedit.1 \ docs-xml/manpages/vfs_freebsd.8 ${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} .endfor .if ${PORT_OPTIONS:MCLUSTER} ${MKDIR} ${BUILD_WRKSRC}/bin/default/ctdb/ . for man in ctdb_diagnostics.1 ctdb.1 ctdbd_wrapper.1 ctdbd.1 ltdbtool.1 onnode.1 ping_pong.1 \ ctdb.conf.5 ctdb.sysconfig.5 ctdb-script.options.5 \ ctdb.7 ctdb-statistics.7 ctdb-tunables.7 ${INSTALL_MAN} ${FILESDIR}/man/${man} ${BUILD_WRKSRC}/bin/default/ctdb/ . endfor .endif post-install-rm-junk: ${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/samba/third_party ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name __pycache__ \ -type d -print0 | ${XARGS} -0 -n 1 -t ${RM} -r post-install-fix-manpages: .for f in vfs_aio_linux.8 vfs_btrfs.8 vfs_ceph.8 vfs_gpfs.8 ${RM} ${STAGEDIR}${PREFIX}/man/man8/${f} .endfor .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes . for f in ldbadd.1 ldbdel.1 ldbedit.1 ldbmodify.1 ldbrename.1 ldbsearch.1 ${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/samba-${f} . endfor .endif .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes . for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8 ${MV} ${STAGEDIR}${PREFIX}/man/man8/${f} ${STAGEDIR}${PREFIX}/man/man8/samba-${f} . endfor .endif post-install: post-install-rm-junk post-install-fix-manpages ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz # Run post-install script .for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} ${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_BINDDNSDIR}" ${INSTALL} -d -m 0750 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" .for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" .endfor .if !defined(WITH_DEBUG) -${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin ${STAGEDIR}${PREFIX}/libexec \ -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} -${FIND} ${STAGEDIR}${PREFIX}/lib -name '*.so*' \ -type f -print0 | ${XARGS} -0 -n 1 -t ${STRIP_CMD} .endif post-install-FRUIT-off: ${RM} ${STAGEDIR}${SAMBA4_MODULEDIR}/vfs/fruit.so ${RM} ${STAGEDIR}${PREFIX}/man/man8/vfs_fruit.8 post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} .endfor post-install-CLUSTER-on: ${LN} -nfs ../../../../share/ctdb/events/legacy/00.ctdb.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/00.ctdb.script ${LN} -nfs ../../../../share/ctdb/events/legacy/10.interface.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/10.interface.script ${LN} -nfs ../../../../share/ctdb/events/legacy/05.system.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/05.system.script ${LN} -nfs ../../../../share/ctdb/events/legacy/01.reclock.script ${STAGEDIR}${PREFIX}/etc/ctdb/events/legacy/01.reclock.script .include Index: head/net/yaz/Makefile =================================================================== --- head/net/yaz/Makefile (revision 553939) +++ head/net/yaz/Makefile (revision 553940) @@ -1,53 +1,54 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= yaz DISTVERSION= 5.30.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ MAINTAINER= neel@neelc.org COMMENT= Z39.50/SR client and API library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libicuuc.so:devel/icu \ libgnutls.so:security/gnutls USES= gnome iconv libtool ncurses pathfix pkgconfig readline \ shebangfix tcl SHEBANG_FILES= util/yaz-asncomp GNU_CONFIGURE= yes USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS= --enable-shared --with-iconv=${ICONV_PREFIX} \ --with-xml2=${LOCALBASE} --with-xslt=${LOCALBASE} \ --with-icu=${LOCALBASE} --enable-tcpd LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lexecinfo PORTDOCS= * OPTIONS_DEFINE= DOCS MEMCACHED REDIS MEMCACHED_DESC= Memcached distributed cache system support MEMCACHED_CONFIGURE_WITH= memcached MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached REDIS_CONFIGURE_WITH= redis REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis post-patch: @${REINPLACE_CMD} 's|tclsh |tclsh8.6 |' ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \ ${WRKSRC}/doc/Makefile post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* .include Index: head/net/zebra-server/Makefile =================================================================== --- head/net/zebra-server/Makefile (revision 553939) +++ head/net/zebra-server/Makefile (revision 553940) @@ -1,27 +1,27 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= zebra-server PORTVERSION= 2.0.55 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/ DISTNAME= idzebra-${PORTVERSION} MAINTAINER= ben@gibbed.org COMMENT= Z39.50/SR server software LIB_DEPENDS= libexpat.so:textproc/expat2 \ libicui18n.so:devel/icu \ libyaz.so:net/yaz GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \ --with-tclconfig=${TCL_LIBDIR} \ --with-iconv=${ICONV_PREFIX} --with-expat=${LOCALBASE} INSTALL_TARGET= install-strip USES= iconv libtool shebangfix tcl SHEBANG_FILES= util/idzebra-abs2dom USE_LDCONFIG= yes .include Index: head/net-im/dino/Makefile =================================================================== --- head/net-im/dino/Makefile (revision 553939) +++ head/net-im/dino/Makefile (revision 553940) @@ -1,66 +1,67 @@ # $FreeBSD$ PORTNAME= dino DISTVERSIONPREFIX= v DISTVERSION= 0.1.0.20201007 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org COMMENT= Modern XMPP Chat Client using GTK+/Vala LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= vala:lang/vala LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ libgee-0.8.so:devel/libgee \ libicuuc.so:devel/icu \ libsoup-2.4.so:devel/libsoup \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error USES= cmake desktop-file-utils gettext-tools gnome \ ninja pkgconfig USE_GITHUB= yes GH_TAGNAME= f28aaac OPTIONS_DEFINE= OMEMO UPLOAD GNUPG OPTIONS_DEFAULT= OMEMO UPLOAD GNUPG OPTIONS_SUB= yes HAS_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS+= -Wl,--export-dynamic USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= cairo gdkpixbuf2 glib20 gnomeprefix gtk30 intlhack OMEMO_DESC= OMEMO plugin UPLOAD_DESC= HTTP file upload plugin OMEMO_GH_TUPLE= signalapp:libsignal-protocol-c:v2.3.3:signalapp/plugins/signal-protocol/libsignal-protocol-c OMEMO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libqrencode.so:graphics/libqrencode OMEMO_VARS= ENABLED_PLUGINS+=omemo OMEMO_CMAKE_BOOL= BUILD_LIBSIGNAL_IN_TREE OMEMO_VARS_OFF= DISABLED_PLUGINS+=omemo UPLOAD_VARS= ENABLED_PLUGINS+=http-files UPLOAD_VARS_OFF= DISABLED_PLUGINS+=http-files GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme GNUPG_VARS= ENABLED_PLUGINS+=openpgp GNUPG_VARS_OFF= DISABLED_PLUGINS+=openpgp CMAKE_ARGS+= -DENABLED_PLUGINS="${ENABLED_PLUGINS:S/ /;/gW}" CMAKE_ARGS+= -DDISABLED_PLUGINS="${DISABLED_PLUGINS:S/ /;/gW}" pre-everything:: @if [ -z "${PACKAGE_BUILDING}" ]; then if ! ${PKG_BIN} query \ '%o-%Ok-%Od' databases/sqlite3 | \ ${GREP} -F -wq databases/sqlite3-UNICODE61-on; then \ ${ECHO_MSG} "/!\ Please make sure databases/sqlite3 is built\ with UNICODE61 option"; \ exit 1; \ fi; fi .include Index: head/news/tin/Makefile =================================================================== --- head/news/tin/Makefile (revision 553939) +++ head/news/tin/Makefile (revision 553940) @@ -1,104 +1,104 @@ # Created by: obrien@cs.ucdavis.edu # $FreeBSD$ PORTNAME= tin PORTVERSION= 2.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= news MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \ ftp://sunsite.icm.edu.pl/pub/unix/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.ka.nu/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.tau.ac.il/pub/unix/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \ ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \ ftp://ftp.karlsruhe.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.informatik.uni-hamburg.de/pub/soft/news/tin/v${PORTVERSION:R}/ MAINTAINER?= kbowling@FreeBSD.org COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support LICENSE= BSD3CLAUSE LIB_DEPENDS= libuu.so:converters/uulib \ libicuuc.so:devel/icu \ libpcre.so:devel/pcre RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support USES= gmake iconv ncurses shebangfix tar:bzip2 GNU_CONFIGURE= yes SHEBANG_FILES= tools/opt-case.pl tools/tinews.pl tools/url_handler.pl \ tools/w2r.pl TIN_EDITOR?= /usr/bin/ee TIN_SCREEN?= ncursesw OPTIONS_DEFINE= GNUPG ISPELL METAMAIL CANLOCK NNTP_ONLY SLRNFACE NLS OPTIONS_DEFAULT= GNUPG ISPELL METAMAIL OPTIONS_SUB= yes NNTP_ONLY_DESC= Only read news via NNTP (no spool dir support) NNTP_ONLY_CONFIGURE_ENABLE=nntp-only GNUPG_RUN_DEPENDS= gpg:security/gnupg GNUPG_CONFIGURE_ON= --with-gpg=${LOCALBASE}/bin/gpg \ --without-pgp --without-pgpk GNUPG_CONFIGURE_OFF= --disable-pgp-gpg ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell ISPELL_CONFIGURE_ON= --with-ispell=${LOCALBASE}/bin/ispell METAMAIL_DESC?= Use metamail to handle MIME attachments METAMAIL_RUN_DEPENDS= metamail:mail/metamail METAMAIL_CONFIGURE_ON= --with-metamail=${LOCALBASE}/bin/metamail CANLOCK_DESC= Enable Cancel-Lock key support via libcanlock CANLOCK_CONFIGURE_ENABLE=cancel-locks NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SLRNFACE_DESC?= Use slrnface to displace sender images SLRNFACE_CONFIGURE_WITH= slrnface=slrnface SLRNFACE_BUILD_DEPENDS= slrnface:news/slrnface SLRNFACE_RUN_DEPENDS= slrnface:news/slrnface # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii # national environment. CONFIGURE_ARGS+=--with-nntp-default-server=news \ --with-spooldir=/var/news \ --with-libdir=${PREFIX}/news/lib \ --with-defaults-dir=${PREFIX}/etc \ --with-editor=${TIN_EDITOR} \ --with-pcre=yes \ --with-screen=${TIN_SCREEN} \ --enable-break-long-lines \ ${ICONV_CONFIGURE_ARG} \ --with-mime-default-charset=US-ASCII \ --enable-ipv6 MAKE_ARGS+= MAKE=${MAKE_CMD} CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= build post-patch: ${REINPLACE_CMD} -Ee 's:5/(mmdf|mbox):5/tin_\1:g' \ ${WRKSRC}/src/Makefile.in ${REINPLACE_CMD} -e 's:/var/spool/news:/var/news:g' \ -e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:g' \ -e 's:/usr/lib/news:${PREFIX}/news/lib:g' \ -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \ -e 's:url_handler\.pl:tinurl_handler.pl:g' \ ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.5 ${REINPLACE_CMD} \ -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \ ${WRKSRC}/src/mimetypes.c ${REINPLACE_CMD} \ -e 's:url_handler\.pl:tinurl_handler.pl:g' \ ${WRKSRC}/src/Makefile.in ${WRKSRC}/include/tin.h ${MV} ${WRKSRC}/tools/url_handler.pl \ ${WRKSRC}/tools/tinurl_handler.pl post-install: ${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \ ${STAGEDIR}${PREFIX}/etc/tin.defaults.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tin ln -sf tin ${STAGEDIR}${PREFIX}/bin/rtin .include Index: head/print/harfbuzz-icu/Makefile =================================================================== --- head/print/harfbuzz-icu/Makefile (revision 553939) +++ head/print/harfbuzz-icu/Makefile (revision 553940) @@ -1,12 +1,12 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -icu COMMENT= Harfbuzz ICU support MASTERDIR= ${.CURDIR}/../../print/harfbuzz PLIST= ${.CURDIR}/pkg-plist HARFBUZZ_SLAVE= icu .include "${MASTERDIR}/Makefile" Index: head/print/libmspub01/Makefile =================================================================== --- head/print/libmspub01/Makefile (revision 553939) +++ head/print/libmspub01/Makefile (revision 553940) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= libmspub PORTVERSION= 0.1.4 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= print graphics devel MASTER_SITES= LODEV/${PORTNAME} PKGNAMESUFFIX= 01 MAINTAINER= office@FreeBSD.org COMMENT= Library and tools for parsing Microsoft Publisher file format LICENSE= MPL20 BUILD_DEPENDS= ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ librevenge-0.0.so:textproc/librevenge GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= compiler:c++11-lib libtool pathfix pkgconfig tar:xz INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include .include Index: head/print/scribus-devel/Makefile =================================================================== --- head/print/scribus-devel/Makefile (revision 553939) +++ head/print/scribus-devel/Makefile (revision 553940) @@ -1,65 +1,65 @@ # Created by: Piotr Kubaj # $FreeBSD$ PORTNAME= scribus PORTVERSION= 1.5.5 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ PKGNAMESUFFIX= -devel MAINTAINER= pkubaj@FreeBSD.org COMMENT= Comprehensive desktop publishing program (development version) LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libboost_thread.so:devel/boost-libs \ libhunspell-1.7.so:textproc/hunspell \ libcairo.so:graphics/cairo \ librevenge-0.0.so:textproc/librevenge \ libcups.so:print/cups \ libwpg-0.3.so:graphics/libwpg03 \ libcdr-0.1.so:graphics/libcdr01 \ libfreehand-0.1.so:graphics/libfreehand \ libpagemaker-0.0.so:print/libpagemaker \ libmspub-0.1.so:print/libmspub01 \ libvisio-0.1.so:textproc/libvisio01 \ libfreetype.so:print/freetype2 \ libtiff.so:graphics/tiff \ libpoppler.so:graphics/poppler \ libharfbuzz-icu.so:print/harfbuzz-icu \ libfontconfig.so:x11-fonts/fontconfig \ libpodofo.so:graphics/podofo \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu USES= cmake compiler:gcc-c++11-lib desktop-file-utils dos2unix gnome \ jpeg pkgconfig qt:5 shared-mime-info ssl tar:xz USE_QT= buildtools_build core declarative gui linguisttools_build \ network opengl printsupport qmake_build widgets xml DOS2UNIX_REGEX= .*\.(cpp|h|txt) USE_GNOME= libxml2 INSTALLS_ICONS= yes USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -DWANT_SCRIPTER2=YES \ -Wno-ferror-limit -DCMAKE_COLOR_MAKEFILE:BOOL=ON OPTIONS_DEFINE= DOCS post-install: ${LN} -sf ../share/icons/1_5_1/scribus.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ ${MKDIR} ${STAGEDIR}${PREFIX}/man/de/man1 \ ${STAGEDIR}${PREFIX}/man/pl/man1 ${MV} ${STAGEDIR}${PREFIX}/share/man/de/man1/scribus.1 \ ${STAGEDIR}${PREFIX}/man/de/man1/ ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/scribus.1 \ ${STAGEDIR}${PREFIX}/man/man1/ ${MV} ${STAGEDIR}${PREFIX}/share/man/pl/man1/scribus.1 \ ${STAGEDIR}${PREFIX}/man/pl/man1/ .include Index: head/print/tex-xetex/Makefile =================================================================== --- head/print/tex-xetex/Makefile (revision 553939) +++ head/print/tex-xetex/Makefile (revision 553940) @@ -1,96 +1,96 @@ # $FreeBSD$ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 37 +PORTREVISION= 38 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- DISTNAME= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TEXMF}${EXTRACT_SUFX} DIST_SUBDIR= TeX EXTRACT_ONLY= texlive-${DISTVERSION_TEXLIVE_SOURCE}-source${EXTRACT_SUFX} MAINTAINER= hrs@FreeBSD.org COMMENT= TeX System with Unicode and Modern Font Technologies LIB_DEPENDS= libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libicuio.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libTECkit.so:textproc/teckit USES= compiler:c++11-lib gnome pkgconfig tar:xz xorg USE_CXXSTD= gnu++11 USE_TEX= kpathsea web2c texmf formats fmtutil dvipdfmx USE_XORG= pixman USE_GNOME= cairo TEXHASHDIRS= ${TEXMFDISTDIR} ${TEXMFVARDIR} EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} EXTRACT_FILES= build-aux \ libs/poppler \ libs/xpdf \ texk/web2c EXTRACT_AFTER_ARGS_TEXMF= \ | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,} DISTVERSION_TEXLIVE_SOURCE=20150521 DISTVERSION_TEXLIVE_TEXMF=20150523 DISTNAME_TEXMF= texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf EXTRACT_FILES_TEXMF= \ texmf-dist/doc/xelatex \ texmf-dist/doc/xetex \ texmf-dist/fonts/misc/xetex \ texmf-dist/scripts/xetex \ texmf-dist/source/xelatex \ texmf-dist/tex/latex/latexconfig/xelatex.ini \ texmf-dist/tex/plain/config/xetex.ini \ texmf-dist/tex/xelatex \ texmf-dist/tex/xetex \ texmf-dist/tex/generic/xetexconfig/unicode-letters.tex WRKSRC= ${WRKDIR}/${DISTNAME}/texk/web2c GNU_CONFIGURE= yes EXCLUDE_ENGINES=aleph etex pdftex luatex luajittex mf mf-nowin \ ptex eptex uptex euptex \ otangle mp pmp upmp web2c web-progs tex synctex CONFIGURE_ARGS= ${EXCLUDE_ENGINES:S/^/--disable-/} \ --enable-xetex \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-graphite2 \ --with-graphite2-includes=${LOCALBASE}/include/graphite2 \ --with-graphite2-libdir=${LOCALBASE}/lib \ --with-system-harfbuzz \ --without-system-poppler \ --with-system-teckit \ --with-teckit-includes=${LOCALBASE}/include/teckit \ --with-teckit-libdir=${LOCALBASE}/lib \ --with-system-zziplib \ --with-system-zlib .for L in cairo gmp kpathsea libpng mpfr pixman ptexenc icu CONFIGURE_ARGS+=--with-system-$L \ --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib .endfor CPPFLAGS+= -I${LOCALBASE}/include/harfbuzz -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes TEX_FORMATS= xetex pre-configure: for D in libs/xpdf libs/poppler; do \ cd ${WRKDIR}/${DISTNAME}/$$D && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS}; \ done pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} .include Index: head/print/texlive-base/Makefile =================================================================== --- head/print/texlive-base/Makefile (revision 553939) +++ head/print/texlive-base/Makefile (revision 553940) @@ -1,147 +1,147 @@ # $FreeBSD$ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 56 +PORTREVISION= 57 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base DISTNAME= ${PORTNAME}-${DISTVERSION}-source DIST_SUBDIR= TeX MAINTAINER= hrs@FreeBSD.org COMMENT= TeX Live Typesetting System, base binaries RUN_DEPENDS= psbook:print/psutils LIB_DEPENDS= libicuio.so:devel/icu \ libt1.so:devel/t1lib \ libTECkit.so:textproc/teckit \ libgd.so:graphics/gd \ libgraphite2.so:graphics/graphite2 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libpng.so:graphics/png \ libzzip.so:devel/zziplib \ libpoppler.so:graphics/poppler \ libpotrace.so:graphics/libpotrace CONFLICTS_INSTALL= ps2eps texlive-texmf-201[234]* USE_TEX= web2c kpathsea ptexenc tlmgr texhash-bootstrap USES= compiler:c++11-lib ghostscript pkgconfig perl5 \ python:run shebangfix tar:xz USE_CXXSTD= gnu++11 USE_PERL5= run # during build phase gnu configure is run a lot MAKE_ENV+= CONFIG_SITE=${CONFIG_SITE} EXCLUDE_FILES= ${DISTNAME}/texk/web2c \ ${DISTNAME}/texk/kpathsea \ ${DISTNAME}/texk/ptexenc \ ${DISTNAME}/texk/xdvik \ ${DISTNAME}/texk/dvipdfm-x \ ${DISTNAME}/texk/dvipsk \ ${DISTNAME}/libs \ ${DISTNAME}/utils/t1utils \ ${DISTNAME}/utils/xpdfopen EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-native-texlive-build \ --disable-web-progs \ --disable-psutils \ --enable-shared \ --disable-t1utils \ --disable-dvipdfmx \ --disable-dvipdfm-x \ --disable-xdvipdfmx \ --disable-xpdfopen \ --enable-build-in-source-tree \ --datarootdir=${LOCALBASE}/share \ --with-system-freetype2 \ --with-freetype2-includes=${LOCALBASE}/include/freetype2 \ --with-freetype2-libdir=${LOCALBASE}/lib \ --with-system-gd \ --with-system-cairo \ --with-system-harfbuzz \ --with-system-graphite2 \ --with-system-pixman \ --with-system-poppler \ --with-system-t1lib \ --with-xpdf-includes=${LOCALBASE}/include/poppler \ --with-xpdf-libdir=${LOCALBASE}/lib \ --with-system-xpdf \ --with-system-zziplib \ --with-system-zlib .for L in gmp icu kpathsea libgs libpng libpaper mpfr ptexenc potrace teckit CONFIGURE_ARGS+=--with-system-$L \ --with-$L-include=${LOCALBASE}/include \ --with-$L-libdir=${LOCALBASE}/lib .endfor CFLAGS+= -I${LOCALBASE}/include PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" INSTALL_TARGET= install-strip SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ texk/texlive/linked_scripts/accfonts/vpl2ovp \ texk/texlive/linked_scripts/accfonts/vpl2vpl \ texk/texlive/linked_scripts/arara/arara.sh \ texk/texlive/linked_scripts/bibexport/bibexport.sh \ texk/texlive/linked_scripts/convbkmk/convbkmk.rb \ texk/texlive/linked_scripts/ctanupload/ctanupload.pl \ texk/texlive/linked_scripts/ebong/*.py \ texk/texlive/linked_scripts/dtxgen/dtxgen \ texk/texlive/linked_scripts/dviasm/*.py \ texk/texlive/linked_scripts/exceltex/exceltex \ texk/texlive/linked_scripts/findhyph/findhyph \ texk/texlive/linked_scripts/fragmaster/fragmaster.pl \ texk/texlive/linked_scripts/installfont/installfont-tl \ texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \ texk/texlive/linked_scripts/latexpand/latexpand \ texk/texlive/linked_scripts/lilyglyphs/*.py \ texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \ texk/texlive/linked_scripts/lua2dox/lua2dox_filter \ texk/texlive/linked_scripts/mathspic/mathspic.pl \ texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \ texk/texlive/linked_scripts/multibibliography/multibibliography.pl \ texk/texlive/linked_scripts/pygmentex/*.py \ texk/texlive/linked_scripts/pythontex/*.py \ texk/texlive/linked_scripts/rubik/rubikrotation.pl \ texk/texlive/linked_scripts/splitindex/splitindex.pl \ texk/texlive/linked_scripts/svn-multi/svn-multi.pl \ texk/texlive/linked_scripts/texdirflatten/texdirflatten \ texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \ texk/texlive/linked_scripts/ulqda/ulqda.pl \ texk/texlive/linked_scripts/urlbst/urlbst \ texk/texlive/linked_scripts/yplan/yplan INFO= dvipng tlbuild OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= TEX=xpdfopen:run post-patch: cd ${WRKSRC}/texk/texlive && \ ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ linked_scripts/texlive/fmtutil-sys.sh \ tl_scripts/texconfig-sys.sh \ linked_scripts/texlive/updmap-sys.sh ${REINPLACE_CMD} -e 's|/usr/bin/python -O|${python_CMD}|' \ ${WRKSRC}/texk/texlive/linked_scripts/de-macro/de-macro \ post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/$$D; \ ${TOUCH} ${STAGEDIR}${PREFIX}/$$D/.keep_me; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c ${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFCONFIGDIR}/web2c/.keep_me ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/fmtutil.cnf \ ${STAGEDIR}${PREFIX}/${FMTUTIL_CNF} post-install: post-install-fmtutil .ORDER: post-install-fmtutil do-texhash .include Index: head/science/py-tensorflow/Makefile =================================================================== --- head/science/py-tensorflow/Makefile (revision 553939) +++ head/science/py-tensorflow/Makefile (revision 553940) @@ -1,160 +1,160 @@ # $FreeBSD$ PORTNAME= tensorflow DISTVERSIONPREFIX= v DISTVERSION= 1.14.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}.tar.gz MAINTAINER= amzo1337@gmail.com COMMENT= Computation using data flow graphs for scalable machine learning LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= fails to build ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \ bash:shells/bash \ cython:lang/cython \ swig:devel/swig \ bazel:devel/bazel029 LIB_DEPENDS= libsnappy.so:archivers/snappy \ liblmdb.so:databases/lmdb \ libsqlite3.so:databases/sqlite3 \ libicuio.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpcre.so:devel/pcre \ libnsync.so:devel/nsync \ libprotobuf.so:devel/protobuf \ libprotobuf-c.so:devel/protobuf-c \ libre2.so:devel/re2 \ libgif.so:graphics/giflib \ libpng.so:graphics/png \ libgpr.so:devel/grpc \ libcurl.so:ftp/curl \ libgoogle_cloud_cpp_common.so:devel/google-cloud-cpp \ libflatbuffers.so:devel/flatbuffers \ libdouble-conversion.so:devel/double-conversion RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}absl>=0.7.1:devel/py-absl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}astor>=0.5:devel/py-astor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gast>=0.2.2:devel/py-gast@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.7:devel/py-google-pasta@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}grpcio>=1.22.0:devel/py-grpcio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}keras>=2.2.4:math/py-keras@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wrapt>=1.11.2:devel/py-wrapt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} USES= python:3.6+ shebangfix jpeg ssl SHEBANG_GLOB= *.py USE_GITHUB= yes USE_PYTHON= distutils BAZEL_BOOT= --output_user_root=${WRKDIR}/bazel_out PLIST_SUB= TF_PORT_VERSION=${PORTVERSION} OPTIONS_DEFINE= CPU_OPTS CPU_OPTS_DESC= Enable optimisations using features available on your CPU CPU_OPTS_VARS= CPU_TARGET=native BAZEL_COPT="-c opt --copt=-march=native --copt=-mfpmath=sse" CPU_OPTS_VARS_OFF= CPU_TARGET=x86-64 .include "Makefile.MASTER_SITES" post-patch: # Set up a local repository with our pre-downloaded packages # This prevents bazel downloading the files without modifying # the bzl files. @${MKDIR} ${WRKDIR}/bazel-cache @${MKDIR} ${WRKDIR}/bazel-distdir .for file in ${DISTFILES:C/\:(.*)//} @${ECHO} "Moving ${file} to ${WRKDIR}/bazel-cache" @${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-distdir .endfor @cd ${WRKSRC} && \ ${REINPLACE_CMD} "s#--batch#${BAZEL_BOOT}\', \'--batch#" \ configure.py @${CP} ${PATCHDIR}/bazelrc ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKDIR}/bazelrc @${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" ${WRKDIR}/bazelrc \ ${WRKSRC}/tensorflow/tensorflow.bzl ${WRKSRC}/.bazelrc \ ${WRKSRC}/tensorflow/core/BUILD \ ${WRKSRC}/third_party/systemlibs/protobuf.bzl do-configure: @cd ${WRKSRC} && ${SETENV} \ PYTHON_BIN_PATH=${PYTHON_CMD} \ PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \ TF_NEED_JEMALLOC=0 \ TF_NEED_KAFKA=0 \ TF_NEED_OPENCL_SYCL=0 \ TF_NEED_AWS=0 \ TF_NEED_GCP=0 \ TF_NEED_HDFS=0 \ TF_NEED_S3=0 \ TF_ENABLE_XLA=0 \ TF_NEED_GDR=0 \ TF_NEED_VERBS=0 \ TF_NEED_OPENCL=0 \ TF_NEED_MPI=0 \ TF_NEED_TENSORRT=0 \ TF_NEED_NGRAPH=0 \ TF_NEED_IGNITE=0 \ TF_NEED_ROCM=0 \ TF_NEED_CUDA=0 \ TF_SET_ANDROID_WORKSPACE=0 \ TF_DOWNLOAD_CLANG=0 \ TF_NEED_NCCL=0 \ TF_NEED_OPENCL=0 \ TF_IGNORE_MAX_BAZEL_VERSION=1 \ CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \ PREFIX="${LOCALBASE}" \ TF_SYSTEM_LIBS="absl_py astor_archive boringssl com_github_googleapis_googleapis com_github_googlecloudplatform_google_cloud_cpp com_google_protobuf \ com_google_protobuf_cc com_googlesource_code_re2 curl cython double_conversion enum34_archive flatbuffers gast_archive gif_archive \ grpc hwloc icu jpeg jsoncpp_git keras_applications_archive lmdb nasm nsync org_sqlite pasta pcre png_archive protobuf_archive \ six_archive snappy swig termcolor_archive wrapt zlib_archive" \ ./configure do-build: @cd ${WRKSRC} && \ bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \ --host_linkopt="-L${LOCALBASE}/lib" --linkopt="-L${LOCALBASE}/lib" --config=opt \ --incompatible_no_support_tools_in_action_inputs=false \ --verbose_failures -s \ //tensorflow:libtensorflow.so \ //tensorflow:libtensorflow_cc.so \ //tensorflow:install_headers \ //tensorflow/tools/pip_package:build_pip_package @cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \ bazel-bin/tensorflow/tools/pip_package/build_pip_package \ ${WRKDIR}/whl do-install: @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR} @${MKDIR} ${WRKDIR}/tmp @${UNZIP_NATIVE_CMD} -d ${WRKDIR}/tmp ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl @${FIND} ${WRKDIR}/tmp -name "*.so*" | ${XARGS} ${STRIP_CMD} cd ${WRKDIR}/tmp && ${COPYTREE_SHARE} ${PORTNAME}-${PORTVERSION}.dist-info \ ${STAGEDIR}${PYTHON_SITELIBDIR} cd ${WRKDIR}/tmp/${PORTNAME}-${PORTVERSION}.data/purelib && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR} post-install: # autoplist: thousands of files, all under ${PYTHON_SITELIBDIR} @cd ${STAGEDIR}${PREFIX} && \ ${FIND} ${PYTHON_SITELIBDIR:C|^${LOCALBASE}/||} -type f -or -type l | grep -v "egg-info/" >> ${TMPPLIST} .include Index: head/security/certificate-transparency/Makefile =================================================================== --- head/security/certificate-transparency/Makefile (revision 553939) +++ head/security/certificate-transparency/Makefile (revision 553940) @@ -1,47 +1,47 @@ # Created by: Edward Tomasz Napierala # $FreeBSD$ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 45 +PORTREVISION= 46 CATEGORIES= security MAINTAINER= ports@FreeBSD.org COMMENT= Open framework for monitoring and auditing SSL certificates LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= inherits generated classes which is prohitited by protobuf. See PR 246530 for detail LIB_DEPENDS= libevent.so:devel/libevent \ libevhtp.so:www/libevhtp \ libgtest.so:devel/googletest \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libgmock.so:devel/googletest \ libicuuc.so:devel/icu \ libjson-c.so:devel/json-c \ libleveldb.so:databases/leveldb \ libobjecthash.so:devel/objecthash \ libprotobuf.so:devel/protobuf \ libsqlite3.so:databases/sqlite3 \ libtcmalloc.so:devel/google-perftools \ libsnappy.so:archivers/snappy USES= autoreconf compiler:c++11-lib gmake localbase:ldflags pkgconfig ssl GNU_CONFIGURE= yes MAKE_FLAGS+= "V=1" USE_GITHUB= yes GH_ACCOUNT= google GH_TAGNAME= 28478cb .include .if ${SSL_DEFAULT} == base BROKEN_FreeBSD_12= could not find the OpenSSL libraries BROKEN_FreeBSD_13= could not find the OpenSSL libraries .endif .include Index: head/sysutils/gdisk/Makefile =================================================================== --- head/sysutils/gdisk/Makefile (revision 553939) +++ head/sysutils/gdisk/Makefile (revision 553940) @@ -1,50 +1,50 @@ # Created by: Dmitry N Fomin # $FreeBSD$ PORTNAME= gdisk PORTVERSION= 1.0.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION} DISTNAME= gptfdisk-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= GPT fdisk LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libpopt.so:devel/popt \ libuuid.so:misc/e2fsprogs-libuuid USES= localbase:ldflags ALL_TARGET= fixparts gdisk sgdisk MAKEFILE= Makefile.freebsd OPTIONS_DEFINE= CGDISK UTF16 OPTIONS_SUB= yes CGDISK_DESC= Curses-based interactive program UTF16_DESC= Support for Unicode partition names CGDISK_ALL_TARGET= cgdisk CGDISK_USES= ncurses UTF16_USES= compiler:c++11-lib UTF16_CPPFLAGS= -DUSE_UTF16 UTF16_CXXFLAGS= -std=gnu++11 UTF16_LDFLAGS= -licuio -licuuc UTF16_LIB_DEPENDS= libicuuc.so:devel/icu do-install: .for i in fixparts gdisk sgdisk ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/${i}.8 ${STAGEDIR}${PREFIX}/share/man/man8 .endfor do-install-CGDISK-on: ${INSTALL_PROGRAM} ${WRKSRC}/cgdisk ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/cgdisk.8 ${STAGEDIR}${PREFIX}/share/man/man8 .include Index: head/sysutils/ltfs/Makefile =================================================================== --- head/sysutils/ltfs/Makefile (revision 553939) +++ head/sysutils/ltfs/Makefile (revision 553940) @@ -1,36 +1,36 @@ # Created by: Kevin Bowling # $FreeBSD$ PORTNAME= ltfs DISTVERSIONPREFIX= v DISTVERSION= 2.4.2.0 DISTVERSIONSUFFIX= -10418 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= kbowling@FreeBSD.org COMMENT= Reference implementation of LTFS for stand alone tape drive LICENSE= BSD3CLAUSE LICENSE_FILE = ${WRKSRC}/LICENSE LIB_DEPENDS= libicudata.so:devel/icu \ libnetsnmp.so:net-mgmt/net-snmp \ libpkg.so:${PKG_ORIGIN} \ libuuid.so:misc/e2fsprogs-libuuid USES= autoreconf compiler:c11 fuse gnome libtool:build pkgconfig ssl CONFIGURE_ARGS+= --enable-icu-6x GH_ACCOUNT= LinearTapeFileSystem GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_GITHUB= yes USE_GNOME= libxml2 USE_LDCONFIG= yes post-install: @${RM} ${STAGEDIR}${DATADIR}/ltfs @${RMDIR} ${STAGEDIR}${DATADIR} .include Index: head/sysutils/ltfs/files/patch-icu68 =================================================================== --- head/sysutils/ltfs/files/patch-icu68 (nonexistent) +++ head/sysutils/ltfs/files/patch-icu68 (revision 553940) @@ -0,0 +1,17 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +fs.c:266:32: error: use of undeclared identifier 'FALSE' + update_platform_safe_name(d, FALSE, idx); + ^ + +--- src/libltfs/fs.c.orig 2020-03-31 23:56:12 UTC ++++ src/libltfs/fs.c +@@ -263,7 +263,7 @@ struct dentry * fs_allocate_dentry(struct dentry *pare + d->platform_safe_name = NULL; + } else if (name && !platform_safe_name) { + d->name.name = strdup(name); +- update_platform_safe_name(d, FALSE, idx); ++ update_platform_safe_name(d, false, idx); + if (! d->name.name || ! d->platform_safe_name) { + ltfsmsg(LTFS_ERR, 10001E, "fs_allocate_dentry: name"); + if (d->name.name) Property changes on: head/sysutils/ltfs/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/osquery/Makefile =================================================================== --- head/sysutils/osquery/Makefile (revision 553939) +++ head/sysutils/osquery/Makefile (revision 553940) @@ -1,91 +1,91 @@ # Created by: Ryan Steinmetz # $FreeBSD$ PORTNAME= osquery PORTVERSION= 3.3.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org COMMENT= SQL powered OS instrumentation, monitoring, and analytics LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to compile: the clang compiler does not support '-march=x86-64' BUILD_DEPENDS= thrift>=0.11.0:devel/thrift \ bash>0:shells/bash \ linenoise-ng>0:devel/linenoise-ng \ rapidjson>0:devel/rapidjson \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libaugeas.so:textproc/augeas \ libboost_regex.so:devel/boost-libs \ libfuzzy.so:security/ssdeep \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libicuuc.so:devel/icu \ librocksdb-lite.so:databases/rocksdb-lite \ libthrift.so:devel/thrift-cpp \ libzstd.so:archivers/zstd RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss USES= cmake compiler:c++11-lib gnome libarchive libtool \ python:2.7,build ssl USE_GNOME= libxml2 CONFIGURE_ENV+= OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \ SKIP_TESTS="yes" CC="${CC}" CXX="${CXX}" \ SKIP_SMART=1 CMAKE_ARGS+= -DFREEBSD=awesome -DCMAKE_SYSTEM_NAME="FreeBSD" BLDDIR= ${WRKDIR}/.build/${PORTNAME} TPVERSION= 3.0.0 USE_RC_SUBR= ${PORTNAME}d USE_GITHUB= yes GH_ACCOUNT= facebook ${PORTNAME}:tp GH_PROJECT= third-party:tp GH_SUBDIR= third-party:tp GH_TAGNAME= ${TPVERSION}:tp # Some options for things that bring in many dependencies OPTIONS_DEFINE= TSK AWS YARA LLDPD TSK_DESC= Build with sleuthkit support TSK_LIB_DEPENDS= libtsk.so:sysutils/sleuthkit TSK_CONFIGURE_ENV_OFF= SKIP_TSK=1 AWS_DESC= Support logging to AWS Kinesis AWS_LIB_DEPENDS= libaws-cpp-sdk-core.so:devel/aws-sdk-cpp AWS_CONFIGURE_ENV_OFF= SKIP_AWS=1 YARA_DESC= Build with YARA malware identification support YARA_LIB_DEPENDS= libyara.so:security/yara YARA_CONFIGURE_ENV_OFF= SKIP_YARA=1 LLDPD_DESC= Support Link Layer Discovery Protocol LLDPD_LIB_DEPENDS= liblldpctl.so:net-mgmt/lldpd LLDPD_CONFIGURE_ENV_OFF=SKIP_LLDPD=1 .include post-patch: ${REINPLACE_CMD} -e 's|/var/osquery/|/var/db/osquery/|g' \ ${WRKSRC}/tools/deployment/osquery.example.conf ${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|g' \ ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/tools/get_platform.py do-install: ${INSTALL_PROGRAM} ${BLDDIR}/osqueryi ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${BLDDIR}/osqueryd ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${BLDDIR}/libosquery.a ${STAGEDIR}${PREFIX}/lib (cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include) ${INSTALL_DATA} ${WRKSRC}/tools/deployment/osquery.example.conf \ ${STAGEDIR}${PREFIX}/etc/osquery.conf.sample ${MKDIR} ${STAGEDIR}/var/db/osquery ${STAGEDIR}/var/log/osquery # The flags file must exist, even if empty. Using @sample # prevents a populated flags file from being nuked on upgrade. ${TOUCH} ${STAGEDIR}${PREFIX}/etc/osquery.flags.sample \ ${STAGEDIR}${PREFIX}/etc/osquery.flags .include Index: head/sysutils/tracker/Makefile =================================================================== --- head/sysutils/tracker/Makefile (revision 553939) +++ head/sysutils/tracker/Makefile (revision 553940) @@ -1,44 +1,45 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= tracker PORTVERSION= 2.3.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Object database, tag/metadata database, search tool and indexer LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libicutu.so:devel/icu PORTSCOUT= limitw:1,even USES= compiler:c++11-lib gettext gnome localbase:ldflags meson \ pkgconfig python:3.4+,build sqlite tar:xz USE_GNOME= glib20 introspection:build libxml2 USE_LDCONFIG= yes INSTALLS_ICONS= yes MESON_ARGS= -Ddocs=false \ -Dman=true \ -Dnetwork_manager=disabled \ -Dstemmer=disabled \ -Dbash_completion=true \ -Dbash_completion_dir=${PREFIX}/etc/bash_completion.d \ -Dsystemd_user_services=false GLIB_SCHEMAS= org.freedesktop.Tracker.DB.gschema.xml \ org.freedesktop.Tracker.FTS.gschema.xml \ org.freedesktop.Tracker.Store.gschema.xml \ org.freedesktop.Tracker.enums.xml \ org.freedesktop.Tracker.gschema.xml BINARY_ALIAS= python3=${PYTHON_CMD} PLIST_SUB= LIBVER=0.304.0 .include Index: head/sysutils/tracker-miners/Makefile =================================================================== --- head/sysutils/tracker-miners/Makefile (revision 553939) +++ head/sysutils/tracker-miners/Makefile (revision 553940) @@ -1,71 +1,71 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= tracker-miners PORTVERSION= 2.3.5 -PORTREVISION= 1 +PORTREVISION= 2 PÖRTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Miners for tracker2 LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LGPL BUILD_DEPENDS= valac:lang/vala LIB_DEPENDS= libicuuc.so:devel/icu \ libupower-glib.so:sysutils/upower \ libexempi.so:textproc/exempi \ libcue.so:textproc/libcue \ libiptcdata.so:graphics/libiptcdata \ libFLAC.so:audio/flac \ libtotem-plparser.so:multimedia/totem-pl-parser \ libpoppler-glib.so:graphics/poppler-glib \ libpng.so:graphics/png \ libtag.so:audio/taglib \ libtiff.so:graphics/tiff \ libgif.so:graphics/giflib \ libvorbisfile.so:audio/libvorbis \ libgxps.so:graphics/libgxps \ libexif.so:graphics/libexif \ libgexiv2.so:graphics/gexiv2 \ libtracker-miner-2.0.so:sysutils/tracker PORTSCOUT= limitw:1,even USES= gettext gnome jpeg localbase:ldflags meson \ pathfix pkgconfig python:3.4+,build sqlite tar:xz USE_GNOME= cairo intltool libgsf libxml2 INSTALLS_ICONS= yes MESON_ARGS= -Dsystemd_user_services=no \ -Dcharset_detenction=icu \ -Dunicode_support=icu \ -Dstemmer=no # -Dbattery_detection=hal OPTIONS_SUB= yes OPTIONS_DEFINE= GSTREAMER RSS OPTIONS_DEFAULT= GSTREAMER RSS GSTREAMER_MESON_ON= -Dgeneric_media_extractor=gstreamer GSTREAMER_MESON_OFF= -Dgeneric_media_extractor=none GSTREAMER_USE= gstreamer1=yes RSS_DESC= Tracker RSS miner RSS_MESON_TRUE= miner_rss RSS_LIB_DEPENDS= libgrss.so:net/libgrss PLIST_SUB= LIBVER=0.2.0 GLIB_SCHEMAS= org.freedesktop.Tracker.Extract.gschema.xml \ org.freedesktop.Tracker.Miner.Files.gschema.xml \ org.freedesktop.Tracker.Writeback.gschema.xml \ org.freedesktop.TrackerMiners.enums.xml #post-install: # ${RM} -rf ${STAGEDIR}/${PREFIX}/lib/systemd .include Index: head/textproc/R-cran-stringi/Makefile =================================================================== --- head/textproc/R-cran-stringi/Makefile (revision 553939) +++ head/textproc/R-cran-stringi/Makefile (revision 553940) @@ -1,18 +1,19 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= stringi DISTVERSION= 1.5.3 +PORTREVISION= 1 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Character String Processing Facilities LICENSE= BSD3CLAUSE LIB_DEPENDS= libicui18n.so:devel/icu USES= cran:auto-plist,compiles pkgconfig:build .include Index: head/textproc/dwdiff/Makefile =================================================================== --- head/textproc/dwdiff/Makefile (revision 553939) +++ head/textproc/dwdiff/Makefile (revision 553940) @@ -1,35 +1,36 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= dwdiff PORTVERSION= 2.1.3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://os.ghalkes.nl/dist/ \ http://fossies.org/unix/privat/ MAINTAINER= danilo@FreeBSD.org COMMENT= Delimited word diff program LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:bz2 OPTIONS_DEFINE= UNICODE NLS DOCS OPTIONS_DEFAULT=UNICODE OPTIONS_SUB= yes NLS_CONFIGURE_WITH= gettext NLS_USES= gettext localbase:ldflags NLS_CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -lintl" UNICODE_CONFIGURE_WITH= unicode UNICODE_LIB_DEPENDS= libicudata.so:devel/icu UNICODE_USES= localbase:ldflags pkgconfig HAS_CONFIGURE= yes CFLAGS+= -D_WITH_GETLINE CONFIGURE_ARGS+=--with-verbose-compile MAKE_ARGS+= prefix=${PREFIX:Q} mandir="${MANPREFIX}/man" docdir=${DOCSDIR:Q} .include Index: head/textproc/dwdiff/files/patch-icu68 =================================================================== --- head/textproc/dwdiff/files/patch-icu68 (nonexistent) +++ head/textproc/dwdiff/files/patch-icu68 (revision 553940) @@ -0,0 +1,26 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from src/unicode.c:21: +src/definitions.h:48:15: error: expected identifier +typedef enum {false, true} bool; + ^ +/usr/include/stdbool.h:36:15: note: expanded from macro 'false' +#define false 0 + ^ + +--- src/definitions.h.orig 2020-07-18 06:57:36 UTC ++++ src/definitions.h +@@ -43,13 +43,7 @@ + + /*==== Misc definitions ====*/ + /* Define a bool type if not already defined (C++ and C99 do)*/ +-#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L)) +-/*@-incondefs@*/ +-typedef enum {false, true} bool; +-/*@+incondefs@*/ +-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L + #include +-#endif + + /*==== Configuration definitions ====*/ + #ifndef NO_STRDUP Property changes on: head/textproc/dwdiff/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/gitlab-elasticsearch-indexer/Makefile =================================================================== --- head/textproc/gitlab-elasticsearch-indexer/Makefile (revision 553939) +++ head/textproc/gitlab-elasticsearch-indexer/Makefile (revision 553940) @@ -1,63 +1,63 @@ # Created by: Matthias Fechner # $FreeBSD$ PORTNAME= gitlab-elasticsearch-indexer PORTVERSION= 2.7.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org COMMENT= Elasticsearch indexer for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= git>=2.16.2:devel/git LIB_DEPENDS= libicui18n.so:devel/icu \ libicuuc.so:devel/icu #RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets pkgconfig MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/tags GL_COMMIT= dbf92a36238af7972fd36d330405103488396974 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor # 25dd GH_TUPLE= \ aws:aws-sdk-go:v1.19.6:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ deoxxa:aws_signing_client:c20ee106809e:deoxxa_aws_signing_client/vendor/github.com/deoxxa/aws_signing_client \ go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ golang:tools:6fdc5776f4bb:golang_tools/vendor/golang.org/x/tools \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \ jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ mailru:easyjson:1ea4449da983:mailru_easyjson/vendor/github.com/mailru/easyjson \ olivere:elastic:v6.2.24:olivere_elastic/vendor/github.com/olivere/elastic \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ sirupsen:logrus:v1.4.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify GL_TUPLE= gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \ gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit \ lupine:icu:54c89d9b1ef6931b4ff61fa9f4ca645d3b86d6dc:lupine_icu/vendor/gitlab.com/lupine/icu PLIST_FILES= bin/gitlab-elasticsearch-indexer do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/gitlab-elasticsearch-indexer ${STAGEDIR}${PREFIX}/bin/gitlab-elasticsearch-indexer .include Index: head/textproc/hs-pandoc-citeproc/Makefile =================================================================== --- head/textproc/hs-pandoc-citeproc/Makefile (revision 553939) +++ head/textproc/hs-pandoc-citeproc/Makefile (revision 553940) @@ -1,153 +1,155 @@ # $FreeBSD$ PORTNAME= pandoc-citeproc PORTVERSION= 0.17.0.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Supports using pandoc with citeproc LICENSE= BSD3CLAUSE USES= cabal OPTIONS_DEFINE= BIBUTILS EMBED_DATA UNICODE_COLLATION OPTIONS_DEFAULT= BIBUTILS BIBUTILS_DESC= Use Chris Putnam's Bibutils BIBUTILS_CABAL_FLAGS= bibutils BIBUTILS_USE_CABAL= hs-bibutils-6.10.0.0 EMBED_DATA_DESC= Embed locale files into the library EMBED_DATA_CABAL_FLAGS= embed_data_files EMBED_DATA_USE_CABAL= file-embed-0.0.12.0 UNICODE_COLLATION_DESC= Use bindings to the Internationl Components for Unicode libraries UNICODE_COLLATION_CABAL_FLAGS= unicode_collation UNICODE_COLLATION_USE_CABAL= text-icu-0.7.0.1 UNICODE_COLLATION_LIB_DEPENDS= libicui18n.so:devel/icu +UNICODE_COLLATION_EXTRA_PATCHES=${PATCHDIR}/extra-patch-icu68 USE_CABAL= Glob-0.10.0_1 \ HTTP-4000.3.14_1 \ HsYAML-0.2.1.0_1 \ HsYAML-aeson-0.2.0.0_1 \ JuicyPixels-3.3.5 \ QuickCheck-2.14_1 \ SHA-1.6.4.4 \ aeson-1.4.7.1_1 \ aeson-pretty-0.8.8 \ ansi-terminal-0.10.3 \ asn1-encoding-0.9.6_1 \ asn1-parse-0.9.5 \ asn1-types-0.3.4 \ async-2.2.2_1 \ attoparsec-0.13.2.4 \ base-compat-0.11.1 \ base-compat-batteries-0.11.1 \ base-orphans-0.8.2 \ base16-bytestring-0.1.1.7 \ base64-bytestring-1.1.0.0 \ basement-0.0.11_2 \ bitarray-0.0.1.1_1 \ blaze-builder-0.4.1.0 \ blaze-html-0.9.1.2 \ blaze-markup-0.8.2.7 \ case-insensitive-1.2.1.0 \ cereal-0.5.8.1 \ cmark-gfm-0.2.1 \ colour-2.3.5 \ conduit-1.3.2 \ conduit-extra-1.3.5 \ connection-0.3.1_1 \ cookie-0.4.5 \ cryptonite-0.27 \ data-default-0.7.1.1 \ data-default-class-0.1.2.0 \ data-default-instances-containers-0.0.1 \ data-default-instances-dlist-0.0.1 \ data-default-instances-old-locale-0.0.1 \ digest-0.0.1.2 \ dlist-0.8.0.8 \ doclayout-0.3 \ doctemplates-0.8.2 \ emojis-0.1 \ errors-2.3.0 \ haddock-library-1.9.0 \ hashable-1.3.0.0_1 \ hourglass-0.2.12 \ hsc2hs-0.68.7 \ hslua-1.1.2 \ hslua-module-system-0.2.1 \ hslua-module-text-0.2.1 \ http-client-0.7.1 \ http-client-tls-0.3.5.3_1 \ http-types-0.12.3 \ hxt-9.3.1.18 \ hxt-charproperties-9.4.0.0 \ hxt-regex-xmlschema-9.2.0.3_1 \ hxt-unicode-9.0.2.4 \ integer-logarithms-1.0.3_2 \ ipynb-0.1.0.1 \ jira-wiki-markup-1.3.2 \ libyaml-0.1.2 \ memory-0.15.0_1 \ mime-types-0.1.0.9 \ mono-traversable-1.0.15.1 \ network-3.1.1.1 \ network-uri-2.6.3.0 \ old-locale-1.0.0.7_2 \ pandoc-2.10 \ pandoc-types-1.21 \ pem-0.2.4 \ primitive-0.7.1.0 \ random-1.1_1 \ regex-base-0.94.0.0_1 \ regex-pcre-builtin-0.95.1.2.8.43 \ resourcet-1.2.4.2 \ rfc5051-0.1.0.4 \ safe-0.3.19 \ scientific-0.3.6.2 \ setenv-0.1.1.3_1 \ skylighting-0.8.5 \ skylighting-core-0.8.5 \ socks-0.6.1 \ split-0.2.3.4 \ splitmix-0.0.5 \ streaming-commons-0.2.1.2 \ syb-0.7.1 \ tagged-0.8.6_2 \ tagsoup-0.14.8 \ temporary-1.3 \ texmath-0.12.0.2 \ text-conversions-0.3.0 \ th-abstraction-0.3.2.0 \ time-compat-1.9.3 \ tls-1.5.4 \ transformers-compat-0.6.5 \ typed-process-0.2.6.0 \ unicode-transforms-0.3.6 \ unliftio-core-0.2.0.1_1 \ unordered-containers-0.2.11.0 \ utf8-string-1.0.1.1_3 \ uuid-types-1.0.3_2 \ vector-0.12.1.2 \ vector-algorithms-0.8.0.3 \ x509-1.7.5_1 \ x509-store-1.6.7_1 \ x509-system-1.6.6 \ x509-validation-1.6.11 \ xml-1.3.14_2 \ xml-conduit-1.8.0.1 \ xml-types-0.3.7 \ yaml-0.11.4.0 \ zip-archive-0.4.1_1 \ zlib-0.6.2.1_1 CABAL_FLAGS= -test_citeproc -debug post-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/pandoc-citeproc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 cd ${WRKSRC} && ${COPYTREE_SHARE} locales ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/chicago-author-date.csl ${STAGEDIR}${DATADIR} .include Index: head/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 =================================================================== --- head/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 (nonexistent) +++ head/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 (revision 553940) @@ -0,0 +1,21 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +cbits/text_icu.c:308:43: error: + error: use of undeclared identifier 'TRUE' + return u_strCompareIter(iter1, iter2, TRUE); + ^ + | +308 | return u_strCompareIter(iter1, iter2, TRUE); + | ^ + +--- text-icu-0.7.0.1/cbits/text_icu.c.orig 2015-01-09 04:58:03 UTC ++++ text-icu-0.7.0.1/cbits/text_icu.c +@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest, int32_t destCa + + int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2) + { +- return u_strCompareIter(iter1, iter2, TRUE); ++ return u_strCompareIter(iter1, iter2, true); + } + + UBlockCode __hs_ublock_getCode(UChar32 c) Property changes on: head/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/libe-book/Makefile =================================================================== --- head/textproc/libe-book/Makefile (revision 553939) +++ head/textproc/libe-book/Makefile (revision 553940) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= libe-book PORTVERSION= 0.1.3 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= textproc MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/ MAINTAINER= office@FreeBSD.org COMMENT= Library for import of reflowable e-book formats LICENSE= MPL20 BUILD_DEPENDS= ${LOCALBASE}/include/boost/algorithm/string/classification.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ liblangtag.so:devel/liblangtag \ librevenge-0.0.so:textproc/librevenge OPTIONS_DEFINE= DOCS USE_GNOME= libxml2 USES= compiler:c++11-lib gmake gnome gperf libtool pathfix pkgconfig \ tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-werror --disable-tests CPPFLAGS+= -I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY PORTDOCS= * DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_CONFIGURE_OFF= --without-docs .include Index: head/textproc/libe-book/files/patch-icu68 =================================================================== --- head/textproc/libe-book/files/patch-icu68 (nonexistent) +++ head/textproc/libe-book/files/patch-icu68 (revision 553940) @@ -0,0 +1,20 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE' + TRUE, TRUE, &status) + ^ +EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE' + TRUE, TRUE, &status) + ^ + +--- src/lib/EBOOKCharsetConverter.cpp.orig 2018-01-01 11:16:28 UTC ++++ src/lib/EBOOKCharsetConverter.cpp +@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c + m_converterToUTF8.get(), m_converterToUnicode.get(), + &outText, outText + out.size(), &inText, inText + length, + nullptr, nullptr, nullptr, nullptr, +- TRUE, TRUE, &status) ++ true, true, &status) + ; + if (status==U_BUFFER_OVERFLOW_ERROR) + { Property changes on: head/textproc/libe-book/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/textproc/libfolia/Makefile =================================================================== --- head/textproc/libfolia/Makefile (revision 553939) +++ head/textproc/libfolia/Makefile (revision 553940) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= libfolia DISTVERSIONPREFIX= v DISTVERSION= 1.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org COMMENT= Library for FoLiA, a format for annotated language resources LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive LIB_DEPENDS= libicui18n.so:devel/icu \ libticcutils.so:devel/ticcutils USES= autoreconf compiler:c++11-lang gmake gnome libtool pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static USE_GITHUB= yes GH_ACCOUNT= LanguageMachines USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip .include Index: head/textproc/libqxp/Makefile =================================================================== --- head/textproc/libqxp/Makefile (revision 553939) +++ head/textproc/libqxp/Makefile (revision 553940) @@ -1,46 +1,46 @@ # $FreeBSD$ PORTNAME= libqxp PORTVERSION= 0.0.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc MASTER_SITES= https://dev-www.libreoffice.org/src/${PORTNAME}/ MAINTAINER= greg@unrelenting.technology COMMENT= Library for parsing QuarkXPress documents LICENSE= MPL20 LIB_DEPENDS= librevenge-0.0.so:textproc/librevenge \ libicui18n.so:devel/icu #libicui18n.so:devel/icu \ #libicuuc.so:devel/icu \ #libicudata.so:devel/icu BUILD_DEPENDS= ${LOCALBASE}/include/boost/math/constants/constants.hpp:devel/boost-libs \ ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \ ${LOCALBASE}/include/boost/variant.hpp:devel/boost-libs \ ${LOCALBASE}/include/boost/range/adaptor/reversed.hpp:devel/boost-libs \ ${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs CONFIGURE_ARGS= --disable-werror CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USES= compiler:c++11-lang libtool pathfix pkgconfig tar:xz USE_LDCONFIG= yes INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS DOXYGEN TEST OPTIONS_DEFAULT= OPTIONS_SUB= yes TEST_TARGET= check TEST_LIB_DEPENDS= libcppunit.so:devel/cppunit TEST_CONFIGURE_ENABLE= tests PORTDOCS= * DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_OFF= --without-docs DOXYGEN_IMPLIES= DOCS .include Index: head/textproc/libvisio01/Makefile =================================================================== --- head/textproc/libvisio01/Makefile (revision 553939) +++ head/textproc/libvisio01/Makefile (revision 553940) @@ -1,30 +1,30 @@ # $FreeBSD$ PORTNAME= libvisio PORTVERSION= 0.1.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc devel MASTER_SITES= LODEV/${PORTNAME} PKGNAMESUFFIX= 01 MAINTAINER= office@FreeBSD.org COMMENT= Library and tools for parsing the visio file format structure LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING.MPL BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:devel/boost-libs LIB_DEPENDS= libicui18n.so:devel/icu \ librevenge-0.0.so:textproc/librevenge CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes USES= compiler:c++11-lib gmake gnome gperf libtool pathfix perl5 \ pkgconfig tar:xz USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= libxml2 INSTALL_TARGET= install-strip .include Index: head/textproc/nuspell/Makefile =================================================================== --- head/textproc/nuspell/Makefile (revision 553939) +++ head/textproc/nuspell/Makefile (revision 553940) @@ -1,48 +1,49 @@ # $FreeBSD$ PORTNAME= nuspell DISTVERSIONPREFIX= v DISTVERSION= 4.0.1 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= jbeich@FreeBSD.org COMMENT= Free and open source C++ spell checking library LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libboost_locale.so:devel/boost-libs \ libicuuc.so:devel/icu USES= cmake compiler:c++14-lang USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_ON= BUILD_SHARED_LIBS OPTIONS_DEFINE= MANPAGES TEST OPTIONS_DEFAULT=MANPAGES MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc MANPAGES_PLIST_FILES= man/man1/${PORTNAME}.1.gz TEST_BUILD_DEPENDS= catch>0:devel/catch \ bash:shells/bash TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test post-patch: # Skip README as it only contains install instructions @${REINPLACE_CMD} -i .doc '/README/d' ${WRKSRC}/CMakeLists.txt # Respect PREFIX != /usr/local @${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/src/nuspell/finder.cxx pre-install-TEST-on: do-test makepatch-clean: @${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig .include # XXX Don't override definition in Mk/bsd.port.mk makepatch: makepatch-clean Index: head/textproc/raptor2/Makefile =================================================================== --- head/textproc/raptor2/Makefile (revision 553939) +++ head/textproc/raptor2/Makefile (revision 553940) @@ -1,36 +1,36 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= raptor2 PORTVERSION= 2.0.15 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= RDF Parser Toolkit for Redland # Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one # of its licenses is "GPLv2 or newer", which includes GPLv3. LICENSE= APACHE20 GPLv2 GPLv3 LGPL21 LICENSE_COMB= dual LIB_DEPENDS= libcurl.so:ftp/curl \ libicuuc.so:devel/icu \ libyajl.so:devel/yajl CONFLICTS= raptor-1.4.1[0-9]* raptor-1.4.21 USE_GNOME= libxml2 libxslt USES= gnome libtool:keepla pathfix pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-xml2-config=${LOCALBASE}/bin/xml2-config \ --with-curl-config=${LOCALBASE}/bin/curl-config \ --with-icu-config=${LOCALBASE}/bin/icu-config \ --with-www=curl INSTALL_TARGET= install-strip USE_LDCONFIG= yes .include Index: head/textproc/rubygem-charlock_holmes/Makefile =================================================================== --- head/textproc/rubygem-charlock_holmes/Makefile (revision 553939) +++ head/textproc/rubygem-charlock_holmes/Makefile (revision 553940) @@ -1,21 +1,21 @@ # $FreeBSD$ PORTNAME= charlock_holmes DISTVERSION= 0.7.7 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG MAINTAINER= kuriyama@FreeBSD.org COMMENT= Gems for character encoding detection LICENSE= MIT LIB_DEPENDS= libicui18n.so:devel/icu USES= gem USE_RUBY= yes CONFIGURE_ARGS= --with-icu-include=${LOCALBASE}/include .include Index: head/textproc/ucto/Makefile =================================================================== --- head/textproc/ucto/Makefile (revision 553939) +++ head/textproc/ucto/Makefile (revision 553940) @@ -1,34 +1,34 @@ # $FreeBSD$ PORTNAME= ucto DISTVERSIONPREFIX= v DISTVERSION= 0.14.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org COMMENT= Advanced rule-based (regular-expression) and unicode-aware tokenizer LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= autoconf-archive>0:devel/autoconf-archive \ uctodata>0:textproc/uctodata LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat \ libfolia.so:textproc/libfolia \ libicuio.so:devel/icu \ libticcutils.so:devel/ticcutils RUN_DEPENDS= uctodata>0:textproc/uctodata USES= autoreconf compiler:c++11-lang gmake gnome libedit libtool \ pkgconfig readline GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static USE_GITHUB= yes GH_ACCOUNT= LanguageMachines USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip .include Index: head/textproc/xalan-c/Makefile =================================================================== --- head/textproc/xalan-c/Makefile (revision 553939) +++ head/textproc/xalan-c/Makefile (revision 553940) @@ -1,31 +1,32 @@ # Created by: Roger Leigh # $FreeBSD$ PORTNAME= xalan-c PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= APACHE/xalan/xalan-c/sources DISTNAME= xalan_c-${PORTVERSION} MAINTAINER= rleigh@apache.org COMMENT= XSLT processor from the Apache XML Project LICENSE= APACHE20 LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 USES= cmake compiler:c++11-lang USE_LDCONFIG= yes CMAKE_ARGS= -Dmsgloader=inmemory -Dmessage-locale=en_US OPTIONS_DEFINE= ICU OPTIONS_DEFAULT= ICU OPTIONS_SUB= yes ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_DESC= Use ICU for transcoding ICU_CMAKE_ON= -Dtranscoder=icu ICU_CMAKE_OFF= -Dtranscoder=default .include Index: head/textproc/zorba/Makefile =================================================================== --- head/textproc/zorba/Makefile (revision 553939) +++ head/textproc/zorba/Makefile (revision 553940) @@ -1,112 +1,112 @@ # Created by: gahr # $FreeBSD$ PORTNAME= zorba PORTVERSION= 2.7.0 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= textproc java MASTER_SITES= https://launchpadlibrarian.net/119058962/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= General purpose C++ XQuery processor LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \ libicudata.so:devel/icu \ libcurl.so:ftp/curl \ libtidy.so:www/tidy-lib \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= fop:textproc/fop WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS DOXYGEN OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS+= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS PHP_CMAKE_BOOL= WITH_PHP5 PYTHON_CMAKE_BOOL= WITH_PYTHON RUBY_CMAKE_BOOL= WITH_RUBY JAVA_CMAKE_BOOL= WITH_JAVA # Both install include/xqc.h CONFLICTS= xqilla-[0-9]* CONFLICTS_BUILD= bison USES= cmake compiler:c++11-lib gnome libedit USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes USE_CXXSTD= c++11 CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ -DLOCALBASE:STRING=${LOCALBASE} MAKE_JOBS_UNSAFE= yes # due to consistent failures in bison-generated code compilation DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PLIST_SUB+= FULLVERSION=${PORTVERSION} \ MIDVERSION=${PORTVERSION:R} \ MINVERSION=${PORTVERSION:R:R} .include .if ${PORT_OPTIONS:MPHP} USE_PHP= tokenizer USES+= php:build WITH_SWIG= yes CMAKE_ARGS+= -DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}" PLIST_SUB+= PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}" .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python WITH_SWIG= yes CMAKE_ARGS+= -DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///} PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///} BROKEN= Does not stage .endif .if ${PORT_OPTIONS:MRUBY} USE_RUBY= yes WITH_SWIG= yes .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} CATEGORIES+= java WITH_SWIG= yes CMAKE_ARGS+= -DJAVA_LIBDIR:PATH=${JAVALIBDIR} .endif .if defined(WITH_SWIG) BUILD_DEPENDS+= swig:devel/swig .endif post-patch: ${REINPLACE_CMD} \ -e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/cmake_modules/FindPHP5.cmake .if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \ ${WRKSRC}/CMakeLists.txt .endif post-install: ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R} .if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN} cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba .endif test: build cd ${BUILD_WRKSRC} && ${MAKE} test .include Index: head/textproc/zorba/files/patch-icu68 =================================================================== --- head/textproc/zorba/files/patch-icu68 (nonexistent) +++ head/textproc/zorba/files/patch-icu68 (revision 553940) @@ -0,0 +1,67 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +src/util/regex.cpp:454:33: error: use of undeclared identifier 'TRUE' + return U_SUCCESS( status ) == TRUE; + ^ +src/util/unicode_util.cpp:2229:33: error: use of undeclared identifier 'TRUE' + return U_SUCCESS( status ) == TRUE; + ^ +src/util/unicode_util.cpp:2250:33: error: use of undeclared identifier 'TRUE' + return U_SUCCESS( status ) == TRUE; + ^ +src/util/unicode_util.cpp:2292:33: error: use of undeclared identifier 'TRUE' + return U_SUCCESS( status ) == TRUE; + ^ +src/util/unicode_util.cpp:2301:33: error: use of undeclared identifier 'TRUE' + return U_SUCCESS( status ) == TRUE; + ^ + +--- src/util/regex.cpp.orig 2012-10-03 22:35:16 UTC ++++ src/util/regex.cpp +@@ -451,7 +451,7 @@ bool regex::replace_all( string const &in, string cons + matcher_->reset( in ); + UErrorCode status = U_ZERO_ERROR; + *out = matcher_->replaceAll( replacement, status ); +- return U_SUCCESS( status ) == TRUE; ++ return U_SUCCESS( status ) == true; + } + + bool regex::replace_all( char const *in, char const *replacement, +--- src/util/unicode_util.cpp.orig 2012-10-03 22:35:16 UTC ++++ src/util/unicode_util.cpp +@@ -2226,7 +2226,7 @@ bool normalize( string const &in, normalization::type + default : icu_mode = UNORM_NONE; break; + } + Normalizer::normalize( in, icu_mode, 0, *out, status ); +- return U_SUCCESS( status ) == TRUE; ++ return U_SUCCESS( status ) == true; + } + + bool strip_diacritics( string const &in, string *out ) { +@@ -2247,7 +2247,7 @@ bool to_char( char const *in, char_type *out ) { + u_strFromUTF8WithSub( + out, 1, nullptr, in, utf8::char_length( *in ), SubChar, nullptr, &status + ); +- return U_SUCCESS( status ) == TRUE; ++ return U_SUCCESS( status ) == true; + } + + #endif /* ZORBA_NO_ICU */ +@@ -2289,7 +2289,7 @@ bool to_string( char const *in, size_type in_len, stri + UErrorCode status = U_ZERO_ERROR; + u_strFromUTF8( buf, in_len + 1, &buf_len, in, in_len, &status ); + out->releaseBuffer( buf_len ); +- return U_SUCCESS( status ) == TRUE; ++ return U_SUCCESS( status ) == true; + } + + bool to_string( wchar_t const *in, size_type in_len, string *out ) { +@@ -2298,7 +2298,7 @@ bool to_string( wchar_t const *in, size_type in_len, s + size_type buf_len; + u_strFromWCS( buf, in_len + 1, &buf_len, in, in_len, &status ); + out->releaseBuffer( buf_len ); +- return U_SUCCESS( status ) == TRUE; ++ return U_SUCCESS( status ) == true; + } + + #endif /* ZORBA_NO_ICU */ Property changes on: head/textproc/zorba/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 553939) +++ head/www/chromium/Makefile (revision 553940) @@ -1,360 +1,360 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium PORTVERSION= 85.0.4183.121 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org COMMENT?= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} .endif .if !defined(GN_ONLY) LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous ONLY_FOR_ARCHS= aarch64 amd64 i386 .endif .if defined(GN_ONLY) USES= compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gbm gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format ALL_TARGET= chrome INSTALLS_ICONS= yes .endif EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free disk space (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="a fair amount of free disk space (~ 6.5GB)" DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .endif .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-85${EXTRACT_SUFX}:fonts .include # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .else PLIST_SUB+= NOT_AARCH64="" .endif # Make better javascript with java .if !defined(GN_ONLY) JAVA_BUILD= yes JAVA_VERSION= 1.8 USE_JAVA= yes .endif # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include .if !defined(GN_ONLY) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ post-patch: # XXX nop for www/chromium itself @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ -e 's|@@MENUNAME@@|Chromium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} # We need the site package from xcbgen, which installs as python3.x (really: default version), while the chromium # build still needs to use python2.7. It works, because xcbgen can run with both versions, but we want to avoid # having the pre-compiled pyc files from 2.7 in the 3.x site packages # Remove this as soon as chromium uses python3.x as well @${MKDIR} ${WRKDIR}/site-packages/xcbgen ${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \ ${WRKDIR}/site-packages/xcbgen .endif do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} .if !defined(GN_ONLY) cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency on amd64 and i386 .if ${ARCH} == amd64 || ${ARCH} == i386 @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java .endif # Setup buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd .endif do-test-TEST-on: .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor .if !defined(GN_ONLY) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .if ${BUILDTYPE} == Debug ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor .endif post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 553939) +++ head/www/cliqz/Makefile (revision 553940) @@ -1,191 +1,191 @@ # $FreeBSD$ PORTNAME= cliqz DISTVERSION= 1.38.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz DISTFILES= adult-domains.bin:amazon \ cliqz@cliqz.com.xpi:cliqz \ dat@cliqz.com.xpi:cliqz \ gdprtool@cliqz.com.xpi:cliqz \ https-everywhere@cliqz.com.xpi:cliqz DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= fox@FreeBSD.org COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-12-31 FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libnspr4.so:devel/nspr \ libnssutil3.so:security/nss \ libplc4.so:devel/nspr \ libplds4.so:devel/nspr \ libvpx.so:multimedia/libvpx BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ py${PYTHON3_DEFAULT:S/.//}-sqlite3>0:databases/py-sqlite3@py${PYTHON3_DEFAULT:S/.//} \ ${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \ autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.14:graphics/graphite2 \ harfbuzz>=2.6.8:print/harfbuzz \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.8.2:multimedia/libvpx \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ nspr>=4.25:devel/nspr \ nss>=3.54:security/nss \ png>=1.6.35:graphics/png \ rust-cbindgen>=0.14.1:devel/rust-cbindgen \ sqlite3>=3.30.1:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig \ python:2.7,build shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk20 gtk30 USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes bash_OLD_CMD= "/bin/bash" bash_CMD= ${LOCALBASE}/bin/bash SHEBANG_FILES= magic_build_and_package.sh CLIQZ_CHANNEL= release # If the DISTVERSION is updated, make sure to update the last build id from # fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid CLIQZ_LAST_BUILD_ID= 20200721193739 CLIQZ_ICON= ${PORTNAME}.png CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} \ LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \ PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \ RUSTFLAGS=${RUSTFLAGS} \ MOZBUILD_STATE_PATH=${WRKDIR} BINARY_ALIAS+= python3=python${PYTHON3_DEFAULT} # Configure args passed into mach build system MOZ_CONFIGURE_ARGS+= "--disable-crashreporter" \ "--disable-debug" \ "--disable-debug-symbols" \ "--disable-tests" \ "--disable-updater" \ "--with-system-libvpx" \ "--libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" .include "${.CURDIR}/Makefile.options" .include # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk .if ${ARCH} == amd64 || ${ARCH} == i386 RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} .else RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} .endif .if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2} MOZ_CONFIGURE_ARGS+= "--enable-rust-simd" .else MOZ_CONFIGURE_ARGS+= "--disable-rust-simd" .endif # Require newer Clang than what's in base system unless user opted out .if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} # XXX avoid warnings USES:= ${USES:Ncompiler\:*} .endif post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin \ ${WRKSRC}/mozilla-release/browser/adult-domains.bin ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} .for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS} @${ECHO_CMD} "ac_add_options" ${MOZ_CONFIGURE_ARG} >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; .endfor # This prevents linker exhausting memory in i386 builds .if ${ARCH} == "i386" @${ECHO_CMD} 'export LDFLAGS="-Wl,--no-keep-memory -Wl,--as-needed"' >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig .endif # Disable vendor checksums like lang/rust @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${WRKSRC}/mozilla-release/third_party/rust/*/.cargo-checksum.json pre-configure-script: # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) # Check if the wayland lib was generated, this happens if # x11-toolkits/gtk30 has WAYLAND option enabled. @if [ -f ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libmozwayland.so ]; then \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%||' ${TMPPLIST}; \ else \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%|@comment |' ${TMPPLIST}; \ fi @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} .include Index: head/www/epiphany/Makefile =================================================================== --- head/www/epiphany/Makefile (revision 553939) +++ head/www/epiphany/Makefile (revision 553940) @@ -1,58 +1,58 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= epiphany PORTVERSION= 3.38.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Extremely lightweight and simple web browser for GNOME 3 LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \ itstool:textproc/itstool \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libsoup-2.4.so:devel/libsoup \ libgcr-base-3.so:security/gcr \ libstartup-notification-1.so:x11/startup-notification \ libnss3.so:security/nss \ libjson-glib-1.0.so:devel/json-glib \ libicuuc.so:devel/icu \ libnotify.so:devel/libnotify \ libgmp.so:math/gmp \ libnettle.so:security/nettle \ libsecret-1.so:security/libsecret \ libp11-kit.so:security/p11-kit \ libdazzle-1.0.so:x11-toolkits/libdazzle \ libhandy-1.so:x11-toolkits/libhandy RUN_DEPENDS= iso-codes>=0:misc/iso-codes \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \ gnome-icon-theme>=0:misc/gnome-icon-theme PORTSCOUT= limitw:1,even USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome \ localbase:ldflags meson pkgconfig python:3.4+ shebangfix \ sqlite tar:xz xorg CPE_VENDOR= gnome USE_GNOME= cairo gnomedesktop3 intlhack libwnck3 libxml2 libxslt USE_XORG= x11 INSTALLS_ICONS= yes USE_LDCONFIG= yes MESON_ARGS= -Ddistributor_name="GNOME Web by the FreeBSD GNOME Project" \ -Db_lundef=false \ -Dunit_tests=disabled GLIB_SCHEMAS= org.gnome.Epiphany.enums.xml \ org.gnome.epiphany.gschema.xml SHEBANG_FILES= post_install.py PLIST_SUB+= EPHY_VERSION=${PORTVERSION:R} .include Index: head/www/firefox/Makefile =================================================================== --- head/www/firefox/Makefile (revision 553939) +++ head/www/firefox/Makefile (revision 553940) @@ -1,60 +1,61 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 82.0.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.56:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.8:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr USE_MOZILLA= -sqlite USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: head/www/firefox-esr/Makefile =================================================================== --- head/www/firefox-esr/Makefile (revision 553939) +++ head/www/firefox-esr/Makefile (revision 553940) @@ -1,62 +1,63 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 78.4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.26:devel/nspr \ nss>=3.56:security/nss \ icu>=67.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=2.6.6:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.35:graphics/png \ libvpx>=1.8.2:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ nasm:devel/nasm \ yasm:devel/yasm \ zip:archivers/zip USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox USE_MOZILLA= -sqlite USES= tar:xz FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: head/www/iridium/Makefile =================================================================== --- head/www/iridium/Makefile (revision 553939) +++ head/www/iridium/Makefile (revision 553940) @@ -1,269 +1,270 @@ # Created by: Carlos J. Puga Medina # $FreeBSD$ PORTNAME= iridium PORTVERSION= 2020.04.81 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} MAINTAINER= chromium@FreeBSD.org COMMENT= Iridium browser LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ flock:sysutils/flock \ node:www/node \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic ONLY_FOR_ARCHS= amd64 i386 USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg USE_GL= gbm gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h ALL_TARGET= chrome INSTALLS_ICONS= yes EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles SUB_FILES= iridium-browser.desktop iridium SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG KERBEROS CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA CODECS CUPS KERBEROS OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free diskspace (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="a fair amount of free diskspace (~ 6.5GB)" KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA. In theory it supports falling back to # PulseAudio, but this is untested. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false # Make better javascript with java JAVA_BUILD= yes JAVA_VERSION= 1.8 USE_JAVA= yes # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Iridium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e 's|@@PACKAGE@@|iridium|' \ -e 's|@@MENUNAME@@|Iridium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that iridium uses # system libraries and not shippen ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node # Setup java dependency @${MKDIR} ${WRKDIR}/bin ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/iridium.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/iridium.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR}/iridium cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/iridium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor # SwiftShader @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so \ ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} .include Index: head/www/node/Makefile =================================================================== --- head/www/node/Makefile (revision 553939) +++ head/www/node/Makefile (revision 553940) @@ -1,115 +1,116 @@ # $FreeBSD$ PORTNAME= node DISTVERSIONPREFIX= v DISTVERSION= 15.0.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= Node.js 15.x requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64le= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_BUILD_DEPENDS= icu>=67.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node10-[0-9]* node12-[0-9]* node14-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-brotli \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= deps/v8/tools/*.py \ deps/v8/third_party/inspector_protocol/*.py \ tools/*.py \ tools/inspector_protocol/*.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" BUILD_DEPENDS+= brotli>=1.0.9,1:archivers/brotli \ libuv>=1.40.0:devel/libuv \ libnghttp2>=1.41.0:www/libnghttp2 \ objdump:devel/binutils LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/tools/v8_gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: head/www/node10/Makefile =================================================================== --- head/www/node10/Makefile (revision 553939) +++ head/www/node10/Makefile (revision 553940) @@ -1,107 +1,108 @@ # $FreeBSD$ PORTNAME= node PORTVERSION= 10.23.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 10 MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= Node.js 10.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64le= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_BUILD_DEPENDS= icu>=64.2:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:2.7,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node12-[0-9]* node14-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= tools/specialize_node_d.py tools/genv8constants.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" BUILD_DEPENDS+= c-ares>=1.15.0:dns/c-ares\ libuv>=1.34.2:devel/libuv \ libnghttp2>=1.41.0:www/libnghttp2 \ objdump:devel/binutils LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 CONFIGURE_ARGS+=--openssl-no-asm .elif (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/deps/v8/gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: head/www/node10/files/patch-icu68 =================================================================== --- head/www/node10/files/patch-icu68 (nonexistent) +++ head/www/node10/files/patch-icu68 (revision 553940) @@ -0,0 +1,109 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +../deps/v8/src/objects/intl-objects.cc:246:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:425:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:660:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:799:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/runtime/runtime-intl.cc:88:66: error: use of undeclared identifier 'TRUE' + uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error); + ^ +../deps/v8/src/runtime/runtime-intl.cc:135:66: error: use of undeclared identifier 'FALSE' + uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error); + ^ +../deps/v8/src/runtime/runtime-intl.cc:167:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/runtime/runtime-intl.cc:402:9: error: use of undeclared identifier 'FALSE' + FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + ^ +../deps/v8/src/runtime/runtime-intl.cc:404:9: error: use of undeclared identifier 'FALSE' + FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + ^ + +--- deps/v8/src/objects/intl-objects.cc.orig 2020-09-15 13:25:38 UTC ++++ deps/v8/src/objects/intl-objects.cc +@@ -243,7 +243,7 @@ void SetResolvedDateSettings(Isolate* isolate, const i + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -422,7 +422,7 @@ void SetResolvedNumericSettings(Isolate* isolate, cons + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -657,7 +657,7 @@ void SetResolvedCollatorSettings(Isolate* isolate, + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -796,7 +796,7 @@ void SetResolvedBreakIteratorSettings(Isolate* isolate + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +--- deps/v8/src/runtime/runtime-intl.cc.orig 2020-09-15 13:25:38 UTC ++++ deps/v8/src/runtime/runtime-intl.cc +@@ -85,7 +85,7 @@ RUNTIME_FUNCTION(Runtime_CanonicalizeLanguageTag) { + char result[ULOC_FULLNAME_CAPACITY]; + + // Force strict BCP47 rules. +- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error); ++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error); + + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + return *factory->NewStringFromAsciiChecked(kInvalidTag); +@@ -132,7 +132,7 @@ RUNTIME_FUNCTION(Runtime_AvailableLocalesOf) { + + error = U_ZERO_ERROR; + // No need to force strict BCP47 rules. +- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error); ++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error); + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + // This shouldn't happen, but lets not break the user. + continue; +@@ -164,7 +164,7 @@ RUNTIME_FUNCTION(Runtime_GetDefaultICULocale) { + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + return *factory->NewStringFromAsciiChecked(result); + } +@@ -399,9 +399,9 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { + std::unique_ptr sap1; + std::unique_ptr sap2; + icu::UnicodeString string_val1( +- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); ++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + icu::UnicodeString string_val2( +- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); ++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + result = collator->compare(string_val1, string_val2, status); + } + if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); Property changes on: head/www/node10/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/node12/Makefile =================================================================== --- head/www/node12/Makefile (revision 553939) +++ head/www/node12/Makefile (revision 553940) @@ -1,111 +1,112 @@ # $FreeBSD$ PORTNAME= node PORTVERSION= 12.19.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 12 MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= Node.js 12.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64le= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_BUILD_DEPENDS= icu>=67.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:2.7,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node10-[0-9]* node14-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= tools/specialize_node_d.py tools/genv8constants.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" BUILD_DEPENDS+= c-ares>=1.16.0:dns/c-ares \ libuv>=1.39.0:devel/libuv \ libnghttp2>=1.41.0:www/libnghttp2 \ objdump:devel/binutils LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp .elif (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/tools/v8_gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: head/www/node14/Makefile =================================================================== --- head/www/node14/Makefile (revision 553939) +++ head/www/node14/Makefile (revision 553940) @@ -1,118 +1,119 @@ # $FreeBSD$ PORTNAME= node DISTVERSIONPREFIX= v DISTVERSION= 14.15.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ PKGNAMESUFFIX= 14 MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_SSL= libressl libressl-devel BROKEN_SSL_REASON= Node.js 14.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT= DTRACE OPTIONS_DEFAULT_FreeBSD_11= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} OPTIONS_SUB= yes .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_BUILD_DEPENDS= icu>=67.1:devel/icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node10-[0-9]* node12-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-brotli \ --shared-cares \ --shared-libuv \ --shared-nghttp2 \ --shared-zlib SHEBANG_FILES= deps/v8/tools/*.py \ deps/v8/third_party/inspector_protocol/*.py \ tools/*.py \ tools/inspector_protocol/*.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" BUILD_DEPENDS+= brotli>=1.0.9,1:archivers/brotli \ c-ares>=1.16.1:dns/c-ares \ libuv>=1.40.0:devel/libuv \ libnghttp2>=1.41.0:www/libnghttp2 \ objdump:devel/binutils LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ libcares.so:dns/c-ares\ libuv.so:devel/libuv \ libnghttp2.so:www/libnghttp2 .include .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 BROKEN_SSL+= base .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/tools/v8_gypfiles/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: head/www/qt5-webkit/Makefile =================================================================== --- head/www/qt5-webkit/Makefile (revision 553939) +++ head/www/qt5-webkit/Makefile (revision 553940) @@ -1,66 +1,66 @@ # $FreeBSD$ PORTNAME= webkit DISTVERSION= 5.212.0-alpha4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/ PKGNAMEPREFIX= qt5- DISTNAME= qt${PORTNAME}-${DISTVERSION} PATCH_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/commit/ PATCHFILES+= 78360c01c796b6260bf828bc9c8a0ef73c5132fd.patch:-p1 MAINTAINER= kde@FreeBSD.org COMMENT= QtWebKit with a more modern WebKit code base LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libhyphen.so:textproc/hyphen \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libwoff2dec.so:devel/woff2 USES= bison cmake compiler:c++11-lang gnome gperf jpeg \ pathfix perl5 pkgconfig python:3.5+,build qt:5 sqlite:3 \ tar:xz xorg USE_GNOME= glib20 libxml2 libxslt USE_PERL5= build USE_QT= core declarative gui location network opengl printsupport \ sensors testlib webchannel widgets \ buildtools_build qmake_build USE_RUBY= yes USE_XORG= x11 xcomposite xrender # Fix pkgconfig install paths. PATHFIX_CMAKELISTSTXT= PlatformQt.cmake RUBY_NO_RUN_DEPENDS= yes CMAKE_ARGS= -DPORT:STRING="Qt" \ -DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \ -DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}" CMAKE_ON= ENABLE_OPENGL CMAKE_OFF= USE_QT_MULTIMEDIA USE_LD_GOLD # Add -DNDEBUG to CXXFLAGS which in turn gets sucked into # CMAKE_CXX_FLAGS_RELEASE where we actually want to have it. # [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ] CXXFLAGS+= -DNDEBUG PLIST_SUB= FULLVER="${PORTVERSION:R}" SUB_FILES= pkg-install SUB_LIST= QT_INCDIR="${QT_INCDIR}" OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT= GSTREAMER GSTREAMER_LIB_DEPENDS= libgstapp-1.0.so:multimedia/gstreamer1-plugins \ libgstbase-1.0.so:multimedia/gstreamer1 GSTREAMER_USE= GSTREAMER1=core GSTREAMER_CMAKE_OFF= -DUSE_GSTREAMER:BOOL=OFF BINARY_ALIAS= python3=${PYTHON_CMD} .include Index: head/www/qt5-webkit/files/patch-icu68 =================================================================== --- head/www/qt5-webkit/files/patch-icu68 (nonexistent) +++ head/www/qt5-webkit/files/patch-icu68 (revision 553940) @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) Property changes on: head/www/qt5-webkit/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit2-gtk3/Makefile =================================================================== --- head/www/webkit2-gtk3/Makefile (revision 553939) +++ head/www/webkit2-gtk3/Makefile (revision 553940) @@ -1,117 +1,118 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit LICENSE= GPLv2 BSD2CLAUSE LICENSE_COMB= dual LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \ libfribidi.so:converters/fribidi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwebp.so:graphics/webp \ libpng.so:graphics/png \ libsecret-1.so:security/libsecret \ libnotify.so:devel/libnotify \ libhyphen.so:textproc/hyphen \ libicutu.so:devel/icu \ libopenjp2.so:graphics/openjpeg \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libsoup-2.4.so:devel/libsoup \ libgcrypt.so:security/libgcrypt \ libtasn1.so:security/libtasn1 \ libwoff2dec.so:devel/woff2 PORTSCOUT= limitw:1,even USES= bison cmake compiler:c++14-lang gettext gl gnome gperf \ jpeg localbase:ldflags perl5 pkgconfig python:build \ sqlite tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt USE_GL= gl egl glesv2 USE_GSTREAMER1= bad gl USE_LDCONFIG= yes USE_PERL5= build USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes USE_XORG= x11 xcomposite xdamage xext xrender xt ice BINARY_ALIAS= python=${PYTHON_CMD} CXXFLAGS+= -DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=32 CXXFLAGS_powerpc= -DENABLE_YARR_JIT=0 CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0 CMAKE_ARGS= -DPORT=GTK CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \ ENABLE_GLES2 \ USE_SYSTEMD CMAKE_ON= ENABLE_MINIBROWSER \ USE_SYSTEM_MALLOC CMAKE_OFF_armv6= ENABLE_JIT CMAKE_OFF_armv7= ENABLE_JIT CMAKE_OFF_powerpc= ENABLE_JIT CMAKE_OFF_powerpc64= ENABLE_JIT CONFIGURE_ENV= XDG_CACHE_HOME=${WRKDIR} INSTALL_TARGET= install BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 OPTIONS_DEFINE= DEBUG GEOIP WAYLAND OPTIONS_DEFAULT= GEOIP WAYLAND OPTIONS_SUB= yes # Building WebKit with debugging symbols requires ar and ld with # support for thin archives. Also see # https://bugs.webkit.org/show_bug.cgi?id=140384 DEBUG_CMAKE_ON= -DCMAKE_AR=${LOCALBASE}/bin/ar \ -DCMAKE_RANLIB=${LOCALBASE}/bin/ranlib \ -DCMAKE_LINKER=${LOCALBASE}/bin/ld DEBUG_CXXFLAGS= -B${LOCALBASE}/bin DEBUG_CMAKE_OFF= -DCMAKE_AR=/usr/bin/ar \ -DCMAKE_RANLIB=/usr/bin/ranlib \ -DCMAKE_LINKER=/usr/bin/ld DEBUG_CXXFLAGS_OFF= -B/usr/bin DEBUG_CFLAGS_OFF= -DNDEBUG GEOIP_CMAKE_BOOL= ENABLE_GEOLOCATION GEOIP_BUILD_DEPENDS= geoclue>=2.4.3:net/geoclue GEOIP_RUN_DEPENDS= geoclue>=2.4.3:net/geoclue WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND_TARGET WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libwpe-1.0.so:www/libwpe \ libWPEBackend-fdo-1.0.so:www/wpebackend-fdo post-patch: @${REINPLACE_CMD} -e 's|/usr/lib/browser/plugins|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebKit/Shared/Plugins/unix/PluginSearchPath.cpp pre-configure: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-egl; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with OPENGL support enabled."; \ ${FALSE}; \ fi post-install: @${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/jsc \ ${STAGEDIR}${PREFIX}/bin/jsc-4 @${RLN} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/MiniBrowser \ ${STAGEDIR}${PREFIX}/bin/MiniBrowser-4 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*.* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/WebKitWebDriver .include Index: head/www/webkit2-gtk3/files/patch-icu68 =================================================================== --- head/www/webkit2-gtk3/files/patch-icu68 (nonexistent) +++ head/www/webkit2-gtk3/files/patch-icu68 (revision 553940) @@ -0,0 +1,173 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:30: +Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProvider.h +@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp +@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) Property changes on: head/www/webkit2-gtk3/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/gnome-shell/Makefile =================================================================== --- head/x11/gnome-shell/Makefile (revision 553939) +++ head/x11/gnome-shell/Makefile (revision 553940) @@ -1,85 +1,85 @@ # Created by: Pawel Worach # $FreeBSD$ PORTNAME= gnome-shell PORTVERSION= 3.36.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ sassc:textproc/sassc \ gnome-control-center:sysutils/gnome-control-center \ a2x:textproc/asciidoc \ ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \ libdrm.so:graphics/libdrm \ libmutter-6.so:x11-wm/mutter \ libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsoup-2.4.so:devel/libsoup \ libjson-glib-1.0.so:devel/json-glib \ libsecret-1.so:security/libsecret \ libpolkit-agent-1.so:sysutils/polkit \ libp11-kit.so:security/p11-kit \ libical.so:devel/libical \ libgcr-base-3.so:security/gcr \ libicuuc.so:devel/icu \ libpulse.so:audio/pulseaudio \ libcroco-0.6.so:textproc/libcroco \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libp11-kit.so:security/p11-kit \ libgjs.so:lang/gjs \ libgraphene-1.0.so:graphics/graphene \ libgnome-autoar-0.so:archivers/gnome-autoar RUN_DEPENDS= gnome-control-center:sysutils/gnome-control-center \ gdm:x11/gdm PORTSCOUT= limitw:1,even USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \ pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \ webplugin:native xorg USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 introspection \ libxslt:build libxml2 gnomedesktop3 USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst USE_GL= egl gbm USE_GSTREAMER1= yes USE_PERL5= build USE_LDCONFIG= yes SHEBANG_FILES= src/gnome-shell-perf-tool.in \ src/gnome-shell-extension-tool.in BINARY_ALIAS= python3=${PYTHON_CMD} WEBPLUGIN_NAME= libgnome-shell-browser-plugin.so WEBPLUGIN_DIR= ${PREFIX}/lib/mozilla/plugins/ WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so MESON_ARGS= -Dsystemd=false \ -Dnetworkmanager=false \ -Dpython=${PYTHON_CMD} CPE_VENDOR= gnome GLIB_SCHEMAS= org.gnome.shell.gschema.xml \ 00_org.gnome.shell.gschema.override .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # Work around "New rpath must not be longer than the old one." LDFLAGS+= -fuse-ld=lld .endif post-extract: ${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces post-patch: ${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \ ${WRKSRC}/meson.build .include Index: head/x11/slop/Makefile =================================================================== --- head/x11/slop/Makefile (revision 553939) +++ head/x11/slop/Makefile (revision 553940) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= slop PORTVERSION= 7.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org COMMENT= Make a screen selection and print the selection coordinates to stdout LICENSE= GPLv3 BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= libicuuc.so:devel/icu USES= cmake compiler:c++11-lang gl xorg USE_GL= gl glu glew USE_LDCONFIG= yes USE_XORG= ice sm x11 xext xrender USE_GITHUB= yes GH_ACCOUNT= naelstrof PLIST_FILES= bin/slop \ include/slop.hpp \ lib/libslopy.so \ lib/libslopy.so.${PORTVERSION} \ man/man1/slop.1.gz .include Index: head/x11-toolkits/gnustep-gui/Makefile =================================================================== --- head/x11-toolkits/gnustep-gui/Makefile (revision 553939) +++ head/x11-toolkits/gnustep-gui/Makefile (revision 553940) @@ -1,71 +1,71 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= gnustep-gui DISTVERSIONPREFIX= gui- DISTVERSION= 0_27_0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits gnustep MAINTAINER= ports@FreeBSD.org COMMENT= GNUstep GUI library LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi LIB_DEPENDS+= libtiff.so:graphics/tiff LIB_DEPENDS+= libpng.so:graphics/png LIB_DEPENDS+= libgif.so:graphics/giflib LIB_DEPENDS+= libicui18n.so:devel/icu LIB_DEPENDS+= libsndfile.so:audio/libsndfile LIB_DEPENDS+= libao.so:audio/libao LIB_DEPENDS+= libflite.so:audio/flite USES= gnustep jpeg pkgconfig xorg USE_GNUSTEP= base build USE_XORG= x11 xt USE_GITHUB= yes GH_ACCOUNT= gnustep GH_PROJECT= libs-gui GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tiff-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-tiff-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-jpeg-library=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-jpeg-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/include CONFIGURE_ARGS+= --with-x-include=${LOCALBASE}/lib MAKE_FLAGS+= OPTFLAG="${CFLAGS}" PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} OPTIONS_DEFINE= DOCS CUPS ASPELL OPTIONS_DEFAULT= CUPS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \ texi2pdf:print/texinfo CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS+= libcups.so:print/cups ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell ASPELL_CONFIGURE_ENABLE= aspell USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} post-patch: ${REINPLACE_CMD} -e "s|libpng/png.h|png.h|" ${WRKSRC}/configure ${REINPLACE_CMD} -e "s|doc=no|doc=yes|" ${WRKSRC}/GNUmakefile pre-configure: .for file in config.guess config.sub install-sh @${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC} .endfor post-install-DOCS-off: @${FIND} -d ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Documentation -type d -empty -delete .include Index: head/x11-toolkits/gnustep-gui/files/patch-icu68 =================================================================== --- head/x11-toolkits/gnustep-gui/files/patch-icu68 (nonexistent) +++ head/x11-toolkits/gnustep-gui/files/patch-icu68 (revision 553940) @@ -0,0 +1,29 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +GSCharacterPanel.m:81:10: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +GSCharacterPanel.m:106:10: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- Source/GSCharacterPanel.m.orig 2019-01-06 22:00:38 UTC ++++ Source/GSCharacterPanel.m +@@ -78,7 +78,7 @@ + static UBool enumCharNamesFn(void *context, UChar32 code, UCharNameChoice nameChoice, const char *name, int32_t length) + { + [(NSMutableIndexSet*)context addIndex: (NSUInteger)code]; +- return TRUE; ++ return true; + } + + static NSIndexSet *AssignedCodepoints() +@@ -103,7 +103,7 @@ static UBool searchCharNamesFn(void *context, UChar32 + { + [ctx->set addIndex: (NSUInteger)code]; + } +- return TRUE; ++ return true; + } + + static NSIndexSet *CodepointsWithNameContainingSubstring(NSString *str) Property changes on: head/x11-toolkits/gnustep-gui/files/patch-icu68 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/tepl/Makefile =================================================================== --- head/x11-toolkits/tepl/Makefile (revision 553939) +++ head/x11-toolkits/tepl/Makefile (revision 553940) @@ -1,23 +1,24 @@ # $FreeBSD$ PORTNAME= tepl PORTVERSION= 5.0.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Text editor product line LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt LIB_DEPENDS= libuchardet.so:textproc/uchardet \ libamtk-5.so:x11-toolkits/amtk \ libicuuc.so:devel/icu USES= compiler:c11 gettext gnome meson pkgconfig tar:xz USE_GNOME= cairo gdkpixbuf2 gtksourceview4 libxml2 USE_LDCONFIG= yes .include Index: head/x11-toolkits/vte3/Makefile =================================================================== --- head/x11-toolkits/vte3/Makefile (revision 553939) +++ head/x11-toolkits/vte3/Makefile (revision 553940) @@ -1,41 +1,42 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ PORTNAME= vte PORTVERSION= 0.62.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 3 DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal widget with improved accessibility and I18N support LICENSE= LGPL21 BUILD_DEPENDS= vapigen:lang/vala \ bash:shells/bash LIB_DEPENDS= libgnutls.so:security/gnutls \ libfribidi.so:converters/fribidi \ libpcre2-8.so:devel/pcre2 \ libicuuc.so:devel/icu PORTSCOUT= limitw:1,even USES= compiler:c++11-lang gettext gnome localbase meson \ pkgconfig tar:xz USE_LDCONFIG= yes USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build MESON_ARGS= -Da11y=true \ -Dgir=true \ -Dfribidi=true \ -Dgtk3=true \ -Dgtk4=false \ -Dicu=true \ -D_systemd=false \ -Dvapi=true PLIST_SUB= VERSION=2.91 .include