Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Aug 2014 12:35:27 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r363891 - in head/audio/pytone: . files
Message-ID:  <53de2c90.56c1.41369eaa@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sun Aug  3 12:35:27 2014
New Revision: 363891
URL: http://svnweb.freebsd.org/changeset/ports/363891
QAT: https://qat.redports.org/buildarchive/r363891/

Log:
  - Update to upstream version 3.0.3
  - Add LICENSE
  - Makefile cleanup
  - Use pkg-message.in instead of pkg-message
  
  PR:		190889
  Submitted by:	tkato432@yahoo.com
  Approved by:	mentors (implicit)

Added:
  head/audio/pytone/files/
  head/audio/pytone/files/pkg-message.in
     - copied, changed from r363855, head/audio/pytone/pkg-message
Deleted:
  head/audio/pytone/pkg-message
Modified:
  head/audio/pytone/Makefile
  head/audio/pytone/distinfo

Modified: head/audio/pytone/Makefile
==============================================================================
--- head/audio/pytone/Makefile	Sun Aug  3 12:25:11 2014	(r363890)
+++ head/audio/pytone/Makefile	Sun Aug  3 12:35:27 2014	(r363891)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pytone
-PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTVERSION=	3.0.3
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.luga.de/pytone/download/ \
 		http://redundancy.redundancy.org/mirror/
@@ -12,37 +11,45 @@ DISTNAME=	PyTone-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music jukebox written in Python with a curses GUI
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+		${PYTHON_PKGNAMEPREFIX}mutagen>0y:${PORTSDIR}/audio/py-mutagen
+		
 
 USES=		ncurses
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
-OPTIONS_DEFINE=	MAD VORBIS PYAO MPG123 MPG321
-OPTIONS_DEFAULT=	MAD VORBIS
-PYAO_DESC=	${AO_DESC}
-MPG123_DESC=	mpg123 player engine
-MPG321_DESC=	mpg321 player engine
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+
+SUB_FILES=	pkg-message
+
 PLIST_FILES=	etc/pytonerc.sample
 
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+OPTIONS_DEFINE=		MAD MPG123 MPG321 PYAO VORBIS
+OPTIONS_DEFAULT=	MAD VORBIS
 
-MAD_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
-VORBIS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
-PYAO_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/aomodule.so:${PORTSDIR}/audio/py-ao
-MPG123_RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123
-MPG321_RUN_DEPENDS+=	${LOCALBASE}/bin/mpg321:${PORTSDIR}/audio/mpg321
+MAD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mad>0:${PORTSDIR}/audio/py-mad
+MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MPG321_DESC=		MP3 decoding support via mpg321
+MPG321_RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
+PYAO_DESC=		${AO_DESC}
+PYAO_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ao>0:${PORTSDIR}/audio/py-ao
+VORBIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|src/|${PYTHON_SITELIBDIR}/pytone/|g' \
-		${WRKSRC}/pytone
-	@${REINPLACE_CMD} -e 's|src/|${PYTHON_SITELIBDIR}/pytone/|g' \
-		${WRKSRC}/pytonectl
+.for i in pytone pytonectl
+	@${REINPLACE_CMD} -e \
+		's|^python |${PYTHON_CMD} | ; \
+		 s|src/|${PYTHONPREFIX_SITELIBDIR}/pytone/|' ${WRKSRC}/${i}
+.endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/pytonerc ${STAGEDIR}${PREFIX}/etc/pytonerc.sample
+	(cd ${WRKSRC}/conf && ${INSTALL_DATA} pytonerc \
+		${STAGEDIR}${PREFIX}/etc/pytonerc.sample)
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pytone/*.so
 
 .include <bsd.port.mk>

Modified: head/audio/pytone/distinfo
==============================================================================
--- head/audio/pytone/distinfo	Sun Aug  3 12:25:11 2014	(r363890)
+++ head/audio/pytone/distinfo	Sun Aug  3 12:35:27 2014	(r363891)
@@ -1,2 +1,2 @@
-SHA256 (PyTone-3.0.2.tar.gz) = 303fdf52733deb27f00f8449e339972c6568b0180f58450685f101fdc1c24832
-SIZE (PyTone-3.0.2.tar.gz) = 161636
+SHA256 (PyTone-3.0.3.tar.gz) = 50b31aadb2b810549ab1441cd1e8de023a9c9a28a914a676a68c8a781000ab1e
+SIZE (PyTone-3.0.3.tar.gz) = 161612

Copied and modified: head/audio/pytone/files/pkg-message.in (from r363855, head/audio/pytone/pkg-message)
==============================================================================
--- head/audio/pytone/pkg-message	Sun Aug  3 08:07:20 2014	(r363855, copy source)
+++ head/audio/pytone/files/pkg-message.in	Sun Aug  3 12:35:27 2014	(r363891)
@@ -1,7 +1,7 @@
 
 ###############################################################
 
-To use pytone, you should copy ${LOCALBASE}/etc/pytonerc.sample to:
+To use pytone, you should copy %%PREFIX%%/etc/pytonerc.sample to:
 
 ~/.pytone/pytonerc
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53de2c90.56c1.41369eaa>