Make this compile with gcc-2.95 (hi drochner!). Closes PR 24515.

bl3ify, and provide a buildlink3.mk file for future bl3ification of
dependencies.

5 files changed, 80 insertions, 6 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index a45acc6182a..9d553615dd3 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/20 16:06:22 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/21 22:58:08 cube Exp $
 #
 
 DISTNAME=	libgphoto2-2.1.4
@@ -12,13 +12,13 @@ COMMENT=	Digital camera access library
 
 CONFLICTS+=	gphoto<2.1.1
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE+=	libgphoto2/libgphoto2.pc.in
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libusb/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libusb/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk
new file mode 100644
index 00000000000..9c751262ae2
--- /dev/null
+++ b/devel/libgphoto2/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/21 22:58:08 cube Exp $
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGPHOTO2_BUILDLINK3_MK:=	${LIBGPHOTO2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgphoto2
+.endif
+
+.if !empty(LIBGPHOTO2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgphoto2
+BUILDLINK_DEPENDS.libgphoto2+=		libgphoto2>=2.1.2
+BUILDLINK_PKGSRCDIR.libgphoto2?=		../../devel/libgphoto2
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+
+.endif # LIBGPHOTO2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 6404c9abc86..2b3dfc8b141 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/02/20 16:06:22 drochner Exp $
+$NetBSD: distinfo,v 1.4 2004/02/21 22:58:08 cube Exp $
 
 SHA1 (libgphoto2-2.1.4.tar.bz2) = aa437f6bff0f58049b84ded2f96fee89e124cb34
 Size (libgphoto2-2.1.4.tar.bz2) = 1819325 bytes
+SHA1 (patch-aa) = db286753834c8a792abc8d2d4b3d1ddfc1d78b19
+SHA1 (patch-ab) = fdf52725d0cf10bec23e98e936c277f71b3b4b5f
diff --git a/devel/libgphoto2/patches/patch-aa b/devel/libgphoto2/patches/patch-aa
new file mode 100644
index 00000000000..9736e53ad2c
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2004/02/21 22:58:08 cube Exp $
+
+--- camlibs/aox/aox.c.orig	Sun Jan 18 19:47:00 2004
++++ camlibs/aox/aox.c
+@@ -39,10 +39,10 @@
+ int aox_init (GPPort *port, Model *model, Info *info) 
+ {
+ 	unsigned char c[4];
+-	memset(c,0,sizeof(c));
+ 	unsigned char hi[2];
+-	memset (hi,0,2);
+ 	unsigned char lo[2];
++	memset(c,0,sizeof(c));
++	memset (hi,0,2);
+ 	memset (lo,0,2);
+ 
+ 	GP_DEBUG("Running aox_init\n");
+@@ -86,11 +86,11 @@ int aox_get_num_hi_pics      (Info *info
+ 
+ int aox_get_picture_size  (GPPort *port, int lo, int hi, int n, int k) 
+ {
++	unsigned char c[4];
++        unsigned int size;
+ 	GP_DEBUG("Running aox_get_picture_size\n");
+ 
+-	unsigned char c[4];
+ 	memset (c,0,4);
+-        unsigned int size;
+ 
+ 	if ( ( (lo) && ( n ==k ) && (k ==0)) ) {
+ 	    	READ(port, 0x04, 0x1, 0x1, c, 2);	
diff --git a/devel/libgphoto2/patches/patch-ab b/devel/libgphoto2/patches/patch-ab
new file mode 100644
index 00000000000..884586ad3ba
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2004/02/21 22:58:08 cube Exp $
+
+--- camlibs/aox/library.c.orig	Sun Jan 18 19:47:00 2004
++++ camlibs/aox/library.c
+@@ -202,6 +202,7 @@ get_file_func (CameraFilesystem *fs, con
+ 			gp_file_adjust_name_for_mime_type (file);
+ 		}
+ 		if ((w == 640)){
++			int header_len;
+ 			/* Stripping useless header */
+ 			p_data = data + 0x98;
+ 			/* Picture is mirror-imaged.*/
+@@ -222,7 +223,7 @@ get_file_func (CameraFilesystem *fs, con
+ 			GP_DEBUG("size of data = %i\n", sizeof(data));
+ 			GP_DEBUG("size of p_data = %i\n", sizeof(p_data));
+ 			/* And now create a ppm file, with our own header */
+-			int  header_len = snprintf(header, 127, 
++			header_len = snprintf(header, 127, 
+ 				"P6\n" 
+ 				"# CREATOR: gphoto2, aox library\n" 
+ 				"%d %d\n"