svn commit: r371172 - in head: cad/brickutils cad/geda-utils cad/kicad-devel cad/pythoncad chinese/bg5ps chinese/ibus-pinyin chinese/ydict comms/congruity comms/gammu comms/gnuradio comms/hamlib co...

Sun Oct 19 07:51:00 UTC 2014

Author: mva
Date: Sun Oct 19 07:50:53 2014
New Revision: 371172
URL: https://svnweb.freebsd.org/changeset/ports/371172
QAT: https://qat.redports.org/buildarchive/r371172/

Log:
  - Convert ports from cad/, chinese/, comms/ and converters/ to new
    USES=python
  
  Approved by:	portmgr (implicit)

Modified:
  head/cad/brickutils/Makefile
  head/cad/geda-utils/Makefile
  head/cad/kicad-devel/Makefile
  head/cad/pythoncad/Makefile
  head/chinese/bg5ps/Makefile
  head/chinese/ibus-pinyin/Makefile
  head/chinese/ydict/Makefile
  head/comms/congruity/Makefile
  head/comms/gammu/Makefile
  head/comms/gnuradio/Makefile
  head/comms/hamlib/Makefile
  head/comms/py-bulksms/Makefile
  head/comms/py-libconcord/Makefile
  head/comms/py-lirc/Makefile
  head/comms/py-serial/Makefile
  head/comms/pyla/Makefile
  head/comms/quisk/Makefile
  head/converters/gbsdconv/Makefile
  head/converters/py-bsdconv/Makefile
  head/converters/py-unidecode/Makefile
  head/converters/py-zfec/Makefile
  head/converters/zbase32/Makefile

Modified: head/cad/brickutils/Makefile
==============================================================================

--- head/cad/brickutils/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/cad/brickutils/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -25,8 +25,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/ldraw/mo
 
 WRKSRC=		${WRKDIR}/BrickUtils-${PORTVERSION}
 
+USES=		python
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
 
 PORTDOCS=	*
 

Modified: head/cad/geda-utils/Makefile
==============================================================================
--- head/cad/geda-utils/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/cad/geda-utils/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -20,12 +20,11 @@ LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/
 DOCSDIR=	${PREFIX}/share/doc/geda
 DATADIR=	${PREFIX}/share/geda
 
-USES=		gmake perl5 pkgconfig shebangfix
+USES=		gmake perl5 pkgconfig python:run shebangfix
 SHEBANG_FILES=	scripts/gnet_hier_verilog.sh
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 USE_PERL5=	run
-USE_PYTHON_RUN=	yes
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/cad/kicad-devel/Makefile
==============================================================================
--- head/cad/kicad-devel/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/cad/kicad-devel/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -27,7 +27,6 @@ USE_GL=		glew glu
 USE_WX=		3.0
 WX_UNICODE=	yes
 USE_GNOME=	atk	# Required by libwx_gtk2_aui-2.8.so
-USE_PYTHON=	yes
 
 OPTIONS_DEFINE=	DOCS
 
@@ -37,7 +36,9 @@ PLIST_SUB=	OPSYS=${OPSYS}	\
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
-USES=		desktop-file-utils shared-mime-info compiler:c++11-lang tar:bzip2 cmake gettext
+USES=		desktop-file-utils shared-mime-info compiler:c++11-lang tar:bzip2 cmake \
+		gettext python
+		
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		-DCMAKE_BUILD_TYPE="Debug" \

Modified: head/cad/pythoncad/Makefile
==============================================================================
--- head/cad/pythoncad/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/cad/pythoncad/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=			python
+USE_PYTHON=		distutils
 PYDISTUTILS_PKGNAME=	PythonCAD
 PYDISTUTILS_PKGVERSION=	DS1-R${PORTVERSION}
 

Modified: head/chinese/bg5ps/Makefile
==============================================================================
--- head/chinese/bg5ps/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/chinese/bg5ps/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -14,7 +14,7 @@ COMMENT=	Convert Chinese-Big5/GB encoded
 
 LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 
-USE_PYTHON=	yes
+USES=		python
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES

Modified: head/chinese/ibus-pinyin/Makefile
==============================================================================
--- head/chinese/ibus-pinyin/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/chinese/ibus-pinyin/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -18,9 +18,7 @@ LIB_DEPENDS=	libpyzy-1.0.so:${PORTSDIR}/
 		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
-USE_PYTHON=	yes
-
-USES=		gmake pkgconfig compiler:c++11-lib
+USES=		compiler:c++11-lib gmake pkgconfig python
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
 

Modified: head/chinese/ydict/Makefile
==============================================================================
--- head/chinese/ydict/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/chinese/ydict/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -11,10 +11,15 @@ COMMENT=	Command line tool of Yahoo! Dic
 
 LICENSE=	GPLv3
 
+USES=		python:2,run shebangfix
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/ydict
-USE_PYTHON_RUN=	yes
+
+SHEBANG_FILES=	${WRKSRC}/ydict
+python_OLD_CMD=	/usr/bin/env python
+python_CMD=	/usr/bin/env python2
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ydict ${STAGEDIR}${PREFIX}/bin/

Modified: head/comms/congruity/Makefile
==============================================================================
--- head/comms/congruity/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/congruity/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -15,8 +15,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:${PORTSDIR}/comms/py-libconcord
 
 MAKE_ARGS=	MANDIR=${PREFIX}/man
-USES=		tar:bzip2 gmake desktop-file-utils
-USE_PYTHON=	2.7+
+USES=		desktop-file-utils gmake tar:bzip2 python:2.7+
 USE_WX=		2.8+
 WANT_UNICODE=	yes
 WX_COMPS=	python

Modified: head/comms/gammu/Makefile
==============================================================================
--- head/comms/gammu/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/gammu/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -22,10 +22,9 @@ OPTIONS_DEFINE=	BASH
 
 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata
 
-USES=		cmake gettext pkgconfig shebangfix
+USES=		cmake gettext pkgconfig python shebangfix
 SHEBANG_FILES=	utils/jadmaker utils/gammu-config
 bash_CMD=	/bin/sh
-USE_PYTHON=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/gnuradio/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -38,7 +38,7 @@ LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/d
 		libgsl.so:${PORTSDIR}/math/gsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		iconv cmake:outsource perl5 shebangfix
+USES=		iconv cmake:outsource perl5 python:2.7 shebangfix
 SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
 CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
@@ -47,7 +47,6 @@ CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${IC
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
-USE_PYTHON=	2.6-2.8
 USE_WX=		3.0+
 USE_QT4=	gui xml qmake moc rcc uic
 WX_COMPS=	wx wx:build wx:run python:build python:run

Modified: head/comms/hamlib/Makefile
==============================================================================
--- head/comms/hamlib/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/hamlib/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -15,9 +15,8 @@ LICENSE=	LGPL20
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		perl5 libtool:keepla pkgconfig pathfix tcl
+USES=		perl5 libtool:keepla pkgconfig pathfix python tcl
 USE_GNOME=	libxml2
-USE_PYTHON=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/comms/py-bulksms/Makefile
==============================================================================
--- head/comms/py-bulksms/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/py-bulksms/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	craig001 at lerwick.hopto.org
 COMMENT=	Python client for the BulkSMS.co.uk HTTP API
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USES=			python
+USE_PYTHON=		distutils
 PYDISTUTILS_PKGNAME=	BulkSMS
 PYDISTUTILS_PKGVERSION=	1.0
 

Modified: head/comms/py-libconcord/Makefile
==============================================================================
--- head/comms/py-libconcord/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/py-libconcord/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -16,9 +16,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libconcord.so:${PORTSDIR}/comms/libconcord
 
 USE_LDCONFIG=	yes
-USES=		tar:bzip2
+USES=		python:2.7+ tar:bzip2
 WRKSRC_SUBDIR=	libconcord/bindings/python
-USE_PYTHON=	2.7+
-USE_PYDISTUTILS=yes
+USE_PYTHON=	distutils
 
 .include <bsd.port.mk>

Modified: head/comms/py-lirc/Makefile
==============================================================================
--- head/comms/py-lirc/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/py-lirc/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -19,9 +19,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/pylircmodule.so
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=			python
+USE_PYTHON=		distutils pythonprefix
 PYDISTUTILS_PKGNAME=	pylirc
 
 .include <bsd.port.mk>

Modified: head/comms/py-serial/Makefile
==============================================================================
--- head/comms/py-serial/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/py-serial/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -11,13 +11,12 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sbz at FreeBSD.org
 COMMENT=	Serial port encapsulation library for Python
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-USE_PYTHON_PREFIX=	yes
+USES=			python
+USE_PYTHON=		distutils pythonprefix
 PYDISTUTILS_PKGNAME=	py${PORTNAME}
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 

Modified: head/comms/pyla/Makefile
==============================================================================
--- head/comms/pyla/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/pyla/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -19,7 +19,7 @@ COMMENT=	Hylafax client written in Pytho
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${PREFIX}/lib/pyla
 
-USE_PYTHON=	yes
+USES=		python
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>

Modified: head/comms/quisk/Makefile
==============================================================================
--- head/comms/quisk/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/comms/quisk/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -19,11 +19,10 @@ LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/mat
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
-USE_PYTHON=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python
-USE_PYDISTUTILS=yes
-PYDISTUTILS_AUTOPLIST=	yes
 
 post-extract:
 	${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so

Modified: head/converters/gbsdconv/Makefile
==============================================================================
--- head/converters/gbsdconv/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/converters/gbsdconv/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -18,8 +18,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
 GH_COMMIT=	0a9ad34
 
+USES=		python
 USE_GNOME=	gtk30 introspection:run
-USE_PYTHON=	yes
 
 USE_LDCONFIG=	yes
 

Modified: head/converters/py-bsdconv/Makefile
==============================================================================
--- head/converters/py-bsdconv/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/converters/py-bsdconv/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -19,8 +19,8 @@ GH_ACCOUNT=	buganini
 GH_COMMIT=	075a20e
 GH_PROJECT=	python-${PORTNAME}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+USES=		python
+USE_PYTHON=	distutils
 
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
 

Modified: head/converters/py-unidecode/Makefile
==============================================================================
--- head/converters/py-unidecode/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/converters/py-unidecode/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -13,8 +13,7 @@ COMMENT=	ASCII transliterations of Unico
 
 LICENSE=	GPLv2
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>

Modified: head/converters/py-zfec/Makefile
==============================================================================
--- head/converters/py-zfec/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/converters/py-zfec/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -18,9 +18,8 @@ BUILD_DEPENDS=	darcsver:${PORTSDIR}/deve
 		unsort:${PORTSDIR}/devel/py-pyutil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 

Modified: head/converters/zbase32/Makefile
==============================================================================
--- head/converters/zbase32/Makefile	Sun Oct 19 07:38:11 2014	(r371171)
+++ head/converters/zbase32/Makefile	Sun Oct 19 07:50:53 2014	(r371172)
@@ -14,8 +14,7 @@ COMMENT=	Base32 Encoder/Decoder
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:${PORTSDIR}/devel/py-setuptools_darcs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_AUTOPLIST=	yes
+USES=		python
+USE_PYTHON=	distuils autoplist
 
 .include <bsd.port.mk>
