Update to 4.0.3

PR:		18139
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

13 files changed, 227 insertions, 93 deletions

diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 5720777..99446a5 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	gphoto
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.3
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.mustec.eu.org/~psj/downloads/ \
-		http://www.freenix.no/~anders/
+MASTER_SITES=	ftp://ftp.gphoto.org/projects/gphoto/pub/tar/stable/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ppm.h:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		gdk_imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GLIB_CONFIG="${PREFIX}/bin/glib12-config" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		IMLIB_CONFIG="${X11BASE}/bin/imlib-config" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-gtktest --disable-imlibtest
 
 MAN1=		gphoto.1
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/PROGRAMMERS ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/THANKS ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/THEMES ${PREFIX}/share/gphoto/doc
-	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/gphoto/doc
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/gphoto
+.for file in ChangeLog FAQ NEWS PROGRAMMERS README THANKS THEMES TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gphoto
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gphoto/distinfo b/graphics/gphoto/distinfo
index 7be824a..6b63177 100644
--- a/graphics/gphoto/distinfo
+++ b/graphics/gphoto/distinfo
@@ -1 +1 @@
-MD5 (gphoto-0.4.0.tar.gz) = 3c66dfa4f71a65a9f19da240a88db476
+MD5 (gphoto-0.4.3.tar.gz) = 8b4e70df78870479d2d9a45c8f4db5f4
diff --git a/graphics/gphoto/files/patch-ai b/graphics/gphoto/files/patch-ai
index ce4cc2b..c7deffd 100644
--- a/graphics/gphoto/files/patch-ai
+++ b/graphics/gphoto/files/patch-ai
@@ -1,10 +1,10 @@
---- src/callbacks.c.orig	Thu Jun 17 00:09:31 1999
-+++ src/callbacks.c	Thu Jun 17 00:10:16 1999
-@@ -403,7 +403,9 @@
+--- src/callbacks.c.orig	Tue Mar  7 06:23:06 2000
++++ src/callbacks.c	Thu Apr 20 03:00:00 2000
+@@ -529,7 +529,9 @@
  
  #ifdef linux
          sprintf(serial_port_prefix, "/dev/ttyS");
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
+-#elif defined(BSD)
 +#elif defined(__FreeBSD__)
 +        sprintf(serial_port_prefix, "/dev/cuaa");
 +#elif defined(__NetBSD__)
diff --git a/graphics/gphoto/files/patch-as b/graphics/gphoto/files/patch-as
new file mode 100644
index 0000000..99543ba
--- /dev/null
+++ b/graphics/gphoto/files/patch-as
@@ -0,0 +1,33 @@
+--- Makefile.in.orig	Tue Mar  7 07:06:33 2000
++++ Makefile.in	Thu Apr 20 03:00:00 2000
+@@ -85,12 +85,12 @@
+ driversdir = @driversdir@
+ gallerydir = @gallerydir@
+ 
+-CFLAGS = -O2 -Wall
++CFLAGS = @CFLAGS@
+ 
+ SUBDIRS = canon 	casio 	directory 	fuji 	gallery 	kodak 	kodak_generic 	konica 	konica_qmxxx 	man 	minolta 	mustek 	nikon 	philips 	photopc 	ricoh 	samsung 	sony 	src
+ 
+ 
+-gphotodocdir = $(datadir)/gphoto/doc
++gphotodocdir = $(datadir)/gphoto
+ 
+ gphotodoc_DATA = AUTHORS MANUAL
+ 
+@@ -365,13 +365,13 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-gphotodocDATA install-sysDATA
++install-data-am: install-gphotodocDATA
+ install-data: install-data-recursive
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-recursive
+-uninstall-am: uninstall-gphotodocDATA uninstall-sysDATA
++uninstall-am: uninstall-gphotodocDATA
+ uninstall: uninstall-recursive
+ all-am: Makefile $(DATA) config.h
+ all-redirect: all-recursive-am
diff --git a/graphics/gphoto/files/patch-at b/graphics/gphoto/files/patch-at
new file mode 100644
index 0000000..da835ef
--- /dev/null
+++ b/graphics/gphoto/files/patch-at
@@ -0,0 +1,12 @@
+--- kodak/dc21x/lowlevel.c.orig	Fri Jan 21 06:42:18 2000
++++ kodak/dc21x/lowlevel.c	Thu Apr 20 03:00:00 2000
+@@ -2,7 +2,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#ifndef __FreeBSD__
+ #include <sys/select.h>
++#endif
+ #include <sys/time.h>
+ #include <time.h>
+ #include "dc21x.h"
diff --git a/graphics/gphoto/files/patch-au b/graphics/gphoto/files/patch-au
new file mode 100644
index 0000000..b36f8e1
--- /dev/null
+++ b/graphics/gphoto/files/patch-au
@@ -0,0 +1,12 @@
+--- kodak/dc21x/main.c.orig	Fri Jan 21 06:42:18 2000
++++ kodak/dc21x/main.c	Thu Apr 20 03:00:00 2000
+@@ -2,7 +2,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#ifndef __FreeBSD__
+ #include <sys/select.h>
++#endif
+ #include <sys/time.h>
+ #include <time.h>
+ #include "dc21x.h"
diff --git a/graphics/gphoto/files/patch-av b/graphics/gphoto/files/patch-av
new file mode 100644
index 0000000..03fad37
--- /dev/null
+++ b/graphics/gphoto/files/patch-av
@@ -0,0 +1,11 @@
+--- kodak/dc21x/Makefile.in.orig	Tue Mar  7 07:06:48 2000
++++ kodak/dc21x/Makefile.in	Thu Apr 20 03:00:00 2000
+@@ -87,7 +87,7 @@
+ 
+ LIBDIR = 
+ LIBS = 
+-CFLAGS = -O2 -Wall
++CFLAGS = @CFLAGS@
+ 
+ bin_PROGRAMS = dc21x_cam
+ dc21x_cam_SOURCES = dc21x.h main.c lowlevel.c
diff --git a/graphics/gphoto/files/patch-aw b/graphics/gphoto/files/patch-aw
new file mode 100644
index 0000000..f8e8f3e
--- /dev/null
+++ b/graphics/gphoto/files/patch-aw
@@ -0,0 +1,11 @@
+--- mustek/device.c.orig	Mon Dec  6 03:48:54 1999
++++ mustek/device.c	Thu Apr 20 03:00:00 2000
+@@ -59,7 +59,7 @@
+ 	newtio.c_cflag = (newtio.c_cflag & ~CSIZE) | CS8;
+ 
+ 	//  Set into raw, no echo mode 
+-	#if defined(__NetBSD__)
++	#if defined(__NetBSD__) || defined(__FreeBSD__)
+ 	newtio.c_iflag &= ~(IGNBRK | IGNCR | INLCR | ICRNL |
+ 		IXANY | IXON | IXOFF | INPCK | ISTRIP);
+ 	#else
diff --git a/graphics/gphoto/files/patch-ax b/graphics/gphoto/files/patch-ax
new file mode 100644
index 0000000..5f4a900
--- /dev/null
+++ b/graphics/gphoto/files/patch-ax
@@ -0,0 +1,10 @@
+--- philips/philips_io.c.orig	Sun Nov 21 01:28:41 1999
++++ philips/philips_io.c	Thu Apr 20 03:00:00 2000
+@@ -55,7 +55,6 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <time.h>
+-#include <malloc.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/time.h>
diff --git a/graphics/gphoto/files/patch-ay b/graphics/gphoto/files/patch-ay
new file mode 100644
index 0000000..035cc6d
--- /dev/null
+++ b/graphics/gphoto/files/patch-ay
@@ -0,0 +1,10 @@
+--- src/main.c.orig	Tue Mar  7 06:23:06 2000
++++ src/main.c	Thu Apr 20 03:00:00 2000
+@@ -134,6 +134,7 @@
+ 		"Usage: gphoto [-h] [-c] [-n] [-s # filename] [-t # filename]\n");
+ 	fprintf(stdout, "              [-d #] [-p filename] [-l filename]\n");
+ 
++	gtk_set_locale();
+ 	gtk_init(&argc, &argv);
+ #if 1 /* by fujisawa */
+ 	gdk_imlib_init();
diff --git a/graphics/gphoto/files/patch-az b/graphics/gphoto/files/patch-az
new file mode 100644
index 0000000..7a2668d
--- /dev/null
+++ b/graphics/gphoto/files/patch-az
@@ -0,0 +1,22 @@
+--- src/util.c.orig	Tue Mar  7 06:23:06 2000
++++ src/util.c	Thu Apr 20 03:00:00 2000
+@@ -1,3 +1,4 @@
++#include "config.h"
+ #include "gphoto.h"
+ #include "util.h"
+ #include <stdio.h>    
+@@ -9,10 +10,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <sys/dir.h>
++#ifdef HAVE_DIRENT_H
+ #include <dirent.h>
+-#ifdef __FreeBSD__
+ #else
++#include <sys/dir.h>
++#endif
++#ifndef __FreeBSD__
+ #include <sys/resource.h>
+ #endif
+ #ifdef linux
diff --git a/graphics/gphoto/files/patch-ba b/graphics/gphoto/files/patch-ba
new file mode 100644
index 0000000..c8d0952
--- /dev/null
+++ b/graphics/gphoto/files/patch-ba
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Mar  7 07:07:09 2000
++++ src/Makefile.in	Thu Apr 20 03:00:00 2000
+@@ -89,7 +89,7 @@
+ 
+ bin_PROGRAMS = gphoto
+ 
+-CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ -O2 -Wall -I$(srcdir)/icons
++CFLAGS = @GTK_CFLAGS@ @GDK_IMLIB_CFLAGS@ @CFLAGS@ -I$(srcdir)/icons
+ 
+ gphoto_LDADD = ../konica/libgphoto_konica_qm100.la 	../konica_qmxxx/libgphoto_konica_qmxxx.la 	../canon/libgphoto_canon.la 	../casio/libgphoto_casio_qv.la 	../nikon/libgphoto_coolpix600.la 	../philips/libgphoto_philips.la 	../fuji/libgphoto_fuji.la 	../photopc/libgphoto_photopc.la 	../kodak/libgphoto_kodak_dc2x.la 	../kodak_generic/libgphoto_kodak_generic.la 	../minolta/libgphoto_dimage_v.la 	../mustek/libgphoto_mustek_mdc800.la 	../ricoh/libgphoto_ricoh300z.la 	../samsung/libgphoto_samsung.la 	../sony/libgphoto_sony_dscf1.la 	../sony/dscf55/libgphoto_sony_dscf55.la 	../directory/libgphoto_dir.la 	@GTK_LIBS@ @GDK_IMLIB_LIBS@ -ljpeg 
+ 
diff --git a/graphics/gphoto/pkg-plist b/graphics/gphoto/pkg-plist
index 8393d51c..eb83231 100644
--- a/graphics/gphoto/pkg-plist
+++ b/graphics/gphoto/pkg-plist
@@ -3,54 +3,77 @@ bin/gphoto-exifdump
 bin/qm100
 bin/qmxxx
 bin/rsony
-share/gphoto/drivers/libgphoto_canon.so.0
-share/gphoto/drivers/libgphoto_canon.so
-share/gphoto/drivers/libgphoto_canon.a
-share/gphoto/drivers/libgphoto_casio_qv.so.0
-share/gphoto/drivers/libgphoto_casio_qv.so
-share/gphoto/drivers/libgphoto_casio_qv.a
-share/gphoto/drivers/libgphoto_fuji.so.0
-share/gphoto/drivers/libgphoto_fuji.so
-share/gphoto/drivers/libgphoto_fuji.a
-share/gphoto/drivers/libgphoto_kodak_dc2x.so.0
-share/gphoto/drivers/libgphoto_kodak_dc2x.so
-share/gphoto/drivers/libgphoto_kodak_dc2x.a
-share/gphoto/drivers/libgphoto_kodak_generic.so.0
-share/gphoto/drivers/libgphoto_kodak_generic.so
-share/gphoto/drivers/libgphoto_kodak_generic.a
-share/gphoto/drivers/libgphoto_konica_qm100.so.0
-share/gphoto/drivers/libgphoto_konica_qm100.so
-share/gphoto/drivers/libgphoto_konica_qm100.a
-share/gphoto/drivers/libgphoto_dimage_v.so.0
-share/gphoto/drivers/libgphoto_dimage_v.so
-share/gphoto/drivers/libgphoto_dimage_v.a
-share/gphoto/drivers/libgphoto_mustek_mdc800.so.0
-share/gphoto/drivers/libgphoto_mustek_mdc800.so
-share/gphoto/drivers/libgphoto_mustek_mdc800.a
-share/gphoto/drivers/libgphoto_philips.so.0
-share/gphoto/drivers/libgphoto_philips.so
-share/gphoto/drivers/libgphoto_philips.a
-share/gphoto/drivers/libgphoto_konica_qmxxx.so.0
-share/gphoto/drivers/libgphoto_konica_qmxxx.so
-share/gphoto/drivers/libgphoto_photopc.so.0
-share/gphoto/drivers/libgphoto_konica_qmxxx.a
-share/gphoto/drivers/libgphoto_photopc.so
-share/gphoto/drivers/libgphoto_photopc.a
-share/gphoto/drivers/libgphoto_ricoh300z.so.0
-share/gphoto/drivers/libgphoto_ricoh300z.so
-share/gphoto/drivers/libgphoto_ricoh300z.a
-share/gphoto/drivers/libgphoto_sony_dscf55.so.0
-share/gphoto/drivers/libgphoto_sony_dscf55.so
-share/gphoto/drivers/libgphoto_sony_dscf55.a
-share/gphoto/drivers/libgphoto_sony_dscf1.so.0
-share/gphoto/drivers/libgphoto_sony_dscf1.so
-share/gphoto/drivers/libgphoto_sony_dscf1.a
-share/gphoto/drivers/libgphoto_coolpix600.so.0
-share/gphoto/drivers/libgphoto_coolpix600.so
-share/gphoto/drivers/libgphoto_coolpix600.a
-share/gphoto/drivers/libgphoto_dir.so.0
-share/gphoto/drivers/libgphoto_dir.so
-share/gphoto/drivers/libgphoto_dir.a
+lib/libgphoto_canon.a
+lib/libgphoto_canon.so
+lib/libgphoto_canon.so.0
+lib/libgphoto_casio_qv.a
+lib/libgphoto_casio_qv.so
+lib/libgphoto_casio_qv.so.0
+lib/libgphoto_coolpix600.so.0
+lib/libgphoto_coolpix600.a
+lib/libgphoto_coolpix600.so
+lib/libgphoto_dimage_v.a  
+lib/libgphoto_dimage_v.so
+lib/libgphoto_dimage_v.so.0
+lib/libgphoto_dir.a
+lib/libgphoto_dir.so
+lib/libgphoto_dir.so.0
+lib/libgphoto_fuji.a
+lib/libgphoto_fuji.so
+lib/libgphoto_fuji.so.0
+lib/libgphoto_kodak_dc2x.a
+lib/libgphoto_kodak_dc2x.so
+lib/libgphoto_kodak_dc2x.so.0
+lib/libgphoto_kodak_generic.a
+lib/libgphoto_kodak_generic.so
+lib/libgphoto_kodak_generic.so.0
+lib/libgphoto_konica_qm100.a
+lib/libgphoto_konica_qm100.so
+lib/libgphoto_konica_qm100.so.0
+lib/libgphoto_konica_qmxxx.a
+lib/libgphoto_konica_qmxxx.so
+lib/libgphoto_konica_qmxxx.so.0
+lib/libgphoto_mustek_mdc800.a
+lib/libgphoto_mustek_mdc800.so
+lib/libgphoto_mustek_mdc800.so.1
+lib/libgphoto_philips.a
+lib/libgphoto_philips.so
+lib/libgphoto_philips.so.0
+lib/libgphoto_photopc.a
+lib/libgphoto_photopc.so
+lib/libgphoto_photopc.so.0
+lib/libgphoto_ricoh300z.a
+lib/libgphoto_ricoh300z.so
+lib/libgphoto_ricoh300z.so.0
+lib/libgphoto_samsung.a
+lib/libgphoto_samsung.so
+lib/libgphoto_samsung.so.0
+lib/libgphoto_sony_dscf1.a
+lib/libgphoto_sony_dscf1.so
+lib/libgphoto_sony_dscf1.so.0
+lib/libgphoto_sony_dscf55.a
+lib/libgphoto_sony_dscf55.so
+lib/libgphoto_sony_dscf55.so.0
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+share/doc/gphoto/ChangeLog
+share/doc/gphoto/FAQ
+share/doc/gphoto/NEWS
+share/doc/gphoto/PROGRAMMERS
+share/doc/gphoto/README
+share/doc/gphoto/THANKS
+share/doc/gphoto/THEMES
+share/doc/gphoto/TODO
+share/gphoto/AUTHORS
+share/gphoto/MANUAL
+share/gphoto/gallery/CSStheme/gphotobutton.png 
+share/gphoto/gallery/CSStheme/index_bottom.html
+share/gphoto/gallery/CSStheme/index_top.html
+share/gphoto/gallery/CSStheme/mwcos.png
+share/gphoto/gallery/CSStheme/picture.html
+share/gphoto/gallery/CSStheme/styles.css
+share/gphoto/gallery/CSStheme/thumbnail.html
+share/gphoto/gallery/CSStheme/vh40.png
 share/gphoto/gallery/Default/banner.gif
 share/gphoto/gallery/Default/index.gif
 share/gphoto/gallery/Default/index_bottom.html
@@ -68,29 +91,9 @@ share/gphoto/gallery/RedNGray/next.gif
 share/gphoto/gallery/RedNGray/picture.html
 share/gphoto/gallery/RedNGray/previous.gif
 share/gphoto/gallery/RedNGray/thumbnail.html
-share/gphoto/gallery/CSStheme/index_bottom.html
-share/gphoto/gallery/CSStheme/index_top.html
-share/gphoto/gallery/CSStheme/mwcos.png
-share/gphoto/gallery/CSStheme/picture.html
-share/gphoto/gallery/CSStheme/styles.css
-share/gphoto/gallery/CSStheme/thumbnail.html
-share/gphoto/gallery/CSStheme/vh40.png
-share/gphoto/gallery/CSStheme/gphotobutton.png
-share/gphoto/doc/AUTHORS
-share/gphoto/doc/COPYING
-share/gphoto/doc/ChangeLog
-share/gphoto/doc/FAQ
-share/gphoto/doc/MANUAL
-share/gphoto/doc/NEWS
-share/gphoto/doc/PROGRAMMERS
-share/gphoto/doc/README
-share/gphoto/doc/THANKS
-share/gphoto/doc/THEMES
-share/gphoto/doc/TODO
-@dirrm share/gphoto/drivers
-@dirrm share/gphoto/gallery/Default
 @dirrm share/gphoto/gallery/RedNGray
+@dirrm share/gphoto/gallery/Default
 @dirrm share/gphoto/gallery/CSStheme
 @dirrm share/gphoto/gallery
-@dirrm share/gphoto/doc
 @dirrm share/gphoto
+@dirrm share/doc/gphoto