From 1478d9df0df82a401f69a8c619412b781a5ab308 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 19 Oct 2007 12:57:51 +0000 Subject: [PATCH] - monster update to 2.4.0 - enable localizations - remove Arnaud Launay from MAINTAINER (timeout) ; leave espie@ though ;) feedback and testing sthen@ landry@, thanks guys! ok sthen@ landry@ jasper@, "go ahead" espie@ --- graphics/libgphoto2/Makefile | 27 +- graphics/libgphoto2/distinfo | 10 +- graphics/libgphoto2/patches/patch-Makefile_in | 12 + graphics/libgphoto2/patches/patch-aclocal_m4 | 12 - .../patch-camlibs_agfa-cl20_Makefile_in | 11 - .../patches/patch-camlibs_aox_Makefile_in | 11 - .../patches/patch-camlibs_barbie_Makefile_in | 11 - .../patches/patch-camlibs_canon_Makefile_in | 11 - .../patches/patch-camlibs_canon_usb_c | 12 + .../patches/patch-camlibs_digita_Makefile_in | 11 - .../patches/patch-camlibs_dimera_Makefile_in | 11 - .../patch-camlibs_directory_Makefile_in | 11 - .../patch-camlibs_directory_directory_c | 11 + .../patch-camlibs_enigma13_Makefile_in | 11 - .../patches/patch-camlibs_fuji_Makefile_in | 11 - .../patch-camlibs_gsmart300_Makefile_in | 11 - .../patches/patch-camlibs_iclick_Makefile_in | 11 - .../patches/patch-camlibs_jamcam_Makefile_in | 11 - .../patches/patch-camlibs_jd11_Makefile_in | 11 - .../patch-camlibs_kodak_dc120_Makefile_in | 11 - .../patch-camlibs_kodak_dc210_Makefile_in | 11 - .../patch-camlibs_kodak_dc240_Makefile_in | 11 - .../patch-camlibs_kodak_dc3200_Makefile_in | 11 - .../patch-camlibs_kodak_ez200_Makefile_in | 11 - .../patches/patch-camlibs_konica_Makefile_in | 11 - .../patch-camlibs_largan_lmini_Makefile_in | 11 - .../patches/patch-camlibs_mars_Makefile_in | 11 - .../patch-camlibs_minolta_dimagev_Makefile_in | 11 - .../patches/patch-camlibs_mustek_Makefile_in | 11 - .../patch-camlibs_panasonic_Makefile_in | 11 - ...tch-camlibs_panasonic_coolshot_Makefile_in | 11 - .../patch-camlibs_panasonic_l859_Makefile_in | 11 - .../patch-camlibs_pccam300_Makefile_in | 11 - .../patch-camlibs_pccam600_Makefile_in | 11 - .../patch-camlibs_polaroid_Makefile_in | 11 - .../patches/patch-camlibs_ptp2_Makefile_in | 11 - .../patches/patch-camlibs_ptp2_config_c | 11 + .../patches/patch-camlibs_ptp2_library_c | 35 ++ .../patches/patch-camlibs_ricoh_Makefile_in | 11 - .../patches/patch-camlibs_samsung_Makefile_in | 11 - .../patches/patch-camlibs_sierra_Makefile_in | 11 - .../patches/patch-camlibs_sipix_Makefile_in | 11 - .../patches/patch-camlibs_smal_Makefile_in | 11 - .../patch-camlibs_sonydscf1_Makefile_in | 11 - .../patch-camlibs_sonydscf55_Makefile_in | 11 - .../patch-camlibs_soundvision_Makefile_in | 11 - .../patches/patch-camlibs_spca50x_Makefile_in | 11 - .../patches/patch-camlibs_sq905_Makefile_in | 11 - .../patches/patch-camlibs_stv0674_Makefile_in | 11 - .../patches/patch-camlibs_stv0680_Makefile_in | 11 - .../patches/patch-camlibs_sx330z_Makefile_in | 11 - .../patch-camlibs_toshiba_pdrm11_Makefile_in | 11 - graphics/libgphoto2/patches/patch-configure | 17 + .../libgphoto2/patches/patch-configure_in | 26 -- .../patches/patch-gphoto2-config_in | 12 - .../patches/patch-libgphoto2_Makefile_in | 11 - .../patches/patch-libgphoto2_filesys_c | 12 - .../patches/patch-libgphoto2_port_Makefile_in | 12 + .../patches/patch-libgphoto2_port_configure | 17 + ...o2_port_gphoto2_gphoto2-port-portability_h | 26 ++ ...ibgphoto2_port_libgphoto2_port_Makefile_in | 11 - ...libgphoto2_port_gphoto2-port-portability_h | 14 - .../patches/patch-libgphoto2_port_ltmain_sh | 12 - .../patch-libgphoto2_port_serial_Makefile_in | 12 - .../patch-libgphoto2_port_test_Makefile_in | 11 - .../patch-libgphoto2_port_usb_Makefile_in | 12 - .../patches/patch-tests_Makefile_in | 15 + graphics/libgphoto2/pkg/PFRAG.shared | 117 ++++--- graphics/libgphoto2/pkg/PLIST | 323 +++++++++++------- 69 files changed, 450 insertions(+), 824 deletions(-) create mode 100644 graphics/libgphoto2/patches/patch-Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-aclocal_m4 delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_agfa-cl20_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_aox_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_barbie_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_canon_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-camlibs_canon_usb_c delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_digita_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_dimera_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_directory_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-camlibs_directory_directory_c delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_enigma13_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_fuji_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_gsmart300_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_iclick_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_jamcam_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_jd11_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_kodak_dc120_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_kodak_dc210_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_kodak_dc240_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_kodak_dc3200_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_kodak_ez200_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_konica_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_largan_lmini_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_mars_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_minolta_dimagev_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_mustek_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_panasonic_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_panasonic_coolshot_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_panasonic_l859_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_pccam300_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_pccam600_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_polaroid_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_ptp2_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-camlibs_ptp2_config_c create mode 100644 graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_ricoh_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_samsung_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sierra_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sipix_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_smal_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sonydscf1_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sonydscf55_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_soundvision_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_spca50x_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sq905_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_stv0674_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_stv0680_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_sx330z_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-camlibs_toshiba_pdrm11_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-configure delete mode 100644 graphics/libgphoto2/patches/patch-configure_in delete mode 100644 graphics/libgphoto2/patches/patch-gphoto2-config_in delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_filesys_c create mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_configure create mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_gphoto2-port-portability_h delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_ltmain_sh delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_serial_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_test_Makefile_in delete mode 100644 graphics/libgphoto2/patches/patch-libgphoto2_port_usb_Makefile_in create mode 100644 graphics/libgphoto2/patches/patch-tests_Makefile_in diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index d7659d6e6fc..3d3161b9f4b 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.12 2007/08/05 08:27:55 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2007/10/19 12:57:51 ajacoutot Exp $ COMMENT= digital camera library CATEGORIES= graphics devel -MAINTAINER= Marc Espie , Arnaud Launay +MAINTAINER= Marc Espie -VERSION= 2.1.5 +VERSION= 2.4.0 DISTNAME= libgphoto2-${VERSION} -PKGNAME= libgphoto-${VERSION}p2 -SHARED_LIBS= gphoto2 2.3 \ - gphoto2_port 5.1 +PKGNAME= libgphoto-${VERSION} +SHARED_LIBS+= gphoto2 3.0 # 5.0 +SHARED_LIBS+= gphoto2_port 6.0 # 8.0 HOMEPAGE= http://www.gphoto.org/ @@ -20,21 +20,22 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -WANTLIB= m +WANTLIB= c m USE_LIBTOOL= Yes -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.57 -SEPARATE_BUILD= simple -CONFIGURE_ARGS= --disable-nls +CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_path_DOXYGEN=false +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --enable-static SUBST_VARS= VERSION MODULES= devel/gettext LIB_DEPENDS= exif::graphics/libexif \ jpeg::graphics/jpeg \ - usb::devel/libusb + usb::devel/libusb \ + ltdl.>=4::devel/libtool,-ltdl .include diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index 884ede321e9..456a42f74ac 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,5 +1,5 @@ -MD5 (libgphoto2-2.1.5.tar.gz) = IQhE8NiPWIQpF69ur/Bjgg== -RMD160 (libgphoto2-2.1.5.tar.gz) = C+CQN9Z0sTRF7z1vl4KwP7bUZqE= -SHA1 (libgphoto2-2.1.5.tar.gz) = tVdv4i3YqDv2kjinmtlJao8IE4Q= -SHA256 (libgphoto2-2.1.5.tar.gz) = RpG8h/Vn66STjRRl56Ld+ve96oZik5CDARG9A70iftU= -SIZE (libgphoto2-2.1.5.tar.gz) = 2946757 +MD5 (libgphoto2-2.4.0.tar.gz) = re8aVk09GkjhwT7ONLERtg== +RMD160 (libgphoto2-2.4.0.tar.gz) = 8yU/CIssA9NsLw0w8s/F4M/IZOQ= +SHA1 (libgphoto2-2.4.0.tar.gz) = cTASJWXMqPCo2OIJI88KGjhCNbU= +SHA256 (libgphoto2-2.4.0.tar.gz) = 37MhZpIZPzPD7wJGFNoERvjl2vQbtzSqaOdCGREcgLM= +SIZE (libgphoto2-2.4.0.tar.gz) = 4257979 diff --git a/graphics/libgphoto2/patches/patch-Makefile_in b/graphics/libgphoto2/patches/patch-Makefile_in new file mode 100644 index 00000000000..08556e9d800 --- /dev/null +++ b/graphics/libgphoto2/patches/patch-Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2007/10/19 12:57:51 ajacoutot Exp $ +--- Makefile.in.orig Thu Oct 11 13:22:12 2007 ++++ Makefile.in Thu Oct 11 13:22:27 2007 +@@ -299,7 +299,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck. + SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc + pkgconfig_DATA = libgphoto2.pc + noinst_DATA = libgphoto2-uninstalled.pc +-doc_DATA = AUTHORS COPYING README NEWS ++doc_DATA = README + nobase_include_HEADERS = \ + gphoto2/gphoto2.h \ + gphoto2/gphoto2-abilities-list.h\ diff --git a/graphics/libgphoto2/patches/patch-aclocal_m4 b/graphics/libgphoto2/patches/patch-aclocal_m4 deleted file mode 100644 index 4929dd684bb..00000000000 --- a/graphics/libgphoto2/patches/patch-aclocal_m4 +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-aclocal_m4,v 1.3 2005/05/16 17:44:02 robert Exp $ ---- aclocal.m4.orig Wed Dec 15 23:03:11 2004 -+++ aclocal.m4 Mon May 16 18:15:06 2005 -@@ -9664,6 +9664,8 @@ dnl Look for standard byte swapping macr - AC_HAVE_SYMBOL(ntohl,arpa/inet.h, - [cat >> "$1" << EOF - /* ntohl and relatives live here */ -+#include -+#include - #include - - EOF], diff --git a/graphics/libgphoto2/patches/patch-camlibs_agfa-cl20_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_agfa-cl20_Makefile_in deleted file mode 100644 index 9c749f42072..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_agfa-cl20_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_agfa-cl20_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/agfa-cl20/Makefile.in.orig Wed Dec 15 23:03:30 2004 -+++ camlibs/agfa-cl20/Makefile.in Mon May 16 18:15:06 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_agfa_cl20.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_aox_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_aox_Makefile_in deleted file mode 100644 index 2408666a5b8..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_aox_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_aox_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/aox/Makefile.in.orig Wed Dec 15 23:03:30 2004 -+++ camlibs/aox/Makefile.in Mon May 16 18:15:06 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_aox.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_barbie_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_barbie_Makefile_in deleted file mode 100644 index c847fbccad9..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_barbie_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_barbie_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/barbie/Makefile.in.orig Wed Dec 15 23:03:30 2004 -+++ camlibs/barbie/Makefile.in Mon May 16 18:15:06 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = barbie.df makefile.os2 main - camlib_LTLIBRARIES = libgphoto2_barbie.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_canon_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_canon_Makefile_in deleted file mode 100644 index ae2e26a1468..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_canon_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_canon_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/canon/Makefile.in.orig Wed Dec 15 23:03:30 2004 -+++ camlibs/canon/Makefile.in Mon May 16 18:15:06 2005 -@@ -209,7 +209,6 @@ EXTRA_DIST = .indent.pro canon.df makefi - camlib_LTLIBRARIES = libgphoto2_canon.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c b/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c new file mode 100644 index 00000000000..0e224b5780b --- /dev/null +++ b/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-camlibs_canon_usb_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- camlibs/canon/usb.c.orig Sun Oct 14 12:14:21 2007 ++++ camlibs/canon/usb.c Sun Oct 14 12:14:35 2007 +@@ -72,7 +72,7 @@ + + /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for + * an URB to come back on an interrupt endpoint */ +-#define CANON_FAST_TIMEOUT 75 ++#define CANON_FAST_TIMEOUT 750 + + /* WARNING: This destroys reentrancy of the code. Better to put this + * in the camera descriptor somewhere. */ diff --git a/graphics/libgphoto2/patches/patch-camlibs_digita_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_digita_Makefile_in deleted file mode 100644 index 5bae1d45f2c..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_digita_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_digita_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/digita/Makefile.in.orig Wed Dec 15 23:03:30 2004 -+++ camlibs/digita/Makefile.in Mon May 16 18:15:06 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = digita.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_digita.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_dimera_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_dimera_Makefile_in deleted file mode 100644 index 82621829ebb..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_dimera_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_dimera_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/dimera/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/dimera/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = dimera.df makefile.os2 CRED - camlib_LTLIBRARIES = libgphoto2_dimera3500.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_directory_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_directory_Makefile_in deleted file mode 100644 index 356cf85b83c..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_directory_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_directory_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/directory/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/directory/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = directory.df directory.def - camlib_LTLIBRARIES = libgphoto2_directory.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - $(EXIF_CFLAGS) diff --git a/graphics/libgphoto2/patches/patch-camlibs_directory_directory_c b/graphics/libgphoto2/patches/patch-camlibs_directory_directory_c new file mode 100644 index 00000000000..a82a58271de --- /dev/null +++ b/graphics/libgphoto2/patches/patch-camlibs_directory_directory_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-camlibs_directory_directory_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- camlibs/directory/directory.c.orig Thu Oct 11 12:42:30 2007 ++++ camlibs/directory/directory.c Thu Oct 11 12:41:53 2007 +@@ -38,6 +38,7 @@ + # include + #endif + #ifdef HAVE_SYS_MOUNT_H ++# include + # include + #endif + #ifdef HAVE_SYS_STATFS_H diff --git a/graphics/libgphoto2/patches/patch-camlibs_enigma13_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_enigma13_Makefile_in deleted file mode 100644 index a30b8e62f9c..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_enigma13_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_enigma13_Makefile_in,v 1.1 2005/05/16 17:44:02 robert Exp $ ---- camlibs/enigma13/Makefile.in.orig Wed Apr 13 15:20:37 2005 -+++ camlibs/enigma13/Makefile.in Wed Apr 13 15:20:44 2005 -@@ -209,7 +209,6 @@ camlib_LTLIBRARIES = \ - EXTRA_DIST = - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_fuji_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_fuji_Makefile_in deleted file mode 100644 index cb52921056b..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_fuji_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_fuji_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/fuji/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/fuji/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_fuji.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_gsmart300_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_gsmart300_Makefile_in deleted file mode 100644 index ce0872fa525..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_gsmart300_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_gsmart300_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/gsmart300/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/gsmart300/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_gsmart300.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_iclick_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_iclick_Makefile_in deleted file mode 100644 index 290e0d28fe8..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_iclick_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_iclick_Makefile_in,v 1.1 2005/05/16 17:44:02 robert Exp $ ---- camlibs/iclick/Makefile.in.orig Wed Apr 13 15:21:50 2005 -+++ camlibs/iclick/Makefile.in Wed Apr 13 15:21:56 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_iclick.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_jamcam_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_jamcam_Makefile_in deleted file mode 100644 index 1a6ba03097a..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_jamcam_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_jamcam_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/jamcam/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/jamcam/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_jamcam.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_jd11_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_jd11_Makefile_in deleted file mode 100644 index 747acd7dae5..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_jd11_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_jd11_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/jd11/Makefile.in.orig Wed Dec 15 23:03:31 2004 -+++ camlibs/jd11/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = jd11.html - camlib_LTLIBRARIES = libgphoto2_jd11.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc120_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_kodak_dc120_Makefile_in deleted file mode 100644 index dc7ef6538e0..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc120_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_kodak_dc120_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/kodak/dc120/Makefile.in.orig Wed Dec 15 23:03:32 2004 -+++ camlibs/kodak/dc120/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = kodak.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_kodak_dc120.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc210_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_kodak_dc210_Makefile_in deleted file mode 100644 index 2b862c7cd63..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc210_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_kodak_dc210_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/kodak/dc210/Makefile.in.orig Wed Dec 15 23:03:32 2004 -+++ camlibs/kodak/dc210/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = kodak.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_kodak_dc210.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc240_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_kodak_dc240_Makefile_in deleted file mode 100644 index 9a75f55768b..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc240_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_kodak_dc240_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/kodak/dc240/Makefile.in.orig Wed Dec 15 23:03:32 2004 -+++ camlibs/kodak/dc240/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = kodak.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_kodak_dc240.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc3200_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_kodak_dc3200_Makefile_in deleted file mode 100644 index 472755c6e8d..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_kodak_dc3200_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_kodak_dc3200_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/kodak/dc3200/Makefile.in.orig Wed Dec 15 23:03:32 2004 -+++ camlibs/kodak/dc3200/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = kodak.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_kodak_dc3200.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_kodak_ez200_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_kodak_ez200_Makefile_in deleted file mode 100644 index 2a87af9eaad..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_kodak_ez200_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_kodak_ez200_Makefile_in,v 1.1 2005/05/16 17:44:02 robert Exp $ ---- camlibs/kodak/ez200/Makefile.in.orig Wed Apr 13 15:24:25 2005 -+++ camlibs/kodak/ez200/Makefile.in Wed Apr 13 15:24:32 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_ez200.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_konica_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_konica_Makefile_in deleted file mode 100644 index e36355be604..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_konica_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_konica_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/konica/Makefile.in.orig Wed Dec 15 23:03:32 2004 -+++ camlibs/konica/Makefile.in Mon May 16 18:15:07 2005 -@@ -210,7 +210,6 @@ EXTRA_DIST = EXPERTS konica.df makefile. - - INCLUDES = \ - -DLOCALIZATION=\"$(datadir)/$(PACKAGE)/$(VERSION)/konica\" \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port - diff --git a/graphics/libgphoto2/patches/patch-camlibs_largan_lmini_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_largan_lmini_Makefile_in deleted file mode 100644 index c72c2f1e6a6..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_largan_lmini_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_largan_lmini_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/largan/lmini/Makefile.in.orig Wed Dec 15 23:03:33 2004 -+++ camlibs/largan/lmini/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_largan.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_mars_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_mars_Makefile_in deleted file mode 100644 index 30b6b1d8994..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_mars_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_mars_Makefile_in,v 1.1 2005/05/16 17:44:02 robert Exp $ ---- camlibs/mars/Makefile.in.orig Wed Apr 13 15:29:30 2005 -+++ camlibs/mars/Makefile.in Wed Apr 13 15:29:36 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_mars.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_minolta_dimagev_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_minolta_dimagev_Makefile_in deleted file mode 100644 index 9df61698766..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_minolta_dimagev_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_minolta_dimagev_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/minolta/dimagev/Makefile.in.orig Wed Dec 15 23:03:33 2004 -+++ camlibs/minolta/dimagev/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = dimagev.df makefile.os2 - camlib_LTLIBRARIES = libgphoto2_dimagev.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_mustek_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_mustek_Makefile_in deleted file mode 100644 index 19d7575704a..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_mustek_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_mustek_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/mustek/Makefile.in.orig Wed Dec 15 23:03:33 2004 -+++ camlibs/mustek/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_mustek.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_panasonic_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_panasonic_Makefile_in deleted file mode 100644 index 525fa9af759..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_panasonic_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_panasonic_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/panasonic/Makefile.in.orig Wed Dec 15 23:03:33 2004 -+++ camlibs/panasonic/Makefile.in Mon May 16 18:15:07 2005 -@@ -212,7 +212,6 @@ camlib_LTLIBRARIES = \ - - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_panasonic_coolshot_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_panasonic_coolshot_Makefile_in deleted file mode 100644 index dab15189379..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_panasonic_coolshot_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_panasonic_coolshot_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/panasonic/coolshot/Makefile.in.orig Wed Dec 15 23:03:33 2004 -+++ camlibs/panasonic/coolshot/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_panasonic_coolshot.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_panasonic_l859_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_panasonic_l859_Makefile_in deleted file mode 100644 index 592cc82ea52..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_panasonic_l859_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_panasonic_l859_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/panasonic/l859/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/panasonic/l859/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_panasonic_l859.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_pccam300_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_pccam300_Makefile_in deleted file mode 100644 index e42f399f018..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_pccam300_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_pccam300_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/pccam300/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/pccam300/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_pccam300.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_pccam600_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_pccam600_Makefile_in deleted file mode 100644 index 95b3af9c133..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_pccam600_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_pccam600_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/pccam600/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/pccam600/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_pccam600.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_polaroid_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_polaroid_Makefile_in deleted file mode 100644 index e97780406ed..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_polaroid_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_polaroid_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/polaroid/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/polaroid/Makefile.in Mon May 16 18:15:07 2005 -@@ -211,7 +211,6 @@ camlib_LTLIBRARIES = \ - - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_ptp2_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_ptp2_Makefile_in deleted file mode 100644 index 3cec4b05162..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_ptp2_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_ptp2_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/ptp2/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/ptp2/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = ptp-pack.c - camlib_LTLIBRARIES = libgphoto2_ptp2.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_ptp2_config_c b/graphics/libgphoto2/patches/patch-camlibs_ptp2_config_c new file mode 100644 index 00000000000..5b0ab037d67 --- /dev/null +++ b/graphics/libgphoto2/patches/patch-camlibs_ptp2_config_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-camlibs_ptp2_config_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- camlibs/ptp2/config.c.orig Thu Oct 11 12:58:55 2007 ++++ camlibs/ptp2/config.c Thu Oct 11 12:58:09 2007 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c b/graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c new file mode 100644 index 00000000000..43eada20e49 --- /dev/null +++ b/graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c @@ -0,0 +1,35 @@ +$OpenBSD: patch-camlibs_ptp2_library_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- camlibs/ptp2/library.c.orig Fri Jul 27 02:35:37 2007 ++++ camlibs/ptp2/library.c Mon Oct 15 12:34:45 2007 +@@ -26,7 +26,11 @@ + #include + #include + #include ++#ifndef __OpenBSD__ ++/* nl_langinfo(CODESET) returns 646, not usable by iconv_open() */ ++#define HAVE_NL_LANGINFO + #include ++#endif + + #include + #include +@@ -683,6 +687,7 @@ static struct { + {"Canon:PowerShot A710 IS (PTP mode)", 0x04a9, 0x3138, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:PowerShot A640 (PTP mode)", 0x04a9, 0x3139, PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW}, + {"Canon:PowerShot A630 (PTP mode)", 0x04a9, 0x313a, PTPBUG_DELETE_SENDS_EVENT}, ++ {"Canon:EOS 40D (PTP mode)", 0x04a9, 0x3146, 0}, + {"Canon:PowerShot S5 IS (PTP mode)", 0x04a9, 0x3148, PTP_CAP|PTP_CAP_PREVIEW}, + {"Canon:PowerShot A570 IS (PTP mode)", 0x04a9, 0x314c, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:PowerShot A560 (PTP mode)", 0x04a9, 0x314d, PTPBUG_DELETE_SENDS_EVENT}, +@@ -4203,7 +4208,11 @@ camera_init (Camera *camera, GPContext *context) + break; + } + ++#ifdef HAVE_NL_LANGINFO + curloc = nl_langinfo (CODESET); ++#else ++ curloc="ISO-8859-1"; ++#endif + if (!curloc) curloc="UTF-8"; + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, camloc); + camera->pl->params.cd_locale_to_ucs2 = iconv_open(camloc, curloc); diff --git a/graphics/libgphoto2/patches/patch-camlibs_ricoh_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_ricoh_Makefile_in deleted file mode 100644 index 43ebea3d7e4..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_ricoh_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_ricoh_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/ricoh/Makefile.in.orig Wed Dec 15 23:03:34 2004 -+++ camlibs/ricoh/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ camlib_LTLIBRARIES = libgphoto2_ricoh.la - EXTRA_DIST = g3.txt - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_samsung_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_samsung_Makefile_in deleted file mode 100644 index dce151b0513..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_samsung_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_samsung_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/samsung/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/samsung/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_samsung.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_sierra_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sierra_Makefile_in deleted file mode 100644 index c56483d3d8f..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sierra_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sierra_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sierra/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/sierra/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = sierra.df makefile.os2 PROT - camlib_LTLIBRARIES = libgphoto2_sierra.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_sipix_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sipix_Makefile_in deleted file mode 100644 index abc377c78d9..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sipix_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sipix_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sipix/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/sipix/Makefile.in Mon May 16 18:15:07 2005 -@@ -211,7 +211,6 @@ camlib_LTLIBRARIES = \ - EXTRA_DIST = web2.html blink.txt xjpeg.c - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_smal_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_smal_Makefile_in deleted file mode 100644 index 1b90fd8cb98..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_smal_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_smal_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/smal/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/smal/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_smal.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_sonydscf1_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sonydscf1_Makefile_in deleted file mode 100644 index 6469253f51c..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sonydscf1_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sonydscf1_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sonydscf1/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/sonydscf1/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = sonydscf1.df makefile.os2 r - camlib_LTLIBRARIES = libgphoto2_sony_dscf1.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_sonydscf55_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sonydscf55_Makefile_in deleted file mode 100644 index aff25460fe7..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sonydscf55_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sonydscf55_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sonydscf55/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/sonydscf55/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_sony_dscf55.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_soundvision_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_soundvision_Makefile_in deleted file mode 100644 index 04a622846a6..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_soundvision_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_soundvision_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/soundvision/Makefile.in.orig Wed Dec 15 23:03:35 2004 -+++ camlibs/soundvision/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_soundvision.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_spca50x_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_spca50x_Makefile_in deleted file mode 100644 index 301f1d56aab..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_spca50x_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_spca50x_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/spca50x/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/spca50x/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_spca50x.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_sq905_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sq905_Makefile_in deleted file mode 100644 index 48e8b74a2bf..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sq905_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sq905_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sq905/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/sq905/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_sq905.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir) \ diff --git a/graphics/libgphoto2/patches/patch-camlibs_stv0674_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_stv0674_Makefile_in deleted file mode 100644 index 4a81788992b..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_stv0674_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_stv0674_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/stv0674/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/stv0674/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = Protocol - camlib_LTLIBRARIES = libgphoto2_stv0674.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 - diff --git a/graphics/libgphoto2/patches/patch-camlibs_stv0680_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_stv0680_Makefile_in deleted file mode 100644 index fbec9d3fc2b..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_stv0680_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_stv0680_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/stv0680/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/stv0680/Makefile.in Mon May 16 18:15:07 2005 -@@ -207,7 +207,6 @@ EXTRA_DIST = stv0680.df makefile.os2 CRE - camlib_LTLIBRARIES = libgphoto2_stv0680.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_sx330z_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_sx330z_Makefile_in deleted file mode 100644 index afcdc8dbfc7..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_sx330z_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_sx330z_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/sx330z/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/sx330z/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_sx330z.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-camlibs_toshiba_pdrm11_Makefile_in b/graphics/libgphoto2/patches/patch-camlibs_toshiba_pdrm11_Makefile_in deleted file mode 100644 index babd740f421..00000000000 --- a/graphics/libgphoto2/patches/patch-camlibs_toshiba_pdrm11_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-camlibs_toshiba_pdrm11_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- camlibs/toshiba/pdrm11/Makefile.in.orig Wed Dec 15 23:03:36 2004 -+++ camlibs/toshiba/pdrm11/Makefile.in Mon May 16 18:15:07 2005 -@@ -205,7 +205,6 @@ target_alias = @target_alias@ - camlib_LTLIBRARIES = libgphoto2_toshiba_pdrm11.la - - INCLUDES = \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -I$(top_srcdir)/libgphoto2 \ - -I$(top_builddir)/libgphoto2 diff --git a/graphics/libgphoto2/patches/patch-configure b/graphics/libgphoto2/patches/patch-configure new file mode 100644 index 00000000000..54dcfc5efb9 --- /dev/null +++ b/graphics/libgphoto2/patches/patch-configure @@ -0,0 +1,17 @@ +$OpenBSD: patch-configure,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- configure.orig Tue Oct 16 16:48:32 2007 ++++ configure Tue Oct 16 16:49:17 2007 +@@ -28442,10 +28442,10 @@ MSGFMT!$MSGFMT$ac_delim + GMSGFMT!$GMSGFMT$ac_delim + XGETTEXT!$XGETTEXT$ac_delim + MSGMERGE!$MSGMERGE$ac_delim +-LIBICONV!$LIBICONV$ac_delim ++LIBICONV!$LTLIBICONV$ac_delim + LTLIBICONV!$LTLIBICONV$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-LIBINTL!$LIBINTL$ac_delim ++INTLLIBS!$LTLIBINTL$ac_delim ++LIBINTL!$LTLIBINTL$ac_delim + LTLIBINTL!$LTLIBINTL$ac_delim + POSUB!$POSUB$ac_delim + LIBJPEG!$LIBJPEG$ac_delim diff --git a/graphics/libgphoto2/patches/patch-configure_in b/graphics/libgphoto2/patches/patch-configure_in deleted file mode 100644 index 8ebf8c2bd50..00000000000 --- a/graphics/libgphoto2/patches/patch-configure_in +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.5 2005/05/16 17:44:02 robert Exp $ ---- configure.in.orig Wed Dec 15 23:01:51 2004 -+++ configure.in Mon May 16 18:15:06 2005 -@@ -68,15 +68,13 @@ else - fi - AM_GNU_GETTEXT - --AC_CHECK_FUNC(gettext, gettext_without_libintl=true) --# same trick as with libdl: --# if gettext() doesn't require linking against libintl, --# we don't have to check for gettext in libintl. Otherwise --# we may even require libintl. --dnl AC_CHECK_LIB(intl, gettext, [LIBS="$LIBS -lintl"]) --if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then -- AC_CHECK_LIB(intl, gettext, [INTLLIBS="$INTLLIBS -lintl"]) --fi -+LIBS="$LIBS -liconv" -+AC_CHECK_LIB(intl, bindtextdomain, -+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl, -+ [AC_CHECK_LIB(intl, gettext, -+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"], -+ gt_cv_func_gettext_libintl=no)], -+gt_cv_func_gettext_libintl=no)]) - - dnl --------------------------------------------------------------------------- - dnl Turn on debugging and all warnings when using gcc diff --git a/graphics/libgphoto2/patches/patch-gphoto2-config_in b/graphics/libgphoto2/patches/patch-gphoto2-config_in deleted file mode 100644 index cdc094b3624..00000000000 --- a/graphics/libgphoto2/patches/patch-gphoto2-config_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gphoto2-config_in,v 1.1.1.1 2003/04/09 23:55:01 espie Exp $ ---- gphoto2-config.in.orig Thu Feb 27 10:37:30 2003 -+++ gphoto2-config.in Thu Feb 27 10:37:39 2003 -@@ -59,7 +59,7 @@ while test $# -gt 0; do - ;; - - --libs) -- echo "-L@libdir@" -lgphoto2 -lm -+ echo "-L@libdir@" -lgphoto2 -lm -lgphoto2_port - ;; - - *) diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_Makefile_in deleted file mode 100644 index 6512bd6133e..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libgphoto2_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2/Makefile.in.orig Wed Dec 15 23:03:37 2004 -+++ libgphoto2/Makefile.in Mon May 16 18:15:06 2005 -@@ -204,7 +204,6 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - INCLUDES = \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port/libgphoto2_port \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DCAMLIBS=\"$(camlibdir)\" \ diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_filesys_c b/graphics/libgphoto2/patches/patch-libgphoto2_filesys_c deleted file mode 100644 index 94ca15efff3..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_filesys_c +++ /dev/null @@ -1,12 +0,0 @@ ---- libgphoto2/gphoto2-filesys.c.orig Wed Jul 5 12:55:58 2006 -+++ libgphoto2/gphoto2-filesys.c Wed Jul 5 12:56:05 2006 -@@ -119,7 +119,8 @@ - /* - * HP PhotoSmart C30 has the date and time in ifd_exif. - */ --#ifdef HAVE_EXIF_0_5_4 -+/* was #ifdef HAVE_EXIF_0_5_4 */ -+#if 1 - e = exif_content_get_entry (ed->ifd[EXIF_IFD_0], EXIF_TAG_DATE_TIME); - if (!e) - e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF], diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in new file mode 100644 index 00000000000..048f9ece11d --- /dev/null +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- libgphoto2_port/Makefile.in.orig Thu Oct 11 13:24:02 2007 ++++ libgphoto2_port/Makefile.in Thu Oct 11 13:25:14 2007 +@@ -759,7 +759,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-data-local install-docDATA \ ++install-data-am: install-data-local \ + install-nobase_includeHEADERS install-pkgconfigDATA + + install-dvi: install-dvi-recursive diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_configure b/graphics/libgphoto2/patches/patch-libgphoto2_port_configure new file mode 100644 index 00000000000..7617c18501f --- /dev/null +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_configure @@ -0,0 +1,17 @@ +$OpenBSD: patch-libgphoto2_port_configure,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- libgphoto2_port/configure.orig Tue Oct 16 17:04:24 2007 ++++ libgphoto2_port/configure Tue Oct 16 17:04:49 2007 +@@ -27528,10 +27528,10 @@ MSGFMT!$MSGFMT$ac_delim + GMSGFMT!$GMSGFMT$ac_delim + XGETTEXT!$XGETTEXT$ac_delim + MSGMERGE!$MSGMERGE$ac_delim +-LIBICONV!$LIBICONV$ac_delim ++LIBICONV!$LTLIBICONV$ac_delim + LTLIBICONV!$LTLIBICONV$ac_delim +-INTLLIBS!$INTLLIBS$ac_delim +-LIBINTL!$LIBINTL$ac_delim ++INTLLIBS!$LTLIBINTL$ac_delim ++LIBINTL!$LTLIBINTL$ac_delim + LTLIBINTL!$LTLIBINTL$ac_delim + POSUB!$POSUB$ac_delim + MDNS_LIBS!$MDNS_LIBS$ac_delim diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h b/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h new file mode 100644 index 00000000000..ef1f47a1daf --- /dev/null +++ b/graphics/libgphoto2/patches/patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h @@ -0,0 +1,26 @@ +$OpenBSD: patch-libgphoto2_port_gphoto2_gphoto2-port-portability_h,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig Thu Oct 11 12:31:39 2007 ++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h Thu Oct 11 12:33:11 2007 +@@ -151,6 +151,7 @@ typedef struct { + /* yummy. :) */ + + /* XOPEN needed for usleep */ ++#ifndef __OpenBSD__ + #ifndef _XOPEN_SOURCE + # define _XOPEN_SOURCE 500 + #else +@@ -159,11 +160,14 @@ typedef struct { + # define _XOPEN_SOURCE 500 + # endif + #endif ++#endif + + /* for nanosleep */ ++#ifndef __OpenBSD__ + # ifndef _POSIX_C_SOURCE + # define _POSIX_C_SOURCE 199309 + # endif ++#endif + # include + + # include diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_Makefile_in deleted file mode 100644 index 30ad335274f..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_libgphoto2_port_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2_port/libgphoto2_port/Makefile.in.orig Wed Dec 15 23:01:39 2004 -+++ libgphoto2_port/libgphoto2_port/Makefile.in Mon May 16 18:15:06 2005 -@@ -187,7 +187,6 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - INCLUDES = \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/intl \ - -DIOLIBS=\"$(libdir)/gphoto2_port/$(VERSION)\" \ - -DLOCALEDIR=\"$(datadir)/locale\" - diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_gphoto2-port-portability_h b/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_gphoto2-port-portability_h deleted file mode 100644 index b0854dee98f..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_libgphoto2_port_gphoto2-port-portability_h +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_libgphoto2_port_gphoto2-port-portability_h,v 1.3 2004/01/16 01:10:47 brad Exp $ ---- libgphoto2_port/libgphoto2_port/gphoto2-port-portability.h.orig 2003-10-19 12:53:17.000000000 -0400 -+++ libgphoto2_port/libgphoto2_port/gphoto2-port-portability.h 2003-12-28 21:56:40.000000000 -0500 -@@ -60,8 +60,8 @@ typedef struct { - - /* Dynamic library functions */ - #define GP_SYSTEM_DLOPEN(_filename) dlopen(_filename, RTLD_LAZY) --#if defined(__APPLE__) -- /* Darwin prepends underscores to symbols */ -+#if defined(__APPLE__) || (defined(__OpenBSD__) && !defined(__ELF__)) -+ /* prepend an underscore to symbols */ - #define GP_SYSTEM_DLSYM(_handle, _funcname) dlsym(_handle, "_" _funcname) - #else - #define GP_SYSTEM_DLSYM(_handle, _funcname) dlsym(_handle, _funcname) diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_ltmain_sh b/graphics/libgphoto2/patches/patch-libgphoto2_port_ltmain_sh deleted file mode 100644 index 514352b715f..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_ltmain_sh +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_ltmain_sh,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2_port/ltmain.sh.orig Tue Oct 26 12:02:24 2004 -+++ libgphoto2_port/ltmain.sh Mon May 16 18:14:40 2005 -@@ -2272,7 +2272,7 @@ EOF - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -+ need_relink=no - fi - # This is a shared library - diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_serial_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_serial_Makefile_in deleted file mode 100644 index 7639b25bd4e..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_serial_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_serial_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2_port/serial/Makefile.in.orig Wed Dec 15 23:01:39 2004 -+++ libgphoto2_port/serial/Makefile.in Mon May 16 18:15:06 2005 -@@ -187,7 +187,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - EXTRA_DIST = makefile.os2 serial.df - --INCLUDES = -I$(top_srcdir)/libgphoto2_port -I$(top_srcdir)/intl -+INCLUDES = -I$(top_srcdir)/libgphoto2_port - - iolibdir = $(libdir)/gphoto2_port/$(VERSION) - iolib_LTLIBRARIES = libgphoto2_port_serial.la diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_test_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_test_Makefile_in deleted file mode 100644 index bf28429cd52..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_test_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_test_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2_port/test/Makefile.in.orig Wed Dec 15 23:01:39 2004 -+++ libgphoto2_port/test/Makefile.in Mon May 16 18:15:06 2005 -@@ -189,7 +189,6 @@ target_alias = @target_alias@ - INCLUDES = \ - $(GPPORT_CFLAGS) \ - -I$(top_srcdir)/include \ -- -I$(top_srcdir)/intl \ - -I$(top_srcdir)/libgphoto2_port - - diff --git a/graphics/libgphoto2/patches/patch-libgphoto2_port_usb_Makefile_in b/graphics/libgphoto2/patches/patch-libgphoto2_port_usb_Makefile_in deleted file mode 100644 index 1063fa83016..00000000000 --- a/graphics/libgphoto2/patches/patch-libgphoto2_port_usb_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libgphoto2_port_usb_Makefile_in,v 1.2 2005/05/16 17:44:02 robert Exp $ ---- libgphoto2_port/usb/Makefile.in.orig Wed Dec 15 23:01:39 2004 -+++ libgphoto2_port/usb/Makefile.in Mon May 16 18:15:06 2005 -@@ -187,7 +187,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - EXTRA_DIST = makefile.os2 usb.df usb-os2.c - --INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/libgphoto2_port $(USB_CFLAGS) -+INCLUDES = -I$(top_srcdir)/libgphoto2_port $(USB_CFLAGS) - - iolibdir = $(libdir)/gphoto2_port/$(VERSION) - iolib_LTLIBRARIES = libgphoto2_port_usb.la diff --git a/graphics/libgphoto2/patches/patch-tests_Makefile_in b/graphics/libgphoto2/patches/patch-tests_Makefile_in new file mode 100644 index 00000000000..09a2da5c68b --- /dev/null +++ b/graphics/libgphoto2/patches/patch-tests_Makefile_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-tests_Makefile_in,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $ +--- tests/Makefile.in.orig Thu Oct 11 13:22:39 2007 ++++ tests/Makefile.in Thu Oct 11 13:22:56 2007 +@@ -351,9 +351,9 @@ test_camera_list_LDADD = \ + $(INTLLIBS) + + @HAVE_GCC_FALSE@PEDANTIC_CFLAGS = +-@HAVE_GCC_TRUE@PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Wextra -Werror ++@HAVE_GCC_TRUE@PEDANTIC_CFLAGS = -std=c99 -pedantic-errors -W -Wall -Werror + @HAVE_GCC_FALSE@PEDANTIC_CXXFLAGS = +-@HAVE_GCC_TRUE@PEDANTIC_CXXFLAGS = -std=c++98 -pedantic-errors -W -Wall -Wextra -Werror ++@HAVE_GCC_TRUE@PEDANTIC_CXXFLAGS = -std=c++98 -pedantic-errors -W -Wall -Werror + test_pedantic_c_SOURCES = test-pedantic-compilation.c + test_pedantic_c_CPPFLAGS = \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ diff --git a/graphics/libgphoto2/pkg/PFRAG.shared b/graphics/libgphoto2/pkg/PFRAG.shared index 84a5315ece7..5fc20050480 100644 --- a/graphics/libgphoto2/pkg/PFRAG.shared +++ b/graphics/libgphoto2/pkg/PFRAG.shared @@ -1,57 +1,64 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/29 13:16:33 steven Exp $ -lib/gphoto2/${VERSION}/libgphoto2_agfa_cl20.so -lib/gphoto2/${VERSION}/libgphoto2_aox.so -lib/gphoto2/${VERSION}/libgphoto2_barbie.so -lib/gphoto2/${VERSION}/libgphoto2_canon.so -lib/gphoto2/${VERSION}/libgphoto2_casio_qv.so -lib/gphoto2/${VERSION}/libgphoto2_digita.so -lib/gphoto2/${VERSION}/libgphoto2_dimagev.so -lib/gphoto2/${VERSION}/libgphoto2_dimera3500.so -lib/gphoto2/${VERSION}/libgphoto2_directory.so -lib/gphoto2/${VERSION}/libgphoto2_enigma13.so -lib/gphoto2/${VERSION}/libgphoto2_ez200.so -lib/gphoto2/${VERSION}/libgphoto2_fuji.so -lib/gphoto2/${VERSION}/libgphoto2_gsmart300.so -lib/gphoto2/${VERSION}/libgphoto2_iclick.so -lib/gphoto2/${VERSION}/libgphoto2_jamcam.so -lib/gphoto2/${VERSION}/libgphoto2_jd11.so -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc120.so -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc210.so -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc240.so -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc3200.so -lib/gphoto2/${VERSION}/libgphoto2_konica.so -lib/gphoto2/${VERSION}/libgphoto2_konica_qm150.so -lib/gphoto2/${VERSION}/libgphoto2_largan.so -lib/gphoto2/${VERSION}/libgphoto2_mars.so -lib/gphoto2/${VERSION}/libgphoto2_mustek.so -lib/gphoto2/${VERSION}/libgphoto2_panasonic_coolshot.so -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1000.so -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1580.so -lib/gphoto2/${VERSION}/libgphoto2_panasonic_l859.so -lib/gphoto2/${VERSION}/libgphoto2_pccam300.so -lib/gphoto2/${VERSION}/libgphoto2_pccam600.so -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc320.so -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc640.so -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc700.so -lib/gphoto2/${VERSION}/libgphoto2_ptp2.so -lib/gphoto2/${VERSION}/libgphoto2_ricoh.so -lib/gphoto2/${VERSION}/libgphoto2_ricoh_g3.so -lib/gphoto2/${VERSION}/libgphoto2_samsung.so -lib/gphoto2/${VERSION}/libgphoto2_sierra.so -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink.so -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink2.so -lib/gphoto2/${VERSION}/libgphoto2_sipix_web2.so -lib/gphoto2/${VERSION}/libgphoto2_smal.so -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf1.so -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf55.so -lib/gphoto2/${VERSION}/libgphoto2_soundvision.so -lib/gphoto2/${VERSION}/libgphoto2_spca50x.so -lib/gphoto2/${VERSION}/libgphoto2_sq905.so -lib/gphoto2/${VERSION}/libgphoto2_stv0674.so -lib/gphoto2/${VERSION}/libgphoto2_stv0680.so -lib/gphoto2/${VERSION}/libgphoto2_sx330z.so -lib/gphoto2/${VERSION}/libgphoto2_toshiba_pdrm11.so -lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so -lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so +@comment $OpenBSD: PFRAG.shared,v 1.7 2007/10/19 12:57:52 ajacoutot Exp $ @lib lib/libgphoto2.so.${LIBgphoto2_VERSION} +lib/libgphoto2/${VERSION}/adc65.so +lib/libgphoto2/${VERSION}/agfa_cl20.so +lib/libgphoto2/${VERSION}/aox.so +lib/libgphoto2/${VERSION}/barbie.so +lib/libgphoto2/${VERSION}/canon.so +lib/libgphoto2/${VERSION}/casio_qv.so +lib/libgphoto2/${VERSION}/clicksmart310.so +lib/libgphoto2/${VERSION}/digigr8.so +lib/libgphoto2/${VERSION}/digita.so +lib/libgphoto2/${VERSION}/dimagev.so +lib/libgphoto2/${VERSION}/dimera3500.so +lib/libgphoto2/${VERSION}/directory.so +lib/libgphoto2/${VERSION}/enigma13.so +lib/libgphoto2/${VERSION}/fuji.so +lib/libgphoto2/${VERSION}/gsmart300.so +lib/libgphoto2/${VERSION}/hp215.so +lib/libgphoto2/${VERSION}/iclick.so +lib/libgphoto2/${VERSION}/jamcam.so +lib/libgphoto2/${VERSION}/jd11.so +lib/libgphoto2/${VERSION}/kodak_dc120.so +lib/libgphoto2/${VERSION}/kodak_dc210.so +lib/libgphoto2/${VERSION}/kodak_dc240.so +lib/libgphoto2/${VERSION}/kodak_dc3200.so +lib/libgphoto2/${VERSION}/kodak_ez200.so +lib/libgphoto2/${VERSION}/konica.so +lib/libgphoto2/${VERSION}/konica_qm150.so +lib/libgphoto2/${VERSION}/largan.so +lib/libgphoto2/${VERSION}/lg_gsm.so +lib/libgphoto2/${VERSION}/mars.so +lib/libgphoto2/${VERSION}/mustek.so +lib/libgphoto2/${VERSION}/panasonic_coolshot.so +lib/libgphoto2/${VERSION}/panasonic_dc1000.so +lib/libgphoto2/${VERSION}/panasonic_dc1580.so +lib/libgphoto2/${VERSION}/panasonic_l859.so +lib/libgphoto2/${VERSION}/pccam300.so +lib/libgphoto2/${VERSION}/pccam600.so +lib/libgphoto2/${VERSION}/polaroid_pdc320.so +lib/libgphoto2/${VERSION}/polaroid_pdc640.so +lib/libgphoto2/${VERSION}/polaroid_pdc700.so +lib/libgphoto2/${VERSION}/ptp2.so +lib/libgphoto2/${VERSION}/ricoh.so +lib/libgphoto2/${VERSION}/ricoh_g3.so +lib/libgphoto2/${VERSION}/samsung.so +lib/libgphoto2/${VERSION}/sierra.so +lib/libgphoto2/${VERSION}/sipix_blink2.so +lib/libgphoto2/${VERSION}/sipix_web2.so +lib/libgphoto2/${VERSION}/smal.so +lib/libgphoto2/${VERSION}/sonix.so +lib/libgphoto2/${VERSION}/sony_dscf1.so +lib/libgphoto2/${VERSION}/sony_dscf55.so +lib/libgphoto2/${VERSION}/soundvision.so +lib/libgphoto2/${VERSION}/spca50x.so +lib/libgphoto2/${VERSION}/sq905.so +lib/libgphoto2/${VERSION}/stv0674.so +lib/libgphoto2/${VERSION}/stv0680.so +lib/libgphoto2/${VERSION}/sx330z.so +lib/libgphoto2/${VERSION}/toshiba_pdrm11.so @lib lib/libgphoto2_port.so.${LIBgphoto2_port_VERSION} +lib/libgphoto2_port/0.8.0/disk.so +lib/libgphoto2_port/0.8.0/ptpip.so +lib/libgphoto2_port/0.8.0/serial.so +lib/libgphoto2_port/0.8.0/usb.so diff --git a/graphics/libgphoto2/pkg/PLIST b/graphics/libgphoto2/pkg/PLIST index e3f96940cc8..c9ea7cbcb3b 100644 --- a/graphics/libgphoto2/pkg/PLIST +++ b/graphics/libgphoto2/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2005/05/16 17:44:02 robert Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/10/19 12:57:52 ajacoutot Exp $ bin/gphoto2-config bin/gphoto2-port-config include/gphoto2/ +include/gphoto2/gphoto2 include/gphoto2/gphoto2-abilities-list.h include/gphoto2/gphoto2-camera.h include/gphoto2/gphoto2-context.h @@ -20,137 +21,178 @@ include/gphoto2/gphoto2-setting.h include/gphoto2/gphoto2-version.h include/gphoto2/gphoto2-widget.h include/gphoto2/gphoto2.h -lib/gphoto2/ -lib/gphoto2/${VERSION}/ -lib/gphoto2/${VERSION}/libgphoto2_agfa_cl20.a -lib/gphoto2/${VERSION}/libgphoto2_agfa_cl20.la -lib/gphoto2/${VERSION}/libgphoto2_aox.a -lib/gphoto2/${VERSION}/libgphoto2_aox.la -lib/gphoto2/${VERSION}/libgphoto2_barbie.a -lib/gphoto2/${VERSION}/libgphoto2_barbie.la -lib/gphoto2/${VERSION}/libgphoto2_canon.a -lib/gphoto2/${VERSION}/libgphoto2_canon.la -lib/gphoto2/${VERSION}/libgphoto2_casio_qv.a -lib/gphoto2/${VERSION}/libgphoto2_casio_qv.la -lib/gphoto2/${VERSION}/libgphoto2_digita.a -lib/gphoto2/${VERSION}/libgphoto2_digita.la -lib/gphoto2/${VERSION}/libgphoto2_dimagev.a -lib/gphoto2/${VERSION}/libgphoto2_dimagev.la -lib/gphoto2/${VERSION}/libgphoto2_dimera3500.a -lib/gphoto2/${VERSION}/libgphoto2_dimera3500.la -lib/gphoto2/${VERSION}/libgphoto2_directory.a -lib/gphoto2/${VERSION}/libgphoto2_directory.la -lib/gphoto2/${VERSION}/libgphoto2_enigma13.a -lib/gphoto2/${VERSION}/libgphoto2_enigma13.la -lib/gphoto2/${VERSION}/libgphoto2_ez200.a -lib/gphoto2/${VERSION}/libgphoto2_ez200.la -lib/gphoto2/${VERSION}/libgphoto2_fuji.a -lib/gphoto2/${VERSION}/libgphoto2_fuji.la -lib/gphoto2/${VERSION}/libgphoto2_gsmart300.a -lib/gphoto2/${VERSION}/libgphoto2_gsmart300.la -lib/gphoto2/${VERSION}/libgphoto2_iclick.a -lib/gphoto2/${VERSION}/libgphoto2_iclick.la -lib/gphoto2/${VERSION}/libgphoto2_jamcam.a -lib/gphoto2/${VERSION}/libgphoto2_jamcam.la -lib/gphoto2/${VERSION}/libgphoto2_jd11.a -lib/gphoto2/${VERSION}/libgphoto2_jd11.la -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc120.a -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc120.la -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc210.a -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc210.la -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc240.a -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc240.la -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc3200.a -lib/gphoto2/${VERSION}/libgphoto2_kodak_dc3200.la -lib/gphoto2/${VERSION}/libgphoto2_konica.a -lib/gphoto2/${VERSION}/libgphoto2_konica.la -lib/gphoto2/${VERSION}/libgphoto2_konica_qm150.a -lib/gphoto2/${VERSION}/libgphoto2_konica_qm150.la -lib/gphoto2/${VERSION}/libgphoto2_largan.a -lib/gphoto2/${VERSION}/libgphoto2_largan.la -lib/gphoto2/${VERSION}/libgphoto2_mars.a -lib/gphoto2/${VERSION}/libgphoto2_mars.la -lib/gphoto2/${VERSION}/libgphoto2_mustek.a -lib/gphoto2/${VERSION}/libgphoto2_mustek.la -lib/gphoto2/${VERSION}/libgphoto2_panasonic_coolshot.a -lib/gphoto2/${VERSION}/libgphoto2_panasonic_coolshot.la -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1000.a -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1000.la -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1580.a -lib/gphoto2/${VERSION}/libgphoto2_panasonic_dc1580.la -lib/gphoto2/${VERSION}/libgphoto2_panasonic_l859.a -lib/gphoto2/${VERSION}/libgphoto2_panasonic_l859.la -lib/gphoto2/${VERSION}/libgphoto2_pccam300.a -lib/gphoto2/${VERSION}/libgphoto2_pccam300.la -lib/gphoto2/${VERSION}/libgphoto2_pccam600.a -lib/gphoto2/${VERSION}/libgphoto2_pccam600.la -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc320.a -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc320.la -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc640.a -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc640.la -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc700.a -lib/gphoto2/${VERSION}/libgphoto2_polaroid_pdc700.la -lib/gphoto2/${VERSION}/libgphoto2_ptp2.a -lib/gphoto2/${VERSION}/libgphoto2_ptp2.la -lib/gphoto2/${VERSION}/libgphoto2_ricoh.a -lib/gphoto2/${VERSION}/libgphoto2_ricoh.la -lib/gphoto2/${VERSION}/libgphoto2_ricoh_g3.a -lib/gphoto2/${VERSION}/libgphoto2_ricoh_g3.la -lib/gphoto2/${VERSION}/libgphoto2_samsung.a -lib/gphoto2/${VERSION}/libgphoto2_samsung.la -lib/gphoto2/${VERSION}/libgphoto2_sierra.a -lib/gphoto2/${VERSION}/libgphoto2_sierra.la -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink.a -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink.la -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink2.a -lib/gphoto2/${VERSION}/libgphoto2_sipix_blink2.la -lib/gphoto2/${VERSION}/libgphoto2_sipix_web2.a -lib/gphoto2/${VERSION}/libgphoto2_sipix_web2.la -lib/gphoto2/${VERSION}/libgphoto2_smal.a -lib/gphoto2/${VERSION}/libgphoto2_smal.la -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf1.a -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf1.la -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf55.a -lib/gphoto2/${VERSION}/libgphoto2_sony_dscf55.la -lib/gphoto2/${VERSION}/libgphoto2_soundvision.a -lib/gphoto2/${VERSION}/libgphoto2_soundvision.la -lib/gphoto2/${VERSION}/libgphoto2_spca50x.a -lib/gphoto2/${VERSION}/libgphoto2_spca50x.la -lib/gphoto2/${VERSION}/libgphoto2_sq905.a -lib/gphoto2/${VERSION}/libgphoto2_sq905.la -lib/gphoto2/${VERSION}/libgphoto2_stv0674.a -lib/gphoto2/${VERSION}/libgphoto2_stv0674.la -lib/gphoto2/${VERSION}/libgphoto2_stv0680.a -lib/gphoto2/${VERSION}/libgphoto2_stv0680.la -lib/gphoto2/${VERSION}/libgphoto2_sx330z.a -lib/gphoto2/${VERSION}/libgphoto2_sx330z.la -lib/gphoto2/${VERSION}/libgphoto2_toshiba_pdrm11.a -lib/gphoto2/${VERSION}/libgphoto2_toshiba_pdrm11.la -lib/gphoto2_port/ -lib/gphoto2_port/0.5.1/ -lib/gphoto2_port/0.5.1/libgphoto2_port_serial.a -lib/gphoto2_port/0.5.1/libgphoto2_port_serial.la -lib/gphoto2_port/0.5.1/libgphoto2_port_usb.a -lib/gphoto2_port/0.5.1/libgphoto2_port_usb.la +lib/libgphoto2/ lib/libgphoto2.a lib/libgphoto2.la +lib/libgphoto2/${VERSION}/ +lib/libgphoto2/${VERSION}/adc65.a +lib/libgphoto2/${VERSION}/adc65.la +lib/libgphoto2/${VERSION}/agfa_cl20.a +lib/libgphoto2/${VERSION}/agfa_cl20.la +lib/libgphoto2/${VERSION}/aox.a +lib/libgphoto2/${VERSION}/aox.la +lib/libgphoto2/${VERSION}/barbie.a +lib/libgphoto2/${VERSION}/barbie.la +lib/libgphoto2/${VERSION}/canon.a +lib/libgphoto2/${VERSION}/canon.la +lib/libgphoto2/${VERSION}/casio_qv.a +lib/libgphoto2/${VERSION}/casio_qv.la +lib/libgphoto2/${VERSION}/clicksmart310.a +lib/libgphoto2/${VERSION}/clicksmart310.la +lib/libgphoto2/${VERSION}/digigr8.a +lib/libgphoto2/${VERSION}/digigr8.la +lib/libgphoto2/${VERSION}/digita.a +lib/libgphoto2/${VERSION}/digita.la +lib/libgphoto2/${VERSION}/dimagev.a +lib/libgphoto2/${VERSION}/dimagev.la +lib/libgphoto2/${VERSION}/dimera3500.a +lib/libgphoto2/${VERSION}/dimera3500.la +lib/libgphoto2/${VERSION}/directory.a +lib/libgphoto2/${VERSION}/directory.la +lib/libgphoto2/${VERSION}/enigma13.a +lib/libgphoto2/${VERSION}/enigma13.la +lib/libgphoto2/${VERSION}/fuji.a +lib/libgphoto2/${VERSION}/fuji.la +lib/libgphoto2/${VERSION}/gsmart300.a +lib/libgphoto2/${VERSION}/gsmart300.la +lib/libgphoto2/${VERSION}/hp215.a +lib/libgphoto2/${VERSION}/hp215.la +lib/libgphoto2/${VERSION}/iclick.a +lib/libgphoto2/${VERSION}/iclick.la +lib/libgphoto2/${VERSION}/jamcam.a +lib/libgphoto2/${VERSION}/jamcam.la +lib/libgphoto2/${VERSION}/jd11.a +lib/libgphoto2/${VERSION}/jd11.la +lib/libgphoto2/${VERSION}/kodak_dc120.a +lib/libgphoto2/${VERSION}/kodak_dc120.la +lib/libgphoto2/${VERSION}/kodak_dc210.a +lib/libgphoto2/${VERSION}/kodak_dc210.la +lib/libgphoto2/${VERSION}/kodak_dc240.a +lib/libgphoto2/${VERSION}/kodak_dc240.la +lib/libgphoto2/${VERSION}/kodak_dc3200.a +lib/libgphoto2/${VERSION}/kodak_dc3200.la +lib/libgphoto2/${VERSION}/kodak_ez200.a +lib/libgphoto2/${VERSION}/kodak_ez200.la +lib/libgphoto2/${VERSION}/konica.a +lib/libgphoto2/${VERSION}/konica.la +lib/libgphoto2/${VERSION}/konica_qm150.a +lib/libgphoto2/${VERSION}/konica_qm150.la +lib/libgphoto2/${VERSION}/largan.a +lib/libgphoto2/${VERSION}/largan.la +lib/libgphoto2/${VERSION}/lg_gsm.a +lib/libgphoto2/${VERSION}/lg_gsm.la +lib/libgphoto2/${VERSION}/mars.a +lib/libgphoto2/${VERSION}/mars.la +lib/libgphoto2/${VERSION}/mustek.a +lib/libgphoto2/${VERSION}/mustek.la +lib/libgphoto2/${VERSION}/panasonic_coolshot.a +lib/libgphoto2/${VERSION}/panasonic_coolshot.la +lib/libgphoto2/${VERSION}/panasonic_dc1000.a +lib/libgphoto2/${VERSION}/panasonic_dc1000.la +lib/libgphoto2/${VERSION}/panasonic_dc1580.a +lib/libgphoto2/${VERSION}/panasonic_dc1580.la +lib/libgphoto2/${VERSION}/panasonic_l859.a +lib/libgphoto2/${VERSION}/panasonic_l859.la +lib/libgphoto2/${VERSION}/pccam300.a +lib/libgphoto2/${VERSION}/pccam300.la +lib/libgphoto2/${VERSION}/pccam600.a +lib/libgphoto2/${VERSION}/pccam600.la +lib/libgphoto2/${VERSION}/polaroid_pdc320.a +lib/libgphoto2/${VERSION}/polaroid_pdc320.la +lib/libgphoto2/${VERSION}/polaroid_pdc640.a +lib/libgphoto2/${VERSION}/polaroid_pdc640.la +lib/libgphoto2/${VERSION}/polaroid_pdc700.a +lib/libgphoto2/${VERSION}/polaroid_pdc700.la +lib/libgphoto2/${VERSION}/ptp2.a +lib/libgphoto2/${VERSION}/ptp2.la +lib/libgphoto2/${VERSION}/ricoh.a +lib/libgphoto2/${VERSION}/ricoh.la +lib/libgphoto2/${VERSION}/ricoh_g3.a +lib/libgphoto2/${VERSION}/ricoh_g3.la +lib/libgphoto2/${VERSION}/samsung.a +lib/libgphoto2/${VERSION}/samsung.la +lib/libgphoto2/${VERSION}/sierra.a +lib/libgphoto2/${VERSION}/sierra.la +lib/libgphoto2/${VERSION}/sipix_blink2.a +lib/libgphoto2/${VERSION}/sipix_blink2.la +lib/libgphoto2/${VERSION}/sipix_web2.a +lib/libgphoto2/${VERSION}/sipix_web2.la +lib/libgphoto2/${VERSION}/smal.a +lib/libgphoto2/${VERSION}/smal.la +lib/libgphoto2/${VERSION}/sonix.a +lib/libgphoto2/${VERSION}/sonix.la +lib/libgphoto2/${VERSION}/sony_dscf1.a +lib/libgphoto2/${VERSION}/sony_dscf1.la +lib/libgphoto2/${VERSION}/sony_dscf55.a +lib/libgphoto2/${VERSION}/sony_dscf55.la +lib/libgphoto2/${VERSION}/soundvision.a +lib/libgphoto2/${VERSION}/soundvision.la +lib/libgphoto2/${VERSION}/spca50x.a +lib/libgphoto2/${VERSION}/spca50x.la +lib/libgphoto2/${VERSION}/sq905.a +lib/libgphoto2/${VERSION}/sq905.la +lib/libgphoto2/${VERSION}/stv0674.a +lib/libgphoto2/${VERSION}/stv0674.la +lib/libgphoto2/${VERSION}/stv0680.a +lib/libgphoto2/${VERSION}/stv0680.la +lib/libgphoto2/${VERSION}/sx330z.a +lib/libgphoto2/${VERSION}/sx330z.la +lib/libgphoto2/${VERSION}/toshiba_pdrm11.a +lib/libgphoto2/${VERSION}/toshiba_pdrm11.la +lib/libgphoto2/print-camera-list +lib/libgphoto2_port/ lib/libgphoto2_port.a lib/libgphoto2_port.la +lib/libgphoto2_port/0.8.0/ +lib/libgphoto2_port/0.8.0/disk.a +lib/libgphoto2_port/0.8.0/disk.la +lib/libgphoto2_port/0.8.0/ptpip.a +lib/libgphoto2_port/0.8.0/ptpip.la +lib/libgphoto2_port/0.8.0/serial.a +lib/libgphoto2_port/0.8.0/serial.la +lib/libgphoto2_port/0.8.0/usb.a +lib/libgphoto2_port/0.8.0/usb.la lib/pkgconfig/ lib/pkgconfig/libgphoto2.pc +lib/pkgconfig/libgphoto2_port.pc +@comment lib/udev/ +@comment lib/udev/check-mtp-device +@comment lib/udev/check-ptp-camera @man man/man3/libgphoto2.3 @man man/man3/libgphoto2_port.3 share/doc/libgphoto2/ -@comment share/doc/libgphoto2/AUTHORS -@comment share/doc/libgphoto2/CHANGES -@comment share/doc/libgphoto2/COPYING -@comment share/doc/libgphoto2/NEWS share/doc/libgphoto2/README -share/doc/libgphoto2/linux-hotplug/ -share/doc/libgphoto2_port/ -@comment share/doc/libgphoto2_port/AUTHORS -@comment share/doc/libgphoto2_port/NEWS -share/doc/libgphoto2_port/README +share/doc/libgphoto2/camlibs/ +share/doc/libgphoto2/camlibs/README.913C +share/doc/libgphoto2/camlibs/README.adc65 +share/doc/libgphoto2/camlibs/README.agfa-cl20 +share/doc/libgphoto2/camlibs/README.aox +share/doc/libgphoto2/camlibs/README.canon +share/doc/libgphoto2/camlibs/README.clicksmart310 +share/doc/libgphoto2/camlibs/README.digigr8 +share/doc/libgphoto2/camlibs/README.enigma13 +share/doc/libgphoto2/camlibs/README.gsmart300 +share/doc/libgphoto2/camlibs/README.iclick +share/doc/libgphoto2/camlibs/README.jamcam +share/doc/libgphoto2/camlibs/README.konica +share/doc/libgphoto2/camlibs/README.largan-lmini +share/doc/libgphoto2/camlibs/README.lg_gsm +share/doc/libgphoto2/camlibs/README.mars +share/doc/libgphoto2/camlibs/README.minolta-dimagev +share/doc/libgphoto2/camlibs/README.mustek +share/doc/libgphoto2/camlibs/README.panasonic +share/doc/libgphoto2/camlibs/README.panasonic-coolshot +share/doc/libgphoto2/camlibs/README.panasonic-l859 +share/doc/libgphoto2/camlibs/README.pccam300 +share/doc/libgphoto2/camlibs/README.pccam600 +share/doc/libgphoto2/camlibs/README.ptp2 +share/doc/libgphoto2/camlibs/README.smal +share/doc/libgphoto2/camlibs/README.sonix +share/doc/libgphoto2/camlibs/README.sonydscf1 +share/doc/libgphoto2/camlibs/README.soundvision +share/doc/libgphoto2/camlibs/README.spca50x +share/doc/libgphoto2/camlibs/README.sq905 +share/doc/libgphoto2/camlibs/README.toshiba-pdrm11 share/libgphoto2/ share/libgphoto2/${VERSION}/ share/libgphoto2/${VERSION}/konica/ @@ -160,4 +202,41 @@ share/libgphoto2/${VERSION}/konica/german share/libgphoto2/${VERSION}/konica/japanese share/libgphoto2/${VERSION}/konica/korean share/libgphoto2/${VERSION}/konica/spanish +share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/da/LC_MESSAGES/libgphoto2-2.mo +share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/de/LC_MESSAGES/libgphoto2-2.mo +share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/es/LC_MESSAGES/libgphoto2-2.mo +share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/eu/ +share/locale/eu/LC_MESSAGES/ +share/locale/eu/LC_MESSAGES/libgphoto2-2.mo +share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/fr/LC_MESSAGES/libgphoto2-2.mo +share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/hu/LC_MESSAGES/libgphoto2-2.mo +share/locale/it/LC_MESSAGES/libgphoto2-2.mo +share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/ja/LC_MESSAGES/libgphoto2-2.mo +share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/nb/LC_MESSAGES/libgphoto2-2.mo +share/locale/nb/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/nl/LC_MESSAGES/libgphoto2-2.mo +share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/pl/LC_MESSAGES/libgphoto2-2.mo +share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/ru/LC_MESSAGES/libgphoto2-2.mo +share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/sl/LC_MESSAGES/libgphoto2-2.mo +share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/sv/LC_MESSAGES/libgphoto2-2.mo +share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/uk/LC_MESSAGES/libgphoto2-2.mo +share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/vi/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo +share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo %%SHARED%%