Index: head/multimedia/syncplay/Makefile =================================================================== --- head/multimedia/syncplay/Makefile (revision 494150) +++ head/multimedia/syncplay/Makefile (revision 494151) @@ -1,46 +1,44 @@ # $FreeBSD$ PORTNAME= syncplay DISTVERSIONPREFIX= v -DISTVERSION= 1.5.5 -PORTREVISION= 1 +DISTVERSION= 1.6.2 CATEGORIES= multimedia MAINTAINER= heckendorfc@gmail.com COMMENT= Synchronize video playback over networks LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} -USES= desktop-file-utils gmake python:2.7 shebangfix +USES= desktop-file-utils gmake python:3.4+ shebangfix USE_GITHUB= yes GH_ACCOUNT= Syncplay + SHEBANG_FILES= syncplayClient.py \ syncplayServer.py +MAKEFILE= GNUmakefile NO_ARCH= yes OPTIONS_DEFINE= GUI VLC OPTIONS_DEFAULT= GUI VLC CLIENT SERVER OPTIONS_SUB= yes OPTIONS_MULTI= MODES OPTIONS_MULTI_MODES= CLIENT SERVER CLIENT_DESC= Client mode SERVER_DESC= Server mode VLC_DESC= Support for VLC media player -MAKEFILE= GNUmakefile - -GUI_RUN_DEPENDS= pyside-py2?>=1.1.2:devel/pyside - -VLC_MAKE_ARGS= VLC_SUPPORT=true +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR} +VLC_MAKE_ARGS= VLC_SUPPORT=true VLC_MAKE_ARGS_OFF= VLC_SUPPORT=false CLIENT_INSTALL_TARGET= install-client SERVER_INSTALL_TARGET= install-server post-patch: @${REINPLACE_CMD} -e 's|path = os.path.dirname(os.path.dirname(__file__))|path = "'${DATADIR}'"|g' ${WRKSRC}/syncplay/utils.py .include Index: head/multimedia/syncplay/distinfo =================================================================== --- head/multimedia/syncplay/distinfo (revision 494150) +++ head/multimedia/syncplay/distinfo (revision 494151) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531100680 -SHA256 (Syncplay-syncplay-v1.5.5_GH0.tar.gz) = 19f266665daa297794dd6857319da9bb14274c8c804aca6b960e11465085223c -SIZE (Syncplay-syncplay-v1.5.5_GH0.tar.gz) = 1638588 +TIMESTAMP = 1549885925 +SHA256 (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 42f2e18063dbc4e540d6be423d459f6b359977dd5c2188df41846017378ba0a0 +SIZE (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 1640481 Index: head/multimedia/syncplay/files/patch-GNUmakefile =================================================================== --- head/multimedia/syncplay/files/patch-GNUmakefile (revision 494150) +++ head/multimedia/syncplay/files/patch-GNUmakefile (revision 494151) @@ -1,58 +1,58 @@ --- GNUmakefile.orig 2018-04-07 21:02:55 UTC +++ GNUmakefile @@ -38,17 +38,22 @@ endif APP_SHORTCUT_PATH = ${DESTDIR}${PREFIX}/share/applications SHARE_PATH = ${DESTDIR}${PREFIX}/share +default: + +all: + common: - -mkdir -p $(LIB_PATH)/syncplay/resources/lua/intf + -mkdir -p $(SHARE_PATH)/syncplay/resources/lua/intf -mkdir -p $(APP_SHORTCUT_PATH) -mkdir -p $(SHARE_PATH)/app-install/icons -mkdir -p $(SHARE_PATH)/pixmaps/ + -mkdir -p $(LIB_PATH)/syncplay cp -r syncplay $(LIB_PATH)/syncplay/ chmod 755 $(LIB_PATH)/syncplay/ cp -r resources/hicolor $(SHARE_PATH)/icons/ - cp -r resources/*.png $(LIB_PATH)/syncplay/resources/ - cp -r resources/*.lua $(LIB_PATH)/syncplay/resources/ - cp -r resources/lua/intf/*.lua $(LIB_PATH)/syncplay/resources/lua/intf/ + cp -r resources/*.png $(SHARE_PATH)/syncplay/resources/ + cp -r resources/*.lua $(SHARE_PATH)/syncplay/resources/ + cp -r resources/lua/intf/*.lua $(SHARE_PATH)/syncplay/resources/lua/intf/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/ cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/ @@ -60,8 +65,8 @@ u-common: client: -mkdir -p $(BIN_PATH) -+ sed -i '' -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayClient.py ++ sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayClient.py cp syncplayClient.py $(BIN_PATH)/syncplay -- sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay +- sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay chmod 755 $(BIN_PATH)/syncplay cp syncplayClient.py $(LIB_PATH)/syncplay/ cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/ @@ -73,8 +78,6 @@ endif ifeq ($(VLC_SUPPORT),true) -mkdir -p ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/ - -mkdir -p ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/ - cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/ endif u-client: @@ -86,8 +89,8 @@ u-client: server: -mkdir -p $(BIN_PATH) -+ sed -i '' -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayServer.py ++ sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayServer.py cp syncplayServer.py $(BIN_PATH)/syncplay-server -- sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server +- sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay-server chmod 755 $(BIN_PATH)/syncplay-server cp syncplayServer.py $(LIB_PATH)/syncplay/ cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/ Index: head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py =================================================================== --- head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py (nonexistent) +++ head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py (revision 494151) @@ -0,0 +1,13 @@ +--- syncplay/ui/GuiConfiguration.py.orig 2019-01-15 11:08:33 UTC ++++ syncplay/ui/GuiConfiguration.py +@@ -1109,8 +1109,8 @@ class ConfigDialog(QtWidgets.QDialog): + if lang == self.config['language']: + self.languageCombobox.setCurrentIndex(self.languageCombobox.count()-1) + self.languageCombobox.currentIndexChanged.connect(self.languageChanged) +- self.languageLayout.addWidget(self.languageLabel, 1, 0) +- self.languageLayout.addWidget(self.languageCombobox, 1, 1) ++ self.languageLayout.addWidget(self.languageLabel, 1, Qt.AlignLeft) ++ self.languageLayout.addWidget(self.languageCombobox, 1, Qt.AlignLeft) + self.displaySettingsLayout.addWidget(self.languageFrame) + + self.languageLabel.setObjectName("language") Property changes on: head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property