- Update to 0.4.0

PR:		ports/122666
Submitted by:	Max Brazhnikov <makc at issp.ac.ru> (maintainer)

6 files changed, 70 insertions, 30 deletions

diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index f55037b8f3e0..a480713b8a60 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	subtitlecomposer
-PORTVERSION=	0.3
+PORTVERSION=	0.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=subcomposer
@@ -18,11 +18,26 @@ LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	automake:17:env libtool:15
+USE_PERL5_BUILD=yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gstreamer
+INSTALLS_ICONS=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+OPTIONS=	XINE "Enable Xine backend" off
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
+.else
+CONFIGURE_ARGS+=--without-xine
+.endif
+
+pre-configure:
+	@cd ${CONFIGURE_WRKSRC} \
+		&& ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS} \
+		&& ${PERL} admin/am_edit
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/subtitlecomposer-kde4/distinfo b/multimedia/subtitlecomposer-kde4/distinfo
index 2af33cbf3150..99e0df76b93b 100644
--- a/multimedia/subtitlecomposer-kde4/distinfo
+++ b/multimedia/subtitlecomposer-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (subtitlecomposer-0.3.tar.bz2) = bca75b9c6679a6ed9cc2e802adfabdc5
-SHA256 (subtitlecomposer-0.3.tar.bz2) = 82cb3b37411e5fe2d2e6f83a8dfe509f9765f6032222d69404b77998afb41b6c
-SIZE (subtitlecomposer-0.3.tar.bz2) = 655837
+MD5 (subtitlecomposer-0.4.0.tar.bz2) = 7b7244c5ed6f9adce372da994a6f8f5a
+SHA256 (subtitlecomposer-0.4.0.tar.bz2) = ff81b34dcb52394ff2b361c66334009f4874341926fd116a93ed302500ba11c9
+SIZE (subtitlecomposer-0.4.0.tar.bz2) = 586824
diff --git a/multimedia/subtitlecomposer-kde4/pkg-plist b/multimedia/subtitlecomposer-kde4/pkg-plist
index ebb8aa982623..d5cea56dcc67 100644
--- a/multimedia/subtitlecomposer-kde4/pkg-plist
+++ b/multimedia/subtitlecomposer-kde4/pkg-plist
@@ -1,15 +1,19 @@
 bin/subtitlecomposer
 share/applications/kde/subtitlecomposer.desktop
-share/apps/subtitlecomposer/gstreamer-32.png
-share/apps/subtitlecomposer/gstreamer.png
 share/apps/subtitlecomposer/input.conf
-share/apps/subtitlecomposer/linkcurrenttovideo.png
-share/apps/subtitlecomposer/mplayer-32.png
-share/apps/subtitlecomposer/mplayer.png
-share/apps/subtitlecomposer/sethidetime.png
-share/apps/subtitlecomposer/setshowtime.png
+share/apps/subtitlecomposer/pics/audio-volume-high.png
+share/apps/subtitlecomposer/pics/audio-volume-low.png
+share/apps/subtitlecomposer/pics/audio-volume-muted.png
+share/apps/subtitlecomposer/pics/current-line-follows-video.png
+share/apps/subtitlecomposer/pics/flags.png
+share/apps/subtitlecomposer/pics/logo-gstreamer.png
+share/apps/subtitlecomposer/pics/logo-mplayer.png
+share/apps/subtitlecomposer/pics/logo-xine.png
+share/apps/subtitlecomposer/pics/player.png
+share/apps/subtitlecomposer/pics/set-hide-time.png
+share/apps/subtitlecomposer/pics/set-show-time.png
+share/apps/subtitlecomposer/pics/time-from-video.png
 share/apps/subtitlecomposer/subtitlecomposerui.rc
-share/apps/subtitlecomposer/video.png
 share/config/subtitlecomposerrc
 share/icons/hicolor/128x128/apps/subtitlecomposer.png
 share/icons/hicolor/16x16/apps/subtitlecomposer.png
@@ -23,5 +27,6 @@ share/mimelnk/subtitle/x-substationalpha.desktop
 share/mimelnk/subtitle/x-subviewer.desktop
 @dirrm share/mimelnk/subtitle
 @dirrmtry share/config
+@dirrm share/apps/subtitlecomposer/pics
 @dirrm share/apps/subtitlecomposer
 @dirrmtry share/applications/kde
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index f55037b8f3e0..a480713b8a60 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	subtitlecomposer
-PORTVERSION=	0.3
+PORTVERSION=	0.4.0
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=subcomposer
@@ -18,11 +18,26 @@ LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	automake:17:env libtool:15
+USE_PERL5_BUILD=yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gstreamer
+INSTALLS_ICONS=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+OPTIONS=	XINE "Enable Xine backend" off
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
+.else
+CONFIGURE_ARGS+=--without-xine
+.endif
+
+pre-configure:
+	@cd ${CONFIGURE_WRKSRC} \
+		&& ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} ${AUTOMAKE_ARGS} \
+		&& ${PERL} admin/am_edit
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/subtitlecomposer/distinfo b/multimedia/subtitlecomposer/distinfo
index 2af33cbf3150..99e0df76b93b 100644
--- a/multimedia/subtitlecomposer/distinfo
+++ b/multimedia/subtitlecomposer/distinfo
@@ -1,3 +1,3 @@
-MD5 (subtitlecomposer-0.3.tar.bz2) = bca75b9c6679a6ed9cc2e802adfabdc5
-SHA256 (subtitlecomposer-0.3.tar.bz2) = 82cb3b37411e5fe2d2e6f83a8dfe509f9765f6032222d69404b77998afb41b6c
-SIZE (subtitlecomposer-0.3.tar.bz2) = 655837
+MD5 (subtitlecomposer-0.4.0.tar.bz2) = 7b7244c5ed6f9adce372da994a6f8f5a
+SHA256 (subtitlecomposer-0.4.0.tar.bz2) = ff81b34dcb52394ff2b361c66334009f4874341926fd116a93ed302500ba11c9
+SIZE (subtitlecomposer-0.4.0.tar.bz2) = 586824
diff --git a/multimedia/subtitlecomposer/pkg-plist b/multimedia/subtitlecomposer/pkg-plist
index ebb8aa982623..d5cea56dcc67 100644
--- a/multimedia/subtitlecomposer/pkg-plist
+++ b/multimedia/subtitlecomposer/pkg-plist
@@ -1,15 +1,19 @@
 bin/subtitlecomposer
 share/applications/kde/subtitlecomposer.desktop
-share/apps/subtitlecomposer/gstreamer-32.png
-share/apps/subtitlecomposer/gstreamer.png
 share/apps/subtitlecomposer/input.conf
-share/apps/subtitlecomposer/linkcurrenttovideo.png
-share/apps/subtitlecomposer/mplayer-32.png
-share/apps/subtitlecomposer/mplayer.png
-share/apps/subtitlecomposer/sethidetime.png
-share/apps/subtitlecomposer/setshowtime.png
+share/apps/subtitlecomposer/pics/audio-volume-high.png
+share/apps/subtitlecomposer/pics/audio-volume-low.png
+share/apps/subtitlecomposer/pics/audio-volume-muted.png
+share/apps/subtitlecomposer/pics/current-line-follows-video.png
+share/apps/subtitlecomposer/pics/flags.png
+share/apps/subtitlecomposer/pics/logo-gstreamer.png
+share/apps/subtitlecomposer/pics/logo-mplayer.png
+share/apps/subtitlecomposer/pics/logo-xine.png
+share/apps/subtitlecomposer/pics/player.png
+share/apps/subtitlecomposer/pics/set-hide-time.png
+share/apps/subtitlecomposer/pics/set-show-time.png
+share/apps/subtitlecomposer/pics/time-from-video.png
 share/apps/subtitlecomposer/subtitlecomposerui.rc
-share/apps/subtitlecomposer/video.png
 share/config/subtitlecomposerrc
 share/icons/hicolor/128x128/apps/subtitlecomposer.png
 share/icons/hicolor/16x16/apps/subtitlecomposer.png
@@ -23,5 +27,6 @@ share/mimelnk/subtitle/x-substationalpha.desktop
 share/mimelnk/subtitle/x-subviewer.desktop
 @dirrm share/mimelnk/subtitle
 @dirrmtry share/config
+@dirrm share/apps/subtitlecomposer/pics
 @dirrm share/apps/subtitlecomposer
 @dirrmtry share/applications/kde