diff --git a/astro/indiwebmanagerapp/Makefile b/astro/indiwebmanagerapp/Makefile index 82da39d251f2..5ff7ece5d02c 100644 --- a/astro/indiwebmanagerapp/Makefile +++ b/astro/indiwebmanagerapp/Makefile @@ -1,23 +1,24 @@ PORTNAME= indiwebmanagerapp DISTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= astro MAINTAINER= acm@FreeBSD.org COMMENT= Graphical program to manage an INDI WebManager LICENSE= GPLv2 RUN_DEPENDS= indiserver:devel/indi \ ${PYTHON_PKGNAMEPREFIX}indiweb>0:astro/py-indiweb@${PY_FLAVOR} USES= cmake iconv gettext kde:5 ninja qt:5 pkgconfig python:3.5+ USE_KDE= auth bookmarks codecs completion config configwidgets \ coreaddons doctools i18n kio itemviews jobwidgets service \ solid widgetsaddons windowsystem xmlgui USE_QT= buildtools concurrent core dbus gui qmake_build network widgets \ xml USE_GITHUB= yes GH_ACCOUNT= rlancaste GH_PROJECT= INDIWebManagerApp .include diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index ef2e02ff156d..b0cc65677f36 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -1,38 +1,38 @@ PORTNAME= kstars DISTVERSION= 3.5.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= astro kde MASTER_SITES= KDE/stable/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= KDE desktop planetarium LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libindidriver.so:devel/indi \ libqt5keychain.so:security/qtkeychain \ libraw.so:graphics/libraw \ libsecret-1.so:security/libsecret \ libstellarsolver.so:astro/stellarsolver \ libwcs.so:astro/wcslib BUILD_DEPENDS= xplanet:astro/xplanet RUN_DEPENDS= xplanet:astro/xplanet USES= cmake compiler:c++11-lib desktop-file-utils eigen:3 \ gettext gnome kde:5 localbase:ldflags pkgconfig qt:5 tar:xz USE_GNOME= glib20 USE_KDE= attica auth bookmarks codecs completion config configwidgets\ coreaddons crash dbusaddons guiaddons i18n \ iconthemes init itemviews jobwidgets kio newstuff notifications \ notifyconfig parts plotting service solid texteditor \ widgetsaddons xmlgui \ doctools_build ecm_build USE_QT= concurrent core datavis3d dbus declarative gui multimedia \ network opengl printsupport sql svg testlib websockets widgets \ xml \ buildtools_build qmake_build .include diff --git a/astro/phd2/Makefile b/astro/phd2/Makefile index 39ab838368a7..ae2a10a97910 100644 --- a/astro/phd2/Makefile +++ b/astro/phd2/Makefile @@ -1,40 +1,40 @@ PORTNAME= phd2 DISTVERSIONPREFIX=v DISTVERSION= 2.6.9dev5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro MAINTAINER= acm@FreeBSD.org COMMENT= Guiding software inspired by Stark Labs PHD Guiding LICENSE= BSD3CLAUSE LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libgmock.so:devel/googletest \ libindidriver.so:devel/indi \ libcurl.so:ftp/curl RUN_DEPENDS= indiserver:devel/indi USES= cmake eigen:3 gettext ninja pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= OpenPHDGuiding USE_WX= 3.1+ USE_XORG= x11 WX_COMPS= wx CMAKE_ARGS+= -DUSE_SYSTEM_GTEST:BOOL=YES \ -DUSE_SYSTEM_CFITSIO:BOOL=YES \ -DUSE_SYSTEM_LIBUSB:BOOL=YES \ -DUSE_SYSTEM_LIBINDI:BOOL=YES \ -DUSE_SYSTEM_EIGEN3:BOOL=YES .include .if ${ARCH} != aarch64 && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DOPENSOURCE_ONLY:BOOL=YES .endif .include diff --git a/devel/indi/Makefile b/devel/indi/Makefile index 2863585aa9f5..03e54056d60f 100644 --- a/devel/indi/Makefile +++ b/devel/indi/Makefile @@ -1,29 +1,28 @@ PORTNAME= indi DISTVERSIONPREFIX= v -DISTVERSION= 1.9.0 -PORTREVISION= 1 +DISTVERSION= 1.9.1 CATEGORIES= devel MAINTAINER= acm@FreeBSD.org COMMENT= Implementation of the Instrument-Neutral-Device-Interface protocol LICENSE= LGPL21 BROKEN_FreeBSD_11= error: use of undeclared identifier 'TIME_UTC' BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libnova.so:astro/libnova \ libcurl.so:ftp/curl \ libgsl.so:math/gsl \ libfftw3.so:math/fftw3 \ libtheora.so:multimedia/libtheora \ libogg.so:audio/libogg USES= cmake jpeg iconv ninja pkgconfig USE_GITHUB= yes GH_ACCOUNT= indilib USE_LDCONFIG= yes .include diff --git a/devel/indi/distinfo b/devel/indi/distinfo index b8161c51f490..f8116e06320d 100644 --- a/devel/indi/distinfo +++ b/devel/indi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620749898 -SHA256 (indilib-indi-v1.9.0_GH0.tar.gz) = 41943e99f5b3567997c0cb0f707ba45e24f0f1f7cd4c9944055acf34ce52ee6e -SIZE (indilib-indi-v1.9.0_GH0.tar.gz) = 2291283 +TIMESTAMP = 1628026056 +SHA256 (indilib-indi-v1.9.1_GH0.tar.gz) = 74721e3152671939f346ce7618c0208b04eee13ab12af4f3df7d2a8013a3c5a0 +SIZE (indilib-indi-v1.9.1_GH0.tar.gz) = 2322783 diff --git a/devel/indi/files/patch-libs_indicom.c b/devel/indi/files/patch-libs_indicom.c index 37fb07df3318..c9ac9d6e6c6a 100644 --- a/devel/indi/files/patch-libs_indicom.c +++ b/devel/indi/files/patch-libs_indicom.c @@ -1,29 +1,29 @@ ---- libs/indicom.c 2021-04-22 12:28:35.000000000 -0500 -+++ libs/indicom.c 2021-05-11 12:29:20.391397000 -0500 +--- libs/indicom.c.orig 2021-06-26 09:52:40 UTC ++++ libs/indicom.c @@ -32,6 +32,7 @@ #include "base64.h" #include "config.h" +#include #if defined(HAVE_LIBNOVA) #include @@ -61,7 +62,9 @@ #endif #if defined(BSD) && !defined(__GNU__) +#if defined __APPLE__ #include +#endif #include #endif -@@ -763,7 +766,7 @@ +@@ -763,7 +766,7 @@ int tty_connect(const char *device, int bit_rate, int case 57600: bps = B57600; break; case 115200: bps = B115200; break; case 230400: bps = B230400; break; -#ifndef __APPLE__ -+#if !defined(__FreeBSD__) ++#if !defined __APPLE__ && !defined(__FreeBSD__) case 460800: bps = B460800; break; case 576000: bps = B576000; break; case 921600: bps = B921600; break; diff --git a/devel/indi/pkg-plist b/devel/indi/pkg-plist index ccda4577d5e5..8f05fed40443 100644 --- a/devel/indi/pkg-plist +++ b/devel/indi/pkg-plist @@ -1,245 +1,251 @@ bin/indi_aaf2_focus bin/indi_activefocuser_focus bin/indi_arduinost4 bin/indi_astromech_lpm bin/indi_astrometry +bin/indi_astrotrac_telescope bin/indi_baader_dome bin/indi_celestron_gps bin/indi_celestron_sct_focus bin/indi_crux_mount bin/indi_ddw_dome bin/indi_deepskydad_af1_focus bin/indi_deepskydad_af2_focus bin/indi_deepskydad_af3_focus bin/indi_deepskydad_fp1 +bin/indi_deepskydad_fr1 bin/indi_dmfc_focus bin/indi_domepro2_dome bin/indi_dsc_telescope bin/indi_efa_focus bin/indi_eq500x_telescope bin/indi_eval bin/indi_falcon_rotator bin/indi_fcusb_focus bin/indi_flipflat bin/indi_gemini_focus bin/indi_getprop bin/indi_gpusb bin/indi_hid_test bin/indi_hitecastrodc_focus bin/indi_ieq_telescope bin/indi_ieqlegacy_telescope bin/indi_imager_agent bin/indi_integra_focus bin/indi_ioptronHC8406 bin/indi_ioptronv3_telescope bin/indi_lacerta_mfoc_focus bin/indi_lakeside_focus bin/indi_lx200_10micron bin/indi_lx200_16 bin/indi_lx200_OnStep bin/indi_lx200_TeenAstro bin/indi_lx200ap bin/indi_lx200ap_experimental bin/indi_lx200ap_gtocp2 bin/indi_lx200autostar bin/indi_lx200basic bin/indi_lx200classic bin/indi_lx200fs2 bin/indi_lx200gemini bin/indi_lx200generic bin/indi_lx200gotonova bin/indi_lx200gps bin/indi_lx200pulsar2 bin/indi_lx200ss2000pc bin/indi_lx200zeq25 bin/indi_lynx_focus bin/indi_manual_wheel bin/indi_mbox_weather bin/indi_meta_weather bin/indi_microtouch_focus bin/indi_moonlite_focus bin/indi_moonlitedro_focus bin/indi_myfocuserpro2_focus bin/indi_nfocus bin/indi_nightcrawler_focus bin/indi_nstep_focus bin/indi_onfocus_focus bin/indi_openweathermap_weather bin/indi_optec_wheel bin/indi_paramount_telescope +bin/indi_pegasus_flatmaster bin/indi_pegasus_focuscube bin/indi_pegasus_ppb bin/indi_pegasus_ppba bin/indi_pegasus_scopsoag +bin/indi_pegasus_uch bin/indi_pegasus_upb bin/indi_perfectstar_focus bin/indi_planewave_deltat bin/indi_pmc8_telescope bin/indi_pyxis_rotator bin/indi_qhycfw1_wheel bin/indi_qhycfw2_wheel bin/indi_qhycfw3_wheel bin/indi_quantum_wheel bin/indi_rainbow_telescope bin/indi_rainbowrsf_focus bin/indi_rbfocus_focus bin/indi_rigel_dome bin/indi_robo_focus bin/indi_rolloff_dome bin/indi_scopedome_dome bin/indi_script_dome bin/indi_script_telescope bin/indi_sestosenso2_focus bin/indi_sestosenso_focus bin/indi_setprop bin/indi_siefs_focus bin/indi_simulator_ccd bin/indi_simulator_dome bin/indi_simulator_focus bin/indi_simulator_gps bin/indi_simulator_guide +bin/indi_simulator_receiver bin/indi_simulator_rotator -bin/indi_simulator_spectrograph bin/indi_simulator_sqm bin/indi_simulator_telescope bin/indi_simulator_weather bin/indi_simulator_wheel bin/indi_skycommander_telescope bin/indi_skysafari bin/indi_skywatcherAltAzMount bin/indi_skywatcherAltAzSimple bin/indi_smartfocus_focus bin/indi_snapcap bin/indi_sqm_weather bin/indi_star2000 bin/indi_steeldrive2_focus bin/indi_steeldrive_focus bin/indi_synscan_telescope bin/indi_synscanlegacy_telescope bin/indi_tcfs3_focus bin/indi_tcfs_focus bin/indi_teenastro_focus bin/indi_temma_telescope bin/indi_trutech_wheel bin/indi_usbdewpoint bin/indi_usbfocusv3_focus bin/indi_v4l2_ccd bin/indi_vantage_weather bin/indi_watchdog bin/indi_watcher_weather bin/indi_weather_safety_proxy bin/indi_xagyl_wheel bin/indiserver include/libindi/alignment/AlignmentSubsystemForDrivers.h include/libindi/alignment/AlignmentSubsystemForMathPlugins.h include/libindi/alignment/BasicMathPlugin.h include/libindi/alignment/BuiltInMathPlugin.h include/libindi/alignment/ClientAPIForAlignmentDatabase.h include/libindi/alignment/ClientAPIForMathPluginManagement.h include/libindi/alignment/Common.h include/libindi/alignment/ConvexHull.h include/libindi/alignment/DriverCommon.h include/libindi/alignment/InMemoryDatabase.h include/libindi/alignment/MapPropertiesToInMemoryDatabase.h include/libindi/alignment/MathPlugin.h include/libindi/alignment/MathPluginManagement.h include/libindi/alignment/SVDMathPlugin.h include/libindi/alignment/TelescopeDirectionVectorSupportFunctions.h include/libindi/base64.h include/libindi/baseclient.h include/libindi/basedevice.h include/libindi/connectionplugins/connectioninterface.h include/libindi/connectionplugins/connectionserial.h include/libindi/connectionplugins/connectiontcp.h include/libindi/defaultdevice.h include/libindi/dsp.h include/libindi/dsp/convolution.h include/libindi/dsp/dspinterface.h include/libindi/dsp/manager.h include/libindi/dsp/transforms.h include/libindi/eventloop.h include/libindi/hidapi.h include/libindi/indiapi.h include/libindi/indibase.h include/libindi/indibasetypes.h include/libindi/indiccd.h include/libindi/indiccdchip.h include/libindi/indicom.h include/libindi/indicontroller.h include/libindi/indicorrelator.h include/libindi/indidetector.h include/libindi/indidevapi.h include/libindi/indidome.h include/libindi/indidriver.h include/libindi/indidustcapinterface.h include/libindi/indielapsedtimer.h include/libindi/indifilterinterface.h include/libindi/indifilterwheel.h include/libindi/indifocuser.h include/libindi/indifocuserinterface.h include/libindi/indigps.h include/libindi/indiguiderinterface.h include/libindi/indilightboxinterface.h include/libindi/indilogger.h include/libindi/indimacros.h +include/libindi/indiproperties.h include/libindi/indiproperty.h include/libindi/indipropertybasic.h include/libindi/indipropertyblob.h include/libindi/indipropertylight.h include/libindi/indipropertynumber.h include/libindi/indipropertyswitch.h include/libindi/indipropertytext.h include/libindi/indipropertyview.h +include/libindi/indireceiver.h include/libindi/indirotator.h include/libindi/indirotatorinterface.h include/libindi/indisensorinterface.h include/libindi/indisinglethreadpool.h include/libindi/indispectrograph.h include/libindi/indistandardproperty.h include/libindi/inditelescope.h include/libindi/inditimer.h include/libindi/indiusbdevice.h include/libindi/indiutility.h include/libindi/indiversion.h include/libindi/indiweather.h include/libindi/indiweatherinterface.h include/libindi/indiwidgettraits.h include/libindi/indiwidgetview.h include/libindi/libastro.h include/libindi/lilxml.h include/libindi/mounts/lx200driver.h include/libindi/mounts/lx200telescope.h include/libindi/pid.h include/libindi/stream/ccvt.h include/libindi/stream/ccvt_types.h include/libindi/stream/encoder/encoderinterface.h include/libindi/stream/encoder/encodermanager.h include/libindi/stream/encoder/mjpegencoder.h include/libindi/stream/encoder/rawencoder.h include/libindi/stream/fpsmeter.h include/libindi/stream/gammalut16.h include/libindi/stream/jpegutils.h include/libindi/stream/recorder/recorderinterface.h include/libindi/stream/recorder/recordermanager.h include/libindi/stream/recorder/serrecorder.h include/libindi/stream/streammanager.h include/libindi/stream/uniquequeue.h include/libindi/v4l2_builtin_decoder.h include/libindi/v4l2_colorspace.h include/libindi/v4l2_decode.h lib/indi/MathPlugins/libindi_SVD_MathPlugin.so lib/libindiAlignmentClient.a lib/libindiAlignmentDriver.so lib/libindiAlignmentDriver.so.1 -lib/libindiAlignmentDriver.so.1.9.0 +lib/libindiAlignmentDriver.so.1.9.1 lib/libindiclient.a lib/libindidriver.a lib/libindidriver.so lib/libindidriver.so.1 -lib/libindidriver.so.1.9.0 +lib/libindidriver.so.1.9.1 lib/libindilx200.so lib/libindilx200.so.1 -lib/libindilx200.so.1.9.0 +lib/libindilx200.so.1.9.1 +libdata/pkgconfig/libindi.pc %%DATADIR%%/drivers.xml %%DATADIR%%/indi_tcfs_sk.xml -libdata/pkgconfig/libindi.pc