svn commit: r331670 - in head/graphics/libgphoto2: . files

[Tijl Coosemans]

Author: tijl
Date: Sat Oct 26 09:58:00 2013
New Revision: 331670
URL: http://svnweb.freebsd.org/changeset/ports/331670

Log:
  - Fix pkg-plist on FreeBSD 10 and let FreeBSD 8 and 9 use the libusb 1.0
    API too.
  - Remove patching of libgphoto2_port.pc.in.  It has no effect.
  - Don't define _XOPEN_SOURCE and _POSIX_C_SOURCE to old values.  It hides
    C99 symbols like snprintf that the port uses.
  
  PR:		ports/183308

Added:
  head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h   (contents, props changed)
Deleted:
  head/graphics/libgphoto2/files/patch-libgphoto2_port-usb-libusb.c
Modified:
  head/graphics/libgphoto2/Makefile
  head/graphics/libgphoto2/pkg-plist   (contents, props changed)

Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile	Sat Oct 26 09:36:20 2013	(r331669)
+++ head/graphics/libgphoto2/Makefile	Sat Oct 26 09:58:00 2013	(r331670)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgphoto2
 PORTVERSION=	2.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
@@ -23,17 +23,14 @@ LIBTOOLFILES=	configure libgphoto2_port/
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
+CFLAGS+=	-DENODATA=9999	# Safe because it's never used
 
 PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000040
-CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" \
-		LIBUSB_LIBS="-lusb"
-.else
-# Safe because it's never used
-CFLAGS+=	-DENODATA=0
+CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
@@ -66,8 +63,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
 			${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e '/Requires/d' \
-		${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in
 	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
 		${WRKSRC}/libgphoto2_port/configure
 

Added: head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h	Sat Oct 26 09:58:00 2013	(r331670)
@@ -0,0 +1,23 @@
+--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig	2011-04-05 08:38:24.000000000 +0200
++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h	2013-10-26 11:13:54.000000000 +0200
+@@ -152,20 +152,6 @@
+ 
+ /* yummy. :) */
+ 
+-/* XOPEN needed for usleep */
+-#ifndef _XOPEN_SOURCE
+-# define _XOPEN_SOURCE 500
+-#else
+-# if ((_XOPEN_SOURCE - 0) < 500)
+-#  undef _XOPEN_SOURCE
+-#  define _XOPEN_SOURCE 500
+-# endif
+-#endif
+-
+-/* for nanosleep */
+-# ifndef _POSIX_C_SOURCE
+-#  define _POSIX_C_SOURCE 199309
+-# endif
+ # include <time.h>
+ 
+ # include <strings.h>

Modified: head/graphics/libgphoto2/pkg-plist
==============================================================================
--- head/graphics/libgphoto2/pkg-plist	Sat Oct 26 09:36:20 2013	(r331669)
+++ head/graphics/libgphoto2/pkg-plist	Sat Oct 26 09:58:00 2013	(r331670)
@@ -218,9 +218,9 @@ lib/libgphoto2_port/%%VERSION_PORT%%/ptp
 lib/libgphoto2_port/%%VERSION_PORT%%/serial.a
 lib/libgphoto2_port/%%VERSION_PORT%%/serial.la
 lib/libgphoto2_port/%%VERSION_PORT%%/serial.so
-lib/libgphoto2_port/%%VERSION_PORT%%/usb.a
-lib/libgphoto2_port/%%VERSION_PORT%%/usb.la
-lib/libgphoto2_port/%%VERSION_PORT%%/usb.so
+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.a
+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.la
+lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
 lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.a
 lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.la
 lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.so