svn commit: r433766 - in head/multimedia/syncplay: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Feb  9 18:35:48 2017
New Revision: 433766
URL: https://svnweb.freebsd.org/changeset/ports/433766

Log:
  - Fix plist: don't install unnneded file [1]
  - While here, add NO_ARCH and clean up plist (sort and remove unneeded @dir's) [2]
  
  PR:		216933
  Submitted by:	tcberner at freebsd.org
  Approved by:	heckendorfc at gmail.com (maintainer) [1], portmgr blanket [2]

Modified:
  head/multimedia/syncplay/Makefile
  head/multimedia/syncplay/files/patch-GNUmakefile
  head/multimedia/syncplay/pkg-plist

Modified: head/multimedia/syncplay/Makefile
==============================================================================
--- head/multimedia/syncplay/Makefile	Thu Feb  9 18:22:28 2017	(r433765)
+++ head/multimedia/syncplay/Makefile	Thu Feb  9 18:35:48 2017	(r433766)
@@ -15,6 +15,7 @@ GH_ACCOUNT=	Syncplay
 
 USES=		desktop-file-utils gmake python:2 twisted
 USE_TWISTED=	run
+NO_ARCH=	yes
 
 INSTALLS_ICONS=	yes
 

Modified: head/multimedia/syncplay/files/patch-GNUmakefile
==============================================================================
--- head/multimedia/syncplay/files/patch-GNUmakefile	Thu Feb  9 18:22:28 2017	(r433765)
+++ head/multimedia/syncplay/files/patch-GNUmakefile	Thu Feb  9 18:35:48 2017	(r433766)
@@ -21,7 +21,16 @@
  	chmod 755 $(BIN_PATH)/syncplay
  	cp syncplayClient.py $(LIB_PATH)/syncplay/
  	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
-@@ -85,8 +89,8 @@ u-client:
+@@ -72,8 +76,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:
+@@ -85,8 +87,8 @@ u-client:
  
  server:
  	-mkdir -p $(BIN_PATH)

Modified: head/multimedia/syncplay/pkg-plist
==============================================================================
--- head/multimedia/syncplay/pkg-plist	Thu Feb  9 18:22:28 2017	(r433765)
+++ head/multimedia/syncplay/pkg-plist	Thu Feb  9 18:35:48 2017	(r433766)
@@ -1,11 +1,5 @@
-share/icons/128x128/apps/syncplay.png
-share/icons/16x16/apps/syncplay.png
-share/icons/24x24/apps/syncplay.png
-share/icons/256x256/apps/syncplay.png
-share/icons/32x32/apps/syncplay.png
-share/icons/48x48/apps/syncplay.png
-share/icons/64x64/apps/syncplay.png
-share/icons/96x96/apps/syncplay.png
+%%CLIENT%%bin/syncplay
+%%SERVER%%bin/syncplay-server
 lib/syncplay/resources/accept.png
 lib/syncplay/resources/application_get.png
 lib/syncplay/resources/arrow_refresh.png
@@ -36,6 +30,7 @@ lib/syncplay/resources/house.png
 lib/syncplay/resources/key_go.png
 lib/syncplay/resources/lock.png
 lib/syncplay/resources/lock_open.png
+lib/syncplay/resources/lua/intf/syncplay.lua
 lib/syncplay/resources/mpc-hc.png
 lib/syncplay/resources/mpc-hc64.png
 lib/syncplay/resources/mplayer.png
@@ -53,7 +48,6 @@ lib/syncplay/resources/vlc.png
 lib/syncplay/resources/world_add.png
 lib/syncplay/resources/world_explore.png
 lib/syncplay/resources/world_go.png
-lib/syncplay/resources/lua/intf/syncplay.lua
 lib/syncplay/syncplay/__init__.py
 lib/syncplay/syncplay/client.py
 lib/syncplay/syncplay/clientManager.py
@@ -71,6 +65,8 @@ lib/syncplay/syncplay/players/playerFact
 lib/syncplay/syncplay/players/vlc.py
 lib/syncplay/syncplay/protocols.py
 lib/syncplay/syncplay/server.py
+%%CLIENT%%lib/syncplay/syncplayClient.py
+%%SERVER%%lib/syncplay/syncplayServer.py
 lib/syncplay/syncplay/ui/ConfigurationGetter.py
 lib/syncplay/syncplay/ui/GuiConfiguration.py
 lib/syncplay/syncplay/ui/__init__.py
@@ -79,37 +75,16 @@ lib/syncplay/syncplay/ui/gui.py
 lib/syncplay/syncplay/utils.py
 lib/syncplay/syncplay/vendor/__init__.py
 lib/syncplay/syncplay/vendor/qt4reactor.py
-%%SERVER%%lib/syncplay/syncplayServer.py
+%%CLIENT%%%%VLC%%lib/vlc/lua/intf/syncplay.lua
 share/app-install/icons/syncplay.png
-share/pixmaps/syncplay.png
-%%CLIENT%%bin/syncplay
-%%CLIENT%%lib/syncplay/syncplayClient.py
 %%CLIENT%%share/applications/syncplay.desktop
-%%CLIENT%%%%VLC%%lib/vlc/lua/intf/syncplay.lua
-%%SERVER%%bin/syncplay-server
 %%SERVER%%share/applications/syncplay-server.desktop
- at dir share/applications
- at dir share/icons/128x128/apps
- at dir share/icons/128x128
- at dir share/icons/16x16/apps
- at dir share/icons/16x16
- at dir share/icons/24x24/apps
- at dir share/icons/24x24
- at dir share/icons/256x256/apps
- at dir share/icons/256x256
- at dir share/icons/32x32/apps
- at dir share/icons/32x32
- at dir share/icons/48x48/apps
- at dir share/icons/48x48
- at dir share/icons/64x64/apps
- at dir share/icons/64x64
- at dir share/icons/96x96/apps
- at dir share/icons/96x96
- at dir share/icons
- at dir lib/syncplay/resources/lua/intf
- at dir lib/syncplay/resources/lua
- at dir lib/syncplay/resources
- at dir lib/syncplay
-%%CLIENT%%%%VLC%%@dir lib/vlc/lua/intf
-%%CLIENT%%%%VLC%%@dir lib/vlc/lua
-%%CLIENT%%%%VLC%%@dir lib/vlc
+share/icons/128x128/apps/syncplay.png
+share/icons/16x16/apps/syncplay.png
+share/icons/24x24/apps/syncplay.png
+share/icons/256x256/apps/syncplay.png
+share/icons/32x32/apps/syncplay.png
+share/icons/48x48/apps/syncplay.png
+share/icons/64x64/apps/syncplay.png
+share/icons/96x96/apps/syncplay.png
+share/pixmaps/syncplay.png