update qcamview to 0.4.

5 files changed, 35 insertions, 12 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 55536438aba..d8a0d0b049c 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5126 2004/03/07 07:32:57 snj Exp $
+$NetBSD: CHANGES,v 1.5127 2004/03/07 08:23:13 hamajima Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1210,3 +1210,6 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated foobillard to 2.9 [snj 2004-03-07]
 	Added bibtex2html-1.65 [minskim 2004-03-07]
 	Updated ltris to 1.0.6 [snj 2004-03-07]
+	Added cnxtview-0.00a [hamajima 2004-03-07]
+	Added cpia2view-0.03 [hamajima 2004-03-07]
+	Updated qcamview to 0.4 [hamajima 2004-03-07]
diff --git a/graphics/Makefile b/graphics/Makefile
index 301a4765947..8cf70a067c6 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.298 2004/03/06 11:10:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.299 2004/03/07 08:23:14 hamajima Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -43,7 +43,9 @@ SUBDIR+=	camlimages
 SUBDIR+=	cdlabelgen
 SUBDIR+=	clanlib
 SUBDIR+=	claraocr
+SUBDIR+=	cnxtview
 SUBDIR+=	compface
+SUBDIR+=	cpia2view
 SUBDIR+=	cqcam
 SUBDIR+=	dcraw
 SUBDIR+=	denemo
diff --git a/graphics/qcamview/Makefile b/graphics/qcamview/Makefile
index a21da45fbfb..8ca0a6e9473 100644
--- a/graphics/qcamview/Makefile
+++ b/graphics/qcamview/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/07 08:23:14 hamajima Exp $
 #
 
 DISTNAME=	qce-ga-0.40d
-PKGNAME=	qcamview-0.2
-PKGREVISION=	1
+PKGNAME=	qcamview-0.4
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qce-ga/}
 
 PATCH_SITES=	http://www2.starcat.ne.jp/~takam/bsd/
-PATCHFILES= 	qce-ga-bsd-0.02.patch.gz
+PATCHFILES= 	qce-ga-bsd-0.04.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hamajima@NetBSD.org
 HOMEPAGE=	http://www2.starcat.ne.jp/~takam/bsd/NetBSD.html#qcam
 COMMENT=	Logitech Quickcam Express USB Utilities
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		# defined
 
 do-build:
 	for f in qcamshot qcamview ; do				\
@@ -29,7 +28,7 @@ do-install:
 		${MAKE_PROGRAM} -f ${MAKEFILE}.$$f install ;	\
 	done
 
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qcamview/distinfo b/graphics/qcamview/distinfo
index eea1153b9c5..8c766aa4d86 100644
--- a/graphics/qcamview/distinfo
+++ b/graphics/qcamview/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/11 14:04:06 hamajima Exp $
+$NetBSD: distinfo,v 1.2 2004/03/07 08:23:14 hamajima Exp $
 
 SHA1 (qce-ga-0.40d.tar.gz) = 508b74d3d839b4a837a5fa1fbb0f48678e9b0bad
 Size (qce-ga-0.40d.tar.gz) = 40715 bytes
-SHA1 (qce-ga-bsd-0.02.patch.gz) = b2751cc7151c8d371b6e82cc818775669084a7d7
-Size (qce-ga-bsd-0.02.patch.gz) = 17477 bytes
+SHA1 (qce-ga-bsd-0.04.patch.gz) = 3984481734d308545f12451748b3e45ff03b11a0
+Size (qce-ga-bsd-0.04.patch.gz) = 17623 bytes
+SHA1 (patch-aa) = 9b717ed225e9f6d2334ba2122a4ff764e789f074
diff --git a/graphics/qcamview/patches/patch-aa b/graphics/qcamview/patches/patch-aa
new file mode 100644
index 00000000000..9181ed6abb4
--- /dev/null
+++ b/graphics/qcamview/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1 2004/03/07 08:23:14 hamajima Exp $
+
+--- Makefile.qcamview.orig	2004-03-07 09:12:44.000000000 +0900
++++ Makefile.qcamview	2004-03-07 09:13:19.000000000 +0900
+@@ -8,11 +8,11 @@
+ SRCS 	= qcamview.c linux_usbif.c quickcam.c pb0100.c hdcs.c vv6410.c gui.c
+ MAN	= ${PROG}.1
+ 
+-GTKCFLAGS   !=	gtk12-config --cflags
++GTKCFLAGS   !=	gtk-config --cflags
+ IMLIBCFLAGS !=	imlib-config --cflags-gdk
+ CFLAGS      +=	-Wall ${GTKCFLAGS} ${IMLIBCFLAGS}
+ 
+-GTKLDFLAGS  !=	gtk12-config --libs
++GTKLDFLAGS  !=	gtk-config --libs
+ IMLIBLDFLAGS!=	imlib-config --libs-gdk
+ LDFLAGS	    +=	-Wall ${GTKLDFLAGS} ${IMLIBLDFLAGS}
+