ports/170241: [PATCH] devel/libftdi: upgrade to 0.20 and fix automake brokenness

[Craig Leres]

The following reply was made to PR ports/170241; it has been noted by GNATS.

From: Craig Leres <leres at ee.lbl.gov>
To: bug-followup at FreeBSD.org
Cc: leres at ee.lbl.gov
Subject: Re: ports/170241: [PATCH] devel/libftdi: upgrade to 0.20 and fix
 automake brokenness
Date: Sat, 11 Aug 2012 18:07:26 -0700

 This is a multi-part message in MIME format.
 --------------050503070108030308080402
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Here's an updated patchset that converts to OptionsNG and adds an option
 to build/install the Python bindings.
 
 This still applies:
 >     Note that files/patch-examples_serial_read.c needs to be
 >     removed since 0.21 replaced examples/serial_read.c with
 >     examples/serial_test.c (which already includes stdlib.h and
 >     does not need to be patched).
 
 		Craig
 
 --------------050503070108030308080402
 Content-Type: text/plain; charset=us-ascii;
  name="patches.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patches.txt"
 
 --- Makefile.orig	2011-09-23 15:22:03.000000000 -0700
 +++ Makefile	2012-08-11 18:04:53.000000000 -0700
 @@ -6,14 +6,16 @@
  #
  
  PORTNAME=	libftdi
 -PORTVERSION=	0.18
 +PORTVERSION=	0.20
  CATEGORIES=	devel
  MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
  
  MAINTAINER=	o.davydenko at gmail.com
  COMMENT=	A library (using libusb) to talk to FTDI chips
  
 -OPTIONS=	BOOST	"Build with boost"	off
 +OPTIONS_DEFINE+=	BOOST PYTHON
 +BOOST_DESC=		Build with boost
 +PYTHON_DESC=		Python bindings
  
  USE_AUTOTOOLS=		autoconf libtool automake
  GNU_CONFIGURE=		yes
 @@ -23,9 +25,9 @@
  
  PORTDOCS=		COPYING.LIB ChangeLog README
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(WITH_BOOST)
 +.if ${PORT_OPTIONS:MBOOST}
  PLIST_SUB+=		BOOST=""
  CONFIGURE_ARGS+=	--with-boost
  CXXFLAGS+=		"-I${LOCALBASE}/include"
 @@ -35,6 +37,14 @@
  CONFIGURE_ARGS+=	--without-boost
  .endif
  
 +.if ${PORT_OPTIONS:MPYTHON}
 +PLIST_SUB+=		PYTHON=""
 +CONFIGURE_ARGS+=	--enable-python-binding
 +USE_PYTHON=		yes
 +.else
 +PLIST_SUB+=		PYTHON="@comment "
 +.endif
 +
  .if ${OSVERSION} < 800069
  LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
  .else
 @@ -47,7 +57,7 @@
  		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
  
  pre-configure:
 -	@cd ${WRKSRC} && ${AUTORECONF}
 +	cd ${WRKSRC} && ${AUTORECONF} --force --install
  
  post-install:
  .if !defined(NOPORTDOCS)
 @@ -55,4 +65,4 @@
  	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 --- distinfo.orig	2011-03-05 07:55:45.000000000 -0800
 +++ distinfo	2012-08-11 18:01:08.000000000 -0700
 @@ -1,2 +1,2 @@
 -SHA256 (libftdi-0.18.tar.gz) = 5b6f3c3ee51c6aa24d3b87135e01762cf68821d1c3599d87d349fea4ede74c62
 -SIZE (libftdi-0.18.tar.gz) = 398380
 +SHA256 (libftdi-0.20.tar.gz) = 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e
 +SIZE (libftdi-0.20.tar.gz) = 423570
 --- pkg-plist.orig	2011-06-12 06:55:44.000000000 -0700
 +++ pkg-plist	2012-08-11 18:01:08.000000000 -0700
 @@ -4,19 +4,23 @@
  bin/bitbang_cbus
  bin/bitbang_ft2232
  bin/find_all
 +bin/serial_test
  %%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.19
 +lib/libftdi.so.21
  %%BOOST%%lib/libftdipp.a
  %%BOOST%%lib/libftdipp.la
  %%BOOST%%lib/libftdipp.so
  %%BOOST%%lib/libftdipp.so.19
 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_ftdi.so
 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi.py
 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi.pyc
 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libftdi-0.20-py2.7.egg-info
  libdata/pkgconfig/libftdi.pc
  %%BOOST%%libdata/pkgconfig/libftdipp.pc
 
 --------------050503070108030308080402--