2 files changed, 6 insertions, 78 deletions

diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index a7266466f5fe..6462dbb03cea 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgphoto2
 PORTVERSION=	2.5.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
@@ -12,11 +12,9 @@ COMMENT=	Universal digital camera control library
 
 LICENSE=	LGPL21
 
-USE_BZIP2=	yes
-USES=		gmake iconv pkgconfig
-USE_GNOME=	ltverhack
-USE_AUTOTOOLS=	libtool libltdl
-LIBTOOLFILES=	configure libgphoto2_port/configure
+USES=		gmake iconv libtool:keepla pkgconfig tar:bzip2
+USE_AUTOTOOLS=	libltdl
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
 		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
 		PATH="${PATH:C,${HOME}/bin,,}" \
diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist
index c692c9789a2c..4bf5d62d8e17 100644
--- a/graphics/libgphoto2/pkg-plist
+++ b/graphics/libgphoto2/pkg-plist
@@ -19,223 +19,153 @@ include/gphoto2/gphoto2-setting.h
 include/gphoto2/gphoto2-version.h
 include/gphoto2/gphoto2-widget.h
 include/gphoto2/gphoto2.h
-lib/libgphoto2.a
 lib/libgphoto2.la
 lib/libgphoto2.so
 lib/libgphoto2.so.6
-lib/libgphoto2/%%VERSION%%/adc65.a
+lib/libgphoto2.so.6.0.0
 lib/libgphoto2/%%VERSION%%/adc65.la
 lib/libgphoto2/%%VERSION%%/adc65.so
-lib/libgphoto2/%%VERSION%%/agfa_cl20.a
 lib/libgphoto2/%%VERSION%%/agfa_cl20.la
 lib/libgphoto2/%%VERSION%%/agfa_cl20.so
-lib/libgphoto2/%%VERSION%%/aox.a
 lib/libgphoto2/%%VERSION%%/aox.la
 lib/libgphoto2/%%VERSION%%/aox.so
-lib/libgphoto2/%%VERSION%%/ax203.a
 lib/libgphoto2/%%VERSION%%/ax203.la
 lib/libgphoto2/%%VERSION%%/ax203.so
-lib/libgphoto2/%%VERSION%%/barbie.a
 lib/libgphoto2/%%VERSION%%/barbie.la
 lib/libgphoto2/%%VERSION%%/barbie.so
-lib/libgphoto2/%%VERSION%%/canon.a
 lib/libgphoto2/%%VERSION%%/canon.la
 lib/libgphoto2/%%VERSION%%/canon.so
-lib/libgphoto2/%%VERSION%%/casio_qv.a
 lib/libgphoto2/%%VERSION%%/casio_qv.la
 lib/libgphoto2/%%VERSION%%/casio_qv.so
-lib/libgphoto2/%%VERSION%%/clicksmart310.a
 lib/libgphoto2/%%VERSION%%/clicksmart310.la
 lib/libgphoto2/%%VERSION%%/clicksmart310.so
-lib/libgphoto2/%%VERSION%%/digigr8.a
 lib/libgphoto2/%%VERSION%%/digigr8.la
 lib/libgphoto2/%%VERSION%%/digigr8.so
-lib/libgphoto2/%%VERSION%%/digita.a
 lib/libgphoto2/%%VERSION%%/digita.la
 lib/libgphoto2/%%VERSION%%/digita.so
-lib/libgphoto2/%%VERSION%%/dimagev.a
 lib/libgphoto2/%%VERSION%%/dimagev.la
 lib/libgphoto2/%%VERSION%%/dimagev.so
-lib/libgphoto2/%%VERSION%%/dimera3500.a
 lib/libgphoto2/%%VERSION%%/dimera3500.la
 lib/libgphoto2/%%VERSION%%/dimera3500.so
-lib/libgphoto2/%%VERSION%%/directory.a
 lib/libgphoto2/%%VERSION%%/directory.la
 lib/libgphoto2/%%VERSION%%/directory.so
-lib/libgphoto2/%%VERSION%%/enigma13.a
 lib/libgphoto2/%%VERSION%%/enigma13.la
 lib/libgphoto2/%%VERSION%%/enigma13.so
-lib/libgphoto2/%%VERSION%%/fuji.a
 lib/libgphoto2/%%VERSION%%/fuji.la
 lib/libgphoto2/%%VERSION%%/fuji.so
-lib/libgphoto2/%%VERSION%%/gsmart300.a
 lib/libgphoto2/%%VERSION%%/gsmart300.la
 lib/libgphoto2/%%VERSION%%/gsmart300.so
-lib/libgphoto2/%%VERSION%%/hp215.a
 lib/libgphoto2/%%VERSION%%/hp215.la
 lib/libgphoto2/%%VERSION%%/hp215.so
-lib/libgphoto2/%%VERSION%%/iclick.a
 lib/libgphoto2/%%VERSION%%/iclick.la
 lib/libgphoto2/%%VERSION%%/iclick.so
-lib/libgphoto2/%%VERSION%%/jamcam.a
 lib/libgphoto2/%%VERSION%%/jamcam.la
 lib/libgphoto2/%%VERSION%%/jamcam.so
-lib/libgphoto2/%%VERSION%%/jd11.a
 lib/libgphoto2/%%VERSION%%/jd11.la
 lib/libgphoto2/%%VERSION%%/jd11.so
-lib/libgphoto2/%%VERSION%%/jl2005a.a
 lib/libgphoto2/%%VERSION%%/jl2005a.la
 lib/libgphoto2/%%VERSION%%/jl2005a.so
-lib/libgphoto2/%%VERSION%%/jl2005c.a
 lib/libgphoto2/%%VERSION%%/jl2005c.la
 lib/libgphoto2/%%VERSION%%/jl2005c.so
-lib/libgphoto2/%%VERSION%%/kodak_dc120.a
 lib/libgphoto2/%%VERSION%%/kodak_dc120.la
 lib/libgphoto2/%%VERSION%%/kodak_dc120.so
-lib/libgphoto2/%%VERSION%%/kodak_dc210.a
 lib/libgphoto2/%%VERSION%%/kodak_dc210.la
 lib/libgphoto2/%%VERSION%%/kodak_dc210.so
-lib/libgphoto2/%%VERSION%%/kodak_dc240.a
 lib/libgphoto2/%%VERSION%%/kodak_dc240.la
 lib/libgphoto2/%%VERSION%%/kodak_dc240.so
-lib/libgphoto2/%%VERSION%%/kodak_dc3200.a
 lib/libgphoto2/%%VERSION%%/kodak_dc3200.la
 lib/libgphoto2/%%VERSION%%/kodak_dc3200.so
-lib/libgphoto2/%%VERSION%%/kodak_ez200.a
 lib/libgphoto2/%%VERSION%%/kodak_ez200.la
 lib/libgphoto2/%%VERSION%%/kodak_ez200.so
-lib/libgphoto2/%%VERSION%%/konica.a
 lib/libgphoto2/%%VERSION%%/konica.la
 lib/libgphoto2/%%VERSION%%/konica.so
-lib/libgphoto2/%%VERSION%%/konica_qm150.a
 lib/libgphoto2/%%VERSION%%/konica_qm150.la
 lib/libgphoto2/%%VERSION%%/konica_qm150.so
-lib/libgphoto2/%%VERSION%%/largan.a
 lib/libgphoto2/%%VERSION%%/largan.la
 lib/libgphoto2/%%VERSION%%/largan.so
-lib/libgphoto2/%%VERSION%%/lg_gsm.a
 lib/libgphoto2/%%VERSION%%/lg_gsm.la
 lib/libgphoto2/%%VERSION%%/lg_gsm.so
-lib/libgphoto2/%%VERSION%%/mars.a
 lib/libgphoto2/%%VERSION%%/mars.la
 lib/libgphoto2/%%VERSION%%/mars.so
-lib/libgphoto2/%%VERSION%%/mustek.a
 lib/libgphoto2/%%VERSION%%/mustek.la
 lib/libgphoto2/%%VERSION%%/mustek.so
-lib/libgphoto2/%%VERSION%%/panasonic_coolshot.a
 lib/libgphoto2/%%VERSION%%/panasonic_coolshot.la
 lib/libgphoto2/%%VERSION%%/panasonic_coolshot.so
-lib/libgphoto2/%%VERSION%%/panasonic_dc1000.a
 lib/libgphoto2/%%VERSION%%/panasonic_dc1000.la
 lib/libgphoto2/%%VERSION%%/panasonic_dc1000.so
-lib/libgphoto2/%%VERSION%%/panasonic_dc1580.a
 lib/libgphoto2/%%VERSION%%/panasonic_dc1580.la
 lib/libgphoto2/%%VERSION%%/panasonic_dc1580.so
-lib/libgphoto2/%%VERSION%%/panasonic_l859.a
 lib/libgphoto2/%%VERSION%%/panasonic_l859.la
 lib/libgphoto2/%%VERSION%%/panasonic_l859.so
-lib/libgphoto2/%%VERSION%%/pccam300.a
 lib/libgphoto2/%%VERSION%%/pccam300.la
 lib/libgphoto2/%%VERSION%%/pccam300.so
-lib/libgphoto2/%%VERSION%%/pccam600.a
 lib/libgphoto2/%%VERSION%%/pccam600.la
 lib/libgphoto2/%%VERSION%%/pccam600.so
-lib/libgphoto2/%%VERSION%%/pentax.a
 lib/libgphoto2/%%VERSION%%/pentax.la
 lib/libgphoto2/%%VERSION%%/pentax.so
-lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
 lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
 lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
-lib/libgphoto2/%%VERSION%%/polaroid_pdc640.a
 lib/libgphoto2/%%VERSION%%/polaroid_pdc640.la
 lib/libgphoto2/%%VERSION%%/polaroid_pdc640.so
-lib/libgphoto2/%%VERSION%%/polaroid_pdc700.a
 lib/libgphoto2/%%VERSION%%/polaroid_pdc700.la
 lib/libgphoto2/%%VERSION%%/polaroid_pdc700.so
-lib/libgphoto2/%%VERSION%%/ptp2.a
 lib/libgphoto2/%%VERSION%%/ptp2.la
 lib/libgphoto2/%%VERSION%%/ptp2.so
-lib/libgphoto2/%%VERSION%%/ricoh.a
 lib/libgphoto2/%%VERSION%%/ricoh.la
 lib/libgphoto2/%%VERSION%%/ricoh.so
-lib/libgphoto2/%%VERSION%%/ricoh_g3.a
 lib/libgphoto2/%%VERSION%%/ricoh_g3.la
 lib/libgphoto2/%%VERSION%%/ricoh_g3.so
-lib/libgphoto2/%%VERSION%%/samsung.a
 lib/libgphoto2/%%VERSION%%/samsung.la
 lib/libgphoto2/%%VERSION%%/samsung.so
-lib/libgphoto2/%%VERSION%%/sierra.a
 lib/libgphoto2/%%VERSION%%/sierra.la
 lib/libgphoto2/%%VERSION%%/sierra.so
-lib/libgphoto2/%%VERSION%%/sipix_blink2.a
 lib/libgphoto2/%%VERSION%%/sipix_blink2.la
 lib/libgphoto2/%%VERSION%%/sipix_blink2.so
-lib/libgphoto2/%%VERSION%%/sipix_web2.a
 lib/libgphoto2/%%VERSION%%/sipix_web2.la
 lib/libgphoto2/%%VERSION%%/sipix_web2.so
-lib/libgphoto2/%%VERSION%%/smal.a
 lib/libgphoto2/%%VERSION%%/smal.la
 lib/libgphoto2/%%VERSION%%/smal.so
-lib/libgphoto2/%%VERSION%%/sonix.a
 lib/libgphoto2/%%VERSION%%/sonix.la
 lib/libgphoto2/%%VERSION%%/sonix.so
-lib/libgphoto2/%%VERSION%%/sony_dscf1.a
 lib/libgphoto2/%%VERSION%%/sony_dscf1.la
 lib/libgphoto2/%%VERSION%%/sony_dscf1.so
-lib/libgphoto2/%%VERSION%%/sony_dscf55.a
 lib/libgphoto2/%%VERSION%%/sony_dscf55.la
 lib/libgphoto2/%%VERSION%%/sony_dscf55.so
-lib/libgphoto2/%%VERSION%%/soundvision.a
 lib/libgphoto2/%%VERSION%%/soundvision.la
 lib/libgphoto2/%%VERSION%%/soundvision.so
-lib/libgphoto2/%%VERSION%%/spca50x.a
 lib/libgphoto2/%%VERSION%%/spca50x.la
 lib/libgphoto2/%%VERSION%%/spca50x.so
-lib/libgphoto2/%%VERSION%%/sq905.a
 lib/libgphoto2/%%VERSION%%/sq905.la
 lib/libgphoto2/%%VERSION%%/sq905.so
-lib/libgphoto2/%%VERSION%%/st2205.a
 lib/libgphoto2/%%VERSION%%/st2205.la
 lib/libgphoto2/%%VERSION%%/st2205.so
-lib/libgphoto2/%%VERSION%%/stv0674.a
 lib/libgphoto2/%%VERSION%%/stv0674.la
 lib/libgphoto2/%%VERSION%%/stv0674.so
-lib/libgphoto2/%%VERSION%%/stv0680.a
 lib/libgphoto2/%%VERSION%%/stv0680.la
 lib/libgphoto2/%%VERSION%%/stv0680.so
-lib/libgphoto2/%%VERSION%%/sx330z.a
 lib/libgphoto2/%%VERSION%%/sx330z.la
 lib/libgphoto2/%%VERSION%%/sx330z.so
-lib/libgphoto2/%%VERSION%%/topfield.a
 lib/libgphoto2/%%VERSION%%/topfield.la
 lib/libgphoto2/%%VERSION%%/topfield.so
-lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.a
 lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.la
 lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.so
-lib/libgphoto2/%%VERSION%%/tp6801.a
 lib/libgphoto2/%%VERSION%%/tp6801.la
 lib/libgphoto2/%%VERSION%%/tp6801.so
 lib/libgphoto2/print-camera-list
-lib/libgphoto2_port.a
 lib/libgphoto2_port.la
 lib/libgphoto2_port.so
 lib/libgphoto2_port.so.10
-lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
+lib/libgphoto2_port.so.10.1.1
 lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
 lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
-lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.a
 lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.la
 lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.so
-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%%/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
-lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
 lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
 lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 libdata/pkgconfig/libgphoto2.pc