Date: Wed, 6 Apr 2016 01:39:15 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412592 - head/multimedia/aegisub Message-ID: <201604060139.u361dFhM031365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 6 01:39:14 2016 New Revision: 412592 URL: https://svnweb.freebsd.org/changeset/ports/412592 Log: multimedia/aegisub: minor cleanup - Unbundle ffms2 to a newer version - Convert to USES=localbase - Convert to COPYTREE_SHARE - Define LICENSE_FILE - Drop obsolete WX_UNICODE after r397077 Changes: https://github.com/FFMS/ffms2/releases/tag/2.21 Changes: https://github.com/FFMS/ffms2/releases/tag/2.22 Modified: head/multimedia/aegisub/Makefile (contents, props changed) head/multimedia/aegisub/distinfo (contents, props changed) Modified: head/multimedia/aegisub/Makefile ============================================================================== --- head/multimedia/aegisub/Makefile Wed Apr 6 01:38:55 2016 (r412591) +++ head/multimedia/aegisub/Makefile Wed Apr 6 01:39:14 2016 (r412592) @@ -3,30 +3,27 @@ PORTNAME= aegisub PORTVERSION= 3.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp2.aegisub.org/pub/archives/releases/source/ -DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform subtitle editor LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENCE LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ libass.so:multimedia/libass \ libfontconfig.so:x11-fonts/fontconfig -USE_GITHUB= nodefault - USES= compiler:c++11-lib desktop-file-utils gettext gmake iconv \ - pkgconfig tar:xz + localbase pkgconfig tar:xz USE_GNOME= intltool USE_WX= 3.0 -WX_UNICODE= yes WX_CONF_ARGS= absolute USE_GL= glu USE_CSTD= c99 @@ -43,21 +40,14 @@ INSTALLS_ICONS= yes PLIST_SUB= VERSION="${PORTVERSION:R}" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \ PULSEAUDIO OPTIONS_DEFAULT= FFMPEG FFTW HUNSPELL PULSEAUDIO ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --without-alsa -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_CONFIGURE_ENV= FFMS2_CFLAGS="${FFMS_CFLAGS}" \ - FFMS2_LIBS="${FFMS_LIBS}" +FFMPEG_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMPEG_CONFIGURE_OFF= --without-ffms -FFMPEG_CPPFLAGS= ${FFMS_CFLAGS} -FFMPEG_GH_TUPLE= FFMS:ffms2:2.20:ffms FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:textproc/hunspell @@ -71,10 +61,6 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:audi PULSEAUDIO_CONFIGURE_OFF=\ --without-libpulse -FFMS_CFLAGS= -I${WRKSRC_ffms}/include -FFMS_LIBS= ${WRKSRC_ffms}/src/core/.libs/libffms2.a \ - $$(pkg-config --libs libavcodec libavformat libswscale libavutil libavresample) - .include <bsd.port.pre.mk> .if ${COMPILER_TYPE} == "gcc" @@ -110,20 +96,9 @@ post-patch: '/virtual /s|= default;$$|{ }|' .endif -pre-configure-FFMPEG-on: - @(cd ${WRKSRC_ffms} && ${SETENV} ${CONFIGURE_ENV} ./configure \ - --disable-shared CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}") - -pre-build-FFMPEG-on: - @(cd ${WRKSRC_ffms} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ - ${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \ - ${ALL_TARGET}) - post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/automation/v4-docs - (cd ${WRKSRC}/automation/v4-docs && ${INSTALL_DATA} * \ - ${STAGEDIR}${DOCSDIR}/automation/v4-docs) + (cd ${WRKSRC} && ${COPYTREE_SHARE} \ + automation/v4-docs ${STAGEDIR}${DOCSDIR}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aegisub-* .include <bsd.port.post.mk> Modified: head/multimedia/aegisub/distinfo ============================================================================== --- head/multimedia/aegisub/distinfo Wed Apr 6 01:38:55 2016 (r412591) +++ head/multimedia/aegisub/distinfo Wed Apr 6 01:39:14 2016 (r412592) @@ -1,4 +1,2 @@ SHA256 (aegisub-3.2.2.tar.xz) = c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SIZE (aegisub-3.2.2.tar.xz) = 5252052 -SHA256 (FFMS-ffms2-2.20_GH0.tar.gz) = c7d880172756c253f2c5673044dabf03c19890dcfe64da5104ee9f42a1a573a0 -SIZE (FFMS-ffms2-2.20_GH0.tar.gz) = 539587
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604060139.u361dFhM031365>