diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index fcf7ef040c01..5437577e4396 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -1,93 +1,91 @@ # Created by: Brion Moss PORTNAME= xtide -PORTVERSION= 2.15.3 +PORTVERSION= 2.15.4 CATEGORIES= astro geography MASTER_SITES= https://flaterco.com/files/xtide/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME_TCD}${EXTRACT_SUFX} \ ${DISTNAME_HARM}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Harmonic tide clock and tide predictor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png USES= compiler:c++0x gmake libtool localbase tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_tcd_h=yes \ ac_cv_lib_tcd_get_tide_db_header=yes CFLAGS+= -Wno-deprecated-declarations CPPFLAGS+= -I${WRKSRC_TCD} $$(libpng-config --I_opts) LDFLAGS+= -L${WRKSRC_TCD}/.libs $$(libpng-config --L_opts) INSTALL_TARGET= install-strip OPTIONS_DEFINE= WVS X11 OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes WVS_DESC= Use world vector shoreline data (37MB) WVS_DISTFILES= ${DISTNAME_WVS}${EXTRACT_SUFX} X11_USES= xorg X11_USE= xorg=ice,sm,x11,xaw,xext,xmu,xpm,xt X11_CONFIGURE_WITH= x X11_DESKTOP_ENTRIES= "XTide" "" "xtide" "xtide" "" "" DISTNAME_TCD= libtcd-2.2.7-r3 WRKSRC_TCD= ${WRKDIR}/${DISTNAME_TCD:C/-r[0-9]+//} DISTNAME_HARM= harmonics-dwf-20210110-free WRKSRC_HARM= ${WRKDIR}/${DISTNAME_HARM:C/-free//} DISTNAME_WVS= wvs post-patch: - @${REINPLACE_CMD} -e \ - '/if test/s|==|=|g' ${WRKSRC_TCD}/configure @${REINPLACE_CMD} -e \ 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|"/etc/|"${PREFIX}/etc/| ; \ s| /etc/| ${PREFIX}/etc/|' ${WRKSRC}/libxtide/Global.cc pre-configure: @(cd ${WRKSRC_TCD} && ${SETENV} ${CONFIGURE_ENV} \ CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \ ${SH} ./configure ${CONFIGURE_ARGS}) pre-build: @(cd ${WRKSRC_TCD} && ${DO_MAKE_BUILD} ${ALL_TARGET}) post-build: @${ECHO_CMD} -n > ${WRKDIR}/xtide.conf.sample @${ECHO_CMD} "${DATADIR}/harmonics.tcd" >> ${WRKDIR}/xtide.conf.sample @${ECHO_CMD} "${DATADIR}/wvs" >> ${WRKDIR}/xtide.conf.sample @${LN} -sf ${DISTNAME_HARM}.tcd ${WRKSRC_HARM}/harmonics.tcd @${LN} -sf icon_48x48_orig.png ${WRKSRC}/iconsrc/xtide.png pre-install: @(cd ${WRKSRC_TCD} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcd.so.[0-9]* post-install: (cd ${WRKDIR} && ${INSTALL_DATA} xtide.conf.sample \ ${STAGEDIR}${PREFIX}/etc) @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC_HARM} && ${INSTALL_DATA} harmonics.tcd \ ${STAGEDIR}${DATADIR}) post-install-WVS-on: @${MKDIR} ${STAGEDIR}${DATADIR}/wvs (cd ${WRKDIR} && ${INSTALL_DATA} wvs*.dat \ ${STAGEDIR}${DATADIR}/wvs) post-install-X11-on: (cd ${WRKSRC}/iconsrc && ${INSTALL_DATA} xtide.png \ ${STAGEDIR}${PREFIX}/share/pixmaps) .include diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo index 426a8184f93d..40381664654d 100644 --- a/astro/xtide/distinfo +++ b/astro/xtide/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1615566256 -SHA256 (xtide-2.15.3.tar.xz) = 50afef21b2591e92b84d0079b394351eb45414175e4dd094115498c3af2d0ccf -SIZE (xtide-2.15.3.tar.xz) = 574816 +TIMESTAMP = 1644906838 +SHA256 (xtide-2.15.4.tar.xz) = 726622969bc94adab52a8e060b21e2a2434d463febd0d6d2920b25a12ca5093c +SIZE (xtide-2.15.4.tar.xz) = 574580 SHA256 (libtcd-2.2.7-r3.tar.xz) = e1dde9aafb771eab57c676a99b4b79d61c6800990a0e72782bc20057a8a2d877 SIZE (libtcd-2.2.7-r3.tar.xz) = 272284 SHA256 (harmonics-dwf-20210110-free.tar.xz) = af4550d36a1a1ca2e8c8b523c7d64b27845cb9dd8685c5fdfa5196b6cefa0c38 SIZE (harmonics-dwf-20210110-free.tar.xz) = 840968 diff --git a/astro/xtide/files/patch-xxLocationList.cc b/astro/xtide/files/patch-xxLocationList.cc deleted file mode 100644 index cce97eee1ed2..000000000000 --- a/astro/xtide/files/patch-xxLocationList.cc +++ /dev/null @@ -1,20 +0,0 @@ -Regressed by https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3c - -xxLocationList.cc:90:3: error: no matching function for call to 'XawListChange' - XawListChange (list->widget(), stringList, 0, 0, 1); - ^~~~~~~~~~~~~ -/usr/local/include/X11/Xaw/List.h:167:6: note: candidate function not viable: no known conversion from 'char **' to 'const char **' for 2nd argument -void XawListChange - ^ - ---- xxLocationList.cc.orig 2014-10-11 19:42:10 UTC -+++ xxLocationList.cc -@@ -87,7 +87,7 @@ void xxLocationList::pickStation (const XawListReturnS - - - void xxLocationList::listChanged() { -- XawListChange (list->widget(), stringList, 0, 0, 1); -+ XawListChange (list->widget(), (_Xconst char**)stringList, 0, 0, 1); - } - - diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist index 8ac6c2e8266e..c50f540061d6 100644 --- a/astro/xtide/pkg-plist +++ b/astro/xtide/pkg-plist @@ -1,79 +1,79 @@ bin/tide %%X11%%bin/xtide @sample etc/xtide.conf.sample include/libxtide/Amplitude.hh include/libxtide/Angle.hh include/libxtide/Banner.hh include/libxtide/BetterMap.hh include/libxtide/Calendar.hh include/libxtide/CalendarFormC.hh include/libxtide/CalendarFormH.hh include/libxtide/CalendarFormL.hh include/libxtide/CalendarFormNotC.hh include/libxtide/CalendarFormT.hh include/libxtide/ClientSideFont.hh include/libxtide/Colors.hh include/libxtide/Configurable.hh include/libxtide/Constituent.hh include/libxtide/ConstituentSet.hh include/libxtide/Coordinates.hh include/libxtide/CurrentBearing.hh include/libxtide/Date.hh include/libxtide/Dstr.hh include/libxtide/Errors.hh include/libxtide/Global.hh include/libxtide/Graph.hh include/libxtide/HarmonicsFile.hh include/libxtide/HarmonicsPath.hh include/libxtide/Interval.hh include/libxtide/MetaField.hh include/libxtide/ModeFormat.hh include/libxtide/Nullable.hh include/libxtide/NullableInterval.hh include/libxtide/NullablePredictionValue.hh include/libxtide/Offsets.hh include/libxtide/PixelatedGraph.hh include/libxtide/PredictionValue.hh include/libxtide/RGBGraph.hh include/libxtide/SVGGraph.hh include/libxtide/SafeVector.hh include/libxtide/Settings.hh include/libxtide/Skycal.hh include/libxtide/Speed.hh include/libxtide/Station.hh include/libxtide/StationIndex.hh include/libxtide/StationRef.hh include/libxtide/SubordinateStation.hh include/libxtide/TTYGraph.hh include/libxtide/TideEvent.hh include/libxtide/TideEventsOrganizer.hh include/libxtide/Timestamp.hh include/libxtide/Units.hh include/libxtide/Year.hh include/libxtide/autoconf-defines.h include/libxtide/config.hh include/libxtide/libxtide.hh include/libxtide/rgb.hh include/libxtide/xmlparser.hh include/tcd.h lib/libtcd.a lib/libtcd.so lib/libtcd.so.1 lib/libtcd.so.1.0.2 lib/libxtide.a lib/libxtide.so lib/libxtide.so.1 -lib/libxtide.so.1.0.3 +lib/libxtide.so.1.0.4 man/man1/tide.1.gz %%X11%%man/man1/xtide.1.gz man/man8/xttpd.8.gz sbin/xttpd share/libtcd/libtcd.html %%X11%%share/pixmaps/xtide.png %%DATADIR%%/harmonics.tcd %%WVS%%%%DATADIR%%/wvs/wvs1.dat %%WVS%%%%DATADIR%%/wvs/wvs12.dat %%WVS%%%%DATADIR%%/wvs/wvs250k.dat %%WVS%%%%DATADIR%%/wvs/wvs3.dat %%WVS%%%%DATADIR%%/wvs/wvs43.dat %%WVS%%%%DATADIR%%/wvs/wvsfull.dat