svn commit: r462001 - in head/audio/gogglesmm: . files

[Jason E. Hale]

Author: jhale
Date: Fri Feb 16 11:05:58 2018
New Revision: 462001
URL: https://svnweb.freebsd.org/changeset/ports/462001

Log:
  Chase x11-toolkits/fox17 update
  
  Fix shebangs
  
  Make importer scripts optional, they require python and probably aren't used
  all that much.

Modified:
  head/audio/gogglesmm/Makefile
  head/audio/gogglesmm/files/patch-CMakeLists.txt
  head/audio/gogglesmm/pkg-plist

Modified: head/audio/gogglesmm/Makefile
==============================================================================
--- head/audio/gogglesmm/Makefile	Fri Feb 16 11:03:13 2018	(r462000)
+++ head/audio/gogglesmm/Makefile	Fri Feb 16 11:05:58 2018	(r462001)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gogglesmm
 PORTVERSION=	1.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	jhale at FreeBSD.org
@@ -21,13 +21,15 @@ BROKEN_powerpc64=	fails to compile: ap_mad.cpp:358:2: 
 USE_GITHUB=	yes
 
 USES=		cmake compiler:c++11-lib desktop-file-utils \
-		localbase:ldflags pkgconfig sqlite
+		localbase:ldflags pkgconfig shebangfix sqlite
 USE_XORG=	ice sm x11
 INSTALLS_ICONS=	yes
 
+SHEBANG_FILES=	extra/*.py
+
 PORTDOCS=	AUTHORS ChangeLog README
 
-OPTIONS_DEFINE=		A52 ALSA DBUS DCA DOCS FAAD FLAC MAD NLS \
+OPTIONS_DEFINE=		A52 ALSA DBUS DCA DOCS FAAD FLAC IMPORT MAD NLS \
 			OGG OPENGL OPUS PULSEAUDIO ZLIB
 OPTIONS_RADIO=		SSL VORBISDEC
 OPTIONS_RADIO_SSL=	GCRYPT GNUTLS OPENSSL
@@ -61,6 +63,10 @@ GCRYPT_CMAKE_BOOL=	WITH_GCRYPT
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CMAKE_BOOL=	WITH_GNUTLS
+
+IMPORT_DESC=		Install scripts to import old databases
+IMPORT_USES=		python:2.7
+IMPORT_CMAKE_BOOL=	WITH_IMPORT
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CMAKE_BOOL=		WITH_MAD

Modified: head/audio/gogglesmm/files/patch-CMakeLists.txt
==============================================================================
--- head/audio/gogglesmm/files/patch-CMakeLists.txt	Fri Feb 16 11:03:13 2018	(r462000)
+++ head/audio/gogglesmm/files/patch-CMakeLists.txt	Fri Feb 16 11:05:58 2018	(r462001)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2016-10-22 17:13:46 UTC
+--- CMakeLists.txt.orig	2017-06-10 02:18:06 UTC
 +++ CMakeLists.txt
-@@ -57,6 +57,11 @@ if(HAS_CXX_OPTIMIZE_DEBUG AND CMAKE_BUIL
+@@ -57,6 +57,11 @@ if(HAS_CXX_OPTIMIZE_DEBUG AND CMAKE_BUILD_TYPE MATCHES
    add_compile_options(-Og)
  endif()
  
@@ -12,7 +12,26 @@
  # FIXME Doesn't work on all platforms.
  #CHECK_CXX_COMPILER_FLAG(-flto HAS_CXX_OPTIMIZE_LINKTIME)
  if(HAS_CXX_OPTIMIZE_LINKTIME AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
-@@ -96,7 +101,7 @@ install(FILES extra/gogglesmm_64.png DES
+@@ -81,11 +86,13 @@ add_subdirectory(src)
+ #-------------------------------------------------------------------------------
+ 
+ # Extra Installation Files
+-install(PROGRAMS extra/import_banshee_stats.py
+-                 extra/import_gogglesmm12.py
+-                 extra/import_gogglesmm12_stats.py
+-        DESTINATION
+-                 share/gogglesmm)
++if(WITH_IMPORT)
++    install(PROGRAMS extra/import_banshee_stats.py
++                     extra/import_gogglesmm12.py
++                     extra/import_gogglesmm12_stats.py
++            DESTINATION
++                     share/gogglesmm)
++endif()
+ 
+ install(FILES icons/gogglesmm_16.png DESTINATION share/icons/hicolor/16x16/apps RENAME gogglesmm.png)
+ install(FILES extra/gogglesmm_22.png DESTINATION share/icons/hicolor/22x22/apps RENAME gogglesmm.png)
+@@ -96,7 +103,7 @@ install(FILES extra/gogglesmm_64.png DESTINATION share
  install(FILES extra/gogglesmm.svg DESTINATION share/icons/hicolor/scalable/apps RENAME gogglesmm.svg)
  install(FILES extra/gogglesmm.appdata.xml DESTINATION share/appdata)
  install(FILES extra/gogglesmm.desktop DESTINATION share/applications)

Modified: head/audio/gogglesmm/pkg-plist
==============================================================================
--- head/audio/gogglesmm/pkg-plist	Fri Feb 16 11:03:13 2018	(r462000)
+++ head/audio/gogglesmm/pkg-plist	Fri Feb 16 11:05:58 2018	(r462001)
@@ -6,9 +6,9 @@ lib/gogglesmm/libgap_wav.so
 man/man1/gogglesmm.1.gz
 share/appdata/gogglesmm.appdata.xml
 share/applications/gogglesmm.desktop
-%%DATADIR%%/import_banshee_stats.py
-%%DATADIR%%/import_gogglesmm12.py
-%%DATADIR%%/import_gogglesmm12_stats.py
+%%IMPORT%%%%DATADIR%%/import_banshee_stats.py
+%%IMPORT%%%%DATADIR%%/import_gogglesmm12.py
+%%IMPORT%%%%DATADIR%%/import_gogglesmm12_stats.py
 share/icons/hicolor/16x16/apps/gogglesmm.png
 share/icons/hicolor/22x22/apps/gogglesmm.png
 share/icons/hicolor/24x24/apps/gogglesmm.png