Converted to use buildlink.mk files

3 files changed, 14 insertions, 16 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index caf004cac9f..d33d52cd307 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/05/05 19:51:15 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/06/29 14:53:34 zuntum Exp $
 #
 
 DISTNAME=		cqcam-0.45a
@@ -10,11 +10,10 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.duke.edu/~reynolds/cqcam/
 COMMENT=		Free Color QuickCam control program
 
-DEPENDS=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		tk>=8.3.2:../../x11/tk
-
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-alpha
 
 LICENSE=		no-profit
 
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../x11/tk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index 7713b99bbf7..4ceca4051d9 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/29 14:53:34 zuntum Exp $
 
 SHA1 (cqcam-0.45a.tgz) = 39affec6ad3e81cc837ab583d01207767d4f7273
 Size (cqcam-0.45a.tgz) = 40163 bytes
-SHA1 (patch-aa) = f1dadcf9ab08a4bcb7a3ae3fcda40f9f3c4748e0
+SHA1 (patch-aa) = f65eb6001abfc39fea3f5fdab1af445214748f9a
 SHA1 (patch-ab) = 69138220e26174d66e10310d247f9611b3e13471
 SHA1 (patch-ac) = 868cedbdb0e866013079408d2260eb5084121da7
diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index f2c7bf57857..0f958540caa 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
+$NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
 
---- Makefile.orig	Mon Oct 27 15:07:06 1997
-+++ Makefile	Sat Jan  6 19:59:45 2001
+--- Makefile.orig	Tue Oct 28 00:07:06 1997
++++ Makefile
 @@ -13,9 +13,9 @@
  # OS-specific stuff: uncomment all of the lines for your OS of choice
  
@@ -26,8 +26,8 @@ $NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
  #DEFS += -DFREEBSD
  
 +# NetBSD
-+CFLAGS = -O2 -I${X11BASE}/include -I${PREFIX}/include
-+LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
++CFLAGS+= -I${X11BASE}/include
++LDFLAGS+= -L${X11BASE}/lib -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
 +DEFS += -DNETBSD
 +# XXX
 +.if (${MACHINE_ARCH} == "alpha")
@@ -39,15 +39,14 @@ $NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
  # BSDI 3.0
  #CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include
  #LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
-@@ -44,15 +55,15 @@
+@@ -44,15 +55,14 @@
  # JPEG stuff: do you want JPEG support?  Where is your JPEG library?
  
  LDLIBS += -ljpeg
 -#LDFLAGS +=  # -L/usr/local/lib
-+LDFLAGS +=  -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
++LDFLAGS +=  -Wl,-R${LOCALBASE}/lib
  DEFS += -DJPEG 
 -#CFLAGS += -I/usr/local/include
-+CFLAGS += -I${LOCALBASE}/include
  ######################################################################
  
  ######################################################################
@@ -58,7 +57,7 @@ $NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
  LIBS_X = -lX11 -lXext $(REMOTE_LIBS)
  ######################################################################
  
-@@ -67,27 +78,27 @@
+@@ -67,27 +77,27 @@
  #   If you're not compiling xcqcam, this section is irrelevant
  
  # xview remote
@@ -98,7 +97,7 @@ $NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
  ######################################################################
  
  ######################################################################
-@@ -132,13 +143,14 @@
+@@ -132,13 +142,14 @@
  
  bininstall: all
  	@echo -n Installing binaries...