Date: Mon, 10 Jul 2000 08:26:30 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19824: Update port: graphics/cqcam to 0.90p9 (fix ports/17463) Message-ID: <20000710152630.B9FF837B79C@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19824 >Category: ports >Synopsis: Update port: graphics/cqcam to 0.90p9 (fix ports/17463) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 10 08:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.90p9 - Add WWW: line into pkg/PLIST New file: patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae pkg/MESSAGE Remove file: patches/patch-aa This PR supersedes ports/17463. >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/cqcam/Makefile graphics/cqcam/Makefile --- /usr/ports/graphics/cqcam/Makefile Fri Jun 9 21:07:43 2000 +++ graphics/cqcam/Makefile Mon Jul 10 21:41:46 2000 @@ -6,20 +6,50 @@ # PORTNAME= cqcam -PORTVERSION= 0.45a -CATEGORIES= graphics tk82 -MASTER_SITES= ftp://ftp.freesoftware.com/pub/unixfreeware/graphics/ +PORTVERSION= 0.90p9 +CATEGORIES= graphics +MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ +DISTNAME= ${PORTNAME}-0.90pre9 EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg ONLY_FOR_ARCHS= i386 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +USE_XLIB= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --disable-asm +INSTALL_TARGET= bininstall + MAN1= cqcam.1 MLINKS= cqcam.1 webcam.1 \ cqcam.1 xcqcam.1 + +CQCAM_DOCS= README docs/APINOTES docs/CHANGES docs/README.webcam \ + docs/refresh.html docs/webcam.html + +post-install: +.for file in cqcam gtkcam webcam xcqcam + @strip ${PREFIX}/bin/${file} +.endfor + ${INSTALL_MAN} ${WRKSRC}/docs/cqcam.1 ${PREFIX}/man/man1 + @${MKDIR} ${PREFIX}/share/examples/cqcam + ${INSTALL_DATA} ${WRKSRC}/.cqcrc ${PREFIX}/share/examples/cqcam/sample.cqcrc + ${INSTALL_DATA} ${WRKSRC}/webcam/nph-webcam ${PREFIX}/share/examples/cqcam/sample.nph-webcam +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/cqcam +.for file in ${CQCAM_DOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cqcam +.endfor +.endif + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -urN /usr/ports/graphics/cqcam/files/md5 graphics/cqcam/files/md5 --- /usr/ports/graphics/cqcam/files/md5 Mon Feb 9 17:09:36 1998 +++ graphics/cqcam/files/md5 Sat Jun 3 03:43:24 2000 @@ -1 +1 @@ -MD5 (cqcam-0.45a.tgz) = ae0d0d7bdb68a13344089b466d8fd30a +MD5 (cqcam-0.90pre9.tgz) = 1732df04cb536da102f54de187243fa7 diff -urN /usr/ports/graphics/cqcam/patches/patch-aa graphics/cqcam/patches/patch-aa --- /usr/ports/graphics/cqcam/patches/patch-aa Mon Nov 29 12:47:45 1999 +++ graphics/cqcam/patches/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,93 +0,0 @@ ---- Makefile.orig Mon Oct 27 17:07:06 1997 -+++ Makefile Sat Oct 3 21:12:09 1998 -@@ -13,9 +13,9 @@ - # OS-specific stuff: uncomment all of the lines for your OS of choice - - # Linux (people with Alphas probably need to enable -DBROKEN_IO_H) --CFLAGS = -O2 --LDFLAGS = -s --DEFS += -DLINUX # -DBROKEN_IO_H -+#CFLAGS = -O2 -+#LDFLAGS = -s -+#DEFS += -DLINUX # -DBROKEN_IO_H - - # QNX - #CFLAGS = -O2 -T1 -@@ -23,9 +23,9 @@ - #DEFS += -DQNX - - # FreeBSD --#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 -+DEFS += -DFREEBSD - - # BSDI 3.0 - #CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include -@@ -44,7 +44,7 @@ - # JPEG stuff: do you want JPEG support? Where is your JPEG library? - - LDLIBS += -ljpeg --#LDFLAGS += # -L/usr/local/lib -+LDFLAGS += # -L/usr/local/lib - DEFS += -DJPEG - #CFLAGS += -I/usr/local/include - ###################################################################### -@@ -67,27 +67,27 @@ - # If you're not compiling xcqcam, this section is irrelevant - - # xview remote --REMOTE_OBJS = xqcctl.o # code module for the remote --REMOTE_DEFS = -DREMOTE --REMOTE_LIBS = -lxview -lolgx # libraries necessary for the remote --REMOTE_LDFLAGS = -L/usr/openwin/lib # where to find libxview and libolgx --REMOTE_CFLAGS = -I/usr/openwin/include -+#REMOTE_OBJS = xqcctl.o # code module for the remote -+#REMOTE_DEFS = -DREMOTE -+#REMOTE_LIBS = -lxview -lolgx # libraries necessary for the remote -+#REMOTE_LDFLAGS = -L/usr/openwin/lib # where to find libxview and libolgx -+#REMOTE_CFLAGS = -I/usr/openwin/include - - # Tk remote --#REMOTE_OBJS = xqcctl-tk.o # code module for the remote --#REMOTE_DEFS = -DREMOTE --#REMOTE_LIBS = -lm -ldl -ltk -ltcl # libraries necessary for the remote --#REMOTE_LDFLAGS = --#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_LDFLAGS = -+REMOTE_CFLAGS = -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 - ###################################################################### - - ###################################################################### - # Installation information --BINDIR = /usr/local/bin -+BINDIR = ${PREFIX}/bin - BINMODE = 4711 - BINUSER = root - BINGROUP = bin --MANDIR = /usr/local/man/man1 -+MANDIR = ${PREFIX}/man/man1 - ###################################################################### - - ###################################################################### -@@ -132,13 +132,12 @@ - - 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) - @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) - @echo " done" - - clean: diff -urN /usr/ports/graphics/cqcam/patches/patch-ab graphics/cqcam/patches/patch-ab --- /usr/ports/graphics/cqcam/patches/patch-ab Thu Jan 1 09:00:00 1970 +++ graphics/cqcam/patches/patch-ab Mon Mar 13 03:54:51 2000 @@ -0,0 +1,50 @@ +--- configure.orig Mon Feb 1 16:01:12 1999 ++++ configure Mon Mar 13 03:54:42 2000 +@@ -1108,8 +1108,8 @@ + echo "configure:1109: checking if the compiler understands -pipe" >&5 + OLDCC="$CC" + OLDCXX="$CXX" +- CC="$CC -pipe" +- CXX="$CXX -pipe" ++ CC="$CC" ++ CXX="$CXX" + cat > conftest.$ac_ext <<EOF + #line 1115 "configure" + #include "confdefs.h" +@@ -1655,7 +1655,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lgtk `$gtkbin""gtk-config --libs` $LIBS" ++LIBS="`$gtkbin""$GTK_CONFIG --libs` $LIBS" + cat > conftest.$ac_ext <<EOF + #line 1661 "configure" + #include "confdefs.h" +@@ -1694,7 +1694,7 @@ + + echo $ac_n "checking GTK+ version""... $ac_c" 1>&6 + echo "configure:1697: checking GTK+ version" >&5 +- GTKV=`$gtkbin""gtk-config --version` ++ GTKV=`$gtkbin""$GTK_CONFIG --version` + echo "$ac_t""$GTKV" 1>&6 + case "$GTKV" in + 1.0.*) +@@ -1890,8 +1890,8 @@ + OS_LIBCQCAM_OBJS='' + ;; + freebsd*) +- OS_CFLAGS='-O2 -I/usr/local/include -DFREEBSD' +- OS_LDFLAGS='-L/usr/local/lib' ++ OS_CFLAGS="$CXXFLAGS $CPPFLAGS -DFREEBSD" ++ OS_LDFLAGS="$LDFLAGS" + OS_LIBCQCAM_OBJS='' + ;; + bsdi*) +@@ -2124,6 +2124,7 @@ + s%@x_includes@%$x_includes%g + s%@bingroup@%$bingroup%g + s%@gtkbin@%$gtkbin%g ++s%@GTK_CONFIG@%$GTK_CONFIG%g + s%@GTK_CFLAGS@%$GTK_CFLAGS%g + s%@xviewlib@%$xviewlib%g + diff -urN /usr/ports/graphics/cqcam/patches/patch-ac graphics/cqcam/patches/patch-ac --- /usr/ports/graphics/cqcam/patches/patch-ac Thu Jan 1 09:00:00 1970 +++ graphics/cqcam/patches/patch-ac Sat Jul 8 11:46:53 2000 @@ -0,0 +1,22 @@ +--- gtkfe/Makefile.in.orig Mon Feb 1 14:25:32 1999 ++++ gtkfe/Makefile.in Mon Mar 13 03:39:35 2000 +@@ -3,8 +3,8 @@ + bindir = @bindir@ + CC = @CC@ + CXX = @CXX@ +-CFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ `@gtkbin@gtk-config --cflags` +-CXXFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ @LOCKING@ -I../libcqcam `@gtkbin@gtk-config --cflags` ++CFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ `@gtkbin@@GTK_CONFIG@ --cflags` ++CXXFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ @LOCKING@ -I../libcqcam `@gtkbin@@GTK_CONFIG@ --cflags` + LDFLAGS = @OS_LDFLAGS@ -L../libcqcam + LIBS = -lcqcam @JPEG_LIBS@ @OS_LIBS@ + INSTALL = @INSTALL@ +@@ -19,7 +19,7 @@ + rm -f *.o core $(PROGRAMS) + + gtkcam: $(OBJS) $(LIBCQCAM) +- $(CXX) -o $@ $(OBJS) `@gtkbin@gtk-config --libs` $(LDFLAGS) $(LIBS) ++ $(CXX) -o $@ $(OBJS) `@gtkbin@@GTK_CONFIG@ --libs` $(LDFLAGS) $(LIBS) + + bininstall: + $(INSTALL) -o root -g @bingroup@ -m 4711 $(PROGRAMS) $(bindir) diff -urN /usr/ports/graphics/cqcam/patches/patch-ad graphics/cqcam/patches/patch-ad --- /usr/ports/graphics/cqcam/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ graphics/cqcam/patches/patch-ad Sat Jul 8 11:51:18 2000 @@ -0,0 +1,10 @@ +--- libcqcam/camera.C.orig Tue Apr 20 06:33:10 1999 ++++ libcqcam/camera.C Sat Jul 8 11:51:06 2000 +@@ -18,7 +18,6 @@ + */ + + #include <stdio.h> +-#include <string.h> + #include <unistd.h> + + #include "config.h" diff -urN /usr/ports/graphics/cqcam/patches/patch-ae graphics/cqcam/patches/patch-ae --- /usr/ports/graphics/cqcam/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ graphics/cqcam/patches/patch-ae Sat Jul 8 11:50:45 2000 @@ -0,0 +1,10 @@ +--- xfe/xscan.C.orig Wed Apr 26 16:16:35 2000 ++++ xfe/xscan.C Sat Jul 8 11:50:32 2000 +@@ -29,7 +29,6 @@ + + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <signal.h> + #include <sys/time.h> + #include <sys/stat.h> diff -urN /usr/ports/graphics/cqcam/pkg/COMMENT graphics/cqcam/pkg/COMMENT --- /usr/ports/graphics/cqcam/pkg/COMMENT Mon Feb 9 17:09:35 1998 +++ graphics/cqcam/pkg/COMMENT Mon Jul 10 20:28:07 2000 @@ -1 +1 @@ -Color QUICK CAM frame grabber +Color Quickcam control program 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 Mon Jul 10 20:48:08 2000 @@ -1 +1,18 @@ -Color QUICK CAM frame grabber +cqcam - Color Quickcam (PC/Parallel) control program + +Features: + * Automatic brightness and color adjustments + * Batchable output for webcams + * Support for "millions" (24bpp) and "billions" (32bpp) modes + * Nearly lossless on-the-fly despeckling (removal of the "Christmas + lights" effect) + * X11 front-end with optional GTK+, XView, or Tk support and Floyd + dithering for 8bpp displays + * Support for images up to 640x480 + * 24-bit PPM or JPEG output + * Streaming output for use as a continuous-feed webcam + +cqcam supports the Color Quickcam and Color Quickcam 2. It does not support +B&W Quickcams, the Quickclip, the VC, or the new Quickcam Home. + +WWW: http://www.cs.duke.edu/~reynolds/cqcam/ diff -urN /usr/ports/graphics/cqcam/pkg/MESSAGE graphics/cqcam/pkg/MESSAGE --- /usr/ports/graphics/cqcam/pkg/MESSAGE Thu Jan 1 09:00:00 1970 +++ graphics/cqcam/pkg/MESSAGE Mon Jul 10 21:35:28 2000 @@ -0,0 +1,4 @@ +************************************************************ +Please copy /usr/local/share/examples/cqcam/sample.cqcrc to +~/.cqcrc, and edit it for you system. +************************************************************ diff -urN /usr/ports/graphics/cqcam/pkg/PLIST graphics/cqcam/pkg/PLIST --- /usr/ports/graphics/cqcam/pkg/PLIST Mon Oct 5 12:18:36 1998 +++ graphics/cqcam/pkg/PLIST Mon Jul 10 21:40:50 2000 @@ -1,3 +1,14 @@ bin/cqcam -bin/xcqcam +bin/gtkcam bin/webcam +bin/xcqcam +share/examples/cqcam/sample.cqcrc +share/examples/cqcam/sample.nph-webcam +share/doc/cqcam/APINOTES +share/doc/cqcam/CHANGES +share/doc/cqcam/README +share/doc/cqcam/README.webcam +share/doc/cqcam/refresh.html +share/doc/cqcam/webcam.html +@dirrm share/examples/cqcam +@dirrm share/doc/cqcam >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000710152630.B9FF837B79C>