Index: head/multimedia/smplayer/Makefile =================================================================== --- head/multimedia/smplayer/Makefile (revision 460831) +++ head/multimedia/smplayer/Makefile (revision 460832) @@ -1,85 +1,88 @@ # Created by: Diego Depaoli and Yinghong Liu # $FreeBSD$ PORTNAME= smplayer -DISTVERSION= 17.1.0 -PORTREVISION= 2 +DISTVERSION= 18.1.0 CATEGORIES= multimedia audio kde MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION} MAINTAINER= nemysis@FreeBSD.org COMMENT= Complete front-end based on Qt for mplayer LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/Copying.txt USES= cpe desktop-file-utils dos2unix gmake qmake tar:bzip2 USE_XORG= x11 CPE_VENDOR= ricardo_villalba DOS2UNIX_REGEX= .*.[^p][^n][^g]$ INSTALLS_ICONS= yes ALL_TARGET= src/smplayer 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 OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_MULTI= ENGINE OPTIONS_MULTI_ENGINE= MPLAYER MPV OPTIONS_DEFINE= DOCS DEBUG SKINS THEMES OPTIONS_DEFAULT= QT4 MPLAYER SKINS THEMES TOOLKIT_DESC= Qt toolkit version ENGINE_DESC= Multimedia engine MPLAYER_DESC= Allow to use MPlayer as multimedia engine MPV_DESC= Allow to use mpv as multimedia engine SKINS_DESC= Install additional skins THEMES_DESC= Install additional themes QT4_USE= qt4=moc_build,linguisttools_build,rcc_build,uic_build QT4_USE+= qt4=corelib,dbus,gui,network,script,xml QT5_USE= qt5=buildtools_build,linguisttools_build QT5_USE+= qt5=core,dbus,gui,network,script,widgets,xml MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPLAYER_QMAKE_OFF= "DEFINES_DISABLED+=MPLAYER_SUPPORT" MPV_RUN_DEPENDS= mpv:multimedia/mpv MPV_QMAKE_OFF= "DEFINES_DISABLED+=MPV_SUPPORT" SKINS_RUN_DEPENDS= smplayer-skins>=0:multimedia/smplayer-skins THEMES_RUN_DEPENDS= smplayer-themes>=0:multimedia/smplayer-themes # Do not use unstable versions PORTSCOUT= site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/ SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||; \ s|lrelease|${LRELEASE}|; \ 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|#||' \ ${WRKSRC}/src/smplayer.pro post-patch-DEBUG-off: @${REINPLACE_CMD} -e '/DEFINES += NO_DEBUG_ON_CONSOLE/s|#||' \ ${WRKSRC}/src/smplayer.pro 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} .include Index: head/multimedia/smplayer/distinfo =================================================================== --- head/multimedia/smplayer/distinfo (revision 460831) +++ head/multimedia/smplayer/distinfo (revision 460832) @@ -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 Index: head/multimedia/smplayer/files/patch-Makefile =================================================================== --- head/multimedia/smplayer/files/patch-Makefile (revision 460831) +++ head/multimedia/smplayer/files/patch-Makefile (revision 460832) @@ -1,31 +1,33 @@ ---- 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) DATA_PATH=$(PREFIX)/share/smplayer -DOC_PATH=$(PREFIX)/share/doc/packages/smplayer 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)\\\" \ - DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \ + 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 - -install -d $(DESTDIR)$(SHORTCUTS_PATH) cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH) Index: head/multimedia/smplayer/pkg-descr =================================================================== --- head/multimedia/smplayer/pkg-descr (revision 460831) +++ head/multimedia/smplayer/pkg-descr (revision 460832) @@ -1,5 +1,5 @@ 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/ Index: head/multimedia/smplayer/pkg-plist =================================================================== --- head/multimedia/smplayer/pkg-plist (revision 460831) +++ head/multimedia/smplayer/pkg-plist (revision 460832) @@ -1,67 +1,69 @@ +bin/simple_web_server bin/smplayer man/man1/smplayer.1.gz share/applications/smplayer.desktop share/applications/smplayer_enqueue.desktop share/icons/hicolor/128x128/apps/smplayer.png share/icons/hicolor/16x16/apps/smplayer.png share/icons/hicolor/192x192/apps/smplayer.png share/icons/hicolor/22x22/apps/smplayer.png share/icons/hicolor/256x256/apps/smplayer.png share/icons/hicolor/32x32/apps/smplayer.png share/icons/hicolor/512x512/apps/smplayer.png share/icons/hicolor/64x64/apps/smplayer.png share/icons/hicolor/scalable/apps/smplayer.svg %%DATADIR%%/input.conf %%DATADIR%%/shortcuts/default.keys %%DATADIR%%/shortcuts/euskara.keys %%DATADIR%%/shortcuts/vlc.keys %%DATADIR%%/translations/smplayer_am.qm %%DATADIR%%/translations/smplayer_ar.qm %%DATADIR%%/translations/smplayer_ar_SY.qm %%DATADIR%%/translations/smplayer_bg.qm %%DATADIR%%/translations/smplayer_ca.qm %%DATADIR%%/translations/smplayer_cs.qm %%DATADIR%%/translations/smplayer_da.qm %%DATADIR%%/translations/smplayer_de.qm %%DATADIR%%/translations/smplayer_el.qm %%DATADIR%%/translations/smplayer_en.qm %%DATADIR%%/translations/smplayer_en_GB.qm %%DATADIR%%/translations/smplayer_en_US.qm %%DATADIR%%/translations/smplayer_es.qm %%DATADIR%%/translations/smplayer_et.qm %%DATADIR%%/translations/smplayer_eu.qm %%DATADIR%%/translations/smplayer_fa.qm %%DATADIR%%/translations/smplayer_fi.qm %%DATADIR%%/translations/smplayer_fr.qm %%DATADIR%%/translations/smplayer_gl.qm %%DATADIR%%/translations/smplayer_he_IL.qm %%DATADIR%%/translations/smplayer_hr.qm %%DATADIR%%/translations/smplayer_hu.qm %%DATADIR%%/translations/smplayer_id.qm %%DATADIR%%/translations/smplayer_it.qm %%DATADIR%%/translations/smplayer_ja.qm %%DATADIR%%/translations/smplayer_ka.qm %%DATADIR%%/translations/smplayer_ko.qm %%DATADIR%%/translations/smplayer_ku.qm %%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 %%DATADIR%%/translations/smplayer_pt.qm %%DATADIR%%/translations/smplayer_pt_BR.qm %%DATADIR%%/translations/smplayer_ro_RO.qm %%DATADIR%%/translations/smplayer_ru_RU.qm %%DATADIR%%/translations/smplayer_sk.qm %%DATADIR%%/translations/smplayer_sl_SI.qm %%DATADIR%%/translations/smplayer_sq_AL.qm %%DATADIR%%/translations/smplayer_sr.qm %%DATADIR%%/translations/smplayer_sv.qm %%DATADIR%%/translations/smplayer_th.qm %%DATADIR%%/translations/smplayer_tr.qm %%DATADIR%%/translations/smplayer_uk_UA.qm %%DATADIR%%/translations/smplayer_uz.qm %%DATADIR%%/translations/smplayer_vi_VN.qm %%DATADIR%%/translations/smplayer_zh_CN.qm %%DATADIR%%/translations/smplayer_zh_TW.qm