From owner-svn-ports-all@FreeBSD.ORG Thu Jun 26 19:00:00 2014 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 ESMTPS id 385CB781; Thu, 26 Jun 2014 19:00:00 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18E8C2C1F; Thu, 26 Jun 2014 19:00:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QIxxnw056227; Thu, 26 Jun 2014 18:59:59 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QIxxs3056223; Thu, 26 Jun 2014 18:59:59 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406261859.s5QIxxs3056223@svn.freebsd.org> From: Pawel Pekala Date: Thu, 26 Jun 2014 18:59:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359410 - in head/multimedia: libquicktime libquicktime-lame 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.18 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: Thu, 26 Jun 2014 19:00:00 -0000 Author: pawel Date: Thu Jun 26 18:59:58 2014 New Revision: 359410 URL: http://svnweb.freebsd.org/changeset/ports/359410 QAT: https://qat.redports.org/buildarchive/r359410/ Log: - Add staging support - Convert to USES=libtool, bump PORTREVISIONs - la files not installed - Convert to new LIB_DEPENDS format - Remove LATEST_LINK, PKGNAMESUFFIX already set Modified: head/multimedia/libquicktime-lame/Makefile head/multimedia/libquicktime-lame/pkg-plist head/multimedia/libquicktime/Makefile head/multimedia/libquicktime/pkg-plist Modified: head/multimedia/libquicktime-lame/Makefile ============================================================================== --- head/multimedia/libquicktime-lame/Makefile Thu Jun 26 18:21:55 2014 (r359409) +++ head/multimedia/libquicktime-lame/Makefile Thu Jun 26 18:59:58 2014 (r359410) @@ -5,13 +5,12 @@ PORTNAME= libquicktime PORTREVISION= 3 CATEGORIES= multimedia PKGNAMESUFFIX= -lame -PORTREVISION= 2 MAINTAINER= ports@FreeBSD.org COMMENT= LAME plugin for libquicktime -LIB_DEPENDS= quicktime.0:${PORTSDIR}/multimedia/libquicktime \ - mp3lame.0:${PORTSDIR}/audio/lame +LIB_DEPENDS= libquicktime.so:${PORTSDIR}/multimedia/libquicktime \ + libmp3lame.so:${PORTSDIR}/audio/lame LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING @@ -19,8 +18,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING MASTERDIR= ${.CURDIR}/../libquicktime PLIST= ${.CURDIR}/pkg-plist -LATEST_LINK= ${PORTNAME}-${PKGNAMESUFFIX} - _BUILDING_LIBQUICKTIME_PLUGINS= yes CONFIGURE_ARGS+= --with-lame \ @@ -37,8 +34,8 @@ CONFIGURE_ARGS+= --with-lame \ --without-x264 \ --without-schroedinger -NO_STAGE= yes do-install: - @cd ${WRKSRC}/plugins/lame && ${MAKE_CMD} install + @cd ${WRKSRC}/plugins/lame && ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} install ${MAKE_ARGS} .include "${MASTERDIR}/Makefile" Modified: head/multimedia/libquicktime-lame/pkg-plist ============================================================================== --- head/multimedia/libquicktime-lame/pkg-plist Thu Jun 26 18:21:55 2014 (r359409) +++ head/multimedia/libquicktime-lame/pkg-plist Thu Jun 26 18:59:58 2014 (r359410) @@ -1,2 +1 @@ lib/libquicktime/lqt_lame.so -lib/libquicktime/lqt_lame.la Modified: head/multimedia/libquicktime/Makefile ============================================================================== --- head/multimedia/libquicktime/Makefile Thu Jun 26 18:21:55 2014 (r359409) +++ head/multimedia/libquicktime/Makefile Thu Jun 26 18:59:58 2014 (r359410) @@ -3,7 +3,7 @@ PORTNAME= libquicktime PORTVERSION= 1.2.4 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= multimedia MASTER_SITES= SF @@ -18,7 +18,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes -USES= gmake pathfix pkgconfig gettext +USES= gettext gmake libtool pathfix pkgconfig USE_AUTOTOOLS= autoconf CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} @@ -28,7 +28,6 @@ CFLAGS+= -fPIC .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS) USE_XORG= xaw xv CONFIGURE_ARGS= --with-x --enable-gpl --without-doxygen --without-lame -MAN1= lqtplay.1 OPTIONS_DEFINE= ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \ SCHROEDINGER X264 DOCS @@ -45,7 +44,6 @@ CONFIGURE_ARGS+= --without-x --enable-gp OPTIONS_DEFINE= OPTIMIZED_CFLAGS .endif -NO_STAGE= yes .include .if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -146,9 +144,9 @@ pre-configure: .if ${PORT_OPTIONS:MDOCS} && !defined(_BUILDING_LIBQUICKTIME_PLUGINS) post-install: - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/multimedia/libquicktime/pkg-plist ============================================================================== --- head/multimedia/libquicktime/pkg-plist Thu Jun 26 18:21:55 2014 (r359409) +++ head/multimedia/libquicktime/pkg-plist Thu Jun 26 18:59:58 2014 (r359410) @@ -17,34 +17,23 @@ include/lqt/lqt_codecinfo.h include/lqt/lqt_qtvr.h include/lqt/lqt_version.h include/lqt/quicktime.h -lib/libquicktime.la lib/libquicktime.so lib/libquicktime.so.0 -lib/libquicktime/lqt_audiocodec.la +lib/libquicktime.so.0.0.0 lib/libquicktime/lqt_audiocodec.so -%%DV%%lib/libquicktime/lqt_dv.la %%DV%%lib/libquicktime/lqt_dv.so -%%FAAC%%lib/libquicktime/lqt_faac.la %%FAAC%%lib/libquicktime/lqt_faac.so -%%FAAD%%lib/libquicktime/lqt_faad2.la %%FAAD%%lib/libquicktime/lqt_faad2.so -%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.la %%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so -%%JPEG%%lib/libquicktime/lqt_mjpeg.la %%JPEG%%lib/libquicktime/lqt_mjpeg.so -%%PNG%%lib/libquicktime/lqt_png.la %%PNG%%lib/libquicktime/lqt_png.so -lib/libquicktime/lqt_rtjpeg.la lib/libquicktime/lqt_rtjpeg.so -%%SCHROEDINGER%%lib/libquicktime/lqt_schroedinger.la %%SCHROEDINGER%%lib/libquicktime/lqt_schroedinger.so -lib/libquicktime/lqt_videocodec.la lib/libquicktime/lqt_videocodec.so -lib/libquicktime/lqt_vorbis.la lib/libquicktime/lqt_vorbis.so -%%X264%%lib/libquicktime/lqt_x264.la %%X264%%lib/libquicktime/lqt_x264.so libdata/pkgconfig/libquicktime.pc +man/man1/lqtplay.1.gz share/locale/de/LC_MESSAGES/libquicktime.mo @dirrm lib/libquicktime @dirrm include/lqt