Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 19 Sep 2016 10:15:56 +0000 (UTC)
From:      Alexander Leidinger <netchild@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422421 - in head/astro/fowsr: . files
Message-ID:  <201609191015.u8JAFuG0099222@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: netchild
Date: Mon Sep 19 10:15:56 2016
New Revision: 422421
URL: https://svnweb.freebsd.org/changeset/ports/422421

Log:
  - Update to 2.0.
  - project moved to github
  
  PR:		212737, 212738
  Submitted by:	shun.fbsd.pr@dropcut.net

Modified:
  head/astro/fowsr/Makefile
  head/astro/fowsr/distinfo
  head/astro/fowsr/files/patch-fowsr.c
  head/astro/fowsr/pkg-descr

Modified: head/astro/fowsr/Makefile
==============================================================================
--- head/astro/fowsr/Makefile	Mon Sep 19 09:42:29 2016	(r422420)
+++ head/astro/fowsr/Makefile	Mon Sep 19 10:15:56 2016	(r422421)
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	fowsr
-PORTVERSION=	${FILEVER}.${FILEDATE}
+PORTVERSION=	${FILEVER}
 CATEGORIES=	astro
-MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	fowsr-${FILEVER}-${FILEDATE}
-
+DISTNAME=	fowsr-${FILEVER}
+USE_GITHUB=	yes
+GH_ACCOUNT=	apachler
+GH_PROJECT=	fowsr
+GH_TAGNAME= 571db38
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fine Offset Weather Station Reader
 
 LICENSE=	GPLv3
 
-BROKEN=		Unfetchable (google code has gone away)
-
-FILEVER=	1.0
-FILEDATE=	20100718
-WRKSRC=		${WRKDIR}/${PORTNAME}-${FILEVER}
+FILEVER=	2.0
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}/${PORTNAME}.src
 
 USES=		gmake dos2unix
 

Modified: head/astro/fowsr/distinfo
==============================================================================
--- head/astro/fowsr/distinfo	Mon Sep 19 09:42:29 2016	(r422420)
+++ head/astro/fowsr/distinfo	Mon Sep 19 10:15:56 2016	(r422421)
@@ -1,2 +1,3 @@
-SHA256 (fowsr-1.0-20100718.tar.gz) = ec43baea6bfe4523f8b5badd62c0adea239012a9bdd4c0d4d0c3fbc1a3e6ecbb
-SIZE (fowsr-1.0-20100718.tar.gz) = 35716
+TIMESTAMP = 1474280139
+SHA256 (fowsr-2.0_GH0.tar.gz) = ae18078b948037576217f83cbb86287f38e30e4f3a425b6cf8e6f891b43e0623
+SIZE (fowsr-2.0_GH0.tar.gz) = 24288

Modified: head/astro/fowsr/files/patch-fowsr.c
==============================================================================
--- head/astro/fowsr/files/patch-fowsr.c	Mon Sep 19 09:42:29 2016	(r422420)
+++ head/astro/fowsr/files/patch-fowsr.c	Mon Sep 19 10:15:56 2016	(r422421)
@@ -1,43 +1,18 @@
---- fowsr.c.orig	2016-07-26 12:57:00 UTC
+--- fowsr.c.orig	2016-09-18 13:31:19 UTC
 +++ fowsr.c
-@@ -110,13 +110,17 @@ int CUSB_Open(int vendor, int product)
- 
- 	signal(SIGTERM, release_usb_device);
- 
-+#ifdef LIBUSB_HAS_GET_DRIVER_NP
- 	ret = usb_get_driver_np(devh, 0, buf, sizeof(buf));
- 	printf("usb_get_driver_np returned %d\n", ret);
- 	if (ret == 0) {
- 		printf("interface 0 already claimed by driver \\'%s\\', attempting to detach it\n", buf);
-+#ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
- 		ret = usb_detach_kernel_driver_np(devh, 0);
- 		printf("usb_detach_kernel_driver_np returned %d\n", ret);
-+#endif
- 	}
-+#endif
- 	ret = usb_claim_interface(devh, 0);
- 	if (ret != 0) {
- 		printf("claim failed with error %d\n", ret);
-@@ -159,12 +163,14 @@ void CWS_Cache(char isStoring)
- 	FILE* f;
- 	if (isStoring == ISREADING) {
+@@ -321,6 +321,7 @@ void CWS_Cache(char isStoring)
+ 	
+ 	if (isStoring == WS_CACHE_READ) {
  		if (f=fopen(fname,"rb")) {
-+			printf("using cache file %s\n", fname);
++			printf("using cache file %s\n", fname);          
  			n=fread(&m_previous_timestamp,sizeof(m_previous_timestamp),1,f);
  			n=fread(m_buf,sizeof(m_buf[0]),WS_BUFFER_SIZE,f);
  		}
- 		print_bytes((char *)&m_previous_timestamp, sizeof(time_t));
- 	} else {	// ISWRITING
- 		if (f=fopen(fname,"wb")) {
-+			printf("updating cache file %s\n", fname);
- 			n=fwrite(&m_timestamp,sizeof(m_timestamp),1,f);
- 			n=fwrite(m_buf,sizeof(m_buf[0]),WS_BUFFER_SIZE,f);
- 		}
-@@ -566,6 +572,7 @@ int CWF_Write(char arg,char* fname)
- 
- 	FILE* f;
- 	if (f=fopen(fname,"a+s")) {
-+		printf("writing to %s\n", fname);
+@@ -691,6 +692,7 @@ int CWF_Write(char arg, const char* fnam
+ 		f = fopen(s1,"a+t");
+ 		if(!f)
+ 			return -1;
++        printf("writing to %s\n", s1);
+ 	}
  
- 		// Header
- 		switch (arg) {
+ 	if((old_pos==0)||(old_pos==0xFFFF))	//cachefile empty or empty eeprom was read

Modified: head/astro/fowsr/pkg-descr
==============================================================================
--- head/astro/fowsr/pkg-descr	Mon Sep 19 09:42:29 2016	(r422420)
+++ head/astro/fowsr/pkg-descr	Mon Sep 19 10:15:56 2016	(r422421)
@@ -21,3 +21,5 @@ Rain data is then calculated per hour, d
 periods exist. No further data processing is performed. This makes fowsr
 very small and well suited for running in embedded devices at remote
 locations.
+
+WWW: https://github.com/apachler/fowsr



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