diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 9db2dd365fc..11709d2c009 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2005/11/13 21:11:13 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.6 2006/02/03 05:13:05 jakemsr Exp $ COMMENT= "video stream processing tools" DISTNAME= transcode-1.0.2 +PKGNAME= ${DISTNAME}p0 CATEGORIES= multimedia HOMEPAGE= http://www.transcoding.org/ @@ -101,7 +102,7 @@ PKG_ARGS+= -Dlzo=0 .if ${FLAVOR:L:Mmjpegtools} CONFIGURE_ARGS+= --enable-mjpegtools -BUILD_DEPENDS+= ::multimedia/mjpegtools +LIB_DEPENDS+= mjpegutils.4::multimedia/mjpegtools RUN_DEPENDS+= ::multimedia/mjpegtools PKG_ARGS+= -Dmjpegtools=1 .else diff --git a/multimedia/transcode/patches/patch-configure b/multimedia/transcode/patches/patch-configure deleted file mode 100644 index 132873dbc7b..00000000000 --- a/multimedia/transcode/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2005/11/13 21:11:13 jakemsr Exp $ ---- configure.orig Sun Oct 2 19:50:44 2005 -+++ configure Sun Oct 9 14:46:27 2005 -@@ -40618,7 +40618,7 @@ if test "${ac_cv_lib_mjpegutils_y4m_si_g - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmjpegutils $MJPEGTOOLS_EXTRA_LIBS $LIBS" -+LIBS="-lmjpegutils_pic $MJPEGTOOLS_EXTRA_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -40677,7 +40677,7 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_lib_mjpegutils_y4m_si_get_height" >&5 - echo "${ECHO_T}$ac_cv_lib_mjpegutils_y4m_si_get_height" >&6 - if test $ac_cv_lib_mjpegutils_y4m_si_get_height = yes; then -- MJPEGTOOLS_LIBS="$mjpegtools_ll -lmjpegutils $MJPEGTOOLS_EXTRA_LIBS" -+ MJPEGTOOLS_LIBS="$mjpegtools_ll -lmjpegutils_pic $MJPEGTOOLS_EXTRA_LIBS" - else - - tc_pkg_err="yes"