Attachment 159183 Details for Bug 201845 – graphics_gphoto2.shar

graphics_gphoto2.shar

graphics_gphoto2.shar (text/plain), 6.01 KB, created by tkato432 on 2015-07-24 18:34:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-07-24 18:34:37 UTC

Size: 6.01 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	graphics_libgphoto2.diff
>#	graphics_gphoto2.diff
>#
>echo x - graphics_libgphoto2.diff
>sed 's/^X//' >graphics_libgphoto2.diff << 'd64ac200ec15b9bd128819af21875b49'
>Xdiff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
>X--- /usr/ports/graphics/libgphoto2/Makefile	2015-06-23 07:01:41.293318000 +0900
>X+++ graphics/libgphoto2/Makefile	2015-07-25 00:00:00.000000000 +0900
>X@@ -2,7 +2,7 @@
>X # $FreeBSD: head/graphics/libgphoto2/Makefile 390310 2015-06-22 18:33:20Z antoine $
>X 
>X PORTNAME=	libgphoto2
>X-PORTVERSION=	2.5.7
>X+PORTVERSION=	2.5.8
>X CATEGORIES=	graphics
>X MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
>X 
>X@@ -10,7 +10,7 @@
>X COMMENT=	Universal digital camera control library
>X 
>X LICENSE=	LGPL21
>X-LICENSE_FILE=	${WRKSRC}/COPYING
>X+#LICENSE_FILE=	${WRKSRC}/COPYING
>X 
>X LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
>X 
>X@@ -55,9 +55,9 @@
>X post-patch:
>X .for i in configure libgphoto2_port/configure
>X 	@${REINPLACE_CMD} -e \
>X-		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
>X-		 /FLAGS/s|-g|| ; \
>X-		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
>X+		'/FLAGS/s|-g|| ; \
>X+		 /grep -i linux/s|; fi ; then|; else false; fi ; then| ; \
>X+		 /pkgconfig/s|$${libdir}|$${prefix}/libdata|' \
>X 		${WRKSRC}/${i}
>X .endfor
>X 	@${REINPLACE_CMD} -e \
>Xdiff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
>X--- /usr/ports/graphics/libgphoto2/distinfo	2015-01-23 20:07:53.000000000 +0900
>X+++ graphics/libgphoto2/distinfo	2015-07-25 00:00:00.000000000 +0900
>X@@ -1,2 +1,2 @@
>X-SHA256 (libgphoto2-2.5.7.tar.bz2) = 7260193277bdb4c319dd8f151224f87deac9fde64cbe5d2eb25d9c19e4d09894
>X-SIZE (libgphoto2-2.5.7.tar.bz2) = 6726164
>X+SHA256 (libgphoto2-2.5.8.tar.bz2) = 031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6
>X+SIZE (libgphoto2-2.5.8.tar.bz2) = 6941251
>Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h
>X--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h	2014-06-21 17:44:35.000000000 +0900
>X+++ graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h	2015-07-25 00:00:00.000000000 +0900
>X@@ -1,6 +1,6 @@
>X---- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig	2011-04-05 08:38:24.000000000 +0200
>X-+++ libgphoto2_port/gphoto2/gphoto2-port-portability.h	2013-10-26 11:13:54.000000000 +0200
>X-@@ -152,20 +152,6 @@
>X+--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig	2014-06-27 05:26:01 UTC
>X++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h
>X+@@ -174,20 +174,6 @@ typedef struct {
>X  
>X  /* yummy. :) */
>X  
>Xdiff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c
>X--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	1970-01-01 09:00:00.000000000 +0900
>X+++ graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	2015-07-25 00:00:00.000000000 +0900
>X@@ -0,0 +1,13 @@
>X+--- libgphoto2_port/libusb1/libusb1.c.orig	2015-06-15 20:13:54 UTC
>X++++ libgphoto2_port/libusb1/libusb1.c
>X+@@ -66,6 +66,10 @@
>X+ 	}\
>X+ } while(0)
>X+ 
>X++#ifndef LIBUSB_CALL
>X++#define LIBUSB_CALL
>X++#endif
>X++
>X+ #ifndef HAVE_LIBUSB_STRERROR
>X+ static const char *libusb_strerror(int r)
>X+ {
>d64ac200ec15b9bd128819af21875b49
>echo x - graphics_gphoto2.diff
>sed 's/^X//' >graphics_gphoto2.diff << '4a42443d63703904263e18f4dc1a673f'
>Xdiff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
>X--- /usr/ports/graphics/gphoto2/Makefile	2015-01-23 20:07:53.000000000 +0900
>X+++ graphics/gphoto2/Makefile	2015-07-25 00:00:00.000000000 +0900
>X@@ -2,7 +2,7 @@
>X # $FreeBSD: head/graphics/gphoto2/Makefile 377718 2015-01-23 09:35:06Z vanilla $
>X 
>X PORTNAME=	gphoto2
>X-PORTVERSION=	2.5.6
>X+PORTVERSION=	2.5.8
>X CATEGORIES=	graphics
>X MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
>X 
>X@@ -10,6 +10,7 @@
>X COMMENT=	Command-line frontend to libgphoto2
>X 
>X LICENSE=	GPLv2
>X+#LICENSE_FILE=	${WRKSRC}/COPYING
>X 
>X LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
>X 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
>X@@ -31,11 +32,11 @@
>X NLS_USES=		gettext
>X NLS_CONFIGURE_ENABLE=	nls
>X NLS_CPPFLAGS=		-I${LOCALBASE}/include
>X-NLS_LIBS=		-L${LOCALBASE}/lib -lintl
>X+NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
>X READLINE_USES=		readline
>X-READLINE_CONFIGURE_WITH=readline
>X+READLINE_CONFIGURE_WITH=	readline
>X 
>X post-install:
>X-	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
>X+	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
>X 
>X .include <bsd.port.mk>
>Xdiff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
>X--- /usr/ports/graphics/gphoto2/distinfo	2015-01-23 20:07:53.000000000 +0900
>X+++ graphics/gphoto2/distinfo	2015-07-25 00:00:00.000000000 +0900
>X@@ -1,2 +1,2 @@
>X-SHA256 (gphoto2-2.5.6.tar.bz2) = 55e5ec8b2bba4ed358f15eda466f61c79d6f75c220237f821ac687a3ceb336e8
>X-SIZE (gphoto2-2.5.6.tar.bz2) = 756926
>X+SHA256 (gphoto2-2.5.8.tar.bz2) = a9abcd15d95f205318d17e3ac12af7ce523d2bc4943709d50b0a12c30cc5ee4d
>X+SIZE (gphoto2-2.5.8.tar.bz2) = 777235
>Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-configure graphics/gphoto2/files/patch-configure
>X--- /usr/ports/graphics/gphoto2/files/patch-configure	2014-06-21 17:44:50.000000000 +0900
>X+++ graphics/gphoto2/files/patch-configure	2015-07-25 00:00:00.000000000 +0900
>X@@ -1,6 +1,6 @@
>X---- configure.orig	2014-05-08 17:21:32.000000000 +0400
>X-+++ configure	2014-05-08 17:23:08.000000000 +0400
>X-@@ -12988,13 +12988,11 @@
>X+--- configure.orig	2015-07-05 20:43:09 UTC
>X++++ configure
>X+@@ -13459,13 +13459,11 @@ else
>X    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>X  /* end confdefs.h.  */
>X  #include <libintl.h>
>4a42443d63703904263e18f4dc1a673f
>exit
>

Actions: View

Attachments on bug 201845: 159183