From fc3f45b47ca29e3e44bb5924a73545fc891f9c98 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 7 Jan 2014 13:44:48 +0000
Subject: [PATCH] disable asm support on this i386-only port; uses %ebx which
 conflicts with PIE

---
 graphics/cqcam/Makefile | 12 +++++++-----
 graphics/cqcam/distinfo |  3 ---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index bf3ba344bd0..c03aaa5dac5 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.21 2013/03/11 11:10:51 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2014/01/07 13:44:48 sthen Exp $
 
 ONLY_FOR_ARCHS= i386
 
 COMMENT=	color QuickCam control program
 
 DISTNAME=	cqcam-0.91
-REVISION =	3
+REVISION=	4
 CATEGORIES=	graphics
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
-WANTLIB=		c m stdc++ jpeg>=62
+
+WANTLIB=	c m stdc++ jpeg>=62
 
 HOMEPAGE=	http://www.cs.duke.edu/~reynolds/cqcam/
 MASTER_SITES=	${HOMEPAGE}
@@ -19,8 +20,9 @@ USE_GROFF =	Yes
 LIB_DEPENDS=	graphics/jpeg
 
 CONFIGURE_STYLE= gnu dest
-CONFIGURE_ARGS= --enable-jpeg \
-		--enable-asm \
+# asm uses %ebx, conflict with PIE
+CONFIGURE_ARGS= --disable-asm \
+		--enable-jpeg \
 		--without-xview
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index 912d1498c8d..d8d5764d336 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,5 +1,2 @@
-MD5 (cqcam-0.91.tar.gz) = 7D944AQq3ZN0J7Dh01wK4g==
-RMD160 (cqcam-0.91.tar.gz) = TvYrAZhfg0BjoOCUE5G40GQor34=
-SHA1 (cqcam-0.91.tar.gz) = KMeMmiSuAbWhjYHjNPjA3Ksuvng=
 SHA256 (cqcam-0.91.tar.gz) = dBoltOLxB8v5wwP9Bc09n0MifR7lGokVgczkqA0bCR0=
 SIZE (cqcam-0.91.tar.gz) = 121252