Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jun 2017 20:10:34 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r442683 - head/audio/jokosher
Message-ID:  <201706052010.v55KAYW5082210@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Jun  5 20:10:34 2017
New Revision: 442683
URL: https://svnweb.freebsd.org/changeset/ports/442683

Log:
  - Add LICENSE_FILE
  - Remove deprecated WANT_GNOME
  - Add GNOME option to OPTIONS_DEFINE, remove PROFILES which has
    the same outcome
  - Use options helpers
  - Don't bother to install omf file, it's only placeholder and don't
    contain any useful information
  - Port is architecture neutral

Modified:
  head/audio/jokosher/Makefile
  head/audio/jokosher/pkg-plist

Modified: head/audio/jokosher/Makefile
==============================================================================
--- head/audio/jokosher/Makefile	Mon Jun  5 19:39:19 2017	(r442682)
+++ head/audio/jokosher/Makefile	Mon Jun  5 20:10:34 2017	(r442683)
@@ -2,7 +2,7 @@
 
 PORTNAME=	jokosher
 PORTVERSION=	0.11.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://launchpadlibrarian.net/43860543/
 
@@ -10,57 +10,37 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-track non-linear audio editing
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 
-USES=	desktop-file-utils python:2 shared-mime-info
+USES=		desktop-file-utils python:2 shared-mime-info
 USE_PYTHON=	distutils
-WANT_GNOME=	yes
 USE_GSTREAMER=	gnonlin good python
 INSTALLS_ICONS=	yes
+NO_ARCH=	yes
 
-OPTIONS_DEFINE=	DBUS FLAC GCONF JACK LADSPA LAME MP3 PIDGIN PROFILES PULSEAUDIO VORBIS
+OPTIONS_DEFINE=	DBUS FLAC GCONF GNOME JACK LADSPA LAME MP3 PIDGIN PULSEAUDIO VORBIS
 OPTIONS_DEFAULT=	DBUS FLAC GCONF LADSPA VORBIS
+
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+FLAC_USE=	GSTREAMER=flac
+GCONF_USE=	GSTREAMER=gconf
+JACK_USE=	GSTREAMER=jack
+LADSPA_USE=	GSTREAMER=ladspa
+LAME_USE=	GSTREAMER=lame
 MP3_DESC=	MP3 import
+MP3_USE=	GSTREAMER=mp3
+GNOME_USE=	GNOME=pygnome2
 PIDGIN_DESC=	Pidgin status extension
-PROFILES_DESC=	Gnome Audio Profiles extension
+PIDGIN_IMPLIES=	DBUS
+PIDGIN_RUN_DEPENDS=	pidgin:net-im/pidgin
 PULSEAUDIO_USE=	GSTREAMER=pulse
+VORBIS_USE=	GSTREAMER=vorbis
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDBUS}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
-.endif
-
-.if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MPROFILES} \
-	|| exists(${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc)
-USE_GNOME+=	pygnome2
-.endif
-
-.if ${PORT_OPTIONS:MPIDGIN}
-.if empty(PORT_OPTIONS:MDBUS)
-IGNORE=		requires DBUS support
-. endif
-RUN_DEPENDS+=	pidgin:net-im/pidgin
-.endif
-
-.if ${PORT_OPTIONS:MOMF} || exists(${LOCALBASE}/bin/scrollkeeper-update)
-RUN_DEPENDS+=	scrollkeeper-update:textproc/scrollkeeper
-INSTALLS_OMF=	yes
-PLIST_SUB+=	OMF=""
-.else
-PLIST_SUB+=	OMF="@comment "
-.endif
-
-.for plugin in flac gconf jack ladspa lame mp3 vorbis
-. if ${PORT_OPTIONS:M${plugin:tu}}
-USE_GSTREAMER+=${plugin}
-. endif
-.endfor
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' -e \
-		'\|scrollkeeper-preinstall|s|HELPURI\[fileNum]|"file://" + &|' -e \
+		's|scrollkeeper-config||' -e \
 		's|"update-desktop-database"|&, "${PREFIX}/share/applications"|' \
 		${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/${PYSETUP}
 

Modified: head/audio/jokosher/pkg-plist
==============================================================================
--- head/audio/jokosher/pkg-plist	Mon Jun  5 19:39:19 2017	(r442682)
+++ head/audio/jokosher/pkg-plist	Mon Jun  5 20:10:34 2017	(r442683)
@@ -301,5 +301,4 @@ share/locale/tr/LC_MESSAGES/jokosher.mo
 share/locale/uk/LC_MESSAGES/jokosher.mo
 share/locale/zh_CN/LC_MESSAGES/jokosher.mo
 share/mime/packages/jokosher.xml
-%%OMF%%share/omf/jokosher/jokosher-C.omf
 share/pixmaps/jokosher.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706052010.v55KAYW5082210>