From owner-svn-ports-all@FreeBSD.ORG Tue Oct 8 20:07:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B14BBE42; Tue, 8 Oct 2013 20:07:59 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82B2C2D2A; Tue, 8 Oct 2013 20:07:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98K7xck035869; Tue, 8 Oct 2013 20:07:59 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98K7xKC035868; Tue, 8 Oct 2013 20:07:59 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310082007.r98K7xKC035868@svn.freebsd.org> From: William Grzybowski Date: Tue, 8 Oct 2013 20:07:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329833 - head/textproc/libextractor X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 20:07:59 -0000 Author: wg Date: Tue Oct 8 20:07:58 2013 New Revision: 329833 URL: http://svnweb.freebsd.org/changeset/ports/329833 Log: textproc/libextractor: link using ffmpeg0 - Link using ffmpeg0 Approved by: portmgr Modified: head/textproc/libextractor/Makefile Modified: head/textproc/libextractor/Makefile ============================================================================== --- head/textproc/libextractor/Makefile Tue Oct 8 20:06:45 2013 (r329832) +++ head/textproc/libextractor/Makefile Tue Oct 8 20:07:58 2013 (r329833) @@ -3,7 +3,7 @@ PORTNAME= libextractor PORTVERSION= 0.6.2 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,8 +18,8 @@ USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/libextractor CONFIGURE_ARGS= --disable-ltdl-install -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib MAKE_JOBS_UNSAFE= yes EXTRACT_AFTER_ARGS= --exclude libltdl @@ -35,7 +35,12 @@ OPTIONS_DEFAULT= EXIV2 FLAC MPEG2 VORBIS NO_STAGE= yes post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} \ + -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + -e 's|-lavcodec|-lavcodec0|g' \ + -e 's|-lavformat|-lavformat0|g' \ + -e 's|-lswscale|-lswscale0|g' \ + -e 's|-lavutil|-lavutil0|g' \ ${WRKSRC}/src/plugins/Makefile.* @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \ -e 's|-lstdc++||g' \ @@ -120,10 +125,10 @@ PLIST_SUB+= QT="@comment " # FFMPEG can be disabled .if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg -LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg -LIB_DEPENDS+= swscale:${PORTSDIR}/multimedia/ffmpeg -LIB_DEPENDS+= avutil:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 +LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 +LIB_DEPENDS+= libswscale0.so:${PORTSDIR}/multimedia/ffmpeg0 +LIB_DEPENDS+= libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 CONFIGURE_ARGS+=--enable-ffmpeg PLIST_SUB+= FFMPEG="" .else