3 files changed, 217 insertions, 97 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 8c612eaa80ad..6dd9a855f97a 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -8,102 +8,201 @@
 #
 
 PORTNAME=	aegisub
-PORTVERSION=	2.1.8
-PORTREVISION=	3
+PORTVERSION=	2.1.9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/releases/ \
 		http://ftp2.aegisub.org/pub/releases/ \
 		ftp://ftp.aegisub.org/pub/releases/ \
-		ftp://ftp2.aegisub.org/pub/releases/
+		ftp://ftp2.aegisub.org/pub/releases/ \
+		GOOGLE_CODE:ffms
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FFMS_DISTFILE}:ffms
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Aegisub Project is a cross-platform subtitle editor
+COMMENT=	A cross-platform subtitle editor
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config \
-		intltoolize:${PORTSDIR}/textproc/intltool \
-		${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
+LICENSE=	BSD
+
+LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 OPTIONS=	DEBUG 		"Enable debug" Off \
 		PROFILE 	"Enable profiling" Off \
 		GCOV		"Enable GCOV (require profiling)" Off \
 		EFENCE		"Enable Electric Fence (require profiling)" Off \
-		NLS		"Enable Native Language Support" On \
-		PORTAUDIO	"Enable PortAudio2 audio provider (only one)" Off \
-		PULSE		"Enable PulseAudio audio provider (only one)" On \
-		OSS		"Enable OSS audio player (require portaudio)" Off \
-		FFMPEG		"Enable FFMPEG video provider" Off \
-		HUNSPELL	"Hungarian Spell" On \
-		LUA		"LUA Scripting" On \
-		PERL		"Perl Scripting" On
+		ASS		"Enable libASS subtitle provider" On \
+		ALSA		"Enable ALSA audio provider" Off \
+		OPENAL		"Enable OpenAL audio privider" Off \
+		PORTAUDIO	"Enable PortAudio2 audio provider" Off \
+		PULSEAUDIO	"Enable PulseAudio audio provider" On \
+		FFMPEG		"Enable FFMPEG video provider" On \
+		HUNSPELL	"Enable Hunspell support" On \
+		LUA		"LUA Scripting" On
 
-USE_ICONV=	yes
-USE_WX=	2.8
+USE_GNOME=	intltool pkgconfig
+USE_WX=		2.8
 WX_COMPS=	wx contrib
 WX_UNICODE=	yes
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
-
+WX_CONF_ARGS=	absolute
+USE_GL=		glu
+USE_ICONV=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/lib/wx/include/gtk2-unicode-release-2.8/ \
-		-I${LOCALBASE}/include/wx-2.8 \
-		-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-lua50
+INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
+
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-INSTALLS_ICONS=	yes
+PROJECTHOST=	ffmpegsource
+FFMS_NAME=	ffms
+FFMS_VERSION=	2.17
+FFMS_DISTNAME=	${FFMS_NAME}-${FFMS_VERSION}-src
+FFMS_DISTFILE=	${FFMS_DISTNAME}.tar.bz2
+FFMS_WRKSRC=	${WRKDIR}/${FFMS_DISTNAME}
+FFMS_CFLAGS=	-I${FFMS_WRKSRC}/include
+FFMS_LIBS=	${FFMS_WRKSRC}/src/core/.libs/libffms2.a \
+		`pkg-config --libs libavcodec libavformat libswscale libavutil`
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug --enable-debug-exceptions
 .endif
+
 .if defined(WITH_GCOV)
 CONFIGURE_ARGS+=	--enable-gcov
+LDFLAGS+=	-fprofile-arcs
 WITH_PROFILE=	yes
 .endif
+
 .if defined(WITH_EFENCE)
+LIB_DEPENDS+=	efence.0:${PORTSDIR}/devel/ElectricFence
 CONFIGURE_ARGS+=	--enable-efence
 WITH_PROFILE=	yes
 .endif
+
 .if defined(WITH_PROFILE)
 CONFIGURE_ARGS+=	--enable-profile
 .endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--without-nls
+
+.if defined(WITH_ASS)
+LIB_DEPENDS+=	ass.5:${PORTSDIR}/multimedia/libass
 .else
-USE_GETTEXT=	yes
-.endif
-.if defined(WITH_PORTAUDIO)
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/portaudio-2.0.pc:${PORTSDIR}/audio/portaudio2
+CONFIGURE_ARGS+=	--without-libass
 .endif
-.if defined(WITH_PULSE)
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/libpulse.pc:${PORTSDIR}/audio/pulseaudio
+
+.if defined(WITH_ALSA)
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+.else
+CONFIGURE_ARGS+=	--without-alsa
 .endif
-.if defined(WITH_OSS)
-BUILD_DEPENDS+=	ossinfo:${PORTSDIR}/audio/oss
+
+.if defined(WITH_OPENAL)
+USE_OPENAL=		yes
+.else
+CONFIGURE_ARGS+=	--without-openal
 .endif
-.if defined(WITH_PULSE)
-CONFIGURE_ARGS+=	--with-player-audio=pulseaudio
+
+.if defined(WITH_PORTAUDIO)
+BROKEN=		portaudio2 support is broken
+BUILD_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
+RUN_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
+CFLAGS+=	-isystem ${LOCALBASE}/include/portaudio2
+LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
 .else
-.if defined(WITH_OSS)
-CONFIGURE_ARGS+=	--with-player-audio=portaudio
+CONFIGURE_ARGS+=	--without-portaudio
 .endif
+
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=	--without-pulseaudio
 .endif
-.if !defined(WITHOUT_FFMPEG)
-BROKEN=	ffmpeg support is broken
-BUILD_DEPENDS+=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--with-provider-video=ffmpegsource --with-provider-audio=ffmpegsource
+
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+CONFIGURE_ENV+=	FFMS_CFLAGS="${FFMS_CFLAGS}" FFMS_LIBS="${FFMS_LIBS}"
+CONFIGURE_ARGS+=	--with-provider-video=ffmpegsource \
+			--with-provider-audio=ffmpegsource
+CPPFLAGS+=	${FFMS_CFLAGS}
+.else
+CONFIGURE_ARGS+=	--without-ffms
 .endif
+
 .if defined(WITH_HUNSPELL)
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/hunspell.pc:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS+=	hunspell-1.3.0:${PORTSDIR}/textproc/hunspell
+.else
+CONFIGURE_ARGS+=	--without-hunspell
 .endif
+
 .if defined(WITH_LUA)
 USE_LUA=	5.1+
-CONFIGURE_ENV+=	LUA_CFLAGS="-I${LUA_INCDIR}" LUA_LDFLAGS="-L${LUA_LIBDIR} -llua"
+CONFIGURE_ENV+=	LUA_CFLAGS="-I${LUA_INCDIR}" \
+		LUA_LDFLAGS="-L${LUA_LIBDIR} -llua"
+CPPFLAGS+=	-I${LUA_INCDIR}
+.else
+CONFIGURE_ARGS+=	--without-lua
 .endif
-.if defined(WITH_PERL)
-uSE_PERL5=	yes
-CONFIGURE_ARGS+=	--with-perl
+
+# use multiple make jobs for FFMS_WRKSRC
+.if !defined(DISABLE_MAKE_JOBS)
+_make_jobs=	-j${MAKE_JOBS_NUMBER}
+.endif
+
+post-extract:
+.for i in ${FFMS_DISTFILE}
+	@(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/${i} ${EXTRACT_AFTER_ARGS})
+.endfor
+
+post-patch:
+.for i in configure
+	@${REINPLACE_CMD} -e \
+		'/opt_flag/s|-O2||' ${WRKSRC}/${i}
+.endfor
+.for i in automation/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|@HAVE_AUTOMATION_TRUE@|| ; \
+		 s|@HAVE_AUTOMATION_FALSE@|#| ; \
+		 s|@HAVE_AUTO4_LUA_TRUE@|| ; \
+		 s|@HAVE_AUTO4_LUA_FALSE@|#| ; \
+		 s|@HAVE_AUTO3_LUA_TRUE@|#| ; \
+		 s|@HAVE_AUTO3_LUA_FALSE|| ; \
+		 /^install-data-am/s|: install|: # install|' ${WRKSRC}/${i}
+.endfor
+.for i in src/Makefile.in src/libauto3/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|@HAVE_AUTO3_LUA_TRUE@|#| ; \
+		 s|@HAVE_AUTO3_LUA_FALSE@||' ${WRKSRC}/${i}
+.endfor
+
+pre-configure:
+.if defined(WITH_FFMPEG)
+	@(cd ${FFMS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
+		--disable-shared CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}")
+.endif
+
+pre-build:
+.if defined(WITH_FFMPEG)
+	@(cd ${FFMS_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${_make_jobs} ${MAKE_ARGS} \
+		${ALL_TARGET})
+.endif
+
+post-install:
+	@(cd ${WRKSRC}/automation && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
+		install-nobase_automationDATA)
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC}/automation && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
+		install-nobase_share_docDATA)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/aegisub/distinfo b/multimedia/aegisub/distinfo
index 4d16fe094c26..d8e661bbf298 100644
--- a/multimedia/aegisub/distinfo
+++ b/multimedia/aegisub/distinfo
@@ -1,2 +1,4 @@
-SHA256 (aegisub-2.1.8.tar.gz) = a67356e5c4fa376738d363f1cf5e50aa74e6b69e76a089ed0442bf6d7390d769
-SIZE (aegisub-2.1.8.tar.gz) = 2431099
+SHA256 (aegisub-2.1.9.tar.gz) = ac1f20751f3d2732d7e11627ea4cc30b53cb905d11422925b7f881785d373706
+SIZE (aegisub-2.1.9.tar.gz) = 2538256
+SHA256 (ffms-2.17-src.tar.bz2) = 991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d
+SIZE (ffms-2.17-src.tar.bz2) = 394862
diff --git a/multimedia/aegisub/pkg-plist b/multimedia/aegisub/pkg-plist
index 20e1039a0a5b..84c85f877ce2 100644
--- a/multimedia/aegisub/pkg-plist
+++ b/multimedia/aegisub/pkg-plist
@@ -1,38 +1,34 @@
-bin/aegisub-2.1
-%%DATADIR%%/2.1/automation/autoload/cleantags-autoload.lua
-%%DATADIR%%/2.1/automation/autoload/kara-templater.lua
-%%DATADIR%%/2.1/automation/autoload/karaoke-auto-leadin.lua
-%%DATADIR%%/2.1/automation/autoload/macro-1-edgeblur.lua
-%%DATADIR%%/2.1/automation/autoload/macro-1p-edgeblur.pl
-%%DATADIR%%/2.1/automation/autoload/macro-2-mkfullwitdh.lua
-%%DATADIR%%/2.1/automation/include/Aegisub.pm
-%%DATADIR%%/2.1/automation/include/Aegisub/PerlConsole.pm
-%%DATADIR%%/2.1/automation/include/Aegisub/Progress.pm
-%%DATADIR%%/2.1/automation/include/Aegisub/Script.pm
-%%DATADIR%%/2.1/automation/include/Auto4Utils.pm
-%%DATADIR%%/2.1/automation/include/cleantags.lua
-%%DATADIR%%/2.1/automation/include/karaskel-adv.lua
-%%DATADIR%%/2.1/automation/include/karaskel-auto4.lua
-%%DATADIR%%/2.1/automation/include/karaskel-base.lua
-%%DATADIR%%/2.1/automation/include/karaskel.lua
-%%DATADIR%%/2.1/automation/include/unicode.lua
-%%DATADIR%%/2.1/automation/include/utils-auto4.lua
-%%DATADIR%%/2.1/automation/include/utils.lua
+bin/aegisub-%%VERSION%%
+%%DATADIR%%/%%VERSION%%/automation/autoload/cleantags-autoload.lua
+%%DATADIR%%/%%VERSION%%/automation/autoload/kara-templater.lua
+%%DATADIR%%/%%VERSION%%/automation/autoload/karaoke-auto-leadin.lua
+%%DATADIR%%/%%VERSION%%/automation/autoload/macro-1-edgeblur.lua
+%%DATADIR%%/%%VERSION%%/automation/autoload/macro-2-mkfullwitdh.lua
+%%DATADIR%%/%%VERSION%%/automation/include/Aegisub/Progress.pm
+%%DATADIR%%/%%VERSION%%/automation/include/Aegisub/Script.pm
+%%DATADIR%%/%%VERSION%%/automation/include/Aegisub.pm
+%%DATADIR%%/%%VERSION%%/automation/include/Auto4Utils.pm
+%%DATADIR%%/%%VERSION%%/automation/include/cleantags.lua
+%%DATADIR%%/%%VERSION%%/automation/include/karaskel-adv.lua
+%%DATADIR%%/%%VERSION%%/automation/include/karaskel-auto4.lua
+%%DATADIR%%/%%VERSION%%/automation/include/karaskel-base.lua
+%%DATADIR%%/%%VERSION%%/automation/include/karaskel.lua
+%%DATADIR%%/%%VERSION%%/automation/include/unicode.lua
+%%DATADIR%%/%%VERSION%%/automation/include/utils-auto4.lua
+%%DATADIR%%/%%VERSION%%/automation/include/utils.lua
 share/applications/aegisub.desktop
-%%DOCSDIR%%/2.1/automation3.txt
-%%DOCSDIR%%/2.1/demos/future-windy-blur.lua
-%%DOCSDIR%%/2.1/demos/perl-console.pl
-%%DOCSDIR%%/2.1/demos/raytracer-test1.ass
-%%DOCSDIR%%/2.1/demos/raytracer.lua
-%%DOCSDIR%%/2.1/v4-docs/basic-function-interface.txt
-%%DOCSDIR%%/2.1/v4-docs/configuration-dialogs.txt
-%%DOCSDIR%%/2.1/v4-docs/file-streams.txt
-%%DOCSDIR%%/2.1/v4-docs/misc.txt
-%%DOCSDIR%%/2.1/v4-docs/overview.txt
-%%DOCSDIR%%/2.1/v4-docs/perl-api.txt
-%%DOCSDIR%%/2.1/v4-docs/progress-reporting.txt
-%%DOCSDIR%%/2.1/v4-docs/subtitle-data.txt
-%%DOCSDIR%%/2.1/v4-docs/template-scripting-ideas.ass
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/automation3.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/demos/future-windy-blur.lua
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/demos/raytracer-test1.ass
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/demos/raytracer.lua
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/basic-function-interface.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/configuration-dialogs.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/file-streams.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/misc.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/overview.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/progress-reporting.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/subtitle-data.txt
+%%PORTDOCS%%%%DOCSDIR%%/aegisub/v4-docs/template-scripting-ideas.ass
 share/icons/hicolor/16x16/apps/aegisub.png
 share/icons/hicolor/22x22/apps/aegisub.png
 share/icons/hicolor/24x24/apps/aegisub.png
@@ -46,27 +42,50 @@ share/locale/da/LC_MESSAGES/aegisub21.mo
 share/locale/de/LC_MESSAGES/aegisub21.mo
 share/locale/el/LC_MESSAGES/aegisub21.mo
 share/locale/es/LC_MESSAGES/aegisub21.mo
+share/locale/fa/LC_MESSAGES/aegisub21.mo
 share/locale/fi/LC_MESSAGES/aegisub21.mo
 share/locale/fr_FR/LC_MESSAGES/aegisub21.mo
 share/locale/hu/LC_MESSAGES/aegisub21.mo
+share/locale/id/LC_MESSAGES/aegisub21.mo
 share/locale/it/LC_MESSAGES/aegisub21.mo
 share/locale/ja/LC_MESSAGES/aegisub21.mo
 share/locale/ko/LC_MESSAGES/aegisub21.mo
+share/locale/pl/LC_MESSAGES/aegisub21.mo
 share/locale/pt_BR/LC_MESSAGES/aegisub21.mo
+share/locale/pt_PT/LC_MESSAGES/aegisub21.mo
 share/locale/ru/LC_MESSAGES/aegisub21.mo
+share/locale/sr_RS/LC_MESSAGES/aegisub21.mo
+share/locale/sr_RS@latin/LC_MESSAGES/aegisub21.mo
 share/locale/vi/LC_MESSAGES/aegisub21.mo
 share/locale/zh_CN/LC_MESSAGES/aegisub21.mo
 share/locale/zh_TW/LC_MESSAGES/aegisub21.mo
-@dirrmtry share/applications
+@dirrmtry share/locale/sr_RS@latin/LC_MESSAGES
+@dirrmtry share/locale/sr_RS@latin
+@dirrmtry share/locale/sr_RS/LC_MESSAGES
+@dirrmtry share/locale/sr_RS
+@dirrmtry share/icons/scalable/apps
+@dirrmtry share/icons/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor
-@dirrmtry share/locale
-@dirrmtry %%DATADIR%%/2.1/automation/autoload
-@dirrmtry %%DATADIR%%/2.1/automation/include/Aegisub
-@dirrmtry %%DATADIR%%/2.1/automation/include
-@dirrmtry %%DATADIR%%/2.1/automation
-@dirrmtry %%DATADIR%%/2.1
-@dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%/2.1/demos
-@dirrmtry %%DOCSDIR%%/2.1/v4-docs
-@dirrmtry %%DOCSDIR%%/2.1
-@dirrmtry %%DOCSDIR%%
+@dirrmtry share/icons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/aegisub/v4-docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/aegisub/demos
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/aegisub
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrm %%DATADIR%%/%%VERSION%%/automation/include/Aegisub
+@dirrm %%DATADIR%%/%%VERSION%%/automation/include
+@dirrm %%DATADIR%%/%%VERSION%%/automation/autoload
+@dirrm %%DATADIR%%/%%VERSION%%/automation
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%