- Convert all comms/spandsp-devel consumers to use newer comms/spandsp
- Bump affected ports
- Mark comms/spandsp-devel as deprecated and set expiration date
- Add upgrade instructions to UPDATING
PR: 194399 [1]
Submitted by: Nikola Kolev <koue@chaosophia.net> [1]
Approved by: madpilot (asterisk ports), maintainer timeout (other)
- While here fix import of zeroes removing obsolete import
added DOS2UNIX to faciltate this change
- Do not re-add #LDFLAGS+= -shared it breaks configure
Add more mirrors (primary is currently down) as well as MASTER_SITE_LOCAL
This claims to have integrated patches from the port, but only one patch
gets deleted.
Sub-port of comms/unixcw
Previously, this was a build-time option, but the primary use of
comms/unixcw is to provide libcw.so (and it's a dependency of
comms/cwdaemon).
Since comms/cwdaemon is not a GUI program, it doesn't make sense to enable
the GUI by default, which would mean pkg users couldn't install this
program. By splitting it into a sub-port, it's now available via pkg
and more obviously present when earching ports.
Remove XCWCP option and prepare this to be a master port instead.
Otherwise there's no way to support xcwcp using pkg without making
QT a dependency of comms/cwdaemon.
trying to link with libalsa.so. When it was detected, resulted in linking
with a non-dependant lib.
If there is enough demand, I can add OPTS for ALSA vs portaudio etc, but for
now just a hard dependency on portaudio will be enough.
the 32 ports that still use it. Bump PORTREVISION on their dependent
ports except the ones that depend on these:
audio/libogg
audio/libvorbis
devel/pcre
ftp/curl
graphics/jpeg
graphics/libart_lgpl
graphics/tiff
textproc/expat2
textproc/libxslt
In these cases the same trick as in the recent gettext update is used.
The ports install a symlink with the old library version. When enough
of their dependent ports have had regular updates the remaining ones can
get a PORTREVISION bump and the links can be removed.
Also remove the devel/pcre dependency from USE_GNOME=glib20. It causes
over 2200 packages to depend on devel/pcre while less than 200 actually
link with it. The glib20 package still depends on devel/pcre so this
should not make a difference for ports with USE_GNOME=glib20. Also,
libdata/pkgconfig/glib-2.0.pc lists pcre as a private library so
USE_GNOME=glib20 should not propagate it.
PR: 195724
Exp-run by: antoine
Approved by: portmgr (antoine)
Linrad-04.02 comes with many improvements. The first FFT can now run in
parallel in up to 6 separate threads. More efficient FFT implementations
are available for some hardware architectures.
The converter option is corrected.
Several bug corrections.
As it happens, the docs being included in the archive was unintentional. Add
support for the DOCS option.
This fixes a bug in the reedsolomon encoder/decoder when using the RS4
mode (the program did not decode the transmissions with extensions .rs4
and could possibly crash).
first contains runtime libraries such as libintl and the latter contains
developer tools such as msgfmt. Ports that use gettext will usually need
a LIB_DEPENDS on gettext-runtime and a BUILD_DEPENDS on gettext-tools.
USES=gettext-runtime can be used to set a LIB/BUILD/RUN_DEPENDS on
devel/gettext-runtime and USES=gettext-tools can be used to set a
BUILD/RUN_DEPENDS on devel/gettext-tools. USES=gettext is now the same
as "USES=gettext-runtime gettext-tools" meaning a LIB_DEPENDS on
devel/gettext-runtime and a BUILD_DEPENDS on devel/gettext-tools.
Update gettext to 0.19.3.
Remove :oldver from converters/libiconv and devel/gettext-runtime. Leave
symlinks with the old library versions to avoid the need to bump
PORTREVISION on a large number of dependent ports. When most of the
dependent ports have had normal version updates, PORTREVISION can be
bumped on the remaining ones (low number) and the links can be removed.
Fix some ports that installed files in lib/locale instead of share/locale.
PR: 194038
Reviewed by: bapt
Exp-run: antoine
Approved by: portmgr (antoine)
Before, we had:
site_perl : lib/perl5/site_perl/5.18
site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
perl_man3 : lib/perl5/5.18/man/man3
Now we have:
site_perl : lib/perl5/site_perl
site_arch : lib/perl5/site_perl/mach/5.18
perl_man3 : lib/perl5/site_perl/man/man3
Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.
As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.
The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.
The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.
PR: 194969
Differential Revision: https://reviews.freebsd.org/D1019
Exp-run by: antoine
Reviewed by: perl@
Approved by: portmgr
Change Maintainer to hamradio@
Install (now pre-generated) documentation
From the release announcement:
- compatibility with Easypal Oct 2014: change in hybrid mode
Change maintainership to hamradio@
From the changelog:
- Support both . and , as the decimal point in NEC2 files
- Fix memory leak
- Faster animation on some projections
- Faster drag performance on some models
- Lower minimum window size for small displays
Submitted by: shurd
From the changelog:
I added device names to PulseAudio. The PulseAudio name "pulse" still refers
to the default device. Otherwise, enter a PulseAudio name such as
"pulse:alsa_input.pci-0000_00_1b.0.analog-stereo".
PulseAudio support enables you to connect to recent versions of wsjt-x.
To turn this off, set show_pulse_audio_devices = False in your config file.
Submitted by: shurd
- Remove devel/qt5-qmldevtools from devel/Makefile.
- Hook devel/qt5-qdoc to devel/Makefile.
- Hook comms/qt5-serialport to comms/Makefile.
I knew I would forget something...
Submitted by: antoine
Proudly presented by the KDE on FreeBSD team, with several guest stars.
This update took way longer than initially expected due to us previously
accumulating assumptions and changes to Qt's build system that finally bit
us back with the 5.3 release series, so we had to do a fair amount of
cleanup.
New ports:
- comms/qt5-serialport: Qt functions to access serial ports, originally
based on work by Fernando Apesteguia. [1]
- devel/qt5-qdoc: Qt documentation generator, the Qt5 equivalent of
devel/qt4-qdoc3. Originally worked on by Tobias Berner.
It had already been half-split from devel/qt5-buildtools,
we just needed to finish the work.
Dead ports:
- devel/qt5-qmldevtools: Merged into lang/qt5-qml.
Minor changes:
- devel/qt5: Add x11/qt5-x11extras and the new ports to the dependency list.
- graphics/qt5-imageformats: The port now supports the JPEG2000, WEBP,
Direct Draw Surface and ICNS formats.
- multimedia/qt5-multimedia: The ALSA and PULSEAUDIO options are now
mutually exclusive due to changes introduced in
Qt 5.3.0 (the ALSA code is now a proper plugin
that is only built if PulseAudio is not used).
- x11/qt5-x11extras: Add USE_LDCONFIG since the port installs a shared
library.
The big changes:
- bsd.qt.mk: Set QMAKESPEC instead of QMAKEPATH. [3]
QMAKEPATH does much more than we want now that we call qmake from the top
of ${WRKSRC}. qmake uses QMAKEPATH when evaluating the QMAKE_MKSPECS
property, which is in turn used by qt_config.pri to load the .pri files in
mkspecs/modules.
In practice, this means that if people have an older Qt installation those
files will be used and QT_CONFIG will have values such as "gui" even if
one is building a port like textproc/qt5-xml, which passes -no-gui to the
configure script. Consequently, unintended code paths may be enabled or
the configuration step can just fail if the .pro files expect values that
are not present in the system-wide, older .pri files.
We avoid all those problems if we use QMAKESPEC, as qmake does not take
its value into account when evaluating the QMAKE_MKSPECS property and will
only parse the files in the mkspec's directory (mkspecs/freebsd-clang, for
example, instead of all the files in mkspecs).
- Stop explicitly passing ${LOCALBASE} to the compiler. [3]
qmake's behavior has changed in Qt 5, and the paths set in QMAKE_INCDIR
and QMAKE_LIBDIR in the mkspecs are passed before any others, such as the
ones in the build directory themselves.
In practice, this means that we end up with linker calls like this:
c++ -o libfoo.so foo.o bar.o -L/usr/local/lib -L/wrkdir/build/lib
-lQt5Gui -lQt5Core
So if one already has Qt installed in the system, the older, already
present version of the libraries in /usr/local/lib will be used instead of
the newly-built ones in /wrkdir/build/lib.
QTBUG-40825 discusses this behavior upstream, but there has been no
agreement on a solution yet.
For now, the solution adopted is to make the compiler and the linker aware
of those paths but only try them last after all others, and this is
achieved by setting the CPATH and LIBRARY_PATH environment variables when
qmake is being used.
In addition to setting them in CONFIGURE_ENV and MAKE_ENV, we also need to
stop changing QMAKE_INCDIR and QMAKE_LIBDIR as well as filter those paths
from the pkg-config calls qtbase's configure script makes.
- Call qmake from the root of the ${WRKSRC}.
In Qt 5.3, Qt's build infrastructure has undergone some changes that make
our previous approach of calling qmake from the directories we want to
build stop working. Things would break even more in Qt 5.4, in which
qtbase's configure script does not accept the -process, -fully-process and
-dont-process arguments anymore (it always behaves as if -process had been
used).
Bite the bullet and start calling qmake from ${WRKSRC}. The largest part of
this change involves changing lines in Makefiles from
WRKSRC_SUBDIR= foo/bar
to
BUILD_WRKSRC= ${WRKSRC}/foo/bar
INSTALL_WRKSRC= ${WRKSRC}/foo/bar
as well as adding patches to .pro files to avoid entering other
subdirectories and removing post-configure targets that are not necessary
anymore.
Since qmake needs to be called from the top of ${WRKSRC} anyway, we can
also simplify the configuration process for the qtbase ports a little.
Looking at r10019 it is not clear why we started calling qmake in the
pre-configure target in addition to the post-configure one (while also
skipping it in do-configure), but we can now drop this call since letting
configure behave as if -process had been passed means it will call qmake
on its own and overwrite the files generated by the pre-configure call. We
still need to call qmake in post-configure though, as the configure script
does not pass -recursive when calling qmake and we need to be able to call
make from any subdirectory when building.
PR: 194762 [1]
PR: 194566 # exp-run with base GCC and clang
PR: 194088 [3]
With gcc:
configure: loading site script /usr/ports/Templates/config.site
checking for gcc... cc
checking whether the C compiler works... no
configure: error: in `/wrkdirs/usr/ports/comms/wsjt/work/wsjt-r2511':
configure: error: C compiler cannot create executables
With clang:
configure: loading site script /usr/ports/Templates/config.site
checking for gcc... cc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... configure: error: in `/wrkdirs/usr/ports/comms/wsjt/work/wsjt-r2511':
configure: error: cannot run C compiled programs.
Reported by: pkg-fallout
Alias is a new USES tool that allows DragonFly to masquerade as FreeBSD
by setting CFLAGS+= -D__FreeBSD__. For some ports, this fixes the build
without the need for additional patches.
Approved by: portmgr (bapt, blanket)
USE_KDE4=kdehier component has been deprecated, new components added:
baloo - Baloo core libraries
baloo-widgets - Baloo widgets library
kfilemetadata - KDE library for extracting file metadata
New ports:
graphics/kqtquickcharts - QtQuick plugin to render interactive charts
misc/artikulate - Pronunciation trainer for KDE
(not usable currently, links to both
GStreamer 1.x and 0.10.x via dependencies)
sysutils/baloo[-widgets] - KDE framework for searching and
managing user metadata
sysutils/kfilemetadata - Library for extracting file metadata
l10n ports:
- Farsi (Persian) and Indonesian translations has been readded
- Vietnamese didn't pass threshold for inclusion into release
astro/kstars:
- switch dependency from math/eigen2 to math/eigen3
- add PYKDE option for updating supernovae data
deskutils/kdepim4:
- update dependencies: add libkgapi and baloo,
remove now needless clucene, link-grammar, strigi
- add patch to fix build with gcc42
- update COMMENT and description for all KDE PIM ports
devel/ruby-krossruby:
- remove BROKEN, it builds with ruby 2.x now
editors/kate:
- add patch to disable memory-hungry build of the kate tests [1]
graphics/okular:
- add dependency on graphics/libkscreen
math/cantor:
- add optional dependency on lang/luajit for LuaJIT backend
- fix gfortran detection [2]
misc/kdehier4:
- adapt to new pkg world. Now the purpose of kdehier4 only
to link some stuff between KDE4_PREFIX and LOCALBASE.
science/kalzium:
- switch dependency from math/eigen2 to math/eigen3
- add dependence on science/chemical-mime-data
x11-themes/kdeartwork4
- switch dependency from math/eigen2 to math/eigen3
among other changes:
- drop deprecated USE_KDE4=kdehier
- drop @dirrm from plist
- clean up pkg-descr
- convert to options helpers
- other portlint fixes
The area51 repository features commits by alonso, rakuco and myself.
PR: 187150 [1]
Reported by: pe.freethread@live.com
Patch by: Tobias Berner <tcberner@gmail.com>
PR: 180674 [2]
Reported by: torsten.eichstaedt@web.de
PR: 194316
Exp-run: antoine
- Set Maintainer to hamradio@
From ChangeLog:
FT450D Notch, IC-9100 update, Power meter remote, Smeter remote,
touch panel, xml-fix, FT450D, Freq Control, IC 7410
- change Maintainer to hamradio group
- update to chirp 0.4.1
Version 0.4.1 contains a special backport for Baofeng users to work
around a firmware incompatibility issue.
- Split libusbmuxd.so into comms/libusbmuxd and update to 1.0.9.
- Update libimobiledevice to 1.1.6.
- Update usbmuxd to Git snapshot (~1.0.9).
- Document usbmuxd upgrade process.
This marks an important refactoring effort for proper iOS 7 support.
It's packed with new features, tools, speed improvements, code
refactoring, crash fixes, memory leak fixes and much more.
and libintl.so. This fixes a problem where DATADIRNAME gets an incorrect
value which causes locale files to be installed in the wrong place.
- The only configure checks that still need to be patched are related
to intltool so move DATADIRNAME patching from USES=pathfix to
USE_GNOME=intlhack.
- games/klavaro: remove excessive dependencies
- japanese/libskk: add INSTALL_TARGET=install-strip
- math/libqalculate: add INSTALL_TARGET=install-strip and remove pthread
patching
- multimedia/freetuxtv: remove excessive dependencies
- science/gramps: fix shared-mime-info use
Exp-run by: antoine
Approved by: portmgr (antoine)
- Use USE_LDCONFIG
Overall changes:
- Compile with -fpic instead of -fPIC (potentially smaller code size)
- Add a schematics file for the hardware receiver in FidoCadJ format
- Language and typographical updates to README.md
- Several signed/unsigned/size fixes
Library changes:
- Extract generic third-party code for bits 1..14 from decode_alarm.h into a
new file bits1to14.h
- Convert almost all calculations for decoding the live signal into integer
operations, drop fields 'a', 'frac', and 'maxone' from struct bitinfo.
- New function setclock_ok() in setclock.h
- New functions get_acc_minlen(), add_acc_minlen(), reset_acc_minlen() in
decode_time.h. The accumulated minute length is now a first-class entity.
When decoding the live signal, increment it more precisely than just 1000 ms/s
to prevent drift during bad radio reception.
- New functions dcftime() and isotime() in decode_time.h. Use the latter in
setclock.c
- Check input values of etc/config.txt:
- hw.active_high must be 0 or 1
- hw.freq must be even between 10 and 666666
- Reset the values of bit0 and bit20 if the latter becomes smaller than the
former, show this in the log file using a '!'
- Compact the signal buffer, it now stores 8 pulses per byte instead of just 1.
Client changes:
- Make dcf77pi and dcf77pi-analyze more agnostic of the contents of the
third-party contents
- Update display code of dcf77pi and readpin for the updates to the live signal
decoding
- Show in dcf77pi when the value of bit20 underflows
- Update the code to display the signal buffer in readpin
- Fix readpin to properly clean up when receiving a SIGINT
- Fix installation of lib/libspandsp.so.2 (when patching configure.ac
almost all USE_AUTOTOOLS are needed)
- Replace CONFIGURE_ARGS with CPPFLAGS/LIBS
Reported by: antoine
- Convert to USES=libtool and bump dependent ports
- Add INSTALL_TARGET=install-strip
- Remove patches that renamed include directories and libraries so they
didn't conflict with early development versions of glib/gtk 2.0
Remove patches and hacks that were used to work around the previous
situation
This allows to stage more ports as a regular user
Differential Revision: https://reviews.freebsd.org/D703
Reviewed by and discussed with: bapt
With hat: portmgr
- Important Bug Fixes and Additions
Fixed shutdown in message passing apps
Fixed PortAudio detection during configuration
Fixed QWT detection during configuration
Fixed gr::analog::agc3 volk kernel alignment
Fixed/improved support of audio on OSX
Improved performance on network-based sources and sinks
Fixed pfb_arb_resampler tag propagation
Fixed segfault in fast_atan2f
Updated codec2 support to latest standard and support all rates
New HDLC codec blocks in gr::digital
- Bump dependent ports as .so version has changed
- Use install-strip target instead of STRIP_CMD
- Add/fix libspandsp.so versions in LIB_DEPENDS to differentiate between spandsp and spandsp-devel
Approved by: portmgr blanket
- Mk/bsd.database.mk rewrite, new default to db5.
- db6 is eligible by default only if installed on the system.
- Bump PORTREVISION of all ports that directly depend on BerkeleyDB or
where USE_BDB is found in the port's directory
- Patch a few ports such that they will pick up or work with newer
versions.
- Add UPDATING entry
- Drive-by format fix for pks
- Drop BerkeleyDB option from mail/popular for now, requires more work.
- Exp-run logs linked from the PR below.
- Ports that do not build (IGNORE, BROKEN, etc.) have pro-forma changes
for new Berkeley DB, but are untested.
NOTE: please read UPDATING and the Wiki page before proceeding!
Announcement: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2014-August/000090.html
Wiki reference: https://wiki.freebsd.org/Ports/BerkeleyDBCleanup
PR: 192690
Approved by: portmgr (implicit, PORTREVISION bump on unstaged ports)
rubyforge.org shutdown on May 15, 2014. This commit accounts for that by doing
several things:
- Deprecate ruby that had only rubyforge.org as MASTER_SITES (and so are now
only fetchable via our cache)
- Deprecate ports that depend on those
- Update the WWW pkg-descr line that points to rubyforge.org for rubygem ports
(which are still fetchable from rubygems.org)
The next step will be to remove rubyforge.org from bsd.sites.mk, after these
deprecated ports are deleted.
Phabric: D591
With hat: ruby
Approved by: portmgr (because of committing to unstaged graphics/mingplot port)
PR: 189222
Submitted by: Johan (stromnet.se)
OWFS -- 1-Wire file system.
OWFS is an easy way to use the powerful 1-wire system of Dallas/Maxim.
OWFS is a simple and flexible program to monitor and control the physical
environment. You can write scripts to read temperature, flash lights, write
to an LCD, log and graph, ...
GCC 4.2 in FreeBSD 8.X/9.X base is now too old to compile OpenEXR, so
GCC-based systems will upgrade to the default ports compiler (GCC 4.7
currently.)
Add two patches to OpenEXR to permit building it in a live system with
the older OpenEXR version installed. Bug report filed to upstream Github
at https://github.com/openexr/openexr/issues/130
Couple OpenEXR more tightly to ilmbase and require its exact .so
version.
Add UPDATING note, and bump PORTREVISION of all dependent ports.
Proto-STAGE hugin-devel, and mark it IGNORE because hugin is newer.
Approved by: portmgr (implicit for bumping PORTREVISION on unstaged ports)
PR: 189221
Submitted by: johan (stromnet.se)
Allows access to Telldus Tellstick USB dongles for communicating with
433MHz devices in your home.
Provides "telldusd", the daemon which keeps track of your tellstick
devices. Through a UNIX socket, the sensors and devices can be used/
controlled from the command line tool "tdtool", or via the libtelldus-core
C client library.
- Update to 1.6.1
- Remove some unneeded patches
- Fix pkg-plist
- report configure bug upstream
https://bugs.g10code.com/gnupg/issue1668
- report API breakage downstream and find that MacPorts had the same issue
https://rt.cpan.org/Ticket/Display.html?id=97201
- bump PORTREVISION for dependent ports (approx. 100 ports)
- Thanks to exp-run by antoine@ to find ports that break
- patch ports that would otherwise break
security/shishi with PR 192164 is already committed
[1] devel/ccrtp
[2] editors/abiword
[3] security/p5-Crypt-GCrypt
PR: 191256, 192162 [1], 192163 [2], 192166 [3]
Submitted by: Carlos Jacobo Puga Medina <cjpugmed@gmail.com>
Approved by: maintainer timeout, antoine (exp-run), portmgr (implicit)
The PR wasn't quite right with regards to stage support, so I had to modify
it further. The post-install configure file handling was focused on the
wrong file. I updated the default name of the qpage configure file in
order to use the @sample keyword. I added an entry in UPDATING to let
users know they may need to move an existing configure file accordingly.
PR: 192120
Submitted by: maintainer (Jeff Blank)
Changes by: marino
Update to 2.0.3
Add options for the extra (deprecated) command-line utilities
From ChangeLog.txt:
- Fix defect that doesn't allow adding station locations if only a single
callsign certificate is installed.
Thanks Kenji!
PR: ports/191871
Where possible, correct a few instances where PORTDOCS was being used
to flag stuff in EXAMPLESDIR. For some ports, mostly those owned by
ruby@, PORTDOCS is applied to pretty much everything whether it's
documentation or example.
General:
- add partial support for OSX and Cygwin
- add bitinfo.last0 field which represents the last pulse where the radio signal was 0
- store radio signal into a new field bitinfo.signal
- more robust handling of radio signal glitches
- improve realfreq by approximately 7% on a non-optimized standard build
- simplify code for handling DST changes and leap seconds
- defer assigning the decoded time until the minute length has been checked
to match the exact expected value (i.e. 59 unless a leap second occurs)
- code cleanups
README:
- mention supported platforms
dcf77pi:
- display updates, show last0
readpin:
- overhaul to make more use of libdcf77
- drop -t parameter
radio control based on hamlib libraries, DX cluster connection, band map,
QRZ.com/HamQTH.com callbook (XML access), IOTA support, a grayliner,
propagation indicator, xplanet support (maps in azimuthal projection centered
in your QTH), OK1RR free QSL manager database etc.
Reviewed by: db, skreuzer
Approved by: db, skreuzer (mentors)
Differential Revision: https://phabric.freebsd.org/D313
- Quisk can control the HiQSDR.
- As a receiver it can use the SDR-IQ by RfSpace as a sample source.
- As a receiver it can use your soundcard as a sample source.
- Quisk can control SoftRock hardware for both receive and transmit.
- As a transmitter it can accept microphone input and send that to your
transmitter for SSB operation. For CW, QUISK can mute the audio and
substitute a side tone.
PR: ports/190366
Submitted by: Stephen Hurd <shurd@FreeBSD.org>
Reviewed by: db, skreuzer
Approved by: db, skreuzer (mentors)
Differential Revision: https://phabric.freebsd.org/D301
- Change the sample configuration file to have same behaviour as
old startup script did by default
While here:
- Make strip command silent
- Fix some staging glitches
- Use new @sample directive
PR: 191361 [1]
Submitted by: timp87@gmail.com
This port was removed August 2011 for lack of a public distfile. It's
been cleaned up and the distfile has a new home. Pass maintainership
to submitter.
PR: 188971
Submitted by: Chris Hutchinson
This release only adds a useless manpage (not installed).
Added a DOCS option to install the documentation (previously not installed)
Reviewed by: skreuzer
Approved by: db, skreuzer (mentors)
When run in command line "-n" mode (display new program and/or configuration
files), TQSL could exit before the hheck was completed. Change the behavior
so the program waits for the check to complete.
Signing a log with a location that points to an incomplete certificate
request would cause an "Invalid argument" error rather than the expected
error message notify the user that they have no valid callsign certificates
for that callsign. TQSL now properly displays the error.
Don't display the main TQSL window when requesting the user enter
the password for their callsign certificate when in batch mode.
Add timestamps to diagnostic log entries.
PR: 191233
Submitted by: shurd
Reviewed by: skreuzer
Approved by: db, skreuzer (mentors)
