From bfa895a0d129b6eaea74719f4955f0993a01ac41 Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 22 Dec 2006 16:30:17 +0000 Subject: [PATCH] unbreak by finding pkg-config in the right place --- multimedia/avidemux/Makefile | 5 ++--- multimedia/mjpegtools/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 386042b22f5..64addf8c71c 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2006/12/16 12:22:34 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2006/12/22 16:30:17 steven Exp $ COMMENT= "free video editor" @@ -44,8 +44,7 @@ USE_GCC3= Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ -I${LOCALBASE}/include/libpng" \ - LDFLAGS="-L${LOCALBASE}/lib -logg" \ - PKG_CONFIG=${LOCALBASE}/bin/pkg-config + LDFLAGS="-L${LOCALBASE}/lib -logg" CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --with-jsapi-include=${LOCALBASE}/include/js \ --enable-xv \ diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index fcd2a95bc38..99982c6cdd5 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2006/12/16 12:22:34 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2006/12/22 16:30:17 steven Exp $ COMMENT= "tools to edit/modify/encode video streams" @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ - PKG_CONFIG="${LOCALBASE}/bin/pkg-config" + PKG_CONFIG="/usr/bin/pkg-config" FLAVORS= quicktime optimized FLAVOR?=