Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Apr 2015 11:25:19 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r384348 - branches/2015Q2/multimedia/subtitleeditor
Message-ID:  <201504201125.t3KBPJjL093466@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon Apr 20 11:25:18 2015
New Revision: 384348
URL: https://svnweb.freebsd.org/changeset/ports/384348

Log:
  MFH: r384347
  
  - Update to upstream version 0.41.1
  - Un-break build on 10.x and later
  - Introduce non-default OPENGL OPTION
  
  PR:		199248
  Submitted by:	tkato432@yahoo.com
  Reviewed by:	riggs
  Approved by:	portmgr (erwin)

Modified:
  branches/2015Q2/multimedia/subtitleeditor/Makefile
  branches/2015Q2/multimedia/subtitleeditor/distinfo
  branches/2015Q2/multimedia/subtitleeditor/pkg-plist
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/multimedia/subtitleeditor/Makefile
==============================================================================
--- branches/2015Q2/multimedia/subtitleeditor/Makefile	Mon Apr 20 10:52:21 2015	(r384347)
+++ branches/2015Q2/multimedia/subtitleeditor/Makefile	Mon Apr 20 11:25:18 2015	(r384348)
@@ -2,55 +2,42 @@
 # $FreeBSD$
 
 PORTNAME=	subtitleeditor
-PORTVERSION=	0.41.0
-PORTREVISION=	3
+PORTVERSION=	0.41.1
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/ \
-		LOCAL/ehaupt
+MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C/\.[0-9]*$//}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Subtitle editor
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	iso-codes>0:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgstreamermm-0.10.so:${PORTSDIR}/multimedia/gstreamermm \
-		libenchant.so:${PORTSDIR}/textproc/enchant \
-		libpcre.so:${PORTSDIR}/devel/pcre
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libenchant.so:${PORTSDIR}/textproc/enchant
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake libtool pkgconfig
-USE_GCC=	yes
+USES=		desktop-file-utils gettext gmake libtool pkgconfig
 USE_GNOME=	gtkmm24
-USE_GSTREAMER=	good
-INSTALLS_ICONS=	yes
-INSTALL_TARGET=	install-strip
+USE_GSTREAMER=	good mm
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	DESKTOPDIR="${DESKTOPDIR:S,^${PREFIX}/,,}"
-
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	NLS OPENGL
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_CONFIGURE_OFF=	--disable-nls
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-BROKEN=		Does not compile on FreeBSD 10.0 and later
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+OPENGL_LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm
+OPENGL_USE=		gl=glu
+OPENGL_CONFIGURE_ENABLE=gl
 
 post-patch:
-	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|strtoll|strtoq|g' ${WRKSRC}/plugins/subtitleformats/advancedsubstationalpha/advancedsubstationalpha.cc
+	@${REINPLACE_CMD} -e \
+		's|"GNU strip"|"strip"|' ${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: branches/2015Q2/multimedia/subtitleeditor/distinfo
==============================================================================
--- branches/2015Q2/multimedia/subtitleeditor/distinfo	Mon Apr 20 10:52:21 2015	(r384347)
+++ branches/2015Q2/multimedia/subtitleeditor/distinfo	Mon Apr 20 11:25:18 2015	(r384348)
@@ -1,2 +1,2 @@
-SHA256 (subtitleeditor-0.41.0.tar.gz) = 30e7fc29e8a6e714f6b0eedf80b2b387099957b9d70093fa0032fd5528b14e62
-SIZE (subtitleeditor-0.41.0.tar.gz) = 1637527
+SHA256 (subtitleeditor-0.41.1.tar.gz) = 3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0
+SIZE (subtitleeditor-0.41.1.tar.gz) = 1637940

Modified: branches/2015Q2/multimedia/subtitleeditor/pkg-plist
==============================================================================
--- branches/2015Q2/multimedia/subtitleeditor/pkg-plist	Mon Apr 20 10:52:21 2015	(r384347)
+++ branches/2015Q2/multimedia/subtitleeditor/pkg-plist	Mon Apr 20 11:25:18 2015	(r384348)
@@ -1,3 +1,101 @@
+bin/subtitleeditor
+lib/libsubtitleeditor.so
+lib/libsubtitleeditor.so.0
+lib/libsubtitleeditor.so.0.0.0
+lib/subtitleeditor/plugins/actions/libabout.so
+lib/subtitleeditor/plugins/actions/libadjusttime.so
+lib/subtitleeditor/plugins/actions/libapplytranslation.so
+lib/subtitleeditor/plugins/actions/libbestfit.so
+lib/subtitleeditor/plugins/actions/libchangeframerate.so
+lib/subtitleeditor/plugins/actions/libclipboard.so
+lib/subtitleeditor/plugins/actions/libcombinesubtitles.so
+lib/subtitleeditor/plugins/actions/libcommand.so
+lib/subtitleeditor/plugins/actions/libconfigurekeyboardshortcuts.so
+lib/subtitleeditor/plugins/actions/libdialoguize.so
+lib/subtitleeditor/plugins/actions/libdocumentmanagement.so
+lib/subtitleeditor/plugins/actions/libdocumentsnavigation.so
+lib/subtitleeditor/plugins/actions/libduplicatesubtitle.so
+lib/subtitleeditor/plugins/actions/libeditcell.so
+lib/subtitleeditor/plugins/actions/liberrorchecking.so
+lib/subtitleeditor/plugins/actions/libextendlength.so
+lib/subtitleeditor/plugins/actions/libexternalvideoplayer.so
+lib/subtitleeditor/plugins/actions/libfindandreplace.so
+lib/subtitleeditor/plugins/actions/libinsertsubtitle.so
+lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.so
+lib/subtitleeditor/plugins/actions/libitalicize.so
+lib/subtitleeditor/plugins/actions/libjoindocument.so
+lib/subtitleeditor/plugins/actions/libkeyframesmanagement.so
+lib/subtitleeditor/plugins/actions/libminimizeduration.so
+lib/subtitleeditor/plugins/actions/libmoveafterprecedingsubtitle.so
+lib/subtitleeditor/plugins/actions/libmovesubtitles.so
+lib/subtitleeditor/plugins/actions/libplaintext.so
+lib/subtitleeditor/plugins/actions/libpreferences.so
+lib/subtitleeditor/plugins/actions/libremovesubtitle.so
+lib/subtitleeditor/plugins/actions/libreversetextandtranslation.so
+lib/subtitleeditor/plugins/actions/libscalesubtitles.so
+lib/subtitleeditor/plugins/actions/libselection.so
+lib/subtitleeditor/plugins/actions/libsortsubtitles.so
+lib/subtitleeditor/plugins/actions/libspellchecking.so
+lib/subtitleeditor/plugins/actions/libsplitdocument.so
+lib/subtitleeditor/plugins/actions/libsplitsubtitle.so
+lib/subtitleeditor/plugins/actions/libstacksubtitles.so
+lib/subtitleeditor/plugins/actions/libstyleeditor.so
+lib/subtitleeditor/plugins/actions/libtextcorrection.so
+lib/subtitleeditor/plugins/actions/libtimemodemanagement.so
+lib/subtitleeditor/plugins/actions/libtimingfromplayer.so
+lib/subtitleeditor/plugins/actions/libtypewriter.so
+lib/subtitleeditor/plugins/actions/libvideoplayermanagement.so
+lib/subtitleeditor/plugins/actions/libviewmanager.so
+lib/subtitleeditor/plugins/actions/libwaveformmanagement.so
+lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdntsc.so
+lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdpal.so
+lib/subtitleeditor/plugins/subtitleformats/libadvancedsubstationalpha.so
+lib/subtitleeditor/plugins/subtitleformats/libbitc.so
+lib/subtitleeditor/plugins/subtitleformats/libdcsubtitle.so
+lib/subtitleeditor/plugins/subtitleformats/libmicrodvd.so
+lib/subtitleeditor/plugins/subtitleformats/libmpl2.so
+lib/subtitleeditor/plugins/subtitleformats/libmpsub.so
+lib/subtitleeditor/plugins/subtitleformats/libplaintextformat.so
+lib/subtitleeditor/plugins/subtitleformats/libsami.so
+lib/subtitleeditor/plugins/subtitleformats/libsbv.so
+lib/subtitleeditor/plugins/subtitleformats/libsprucestl.so
+lib/subtitleeditor/plugins/subtitleformats/libsubrip.so
+lib/subtitleeditor/plugins/subtitleformats/libsubstationalpha.so
+lib/subtitleeditor/plugins/subtitleformats/libsubtitleeditorproject.so
+lib/subtitleeditor/plugins/subtitleformats/libsubviewer2.so
+lib/subtitleeditor/plugins/subtitleformats/libtimedtextauthoringformat1.so
+man/man1/subtitleeditor.1.gz
+share/applications/subtitleeditor.desktop
+share/icons/hicolor/16x16/apps/subtitleeditor.png
+share/icons/hicolor/22x22/apps/subtitleeditor.png
+share/icons/hicolor/24x24/apps/subtitleeditor.png
+share/icons/hicolor/32x32/apps/subtitleeditor.png
+share/icons/hicolor/scalable/apps/subtitleeditor.svg
+%%NLS%%share/locale/bg/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/da/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/de/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/el/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/es/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/it/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/subtitleeditor.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/subtitleeditor.mo
+share/pixmaps/subtitleeditor.svg
 %%DATADIR%%/menubar.xml
 %%DATADIR%%/plugins-description/actions/about.se-plugin
 %%DATADIR%%/plugins-description/actions/adjusttime.se-plugin
@@ -96,101 +194,3 @@
 %%DATADIR%%/ui/dialog-save-document.ui
 %%DATADIR%%/ui/dialog-script-properties.ui
 %%DATADIR%%/ui/subtitleeditor.ui
-%%DESKTOPDIR%%/subtitleeditor.desktop
-%%NLS%%share/locale/bg/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/da/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/de/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/el/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/es/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/it/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/subtitleeditor.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/subtitleeditor.mo
-bin/subtitleeditor
-lib/libsubtitleeditor.so
-lib/libsubtitleeditor.so.0
-lib/libsubtitleeditor.so.0.0.0
-lib/subtitleeditor/plugins/actions/libabout.so
-lib/subtitleeditor/plugins/actions/libadjusttime.so
-lib/subtitleeditor/plugins/actions/libapplytranslation.so
-lib/subtitleeditor/plugins/actions/libbestfit.so
-lib/subtitleeditor/plugins/actions/libchangeframerate.so
-lib/subtitleeditor/plugins/actions/libclipboard.so
-lib/subtitleeditor/plugins/actions/libcombinesubtitles.so
-lib/subtitleeditor/plugins/actions/libcommand.so
-lib/subtitleeditor/plugins/actions/libconfigurekeyboardshortcuts.so
-lib/subtitleeditor/plugins/actions/libdialoguize.so
-lib/subtitleeditor/plugins/actions/libdocumentmanagement.so
-lib/subtitleeditor/plugins/actions/libdocumentsnavigation.so
-lib/subtitleeditor/plugins/actions/libduplicatesubtitle.so
-lib/subtitleeditor/plugins/actions/libeditcell.so
-lib/subtitleeditor/plugins/actions/liberrorchecking.so
-lib/subtitleeditor/plugins/actions/libextendlength.so
-lib/subtitleeditor/plugins/actions/libexternalvideoplayer.so
-lib/subtitleeditor/plugins/actions/libfindandreplace.so
-lib/subtitleeditor/plugins/actions/libinsertsubtitle.so
-lib/subtitleeditor/plugins/actions/libinsertsubtitlefromkeyframe.so
-lib/subtitleeditor/plugins/actions/libitalicize.so
-lib/subtitleeditor/plugins/actions/libjoindocument.so
-lib/subtitleeditor/plugins/actions/libkeyframesmanagement.so
-lib/subtitleeditor/plugins/actions/libminimizeduration.so
-lib/subtitleeditor/plugins/actions/libmoveafterprecedingsubtitle.so
-lib/subtitleeditor/plugins/actions/libmovesubtitles.so
-lib/subtitleeditor/plugins/actions/libplaintext.so
-lib/subtitleeditor/plugins/actions/libpreferences.so
-lib/subtitleeditor/plugins/actions/libremovesubtitle.so
-lib/subtitleeditor/plugins/actions/libreversetextandtranslation.so
-lib/subtitleeditor/plugins/actions/libscalesubtitles.so
-lib/subtitleeditor/plugins/actions/libselection.so
-lib/subtitleeditor/plugins/actions/libsortsubtitles.so
-lib/subtitleeditor/plugins/actions/libspellchecking.so
-lib/subtitleeditor/plugins/actions/libsplitdocument.so
-lib/subtitleeditor/plugins/actions/libsplitsubtitle.so
-lib/subtitleeditor/plugins/actions/libstacksubtitles.so
-lib/subtitleeditor/plugins/actions/libstyleeditor.so
-lib/subtitleeditor/plugins/actions/libtextcorrection.so
-lib/subtitleeditor/plugins/actions/libtimemodemanagement.so
-lib/subtitleeditor/plugins/actions/libtimingfromplayer.so
-lib/subtitleeditor/plugins/actions/libtypewriter.so
-lib/subtitleeditor/plugins/actions/libvideoplayermanagement.so
-lib/subtitleeditor/plugins/actions/libviewmanager.so
-lib/subtitleeditor/plugins/actions/libwaveformmanagement.so
-lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdntsc.so
-lib/subtitleeditor/plugins/subtitleformats/libadobeencoredvdpal.so
-lib/subtitleeditor/plugins/subtitleformats/libadvancedsubstationalpha.so
-lib/subtitleeditor/plugins/subtitleformats/libbitc.so
-lib/subtitleeditor/plugins/subtitleformats/libdcsubtitle.so
-lib/subtitleeditor/plugins/subtitleformats/libmicrodvd.so
-lib/subtitleeditor/plugins/subtitleformats/libmpl2.so
-lib/subtitleeditor/plugins/subtitleformats/libmpsub.so
-lib/subtitleeditor/plugins/subtitleformats/libplaintextformat.so
-lib/subtitleeditor/plugins/subtitleformats/libsami.so
-lib/subtitleeditor/plugins/subtitleformats/libsbv.so
-lib/subtitleeditor/plugins/subtitleformats/libsprucestl.so
-lib/subtitleeditor/plugins/subtitleformats/libsubrip.so
-lib/subtitleeditor/plugins/subtitleformats/libsubstationalpha.so
-lib/subtitleeditor/plugins/subtitleformats/libsubtitleeditorproject.so
-lib/subtitleeditor/plugins/subtitleformats/libsubviewer2.so
-lib/subtitleeditor/plugins/subtitleformats/libtimedtextauthoringformat1.so
-man/man1/subtitleeditor.1.gz
-share/icons/hicolor/16x16/apps/subtitleeditor.png
-share/icons/hicolor/22x22/apps/subtitleeditor.png
-share/icons/hicolor/24x24/apps/subtitleeditor.png
-share/icons/hicolor/32x32/apps/subtitleeditor.png
-share/icons/hicolor/scalable/apps/subtitleeditor.svg
-share/pixmaps/subtitleeditor.svg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504201125.t3KBPJjL093466>