After r253637, libgphoto2 no longer builds in FreeBSD-CURRENT. The following patch fixes it. Fix: PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.8.0 @@ -32,6 +30,14 @@ .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 +.endif + .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS=""--z5CRdz1jcKIEyxrPU3TkQoui9MC2E1TUcyVR4kDFwBLMfNK1 Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- Makefile.orig 2013-07-24 20:56:52.069356322 -0700 +++ Makefile 2013-07-24 21:03:53.904218430 -0700 @@ -22,9 +22,7 @@ LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ - LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ - LIBUSB_CFLAGS="-I/usr/include" \ - LIBUSB_LIBS="-lusb" + LIBLTDL="-L${LOCALBASE}/lib -lltdl"
Author: kwm Date: Thu Jul 25 18:55:01 2013 New Revision: 323662 URL: http://svnweb.freebsd.org/changeset/ports/323662 Log: Unbreak after base rev 253637 While here remove unused patch PR: ports/180825 Submitted by: rpaulo@ Deleted: head/graphics/libgphoto2/files/extra-patch-usb20 Modified: head/graphics/libgphoto2/Makefile Modified: head/graphics/libgphoto2/Makefile ============================================================================== --- head/graphics/libgphoto2/Makefile Thu Jul 25 18:53:30 2013 (r323661) +++ head/graphics/libgphoto2/Makefile Thu Jul 25 18:55:01 2013 (r323662) @@ -22,9 +22,7 @@ USE_AUTOTOOLS= libtool libltdl LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ - LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ - LIBUSB_CFLAGS="-I/usr/include" \ - LIBUSB_LIBS="-lusb" + LIBLTDL="-L${LOCALBASE}/lib -lltdl" PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.8.0 @@ -32,6 +30,14 @@ MAN3= libgphoto2.3 libgphoto2_port.3 .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 +.endif + .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed thanks!