Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Mar 2017 02:47:33 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435381 - in head/comms/chirp: . files
Message-ID:  <201703040247.v242lXIh017790@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Sat Mar  4 02:47:32 2017
New Revision: 435381
URL: https://svnweb.freebsd.org/changeset/ports/435381

Log:
  py-serial got updated in r424787 to a 3.* version, which chirp 0.4.1 is not
  compatible with because of a couple function => property changes.
  Given that upstream hasn't made a non-daily release since 0.4.1 we are
  forced to track daily builds for now.
  
  PR:		ports/217499
  Submitted by:	bsdports@kyle-evans.net

Deleted:
  head/comms/chirp/files/patch-chirpui_mainapp.py
  head/comms/chirp/pkg-plist
Modified:
  head/comms/chirp/Makefile
  head/comms/chirp/distinfo
  head/comms/chirp/files/patch-chirp_platform.py
  head/comms/chirp/files/patch-setup.py   (contents, props changed)

Modified: head/comms/chirp/Makefile
==============================================================================
--- head/comms/chirp/Makefile	Sat Mar  4 00:22:07 2017	(r435380)
+++ head/comms/chirp/Makefile	Sat Mar  4 02:47:32 2017	(r435381)
@@ -1,34 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	chirp
-PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTVERSION=	0.4.1.2017.02.22
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://chirp.danplanet.com/download/${PORTVERSION}/ \
+MASTER_SITES=	http://trac.chirp.danplanet.com/chirp_daily/daily-${PORTVERSION:C/[0-9]+\.[0-9]+\.[0-9]+\.//:C/\.//g}/ \
 		LOCAL/db
+DISTNAME=	${PORTNAME}-daily-${PORTVERSION:C/[0-9]+\.[0-9]+\.[0-9]+\.//:C/\.//g}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Free, open-source tool for programming your amateur radio
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${CHIRP_DEPENDS}
 RUN_DEPENDS=	${CHIRP_DEPENDS}
 CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 \
-		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial
+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \
+		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2
 
 USES=		desktop-file-utils gettext python
-USE_PYTHON=	distutils
-
-OPTIONS_DEFINE=	DOCS
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/chirpui/mainapp.py
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${RMDIR} ${STAGEDIR}${PREFIX}/share/chirp/images
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/comms/chirp/distinfo
==============================================================================
--- head/comms/chirp/distinfo	Sat Mar  4 00:22:07 2017	(r435380)
+++ head/comms/chirp/distinfo	Sat Mar  4 02:47:32 2017	(r435381)
@@ -1,2 +1,3 @@
-SHA256 (chirp-0.4.1.tar.gz) = 8c9d652dc89dbab9e2a1a75c07aa7179ce403de078a4d02814365f89e183319e
-SIZE (chirp-0.4.1.tar.gz) = 416851
+TIMESTAMP = 1488505504
+SHA256 (chirp-daily-20170222.tar.gz) = 5a889e79d5a3a1961f6d5a166d930f642e34b6aab8e80e0cf987dc06c64300f3
+SIZE (chirp-daily-20170222.tar.gz) = 668028

Modified: head/comms/chirp/files/patch-chirp_platform.py
==============================================================================
--- head/comms/chirp/files/patch-chirp_platform.py	Sat Mar  4 00:22:07 2017	(r435380)
+++ head/comms/chirp/files/patch-chirp_platform.py	Sat Mar  4 02:47:32 2017	(r435381)
@@ -1,10 +1,10 @@
---- chirp/platform.py.orig	2013-04-09 03:01:35.000000000 -0400
-+++ chirp/platform.py	2014-10-14 17:06:48.000000000 -0400
-@@ -284,6 +284,7 @@
+--- chirp/platform.py.orig	2017-02-07 08:01:12 UTC
++++ chirp/platform.py
+@@ -317,6 +317,7 @@ class UnixPlatform(Platform):
  
      def list_serial_ports(self):
          ports = ["/dev/ttyS*",
 +                 "/dev/tty*",
                   "/dev/ttyUSB*",
                   "/dev/ttyAMA*",
-                  "/dev/cu.*",
+                  "/dev/ttyACM*",

Modified: head/comms/chirp/files/patch-setup.py
==============================================================================
--- head/comms/chirp/files/patch-setup.py	Sat Mar  4 00:22:07 2017	(r435380)
+++ head/comms/chirp/files/patch-setup.py	Sat Mar  4 02:47:32 2017	(r435381)
@@ -1,8 +1,20 @@
---- setup.py.orig	2012-03-24 02:01:12.000000000 -0500
-+++ setup.py	2012-09-21 16:49:59.000000000 -0500
-@@ -110,9 +110,9 @@
+--- setup.py.orig	2015-03-05 08:00:18 UTC
++++ setup.py
+@@ -109,7 +109,7 @@ def default_build():
+ 
+     desktop_files = glob("share/*.desktop")
+     # form_files = glob("forms/*.x?l")
+-    image_files = glob("images/*")
++#    image_files = glob("images/*")
+     _locale_files = glob("locale/*/LC_MESSAGES/CHIRP.mo")
+     stock_configs = glob("stock_configs/*")
+ 
+@@ -127,11 +127,11 @@ def default_build():
+         version=CHIRP_VERSION,
+         scripts=["chirpw"],
          data_files=[('share/applications', desktop_files),
-                     ('share/chirp/images', image_files),
+-                    ('share/chirp/images', image_files),
++#                    ('share/chirp/images', image_files),
                      ('share/chirp', xsd_files),
 -                    ('share/doc/chirp', ['COPYING']),
 +#                    ('share/doc/chirp', ['COPYING']),



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