6 files changed, 45 insertions, 34 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 212f25477419..e612c8cb97bd 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -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
 
@@ -23,7 +21,6 @@ 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
@@ -31,7 +28,7 @@ MLINKS=		cqcam.1 webcam.1 \
 		cqcam.1 xcqcam.1
 
 PORTDOCS=	README docs/APINOTES docs/CHANGES docs/README.webcam \
-		docs/refresh.html docs/webcam.html
+		docs/refresh.html docs/webcam.html docs/README.movies
 
 post-install:
 .for file in cqcam gtkcam webcam xcqcam
@@ -42,9 +39,9 @@ post-install:
 	${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 --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index b1dec2add442..097222404df3 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1 +1 @@
-MD5 (cqcam-0.90pre11.tgz) = 93a5bde5e9118d2db0d7d36196ac5967
+MD5 (cqcam-0.91.tar.gz) = ec3f78e0042add937427b0e1d35c0ae2
diff --git a/graphics/cqcam/files/patch-ab b/graphics/cqcam/files/patch-ab
index e2dd8a4e031e..4d89752a3c31 100644
--- a/graphics/cqcam/files/patch-ab
+++ b/graphics/cqcam/files/patch-ab
@@ -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 --git a/graphics/cqcam/files/patch-ac b/graphics/cqcam/files/patch-ac
index a4b9b4323c22..5e276614fb0b 100644
--- a/graphics/cqcam/files/patch-ac
+++ b/graphics/cqcam/files/patch-ac
@@ -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 --git a/graphics/cqcam/files/patch-ad b/graphics/cqcam/files/patch-ad
index 067456db16e6..817911f5d150 100644
--- a/graphics/cqcam/files/patch-ad
+++ b/graphics/cqcam/files/patch-ad
@@ -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 --git a/graphics/cqcam/pkg-plist b/graphics/cqcam/pkg-plist
index 10b331024292..cc8ce94772a9 100644
--- a/graphics/cqcam/pkg-plist
+++ b/graphics/cqcam/pkg-plist
@@ -2,13 +2,14 @@ bin/cqcam
 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