From nobody@FreeBSD.org  Sat Mar 18 07:08:59 2000
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 4CF5937B61B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 18 Mar 2000 07:08:59 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id HAA55053;
	Sat, 18 Mar 2000 07:08:59 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Message-Id: <200003181508.HAA55053@freefall.freebsd.org>
Date: Sat, 18 Mar 2000 07:08:59 -0800 (PST)
From: tkato@prontomail.ne.jp
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: graphics/cqcam
X-Send-Pr-Version: www-1.0

>Number:         17463
>Category:       ports
>Synopsis:       Update port: graphics/cqcam
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mharo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 18 07:10:04 PST 2000
>Closed-Date:    Fri Jul 14 05:39:04 PDT 2000
>Last-Modified:  Fri Jul 14 05:40:45 PDT 2000
>Originator:     KATO Tsuguru
>Release:        3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Support LOCALBASE properly
- Support install macros
- Add WWW: line into pkg/DESCR

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/cqcam/Makefile graphics/cqcam/Makefile
--- /usr/ports/graphics/cqcam/Makefile	Sat Dec 25 20:13:55 1999
+++ graphics/cqcam/Makefile	Thu Mar 16 22:57:57 2000
@@ -8,7 +8,7 @@
 
 DISTNAME=	cqcam-0.45a
 CATEGORIES=	graphics tk82
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/unixfreeware/graphics/
+MASTER_SITES=	http://www.cs.duke.edu/~reynolds/cqcam/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff -urN /usr/ports/graphics/cqcam/patches/patch-aa graphics/cqcam/patches/patch-aa
--- /usr/ports/graphics/cqcam/patches/patch-aa	Mon Nov 29 20:14:14 1999
+++ graphics/cqcam/patches/patch-aa	Thu Mar 16 22:57:13 2000
@@ -20,8 +20,8 @@
 -#CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include
 -#LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
 -#DEFS += -DFREEBSD
-+CFLAGS = -O2 -I${X11BASE}/include -I${PREFIX}/include
-+LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib
++CFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
++LDFLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib
 +DEFS += -DFREEBSD
  
  # BSDI 3.0
@@ -58,9 +58,9 @@
 -#REMOTE_CFLAGS =
 +REMOTE_OBJS = xqcctl-tk.o            # code module for the remote
 +REMOTE_DEFS = -DREMOTE
-+REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk82 -ltcl82    # libraries necessary for the remote
++REMOTE_LIBS = -lm -L${LOCALBASE}/lib -ltk82 -ltcl82    # libraries necessary for the remote
 +REMOTE_LDFLAGS =
-+REMOTE_CFLAGS = -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2
++REMOTE_CFLAGS = -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
  ######################################################################
  
  ######################################################################
@@ -80,14 +80,14 @@
  bininstall: all
  	@echo -n Installing binaries...
 -	@install -o $(BINUSER) -g $(BINGROUP) -m $(BINMODE) $(PROGRAMS) $(BINDIR)
-+	@install -c -s -o $(BINUSER) -g $(BINGROUP) -m $(BINMODE) $(PROGRAMS) $(BINDIR)
++	${BSD_INSTALL_PROGRAM} $(PROGRAMS) $(BINDIR)
  	@echo " done"
  
  maninstall: cqcam.1
  	@echo -n Installing man pages...
 -	@install -o root -g root -m 644 cqcam.1 $(MANDIR)
 -	@ln -sf cqcam.1 $(MANDIR)/xcqcam.1
-+	@install -c -o root -g wheel -m 644 cqcam.1 $(MANDIR)
++	${BSD_INSTALL_MAN} cqcam.1 $(MANDIR)
  	@echo " done"
  
  clean:
diff -urN /usr/ports/graphics/cqcam/pkg/DESCR graphics/cqcam/pkg/DESCR
--- /usr/ports/graphics/cqcam/pkg/DESCR	Mon Feb  9 17:09:35 1998
+++ graphics/cqcam/pkg/DESCR	Thu Mar 16 23:00:10 2000
@@ -1 +1,3 @@
 Color QUICK CAM frame grabber
+
+WWW: http://www.cs.duke.edu/~reynolds/cqcam/


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: mharo 
State-Changed-When: Fri Mar 31 16:27:05 PST 2000 
State-Changed-Why:  
I applied the patch you submitted, but it didn't compile for me. 
Compiling cqcam.C... done 
Compiling imager.C... done 
Compiling rcfile.C... done 
Linking cqcam...cqcam.o: In function `ffs': 
cqcam.o(.text+0xcec): multiple definition of `ffs' 
camera.o(.text+0x12bc): first defined here 
*** Error code 1 

Stop in /usr/ports/graphics/cqcam/work/cqcam-0.45a. 
*** Error code 1 


Responsible-Changed-From-To: freebsd-ports->mharo 
Responsible-Changed-By: mharo 
Responsible-Changed-When: Fri Mar 31 16:27:05 PST 2000 
Responsible-Changed-Why:  
I'll deal with this one 
State-Changed-From-To: analyzed->closed 
State-Changed-By: alex 
State-Changed-When: Fri Jul 14 05:39:04 PDT 2000 
State-Changed-Why:  
Although this is mharo's PR, close this one in favor of ports/19824, which 
fixes the port and updates it to the 0.90 version. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=17463 
>Unformatted:
