Update to 0.3.2 with modifications by me.

PR:		12404
Submitted by:	Anders Nordby <anders@fix.no>, maintainer

5 files changed, 71 insertions, 112 deletions

diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 9c6362ce6e67..68bdacf1870e 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -3,22 +3,25 @@
 # Date created:		26 May 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/06/06 17:22:09 steve Exp $
 #
 
-DISTNAME=	gphoto-19990511
+DISTNAME=	gphoto-0.3.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gphoto.org/projects/gphoto/pub/snap/ \
+MASTER_SITES=	http://www.mustec.eu.org/~psj/downloads/ \
 		http://www.freenix.no/~anders/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	anders@fix.no
 
+BUILD_DEPENDS=	${X11BASE}/include/ppm.h:${PORTSDIR}/graphics/netpbm
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		gdk_imlib.4:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	GLIB_CONFIG="${PREFIX}/bin/glib12-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		IMLIB_CONFIG="${X11BASE}/bin/imlib-config" \
 
 MAN1=		gphoto.1
 
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index d9c98d1df178..2905374f7a74 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1 +1 @@
-MD5 (gphoto-19990511.tgz) = 3f38ead1d50bb39201ac84d8af8b5028
+MD5 (gphoto-0.3.2.tar.gz) = 07ad5af6a5d228694af77f9857dbcfc7
diff --git a/graphics/gphoto2/files/patch-ai b/graphics/gphoto2/files/patch-ai
index 9dcdc203e248..ce4cc2badd55 100644
--- a/graphics/gphoto2/files/patch-ai
+++ b/graphics/gphoto2/files/patch-ai
@@ -1,61 +1,13 @@
---- src/callbacks.c.orig	Wed May 26 08:12:05 1999
-+++ src/callbacks.c	Wed May 26 08:15:40 1999
-@@ -331,7 +331,9 @@
+--- 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 @@
  
  #ifdef linux
- 	if (strncmp("/dev/ttyS", serial_port, 9) == 0) {
+         sprintf(serial_port_prefix, "/dev/ttyS");
 -#elif defined(__FreeBSD__) || defined(__NetBSD__)
 +#elif defined(__FreeBSD__)
-+	if (strncmp("/dev/ttyd0", serial_port, 9) == 0) {
++        sprintf(serial_port_prefix, "/dev/cuaa");
 +#elif defined(__NetBSD__)
- 	if (strncmp("/dev/tty0", serial_port, 9) == 0) {
+         sprintf(serial_port_prefix, "/dev/tty0");
  #else
- 	if (strncmp("/dev/tty0", serial_port, 9) == 0) {
-@@ -418,7 +420,10 @@
- #ifdef linux
- 		fprintf(conf, "/dev/ttyS0\n");
- 		sprintf(serial_port, "/dev/ttyS0");
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-+		fprintf(conf, "/dev/ttyd0\n");
-+		sprintf(serial_port, "/dev/ttyd0");
-+#elif defined(__NetBSD__)
- 		fprintf(conf, "/dev/tty00\n");
- 		sprintf(serial_port, "/dev/tty00");
- #endif
-@@ -428,7 +433,10 @@
- #ifdef linux
- 		fprintf(conf, "/dev/ttyS1\n");
- 		sprintf(serial_port, "/dev/ttyS1");
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-+		fprintf(conf, "/dev/ttyd1\n");
-+		sprintf(serial_port, "/dev/ttyd1");
-+#elif defined(__NetBSD__)
- 		fprintf(conf, "/dev/tty01\n");
- 		sprintf(serial_port, "/dev/tty01");
- #endif
-@@ -437,7 +445,10 @@
- #ifdef linux
- 		fprintf(conf, "/dev/ttyS2\n");
- 		sprintf(serial_port, "/dev/ttyS2");
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-+		fprintf(conf, "/dev/ttyd2\n");
-+		sprintf(serial_port, "/dev/ttyd2");
-+#elif defined(__NetBSD__)
- 		fprintf(conf, "/dev/tty02\n");
- 		sprintf(serial_port, "/dev/tty02");
- #endif
-@@ -446,7 +457,10 @@
- #ifdef linux
- 		fprintf(conf, "/dev/ttyS3\n");
- 		sprintf(serial_port, "/dev/ttyS3");
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
-+		fprintf(conf, "/dev/ttyd3\n");
-+		sprintf(serial_port, "/dev/ttyd3");
-+#elif defined(__NetBSD__)
- 		fprintf(conf, "/dev/tty03\n");
- 		sprintf(serial_port, "/dev/tty03");
- #endif
+         sprintf(serial_port_prefix, "/dev/tty0");
diff --git a/graphics/gphoto2/pkg-descr b/graphics/gphoto2/pkg-descr
index def867ec1292..2820f4a916be 100644
--- a/graphics/gphoto2/pkg-descr
+++ b/graphics/gphoto2/pkg-descr
@@ -12,3 +12,5 @@ to the web.  A directory browse mode has also been implemented.
 
 gPhoto supports a wide array of digital camera models.  Visit
 http://www.gphoto.org/cameras.php3 for an updated list.
+
+WWW: http://www.gphoto.org/
diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist
index 76b0552a15aa..627e0382f215 100644
--- a/graphics/gphoto2/pkg-plist
+++ b/graphics/gphoto2/pkg-plist
@@ -1,59 +1,61 @@
 bin/gphoto
-doc/gphoto-0.3/AUTHORS
-doc/gphoto-0.3/CREDITS
-doc/gphoto-0.3/FAQ
-doc/gphoto-0.3/MANUAL
-doc/gphoto-0.3/NEWS
-doc/gphoto-0.3/README
-share/gphoto/drivers/libgphoto_casio_qv.so
-share/gphoto/drivers/libgphoto_dir.so
-share/gphoto/drivers/libgphoto_fuji.so
-share/gphoto/drivers/libgphoto_kodak_dc2x.so
+share/doc/gphoto/AUTHORS
+share/doc/gphoto/COPYING
+share/doc/gphoto/CREDITS
+share/doc/gphoto/ChangeLog
+share/doc/gphoto/FAQ
+share/doc/gphoto/MANUAL
+share/doc/gphoto/NEWS
+share/doc/gphoto/README
+share/doc/gphoto/THEMES
+share/doc/gphoto/TODO
 share/gphoto/drivers/libgphoto_konica_qm100.so
+share/gphoto/drivers/libgphoto_konica_qm100.so.0
+share/gphoto/drivers/libgphoto_konica_qm100.a
+share/gphoto/drivers/libgphoto_casio_qv.so
+share/gphoto/drivers/libgphoto_casio_qv.so.0
+share/gphoto/drivers/libgphoto_casio_qv.a
 share/gphoto/drivers/libgphoto_philips.so
+share/gphoto/drivers/libgphoto_philips.so.0
+share/gphoto/drivers/libgphoto_philips.a
+share/gphoto/drivers/libgphoto_fuji.so
+share/gphoto/drivers/libgphoto_fuji.so.0
+share/gphoto/drivers/libgphoto_fuji.a
 share/gphoto/drivers/libgphoto_photopc.so
+share/gphoto/drivers/libgphoto_photopc.so.0
+share/gphoto/drivers/libgphoto_photopc.a
+share/gphoto/drivers/libgphoto_kodak_dc2x.so
+share/gphoto/drivers/libgphoto_kodak_dc2x.so.0
+share/gphoto/drivers/libgphoto_kodak_dc2x.a
 share/gphoto/drivers/libgphoto_ricoh300z.so
+share/gphoto/drivers/libgphoto_ricoh300z.so.0
+share/gphoto/drivers/libgphoto_ricoh300z.a
 share/gphoto/drivers/libgphoto_sony_dscf1.so
-share/gphoto/gphoto/CSStheme/CVS/Entries
-share/gphoto/gphoto/CSStheme/CVS/Repository
-share/gphoto/gphoto/CSStheme/CVS/Root
-share/gphoto/gphoto/CSStheme/index_bottom.html
-share/gphoto/gphoto/CSStheme/index_top.html
-share/gphoto/gphoto/CSStheme/mwcos
-share/gphoto/gphoto/CSStheme/picture.html
-share/gphoto/gphoto/CSStheme/styles.css
-share/gphoto/gphoto/CSStheme/thumbnail.html
-share/gphoto/gphoto/CSStheme/vh40.gif
-share/gphoto/gphoto/Default/CVS/Entries
-share/gphoto/gphoto/Default/CVS/Repository
-share/gphoto/gphoto/Default/CVS/Root
-share/gphoto/gphoto/Default/banner.gif
-share/gphoto/gphoto/Default/index.gif
-share/gphoto/gphoto/Default/index_bottom.html
-share/gphoto/gphoto/Default/index_top.html
-share/gphoto/gphoto/Default/next.gif
-share/gphoto/gphoto/Default/picture.html
-share/gphoto/gphoto/Default/previous.gif
-share/gphoto/gphoto/Default/thumbnail.html
-share/gphoto/gphoto/RedNGray/CVS/Entries
-share/gphoto/gphoto/RedNGray/CVS/Repository
-share/gphoto/gphoto/RedNGray/CVS/Root
-share/gphoto/gphoto/RedNGray/backgrnd.gif
-share/gphoto/gphoto/RedNGray/banner.gif
-share/gphoto/gphoto/RedNGray/index.gif
-share/gphoto/gphoto/RedNGray/index_bottom.html
-share/gphoto/gphoto/RedNGray/index_top.html
-share/gphoto/gphoto/RedNGray/next.gif
-share/gphoto/gphoto/RedNGray/picture.html
-share/gphoto/gphoto/RedNGray/previous.gif
-share/gphoto/gphoto/RedNGray/thumbnail.html
-@dirrm doc/gphoto-0.3
+share/gphoto/drivers/libgphoto_sony_dscf1.so.0
+share/gphoto/drivers/libgphoto_dir.so
+share/gphoto/drivers/libgphoto_dir.so.0
+share/gphoto/drivers/libgphoto_sony_dscf1.a
+share/gphoto/drivers/libgphoto_dir.a
+share/gphoto/gallery/Default/banner.gif
+share/gphoto/gallery/Default/index.gif
+share/gphoto/gallery/Default/index_bottom.html
+share/gphoto/gallery/Default/index_top.html
+share/gphoto/gallery/Default/next.gif
+share/gphoto/gallery/Default/picture.html
+share/gphoto/gallery/Default/previous.gif
+share/gphoto/gallery/Default/thumbnail.html
+share/gphoto/gallery/RedNGray/backgrnd.gif
+share/gphoto/gallery/RedNGray/banner.gif
+share/gphoto/gallery/RedNGray/index.gif
+share/gphoto/gallery/RedNGray/index_bottom.html
+share/gphoto/gallery/RedNGray/index_top.html
+share/gphoto/gallery/RedNGray/next.gif
+share/gphoto/gallery/RedNGray/picture.html
+share/gphoto/gallery/RedNGray/previous.gif
+share/gphoto/gallery/RedNGray/thumbnail.html
+@dirrm share/doc/gphoto
 @dirrm share/gphoto/drivers
-@dirrm share/gphoto/gphoto/CSStheme/CVS
-@dirrm share/gphoto/gphoto/CSStheme
-@dirrm share/gphoto/gphoto/Default/CVS
-@dirrm share/gphoto/gphoto/Default
-@dirrm share/gphoto/gphoto/RedNGray/CVS
-@dirrm share/gphoto/gphoto/RedNGray
-@dirrm share/gphoto/gphoto
+@dirrm share/gphoto/gallery/Default
+@dirrm share/gphoto/gallery/RedNGray
+@dirrm share/gphoto/gallery
 @dirrm share/gphoto