Date: Mon, 16 Jul 2001 09:54:48 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/29014: Update port: graphics/cqcam to 0.91 Message-ID: <200107161654.f6GGsmc20751@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 29014 >Category: ports >Synopsis: Update port: graphics/cqcam to 0.91 >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 16 10:00:04 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.91 >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/cqcam/Makefile graphics/cqcam/Makefile --- /usr/ports/graphics/cqcam/Makefile Fri Oct 13 06:33:37 2000 +++ graphics/cqcam/Makefile Sat Jul 14 00:32:52 2001 @@ -6,11 +6,9 @@ # PORTNAME= cqcam -PORTVERSION= 0.90p11 +PORTVERSION= 0.91 CATEGORIES= graphics MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/pre/} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org @@ -18,20 +16,18 @@ ONLY_FOR_ARCHS= i386 -USE_XLIB= yes USE_GTK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-asm INSTALL_TARGET= bininstall MAN1= cqcam.1 MLINKS= cqcam.1 webcam.1 \ cqcam.1 xcqcam.1 -PORTDOCS= README docs/APINOTES docs/CHANGES docs/README.webcam \ - docs/refresh.html docs/webcam.html +PORTDOCS= README docs/APINOTES docs/CHANGES docs/README.movies \ + docs/README.webcam docs/refresh.html docs/webcam.html post-install: .for file in cqcam gtkcam webcam xcqcam @@ -42,9 +38,9 @@ ${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 + @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/cqcam + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif @${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE} diff -urN /usr/ports/graphics/cqcam/distinfo graphics/cqcam/distinfo --- /usr/ports/graphics/cqcam/distinfo Fri Oct 13 06:33:37 2000 +++ graphics/cqcam/distinfo Fri Jul 13 23:46:52 2001 @@ -1 +1 @@ -MD5 (cqcam-0.90pre11.tgz) = 93a5bde5e9118d2db0d7d36196ac5967 +MD5 (cqcam-0.91.tar.gz) = ec3f78e0042add937427b0e1d35c0ae2 diff -urN /usr/ports/graphics/cqcam/files/patch-ab graphics/cqcam/files/patch-ab --- /usr/ports/graphics/cqcam/files/patch-ab Fri Oct 13 06:33:45 2000 +++ graphics/cqcam/files/patch-ab Fri Oct 13 00:52:59 2000 @@ -1,5 +1,5 @@ --- configure.orig Thu Aug 17 19:41:42 2000 -+++ configure Sat Oct 7 06:30:04 2000 ++++ configure Fri Oct 13 00:52:28 2000 @@ -1182,8 +1182,8 @@ echo "configure:1183: checking if the compiler understands -pipe" >&5 OLDCC="$CC" @@ -16,7 +16,7 @@ else ac_save_LIBS="$LIBS" -LIBS="-lgtk `$gtkbin""gtk-config --libs` $LIBS" -+LIBS="`$gtkbin""$GTK_CONFIG --libs` $LIBS" ++LIBS="`$GTK_CONFIG --libs` $LIBS" cat > conftest.$ac_ext <<EOF #line 1713 "configure" #include "confdefs.h" @@ -25,11 +25,21 @@ echo $ac_n "checking GTK+ version""... $ac_c" 1>&6 echo "configure:1749: checking GTK+ version" >&5 - GTKV=`$gtkbin""gtk-config --version` -+ GTKV=`$gtkbin""$GTK_CONFIG --version` ++ GTKV=`$GTK_CONFIG --version` echo "$ac_t""$GTKV" 1>&6 case "$GTKV" in 1.0.*) -@@ -1942,8 +1942,8 @@ +@@ -1756,7 +1756,8 @@ + GTK_CFLAGS='-DHAVE_GTK_1_1' + ;; + *) +- GTK_CFLAGS='' ++ GTK_CFLAGS=`$GTK_CONFIG --cflags` ++ GTK_LIBS=`$GTK_CONFIG --libs` + ;; + esac + fi +@@ -1942,8 +1943,8 @@ OS_LIBCQCAM_OBJS='' ;; freebsd*) @@ -40,11 +50,11 @@ OS_LIBCQCAM_OBJS='' ;; bsdi*) -@@ -2178,6 +2178,7 @@ - s%@x_includes@%$x_includes%g +@@ -2179,6 +2180,7 @@ s%@bingroup@%$bingroup%g s%@gtkbin@%$gtkbin%g -+s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g ++s%@GTK_LIBS@%$GTK_LIBS%g CEOF + EOF diff -urN /usr/ports/graphics/cqcam/files/patch-ac graphics/cqcam/files/patch-ac --- /usr/ports/graphics/cqcam/files/patch-ac Fri Jul 14 21:46:29 2000 +++ graphics/cqcam/files/patch-ac Thu Oct 12 22:53:23 2000 @@ -1,22 +1,25 @@ ---- 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 @@ +--- gtkfe/Makefile.in.orig Mon Jun 5 14:16:42 2000 ++++ gtkfe/Makefile.in Thu Oct 12 22:53:07 2000 +@@ -3,10 +3,10 @@ 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` ++CFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ ++CXXFLAGS = -Wall @DEBUGFLAGS@ @OS_CFLAGS@ @GTK_CFLAGS@ @JPEG_CFLAGS@ @LOCKING@ -I../libcqcam LDFLAGS = @OS_LDFLAGS@ -L../libcqcam - LIBS = -lcqcam @JPEG_LIBS@ @OS_LIBS@ +-LIBS = -lcqcam @JPEG_LIBS@ @OS_LIBS@ ++LIBS = -lcqcam @JPEG_LIBS@ @OS_LIBS@ @GTK_LIBS@ INSTALL = @INSTALL@ + LIBCQCAM = ../libcqcam/libcqcam.a + @@ -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) ++ $(CXX) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) bininstall: - $(INSTALL) -o root -g @bingroup@ -m 4711 $(PROGRAMS) $(bindir) + mkdir -p $(bindir) diff -urN /usr/ports/graphics/cqcam/files/patch-ad graphics/cqcam/files/patch-ad --- /usr/ports/graphics/cqcam/files/patch-ad Fri Jul 14 21:46:29 2000 +++ graphics/cqcam/files/patch-ad Sat Jul 14 00:09:11 2001 @@ -1,9 +1,9 @@ ---- 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 @@ - */ +--- libcqcam/camera.C.orig Thu Jul 12 03:44:46 2001 ++++ libcqcam/camera.C Sat Jul 14 00:08:57 2001 +@@ -19,7 +19,6 @@ #include <stdio.h> + #include <stdlib.h> -#include <string.h> #include <unistd.h> diff -urN /usr/ports/graphics/cqcam/pkg-plist graphics/cqcam/pkg-plist --- /usr/ports/graphics/cqcam/pkg-plist Fri Jul 14 21:46:30 2000 +++ graphics/cqcam/pkg-plist Sat Jul 14 00:17:17 2001 @@ -2,13 +2,14 @@ bin/gtkcam bin/webcam bin/xcqcam +%%PORTDOCS%%share/doc/cqcam/APINOTES +%%PORTDOCS%%share/doc/cqcam/CHANGES +%%PORTDOCS%%share/doc/cqcam/README +%%PORTDOCS%%share/doc/cqcam/README.movies +%%PORTDOCS%%share/doc/cqcam/README.webcam +%%PORTDOCS%%share/doc/cqcam/refresh.html +%%PORTDOCS%%share/doc/cqcam/webcam.html 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 +%%PORTDOCS%%@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?200107161654.f6GGsmc20751>