Date: Thu, 17 Mar 2016 20:28:05 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411309 - in head/comms/cqrlog: . files Message-ID: <201603172028.u2HKS5wp048288@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Thu Mar 17 20:28:05 2016 New Revision: 411309 URL: https://svnweb.freebsd.org/changeset/ports/411309 Log: - Update to 1.9.1 Added: head/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp (contents, props changed) Modified: head/comms/cqrlog/Makefile head/comms/cqrlog/distinfo head/comms/cqrlog/files/patch-Makefile head/comms/cqrlog/pkg-plist Modified: head/comms/cqrlog/Makefile ============================================================================== --- head/comms/cqrlog/Makefile Thu Mar 17 20:27:25 2016 (r411308) +++ head/comms/cqrlog/Makefile Thu Mar 17 20:28:05 2016 (r411309) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= cqrlog -PORTVERSION= 1.9.0 +PORTVERSION= 1.9.1 DISTVERSIONPREFIX= v -PORTREVISION= 5 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -22,12 +21,12 @@ USES= shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh -USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-net fcl-process \ - fcl-registry fcl-xml hash mysql numlib pasjpeg paszlib x11 +USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-net \ + fcl-registry fcl-xml mysql numlib openssl pasjpeg x11 WANT_GNOME= yes ALL_TARGET= ${PORTNAME} -LAZARUS_VER= 1.4.2 +LAZARUS_VER= 1.6.0 LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} OPTIONS_SINGLE= LCL @@ -38,11 +37,13 @@ GTK2_USE= fpc=gtk2 gnome=gtk20 GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2 GTK2_MAKE_ARGS= PLATFORM=gtk2 -QT4_USE= fpc=yes QT4_LIB_DEPENDS= libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt QT4_MAKE_ARGS= PLATFORM=qt +post-extract: + @${RM} -rf ${WRKSRC}/src/lnet/lib/openssl.pas + post-patch: @${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \ -e s!%%MAKE_CMD%%!${MAKE_CMD}!g \ Modified: head/comms/cqrlog/distinfo ============================================================================== --- head/comms/cqrlog/distinfo Thu Mar 17 20:27:25 2016 (r411308) +++ head/comms/cqrlog/distinfo Thu Mar 17 20:28:05 2016 (r411309) @@ -1,2 +1,2 @@ -SHA256 (ok2cqr-cqrlog-v1.9.0_GH0.tar.gz) = 2f5beef08e109648812e98449ad093a9d6555e3abc72881be2f977e9a1a23850 -SIZE (ok2cqr-cqrlog-v1.9.0_GH0.tar.gz) = 7896794 +SHA256 (ok2cqr-cqrlog-v1.9.1_GH0.tar.gz) = 3df51aecb6745854fa1812d488c74c5855927d082f06f469187389bd0fbcdf20 +SIZE (ok2cqr-cqrlog-v1.9.1_GH0.tar.gz) = 7354976 Modified: head/comms/cqrlog/files/patch-Makefile ============================================================================== --- head/comms/cqrlog/files/patch-Makefile Thu Mar 17 20:27:25 2016 (r411308) +++ head/comms/cqrlog/files/patch-Makefile Thu Mar 17 20:28:05 2016 (r411309) @@ -1,6 +1,6 @@ ---- Makefile.orig 2015-03-04 15:17:21 UTC -+++ Makefile -@@ -1,11 +1,12 @@ +--- Makefile.orig 2015-11-28 17:28:12.000000000 -0500 ++++ Makefile 2016-03-17 12:05:09.138035000 -0500 +@@ -1,12 +1,13 @@ -CC=lazbuild +CC=lazbuild -d ST=strip @@ -10,15 +10,16 @@ +datadir = $(DESTDIR)${PREFIX}/share/cqrlog +bindir = $(DESTDIR)${PREFIX}/bin +sharedir = $(DESTDIR)${PREFIX}/share + tmpdir = /tmp +mandir = $(DESTDIR)${PREFIX} cqrlog: src/cqrlog.lpi -- $(CC) --ws=gtk2 src/cqrlog.lpi +- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi + $(CC) --pcp=. --ws=${PLATFORM} src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%% $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz -@@ -29,7 +30,7 @@ install: +@@ -30,7 +31,7 @@ install -d -v $(sharedir)/pixmaps/cqrlog install -d -v $(sharedir)/icons install -d -v $(sharedir)/applications @@ -27,7 +28,7 @@ install -v -m 0755 src/cqrlog $(bindir) install -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix install -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/ -@@ -46,7 +47,7 @@ install: +@@ -47,7 +48,7 @@ install -v -m 0644 images/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png install -v -m 0644 images/cqrlog.png $(sharedir)/icons/cqrlog.png install -v -m 0644 src/changelog.html $(datadir)/changelog.html Added: head/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/cqrlog/files/patch-src-lnet-lib_lcommon.pp Thu Mar 17 20:28:05 2016 (r411309) @@ -0,0 +1,23 @@ +--- src/lnet/lib/lcommon.pp 2016-03-17 12:36:41.744524000 -0500 ++++ src/lnet/lib/lcommon.pp 2016-03-17 12:37:31.449533000 -0500 +@@ -512,15 +512,15 @@ + procedure FillAddressInfo(var aAddrInfo: TLSocketAddress; const aFamily: sa_family_t; + const Address: string; const aPort: Word); + begin +- aAddrInfo.IPv4.family := aFamily; +- aAddrInfo.IPv4.Port := htons(aPort); ++ aAddrInfo.IPv4.sin_family := aFamily; ++ aAddrInfo.IPv4.sin_port := htons(aPort); + + case aFamily of + LAF_INET : + begin +- aAddrInfo.IPv4.Addr := StrToNetAddr(Address); +- if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.Addr = 0) then +- aAddrInfo.IPv4.Addr := StrToNetAddr(GetHostIP(Address)); ++ aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(Address); ++ if (Address <> LADDR_ANY) and (aAddrInfo.IPv4.sin_addr.s_addr = 0) then ++ aAddrInfo.IPv4.sin_addr.s_addr := StrToNetAddr(GetHostIP(Address)); + end; + LAF_INET6 : + begin Modified: head/comms/cqrlog/pkg-plist ============================================================================== --- head/comms/cqrlog/pkg-plist Thu Mar 17 20:27:25 2016 (r411308) +++ head/comms/cqrlog/pkg-plist Thu Mar 17 20:28:05 2016 (r411309) @@ -8,8 +8,6 @@ share/applications/cqrlog.desktop %%DATADIR%%/ctyfiles/Country.tab %%DATADIR%%/ctyfiles/CountryDel.tab %%DATADIR%%/ctyfiles/Exceptions.tab -%%DATADIR%%/ctyfiles/Exceptions.tbl -%%DATADIR%%/ctyfiles/MASTER.DTA %%DATADIR%%/ctyfiles/MASTER.SCP %%DATADIR%%/ctyfiles/README %%DATADIR%%/ctyfiles/eqsl.txt @@ -89,7 +87,6 @@ share/applications/cqrlog.desktop %%DATADIR%%/help/img/h37.png %%DATADIR%%/help/img/h38.png %%DATADIR%%/help/img/h39.png -%%DATADIR%%/help/img/h4.html %%DATADIR%%/help/img/h4.png %%DATADIR%%/help/img/h40.png %%DATADIR%%/help/img/h41.png @@ -166,7 +163,9 @@ share/applications/cqrlog.desktop %%DATADIR%%/images/bck.png %%DATADIR%%/images/cqrlog.ico %%DATADIR%%/images/cqrlog.png +%%DATADIR%%/images/connect.png %%DATADIR%%/images/delete.png +%%DATADIR%%/images/disconnect.png %%DATADIR%%/images/dxcc_stat.xpm %%DATADIR%%/images/edit.png %%DATADIR%%/images/edwn.xpm @@ -174,7 +173,10 @@ share/applications/cqrlog.desktop %%DATADIR%%/images/eqsl_up.png %%DATADIR%%/images/eupl.xpm %%DATADIR%%/images/filter.png +%%DATADIR%%/images/font.png +%%DATADIR%%/images/go-bottom.png %%DATADIR%%/images/grayline.bmp +%%DATADIR%%/images/help.png %%DATADIR%%/images/menu_new.png %%DATADIR%%/images/my_view.png %%DATADIR%%/images/options.xpm @@ -182,6 +184,7 @@ share/applications/cqrlog.desktop %%DATADIR%%/images/quit.png %%DATADIR%%/images/quit.xpm %%DATADIR%%/images/radio.bmp +%%DATADIR%%/images/rbn_list.png %%DATADIR%%/images/search.png %%DATADIR%%/images/sort.xpm %%DATADIR%%/images/splash.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603172028.u2HKS5wp048288>