Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2021 23:12:48 +0000 (UTC)
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r562516 - in head/comms: . hackrf hackrf-devel hackrf-devel/files
Message-ID:  <202101242312.10ONCm0j064395@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mr
Date: Sun Jan 24 23:12:47 2021
New Revision: 562516
URL: https://svnweb.freebsd.org/changeset/ports/562516

Log:
  Readd hackrf-devel with missing files.
  make index builds for me now.
  
  Copy hackrf to hackrf-devel and update to a current snapshot of hackrf

Added:
  head/comms/hackrf-devel/
     - copied from r562515, head/comms/hackrf/
  head/comms/hackrf-devel/Makefile.git_rev   (contents, props changed)
  head/comms/hackrf-devel/files/newVersion.sh   (contents, props changed)
Modified:
  head/comms/Makefile
  head/comms/hackrf-devel/Makefile
  head/comms/hackrf-devel/distinfo
  head/comms/hackrf-devel/files/patch-host_hackrf-tools_CMakeLists.txt
  head/comms/hackrf-devel/files/patch-host_libhackrf_CMakeLists.txt
  head/comms/hackrf-devel/pkg-plist
  head/comms/hackrf/Makefile

Modified: head/comms/Makefile
==============================================================================
--- head/comms/Makefile	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/Makefile	Sun Jan 24 23:12:47 2021	(r562516)
@@ -62,6 +62,7 @@
     SUBDIR += gstreamer1-plugins-spandsp
     SUBDIR += gtkmmorse
     SUBDIR += hackrf
+    SUBDIR += hackrf-devel
     SUBDIR += hamlib
     SUBDIR += hcidump
     SUBDIR += hidapi

Modified: head/comms/hackrf-devel/Makefile
==============================================================================
--- head/comms/hackrf/Makefile	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf-devel/Makefile	Sun Jan 24 23:12:47 2021	(r562516)
@@ -2,22 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	hackrf
-PORTVERSION=	2017.02.1
+PORTVERSION=	g${GIT_SRC_DATE}
 CATEGORIES=	comms devel hamradio science security
+PKGNAMESUFFIX=  -devel
 
-MAINTAINER=	cederom@tlen.pl
+MAINTAINER=	mr@freebsd.org
 COMMENT=	Low cost open source hardware software radio platform
 
 LICENSE=	GPLv2
 
+CONFLICTS=	hackrf
+
 USE_GITHUB=	YES
 GH_ACCOUNT=	mossmann
-GH_TAGNAME=	31a37bd
+GH_TAGNAME=	${GIT_SRC_HASH}
 
 USES=		cmake
 CMAKE_SOURCE_PATH=	${WRKSRC}/host
 CMAKE_ARGS=	-DLIBUSB_LIBRARIES=/usr/lib/libusb.so
 
 USE_LDCONFIG=	yes
+
+.include "Makefile.git_rev"
 
 .include <bsd.port.mk>

Added: head/comms/hackrf-devel/Makefile.git_rev
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/hackrf-devel/Makefile.git_rev	Sun Jan 24 23:12:47 2021	(r562516)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+GIT_SRC_HASH=  ee44d2d62e2dd24648599172f90fc8fc2e3b3cc3
+GIT_SRC_DATE=  2021.01.24

Modified: head/comms/hackrf-devel/distinfo
==============================================================================
--- head/comms/hackrf/distinfo	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf-devel/distinfo	Sun Jan 24 23:12:47 2021	(r562516)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515609346
-SHA256 (mossmann-hackrf-2017.02.1-31a37bd_GH0.tar.gz) = df00fd6d4fa7aa6fbd07ffc513c664aeac1824c1e4c2a2616ea167579dd1f797
-SIZE (mossmann-hackrf-2017.02.1-31a37bd_GH0.tar.gz) = 16939945
+TIMESTAMP = 1611498095
+SHA256 (mossmann-hackrf-g2021.01.24-ee44d2d62e2dd24648599172f90fc8fc2e3b3cc3_GH0.tar.gz) = d558885810aaa6ed087239d49c8160446887fccb0b8e14a06d80851eef0f2fc0
+SIZE (mossmann-hackrf-g2021.01.24-ee44d2d62e2dd24648599172f90fc8fc2e3b3cc3_GH0.tar.gz) = 15208743

Added: head/comms/hackrf-devel/files/newVersion.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/hackrf-devel/files/newVersion.sh	Sun Jan 24 23:12:47 2021	(r562516)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+CURDIR=`pwd`
+WRKDIR=`pwd`/work
+#mkdir -p "${WRKDIR}"
+
+if [ \! -d "${CURDIR}/kicad-repo" ]; then
+ git clone https://github.com/mossmann/hackrf.git -b master "${CURDIR}/hackrf-repo";
+else
+  cd "${CURDIR}/hackrf-repo"
+  git pull https://github.com/mossmann/hackrf.git;
+fi
+
+cd "${CURDIR}/hackrf-repo"
+GIT_SRC_HASH=`git log -n 1 --pretty=format:"%H"`;
+GIT_SRC_DATE=`git log -n 1 --date=iso-local -n 1 --pretty=format:"%cd" | \
+    cut -c '1-10' | sed -e 's,-,.,g' `
+
+echo "$GIT_SRC_HASH, $GIT_SRC_DATE"
+echo "GIT_SRC_HASH=  ${GIT_SRC_HASH}"    > ${CURDIR}/Makefile.git_rev
+echo "GIT_SRC_DATE=  ${GIT_SRC_DATE}"   >> ${CURDIR}/Makefile.git_rev
+

Modified: head/comms/hackrf-devel/files/patch-host_hackrf-tools_CMakeLists.txt
==============================================================================
--- head/comms/hackrf/files/patch-host_hackrf-tools_CMakeLists.txt	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf-devel/files/patch-host_hackrf-tools_CMakeLists.txt	Sun Jan 24 23:12:47 2021	(r562516)
@@ -1,6 +1,6 @@
---- host/hackrf-tools/CMakeLists.txt.orig	2015-08-30 19:34:41 UTC
+--- host/hackrf-tools/CMakeLists.txt.orig	2020-10-13 21:46:30 UTC
 +++ host/hackrf-tools/CMakeLists.txt
-@@ -35,7 +35,7 @@ include_directories(getopt)
+@@ -33,7 +33,7 @@ include_directories(getopt)
  add_definitions(/D _CRT_SECURE_NO_WARNINGS)
  else()
  add_definitions(-Wall)

Modified: head/comms/hackrf-devel/files/patch-host_libhackrf_CMakeLists.txt
==============================================================================
--- head/comms/hackrf/files/patch-host_libhackrf_CMakeLists.txt	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf-devel/files/patch-host_libhackrf_CMakeLists.txt	Sun Jan 24 23:12:47 2021	(r562516)
@@ -1,6 +1,6 @@
---- host/libhackrf/CMakeLists.txt.orig	2014-08-28 17:34:30 UTC
+--- host/libhackrf/CMakeLists.txt.orig	2020-10-13 21:46:30 UTC
 +++ host/libhackrf/CMakeLists.txt
-@@ -34,7 +34,7 @@ if(MSVC)
+@@ -37,7 +37,7 @@ if(MSVC)
  	set(THREADS_USE_PTHREADS_WIN32 true)
  else()
  	add_definitions(-Wall)

Modified: head/comms/hackrf-devel/pkg-plist
==============================================================================
--- head/comms/hackrf/pkg-plist	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf-devel/pkg-plist	Sun Jan 24 23:12:47 2021	(r562516)
@@ -1,13 +1,14 @@
+bin/hackrf_clock
 bin/hackrf_cpldjtag
+bin/hackrf_debug
 bin/hackrf_info
-bin/hackrf_max2837
-bin/hackrf_rffc5071
-bin/hackrf_si5351c
+bin/hackrf_operacake
 bin/hackrf_spiflash
+bin/hackrf_sweep
 bin/hackrf_transfer
 include/libhackrf/hackrf.h
 lib/libhackrf.a
 lib/libhackrf.so
 lib/libhackrf.so.0
-lib/libhackrf.so.0.4.0
+lib/libhackrf.so.0.5.0
 libdata/pkgconfig/libhackrf.pc

Modified: head/comms/hackrf/Makefile
==============================================================================
--- head/comms/hackrf/Makefile	Sun Jan 24 21:46:49 2021	(r562515)
+++ head/comms/hackrf/Makefile	Sun Jan 24 23:12:47 2021	(r562516)
@@ -10,6 +10,8 @@ COMMENT=	Low cost open source hardware software radio 
 
 LICENSE=	GPLv2
 
+CONFLICTS=	hackrf-devel
+
 USE_GITHUB=	YES
 GH_ACCOUNT=	mossmann
 GH_TAGNAME=	31a37bd



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101242312.10ONCm0j064395>