svn commit: r346784 - head/audio/py-eyed3

Ruslan Makhmatkhanov rm at FreeBSD.org
Sun Mar 2 17:33:39 UTC 2014


Author: rm
Date: Sun Mar  2 17:33:38 2014
New Revision: 346784
URL: http://svnweb.freebsd.org/changeset/ports/346784
QAT: https://qat.redports.org/buildarchive/r346784/

Log:
  py-eyed3: fix packaging and support staging
  
  - fix packaging by correcting reversed logic of PORTDOCS installation [1]
  - support staging
  - general clean-ip
  - bump PORTREVISION, because those, who didn't need PORTDOCS, had them installed
  
  Reported by:	mandree [1]

Modified:
  head/audio/py-eyed3/Makefile
  head/audio/py-eyed3/pkg-plist

Modified: head/audio/py-eyed3/Makefile
==============================================================================
--- head/audio/py-eyed3/Makefile	Sun Mar  2 17:07:21 2014	(r346783)
+++ head/audio/py-eyed3/Makefile	Sun Mar  2 17:33:38 2014	(r346784)
@@ -3,6 +3,7 @@
 
 PORTNAME=	eyed3
 PORTVERSION=	0.6.18
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://eyed3.nicfit.net/releases/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,18 +17,15 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools
 
 USE_PYTHON=	2
-NO_STAGE=	yes
-USE_PYTHON_PREFIX=	yes
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}"
 MAKE_ENV=	SETUP_ARGS_BUILD="${PYDISTUTILS_BUILDARGS}" \
 		SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" \
 		SETUP_COMMAND="${PYDISTUTILS_SETUP:S,",\",g}"
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
-MAN1=		eyeD3.1
-MANCOMPRESSED=	yes
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	AUTHORS COPYING.gz ChangeLog.gz README
 
 INSTALLS_EGGINFO=	yes
 PYDISTUTILS_PKGNAME=	eyeD3
@@ -42,9 +40,9 @@ post-patch:
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,\(setup.py build\),$${SETUP_COMMAND} build $${SETUP_ARGS_BUILD},g' \
 		-e 's,\(setup.py install\),$${SETUP_COMMAND} install $${SETUP_ARGS_INSTALL} ,g' \
-		-e 's,^docdir:=.*,docdir:=${DOCSDIR},g' \
+		-e 's,^docdir:=.*,docdir:=${STAGEDIR}${DOCSDIR},g' \
 		${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MDOCS}
+.if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's,.*docdir.*,#,g' \
 		${WRKSRC}/Makefile.in
 .endif

Modified: head/audio/py-eyed3/pkg-plist
==============================================================================
--- head/audio/py-eyed3/pkg-plist	Sun Mar  2 17:07:21 2014	(r346783)
+++ head/audio/py-eyed3/pkg-plist	Sun Mar  2 17:33:38 2014	(r346784)
@@ -17,9 +17,5 @@ bin/eyeD3
 %%PYTHON_SITELIBDIR%%/eyeD3/utils.py
 %%PYTHON_SITELIBDIR%%/eyeD3/utils.pyc
 %%PYTHON_SITELIBDIR%%/eyeD3/utils.pyo
+man/man1/eyeD3.1.gz
 @dirrm %%PYTHON_SITELIBDIR%%/eyeD3
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.gz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.gz
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%


More information about the svn-ports-all mailing list