svn commit: r330398 - in head: games/fretsonfire games/galaxymage games/py-pychess security/cfv security/cfv/files security/umit

[Baptiste Daroussin]

Author: bapt
Date: Tue Oct 15 12:56:39 2013
New Revision: 330398
URL: http://svnweb.freebsd.org/changeset/ports/330398

Log:
  Remove psyco support

Deleted:
  head/security/cfv/files/extra-psyco-patch-Makefile
Modified:
  head/games/fretsonfire/Makefile
  head/games/galaxymage/Makefile
  head/games/py-pychess/Makefile
  head/security/cfv/Makefile
  head/security/umit/Makefile

Modified: head/games/fretsonfire/Makefile
==============================================================================
--- head/games/fretsonfire/Makefile	Tue Oct 15 12:50:46 2013	(r330397)
+++ head/games/fretsonfire/Makefile	Tue Oct 15 12:56:39 2013	(r330398)
@@ -33,14 +33,6 @@ FOF_DIR=	${PREFIX}/lib/${PORTNAME}
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-WITHOUT_PSYCO=	yes
-.endif
-
-.if !defined(WITHOUT_PSYCO)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-.endif
-
 do-install:
 	${MKDIR} ${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}
 	@cd ${WRKSRC}/src && \

Modified: head/games/galaxymage/Makefile
==============================================================================
--- head/games/galaxymage/Makefile	Tue Oct 15 12:50:46 2013	(r330397)
+++ head/games/galaxymage/Makefile	Tue Oct 15 12:56:39 2013	(r330398)
@@ -19,15 +19,9 @@ USE_TWISTED=	yes
 USES=		gettext
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	PSYCO
-PSYCO_DESC=	Use just-in-time Python compiler
-
 NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPSYCO}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-.endif
+.include <bsd.port.options.mk>
 
 post-configure:
 	@${REINPLACE_CMD} -e 's@%%DATADIR%%@${DATADIR}@g' ${WRKSRC}/GalaxyMage.py ${WRKSRC}/src/Resources.py

Modified: head/games/py-pychess/Makefile
==============================================================================
--- head/games/py-pychess/Makefile	Tue Oct 15 12:50:46 2013	(r330397)
+++ head/games/py-pychess/Makefile	Tue Oct 15 12:56:39 2013	(r330398)
@@ -17,13 +17,12 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 
 INSTALLS_ICONS=	yes
 
-OPTIONS_DEFINE=	PYGSTREAMER CRAFTY GNUCHESS PHALANX SJENG STRONGPLAYER STOCKFISH
+OPTIONS_DEFINE=	PYGSTREAMER CRAFTY GNUCHESS PHALANX SJENG STOCKFISH
 PYGSTREAMER_DESC=	Install gst-python for audio support
 CRAFTY_DESC=	Install crafty (chess engine)
 GNUCHESS_DESC=	Install gnuchess (chess engine)
 PHALANX_DESC=	Install phalanx (chess engine)
 SJENG_DESC=	Install sjeng (chess engine)
-STRONGPLAYER_DESC=	Install psyco/gmpy (strong player)
 STOCKFISH_DESC=	Install stockfish (chess engine)
 
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
@@ -70,11 +69,6 @@ RUN_DEPENDS+=	phalanx:${PORTSDIR}/games/
 RUN_DEPENDS+=	sjeng:${PORTSDIR}/games/sjeng
 .endif
 
-.if ${PORT_OPTIONS:MSTRONGPLAYER}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psyco>=1.6:${PORTSDIR}/devel/py-psyco
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>=1.13:${PORTSDIR}/math/py-gmpy
-.endif
-
 .if ${PORT_OPTIONS:MSTOCKFISH}
 RUN_DEPENDS+=	stockfish:${PORTSDIR}/games/stockfish
 .endif

Modified: head/security/cfv/Makefile
==============================================================================
--- head/security/cfv/Makefile	Tue Oct 15 12:50:46 2013	(r330397)
+++ head/security/cfv/Makefile	Tue Oct 15 12:56:39 2013	(r330398)
@@ -15,19 +15,8 @@ INSTALL_TARGET=	install-wrapper
 
 MAN1=	cfv.1
 
-OPTIONS_DEFINE_i386=	PSYCO
-PSYCO_DESC=	Enable devel/py-psyco optimization support
-
 NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/Makefile
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPSYCO}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-
-EXTRA_PATCHES+=	${FILESDIR}/extra-psyco-patch-Makefile
-.endif
-
 .include <bsd.port.mk>

Modified: head/security/umit/Makefile
==============================================================================
--- head/security/umit/Makefile	Tue Oct 15 12:50:46 2013	(r330397)
+++ head/security/umit/Makefile	Tue Oct 15 12:56:39 2013	(r330398)
@@ -3,7 +3,7 @@
 
 PORTNAME=	umit
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,22 +21,8 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386" || ${PYTHON_REL} > 260
-WITHOUT_PSYCO=	yes
-.endif
-
-.ifndef(WITHOUT_PSYCO)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
-.endif
-
-pre-everything::
-.ifndef(WITHOUT_PSYCO)
-	@${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization'
-.endif
 
 post-patch:
 	${REINPLACE_CMD} 's/self.build_html_doc()//' ${WRKSRC}/setup.py
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>