Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Feb 2010 14:19:56 GMT
From:      Olexandr Davydenko <o.davydenko@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/143556: [UPDATE] devel/libftdi to 0.17
Message-ID:  <201002041419.o14EJu7Y086882@www.freebsd.org>
Resent-Message-ID: <201002041430.o14EU1n4025164@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         143556
>Category:       ports
>Synopsis:       [UPDATE] devel/libftdi to 0.17
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 04 14:30:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Olexandr Davydenko
>Release:        FreeBSD 8.0-RELEASE-p1 i386
>Organization:
>Environment:
FreeBSD xxx 8.0-RELEASE-p1 FreeBSD 8.0-RELEASE-p1 #0: Thu Dec 31 14:30:07 EET 2009     root@xxx:/usr/obj/usr/src/sys/KERN  i386

>Description:
Update devel/libftdi to 0.17
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN libftdi.014/Makefile libftdi/Makefile
--- libftdi.014/Makefile	2010-02-03 14:01:37.000000000 +0200
+++ libftdi/Makefile	2010-02-03 18:19:36.000000000 +0200
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	libftdi
-PORTVERSION=	0.14
-PORTREVISION=	1
+PORTVERSION=	0.17
 CATEGORIES=	devel
 MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
 
 MAINTAINER=	o.davydenko@gmail.com
 COMMENT=	A library (using libusb) to talk to FTDI chips
 
-USE_AUTOTOOLS=	libtool:22
+OPTIONS=	BOOST	"Build with boost"	off
+
+USE_AUTOTOOLS=		autoconf:262 libtool:22
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 USE_LDCONFIG=		yes
@@ -24,17 +25,29 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_BOOST)
+PLIST_SUB+=		BOOST=""
+CONFIGURE_ARGS+=	--with-boost
+CXXFLAGS+=		"-I${LOCALBASE}/include"
+LIB_DEPENDS+=		boost_system.4:${PORTSDIR}/devel/boost-libs
+.else
+PLIST_SUB+=		BOOST="@comment "
+CONFIGURE_ARGS+=	--without-boost
+.endif
+
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
 .else
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
-USE_AUTOTOOLS+=	autoconf:262
 .endif
 
 post-patch:
-.if ${OSVERSION} >= 800069
-	${RM} -f ${WRKSRC}/configure
-.endif
+	@${REINPLACE_CMD} -E -e \
+		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
+		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
+
+pre-configure:
+	@cd ${WRKSRC} && ${AUTORECONF}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN libftdi.014/distinfo libftdi/distinfo
--- libftdi.014/distinfo	2010-02-03 14:01:37.000000000 +0200
+++ libftdi/distinfo	2010-02-03 14:05:42.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (libftdi-0.14.tar.gz) = 43f20478e725aa5ba6cdae311ca0593d
-SHA256 (libftdi-0.14.tar.gz) = b575ec0526efadf4bd6c8af4c62995aff6556c9ffcaf4725373dbcffda354175
-SIZE (libftdi-0.14.tar.gz) = 368634
+MD5 (libftdi-0.17.tar.gz) = 810c69cfaa078b49795c224ef9b6b851
+SHA256 (libftdi-0.17.tar.gz) = d5c0275125ab68a431375083c9544899e578b8f98b83de1254386d0209feabf0
+SIZE (libftdi-0.17.tar.gz) = 435901
diff -urN libftdi.014/files/patch-examples_baud_test.c libftdi/files/patch-examples_baud_test.c
--- libftdi.014/files/patch-examples_baud_test.c	1970-01-01 03:00:00.000000000 +0300
+++ libftdi/files/patch-examples_baud_test.c	2010-02-03 14:21:07.000000000 +0200
@@ -0,0 +1,10 @@
+--- examples/baud_test.c.orig	2010-02-03 14:19:36.000000000 +0200
++++ examples/baud_test.c	2010-02-03 14:19:43.000000000 +0200
+@@ -31,6 +31,7 @@
+ 
+ #include <sys/time.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <ftdi.h>
+ 
diff -urN libftdi.014/files/patch-examples_bitbang.c libftdi/files/patch-examples_bitbang.c
--- libftdi.014/files/patch-examples_bitbang.c	1970-01-01 03:00:00.000000000 +0300
+++ libftdi/files/patch-examples_bitbang.c	2010-02-03 14:26:07.000000000 +0200
@@ -0,0 +1,10 @@
+--- examples/bitbang.c.orig	2010-02-03 14:25:06.000000000 +0200
++++ examples/bitbang.c	2010-02-03 14:25:13.000000000 +0200
+@@ -1,6 +1,7 @@
+ /* This program is distributed under the GPL, version 2 */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #ifdef __WIN32__
+ #define sleep(x) Sleep(x)
diff -urN libftdi.014/files/patch-examples_bitbang2.c libftdi/files/patch-examples_bitbang2.c
--- libftdi.014/files/patch-examples_bitbang2.c	1970-01-01 03:00:00.000000000 +0300
+++ libftdi/files/patch-examples_bitbang2.c	2010-02-03 14:21:31.000000000 +0200
@@ -0,0 +1,10 @@
+--- examples/bitbang2.c.orig	2010-02-03 14:18:25.000000000 +0200
++++ examples/bitbang2.c	2010-02-03 14:18:34.000000000 +0200
+@@ -30,6 +30,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #ifdef __WIN32__
+ #define usleep(x) Sleep((x+999)/1000)
diff -urN libftdi.014/files/patch-examples_bitbang_ft2232.c libftdi/files/patch-examples_bitbang_ft2232.c
--- libftdi.014/files/patch-examples_bitbang_ft2232.c	1970-01-01 03:00:00.000000000 +0300
+++ libftdi/files/patch-examples_bitbang_ft2232.c	2010-02-03 14:21:56.000000000 +0200
@@ -0,0 +1,10 @@
+--- examples/bitbang_ft2232.c.orig	2010-02-03 14:18:48.000000000 +0200
++++ examples/bitbang_ft2232.c	2010-02-03 14:18:57.000000000 +0200
+@@ -9,6 +9,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #ifdef __WIN32__
+ #define sleep(x) _sleep(x)
diff -urN libftdi.014/files/patch-examples_find_all.c libftdi/files/patch-examples_find_all.c
--- libftdi.014/files/patch-examples_find_all.c	2010-02-03 14:01:37.000000000 +0200
+++ libftdi/files/patch-examples_find_all.c	2010-02-03 14:22:17.000000000 +0200
@@ -1,5 +1,5 @@
---- examples/find_all.c.orig	2009-03-07 20:18:06.000000000 +0300
-+++ examples/find_all.c	2009-03-07 20:18:52.000000000 +0300
+--- examples/find_all.c.orig	2009-03-17 23:06:40.000000000 +0200
++++ examples/find_all.c	2010-02-03 14:17:13.000000000 +0200
 @@ -6,6 +6,7 @@
  */
  
@@ -7,4 +7,4 @@
 +#include <stdlib.h>
  #include <ftdi.h>
  
- int main(int argc, char **argv)
+ int main(void)
diff -urN libftdi.014/files/patch-examples_serial_read.c libftdi/files/patch-examples_serial_read.c
--- libftdi.014/files/patch-examples_serial_read.c	1970-01-01 03:00:00.000000000 +0300
+++ libftdi/files/patch-examples_serial_read.c	2010-02-03 14:22:34.000000000 +0200
@@ -0,0 +1,10 @@
+--- examples/serial_read.c.orig	2010-02-03 14:19:13.000000000 +0200
++++ examples/serial_read.c	2010-02-03 14:19:19.000000000 +0200
+@@ -6,6 +6,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <getopt.h>
+ #include <ftdi.h>
diff -urN libftdi.014/files/patch-examples_simple.c libftdi/files/patch-examples_simple.c
--- libftdi.014/files/patch-examples_simple.c	2010-02-03 14:01:37.000000000 +0200
+++ libftdi/files/patch-examples_simple.c	2010-02-03 14:22:54.000000000 +0200
@@ -1,5 +1,5 @@
---- examples/simple.c.orig	2009-03-07 20:12:44.000000000 +0300
-+++ examples/simple.c	2009-03-07 20:14:10.000000000 +0300
+--- examples/simple.c.orig	2009-03-17 23:05:53.000000000 +0200
++++ examples/simple.c	2010-02-03 14:17:13.000000000 +0200
 @@ -6,6 +6,7 @@
  */
  
@@ -7,4 +7,4 @@
 +#include <stdlib.h>
  #include <ftdi.h>
  
- int main(int argc, char **argv)
+ int main(void)
diff -urN libftdi.014/pkg-plist libftdi/pkg-plist
--- libftdi.014/pkg-plist	2010-02-03 14:01:37.000000000 +0200
+++ libftdi/pkg-plist	2010-02-03 17:53:49.000000000 +0200
@@ -1,13 +1,22 @@
+bin/baud_test
 bin/bitbang
 bin/bitbang2
 bin/bitbang_cbus
 bin/bitbang_ft2232
 bin/find_all
+%%BOOST%%bin/find_all_pp
 bin/libftdi-config
+bin/serial_read
 bin/simple
 include/ftdi.h
+%%BOOST%%include/ftdi.hpp
 lib/libftdi.a
 lib/libftdi.la
 lib/libftdi.so
-lib/libftdi.so.15
+lib/libftdi.so.18
+%%BOOST%%lib/libftdipp.a
+%%BOOST%%lib/libftdipp.la
+%%BOOST%%lib/libftdipp.so
+%%BOOST%%lib/libftdipp.so.18
 libdata/pkgconfig/libftdi.pc
+%%BOOST%%libdata/pkgconfig/libftdipp.pc


>Release-Note:
>Audit-Trail:
>Unformatted:



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