From 08daf4e8f7fea7e5001a2e2003d80ea500578524 Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Sat, 3 Feb 2018 18:22:31 +0000 Subject: [PATCH] - Update to version 18.1.0 - Only install documentation when DOCS=on - Update homepage PR: 225272 Submitted by: myself Approved by: maintainer timeout --- multimedia/smplayer/Makefile | 9 ++++++--- multimedia/smplayer/distinfo | 6 +++--- multimedia/smplayer/files/patch-Makefile | 10 ++++++---- multimedia/smplayer/pkg-descr | 2 +- multimedia/smplayer/pkg-plist | 2 ++ 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile index 3773d056ecc1..487d78003c34 100644 --- a/multimedia/smplayer/Makefile +++ b/multimedia/smplayer/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= smplayer -DISTVERSION= 17.1.0 -PORTREVISION= 2 +DISTVERSION= 18.1.0 CATEGORIES= multimedia audio kde MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION} @@ -24,7 +23,7 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src MAKE_ARGS= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} QMAKE_ARGS= "DEFINES_DISABLED+=MPLAYER2_SUPPORT" -PORTDOCS= Changelog Not_so_obvious_things.txt Notes_about_mpv.txt \ +PORTDOCS= Changelog Not_so_obvious_things.txt \ Readme.txt Release_notes.txt Watching_TV.txt OPTIONS_SINGLE= TOOLKIT @@ -67,6 +66,8 @@ post-patch: s|/share/man|/man|g; \ s| make| ${MAKE_CMD}|g' \ ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \ + ${WRKSRC}/webserver/Makefile post-patch-DEBUG-on: @${REINPLACE_CMD} -e '/CONFIG += debug/s|#||' \ @@ -78,7 +79,9 @@ post-patch-DEBUG-off: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simple_web_server +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/multimedia/smplayer/distinfo b/multimedia/smplayer/distinfo index 84075cbe7d87..0780f147b468 100644 --- a/multimedia/smplayer/distinfo +++ b/multimedia/smplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484922612 -SHA256 (smplayer-17.1.0.tar.bz2) = 40375920e6939275b7afc03d8338eb21ef1bcf007ff7df0dc46fb8fe0049fc71 -SIZE (smplayer-17.1.0.tar.bz2) = 4433372 +TIMESTAMP = 1515770414 +SHA256 (smplayer-18.1.0.tar.bz2) = 9d7d908c5160510e8802fbf852598324fd80ca9a8a571b8e65d66b39ec0b19bd +SIZE (smplayer-18.1.0.tar.bz2) = 5033686 diff --git a/multimedia/smplayer/files/patch-Makefile b/multimedia/smplayer/files/patch-Makefile index cd8aa30ec5ba..bc748120602d 100644 --- a/multimedia/smplayer/files/patch-Makefile +++ b/multimedia/smplayer/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2015-07-11 08:39:39 UTC +--- Makefile.orig 2018-01-12 15:20:18 UTC +++ Makefile @@ -5,7 +5,6 @@ PREFIX=/usr/local CONF_PREFIX=$(PREFIX) @@ -8,7 +8,7 @@ TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations THEMES_PATH=$(PREFIX)/share/smplayer/themes SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts -@@ -22,7 +21,7 @@ LRELEASE=lrelease +@@ -18,7 +17,7 @@ LRELEASE=lrelease DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \ TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \ @@ -16,13 +16,15 @@ + THEMES_PATH=\\\"$(THEMES_PATH)\\\" \ SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\" - -@@ -55,11 +54,6 @@ install: src/smplayer + all: src/smplayer webserver/simple_web_server +@@ -43,13 +42,8 @@ install: all install -m 644 src/input.conf $(DESTDIR)$(DATA_PATH) -install -d $(DESTDIR)$(TRANSLATION_PATH) install -m 644 src/translations/*.qm $(DESTDIR)$(TRANSLATION_PATH) - -install -d $(DESTDIR)$(DOC_PATH) - install -m 644 Changelog *.txt $(DESTDIR)$(DOC_PATH) + + install -m 755 webserver/simple_web_server $(DESTDIR)$(PREFIX)/bin/ - - -install -d $(DESTDIR)$(DOC_PATH) - tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x -f - diff --git a/multimedia/smplayer/pkg-descr b/multimedia/smplayer/pkg-descr index 1187149d0ff9..1dfceec486b5 100644 --- a/multimedia/smplayer/pkg-descr +++ b/multimedia/smplayer/pkg-descr @@ -2,4 +2,4 @@ SMPlayer intends to be a complete front-end for MPlayer, from basic features like playing videos, DVDs, and VCDs to more advanced features like support for MPlayer filters and more. -WWW: http://smplayer.sourceforge.net/ +WWW: http://smplayer.info/ diff --git a/multimedia/smplayer/pkg-plist b/multimedia/smplayer/pkg-plist index 1b12cf7a7748..e256720dee31 100644 --- a/multimedia/smplayer/pkg-plist +++ b/multimedia/smplayer/pkg-plist @@ -1,3 +1,4 @@ +bin/simple_web_server bin/smplayer man/man1/smplayer.1.gz share/applications/smplayer.desktop @@ -46,6 +47,7 @@ share/icons/hicolor/scalable/apps/smplayer.svg %%DATADIR%%/translations/smplayer_lt.qm %%DATADIR%%/translations/smplayer_mk.qm %%DATADIR%%/translations/smplayer_ms_MY.qm +%%DATADIR%%/translations/smplayer_nb_NO.qm %%DATADIR%%/translations/smplayer_nl.qm %%DATADIR%%/translations/smplayer_nn_NO.qm %%DATADIR%%/translations/smplayer_pl.qm