From owner-svn-ports-head@FreeBSD.ORG Mon Oct 21 17:30:55 2013 Return-Path: Delivered-To: svn-ports-head@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 9FF3BCCB; Mon, 21 Oct 2013 17:30:55 +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 8D394281E; Mon, 21 Oct 2013 17:30:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9LHUtK5038317; Mon, 21 Oct 2013 17:30:55 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9LHUtO8038315; Mon, 21 Oct 2013 17:30:55 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310211730.r9LHUtO8038315@svn.freebsd.org> From: William Grzybowski Date: Mon, 21 Oct 2013 17:30:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331161 - head/multimedia/dvdstyler X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Oct 2013 17:30:55 -0000 Author: wg Date: Mon Oct 21 17:30:54 2013 New Revision: 331161 URL: http://svnweb.freebsd.org/changeset/ports/331161 Log: multimedia/dvdstyler: link against ffmpeg - Link against ffmpeg - Allow staging - USES desktop-file-utils gmake - Convert lib depends to new format Modified: head/multimedia/dvdstyler/Makefile head/multimedia/dvdstyler/pkg-plist Modified: head/multimedia/dvdstyler/Makefile ============================================================================== --- head/multimedia/dvdstyler/Makefile Mon Oct 21 17:24:13 2013 (r331160) +++ head/multimedia/dvdstyler/Makefile Mon Oct 21 17:30:54 2013 (r331161) @@ -20,9 +20,9 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers mplex:${PORTSDIR}/multimedia/mjpegtools \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ docbook-sk>=4.1.2:${PORTSDIR}/textproc/docbook-sk \ - xmlto:${PORTSDIR}/textproc/xmlto -LIB_DEPENDS= exif:${PORTSDIR}/graphics/libexif \ - avcodec1:${PORTSDIR}/multimedia/ffmpeg1 + xmlto:${PORTSDIR}/textproc/xmlto +LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ + libavcodec.so:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ wxsvg>=1.1.14:${PORTSDIR}/graphics/wxsvg \ dvdauthor:${PORTSDIR}/multimedia/dvdauthor \ @@ -33,27 +33,15 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/z OPTIONS_DEFINE= GNOME DOCS USE_BZIP2= yes -USES= gettext pkgconfig +USES= desktop-file-utils gettext gmake pkgconfig USE_WX= 2.8 WX_COMPS= wx svg WX_CONF_ARGS= absolute -USE_GNOME= desktopfileutils -USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \ - ac_cv_path_FFMPEG_PATH="${LOCALBASE}/bin/ffmpeg1" -MAKE_ENV= AM_CPPFLAGS="${LIBAV_CFLAGS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= dvdstyler.1 - -LIBAV_PC= libavcodec1 libavformat1 libavutil1 libswscale1 -LIBAV_CFLAGS= $$(pkg-config --cflags ${LIBAV_PC}) -LIBAV_LIBS= $$(pkg-config --libs ${LIBAV_PC}) - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGNOME} @@ -91,14 +79,15 @@ post-patch: ${WRKSRC}/src/BurnDlg.cpp @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \ ${WRKSRC}/src/Config.h + @${REINPLACE_CMD} -e 's|CodecID|AVCodecID|g' \ + ${WRKSRC}/src/mediaenc_ffmpeg.cpp post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog INSTALL README - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .endif - @-update-desktop-database .include Modified: head/multimedia/dvdstyler/pkg-plist ============================================================================== --- head/multimedia/dvdstyler/pkg-plist Mon Oct 21 17:24:13 2013 (r331160) +++ head/multimedia/dvdstyler/pkg-plist Mon Oct 21 17:30:54 2013 (r331161) @@ -158,6 +158,7 @@ share/applications/dvdstyler.desktop %%DATADIR%%/templates/Travel/travel.png %%DATADIR%%/templates/Travel/travelWS.dvdt %%DATADIR%%/templates/Travel/travelWS.png +man/man1/dvdstyler.1.gz share/locale/ar/LC_MESSAGES/dvdstyler.mo share/locale/ca/LC_MESSAGES/dvdstyler.mo share/locale/cs/LC_MESSAGES/dvdstyler.mo @@ -211,5 +212,3 @@ share/pixmaps/dvdstyler.png @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/applications -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true