Index: head/java/eclipse-pydev/Makefile =================================================================== --- head/java/eclipse-pydev/Makefile (revision 498899) +++ head/java/eclipse-pydev/Makefile (revision 498900) @@ -1,60 +1,56 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= pydev PORTVERSION= 3.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/PyDev%20${PORTVERSION}/ PKGNAMEPREFIX= eclipse- DISTNAME= PyDev%20${PORTVERSION} MAINTAINER= nivit@FreeBSD.org COMMENT= Eclipse plugin for Python and Jython development -BROKEN= after java/eclipse update - LICENSE= EPL RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:java/eclipse -BUNDLES_INFO= ${PREFIX}/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info +BUNDLES_INFO= ${PREFIX}/share/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info JYTHON_DESC= Use Jython as Python interpreter NO_WRKSUBDIR= yes OPTIONS_DEFINE= JYTHON PLUGINDIR= share/eclipse/dropins/pydev/eclipse/plugins PYDEV_BUNDLES_INFO= ${PREFIX}/${PLUGINDIR}/bundles.info USES= python:2.7 zip .include .if ${PORT_OPTIONS:MJYTHON} RUN_DEPENDS+= jython:lang/jython .endif pre-install: @${ECHO_MSG} "===> Creating bundles.info" @PLUGINS=$$(ls -1 ${WRKSRC}/plugins); \ for d in $${PLUGINS}; do \ (${ECHO_CMD} "$${d},../../${PLUGINDIR}/$${d}/,4,false" | \ ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${WRKSRC}/plugins/bundles.info; \ done @# ignore javashell.py file, because there is a syntax error @# see http://goo.gl/E4epH ${PYTHON_CMD} -m compileall -x javashell.py -f ${WRKSRC}/plugins ${PYTHON_CMD} -O -m compileall -x javashell.py -f ${WRKSRC} add-plist-post: - @${ECHO_CMD} "@exec ${CAT} ${PYDEV_BUNDLES_INFO} >> ${BUNDLES_INFO}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${SED} -i '' -E '/^((org)|(com))\.python\.pydev/d' %D/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" >> ${TMPPLIST} + ${ECHO_CMD} "@exec ${CAT} ${PYDEV_BUNDLES_INFO} >> ${BUNDLES_INFO}" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${SED} -i '' -E '/^((org)|(com))\.python\.pydev/d' %D/share/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info" >> ${TMPPLIST} -# do not include, file went away after java/eclipse update -# mizhka@gmail.com is working on the update -# .include "${PORTSDIR}/java/eclipse/Makefile.plugins" +.include "${PORTSDIR}/java/eclipse/Makefile.plugins" .include