Update intellij to 9.0.2. New features listed here: http://www.jetbrains.com/idea/whatsnew/index.html
Also, remove the use of javaPathHelper based on a conversation with i...@. If you have JDK 1.7 in your path, javaPathHelper will pick that up and intellij will refuse to run. But since intellij will only run with JDK 1.6, making the JDK explicit fixes things. Index: Makefile =================================================================== RCS file: /usr/cvs/ports/devel/intellij/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 18 Apr 2010 19:22:44 -0000 1.2 +++ Makefile 24 Apr 2010 06:10:08 -0000 @@ -4,7 +4,7 @@ COMMENT= IntelliJ Java IDE -V= 9.0.1 +V= 9.0.2 DISTNAME= ideaIC-${V} PKGNAME= intellij-${V} CATEGORIES= java devel @@ -25,14 +25,18 @@ MODJAVA_VER= 1.6 BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS} -RUN_DEPENDS= ::java/javaPathHelper -NO_BUILD= Yes NO_REGRESS= Yes +SUBST_VARS+= JAVA_HOME -WRKDIST= ${WRKDIR}/idea-IC-93.94 +WRKDIST= ${WRKDIR}/idea-IC-95.66 IJ= ${PREFIX}/intellij +# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do +# a no-op for do-build. +do-build: + @true + do-install: ${INSTALL_DATA_DIR} ${IJ} @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ} @@ -44,7 +48,7 @@ ${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${IJ} ${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1 @${INSTALL_DATA_DIR} ${PREFIX}/share/applications - cd ${WRKDIST}/lib && ${LOCALBASE}/jdk-1.6.0/bin/jar xvf icons.jar + cd ${WRKDIST}/lib && ${JAVA_HOME}/bin/jar xf icons.jar cp ${WRKDIST}/lib/icon.png ${IJ}/idea.png @${SUBST_CMD} -c ${FILESDIR}/intellij.desktop \ ${PREFIX}/share/applications/intellij.desktop Index: distinfo =================================================================== RCS file: /usr/cvs/ports/devel/intellij/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- distinfo 9 Apr 2010 22:23:26 -0000 1.1.1.1 +++ distinfo 24 Apr 2010 06:09:20 -0000 @@ -1,5 +1,5 @@ -MD5 (ideaIC-9.0.1.tar.gz) = qUEFTGkXUhtAXaKyIgng0w== -RMD160 (ideaIC-9.0.1.tar.gz) = 47wzla0jwp6snWMcb8RwVIEZEpY= -SHA1 (ideaIC-9.0.1.tar.gz) = OZcapHHb7KGgY3z4aKmG10KUOdQ= -SHA256 (ideaIC-9.0.1.tar.gz) = nTp6r+EQMHjp/E1aZ0db4XAqzV34AuJWUB3j0se5bG4= -SIZE (ideaIC-9.0.1.tar.gz) = 68263881 +MD5 (ideaIC-9.0.2.tar.gz) = p30RTtKxUuCkqtdr/9AO6Q== +RMD160 (ideaIC-9.0.2.tar.gz) = fNGx8XK9iyehgJZ4d67D9ph3tkE= +SHA1 (ideaIC-9.0.2.tar.gz) = 13vL30YHAO61w8dzAeGYh9vIX/U= +SHA256 (ideaIC-9.0.2.tar.gz) = NufIzx9Q0racFatP1vI9NXY9Io68QeK/FuC0OgdaJMA= +SIZE (ideaIC-9.0.2.tar.gz) = 68810826 Index: files/README.OpenBSD =================================================================== RCS file: /usr/cvs/ports/devel/intellij/files/README.OpenBSD,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 README.OpenBSD --- files/README.OpenBSD 9 Apr 2010 22:23:26 -0000 1.1.1.1 +++ files/README.OpenBSD 18 Apr 2010 20:35:54 -0000 @@ -7,15 +7,7 @@ If you have windowing problems, it has been reported that you may need to install x11/wmname to fix the problem. -2. JDK Version --------------- - -Note that intellij requires JDK 1.6 and will not work with OpenJDK 1.7. -If you have a 'java' binary on your path ahead of JDK 1.6 or if you -define $JAVA_HOME to be something other than JDK 1.6, javaPathHelper -could pick those up resulting in the application failing to launch. - -3. Native Libraries +2. Native Libraries ------------------- Functionality depending on native libraries is not likely to work. Index: files/idea =================================================================== RCS file: /usr/cvs/ports/devel/intellij/files/idea,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 idea --- files/idea 9 Apr 2010 22:23:26 -0000 1.1.1.1 +++ files/idea 18 Apr 2010 20:35:54 -0000 @@ -10,18 +10,19 @@ # Determine configuration settings #----------------------------------------------------------------------------- -JAVA_HOME=`javaPathHelper -h intellij` +export IDEA_JDK=${JAVA_HOME} -if [ -z "${JAVA_HOME}" ]; then +if [ ! -x "${IDEA_JDK}/bin/java" ]; then + echo "Error: JAVA_HOME may not be defined correctly: ${IDEA_JDK}" + echo " Unable to find Java binary ${IDEA_JDK}/bin/java" exit 1 fi # Check if 'idea' executable can be found if [ ! -x "${IDEA_HOME}/bin/idea.sh" ]; then - echo "Error: IDEA_HOME is not defined correctly: ${IDEA_HOME}" - echo " Unable to find launcher binary" + echo "Error: IDEA_HOME may not be defined correctly: ${IDEA_HOME}" + echo " Unable to find launcher binary: ${IDEA_HOME}/bin/idea.sh" exit 1 fi -export IDEA_JDK=${JAVA_HOME} -PATH=${JAVA_HOME}/bin:$PATH exec "${IDEA_HOME}/bin/idea.sh" $@ +PATH=${IDEA_JDK}/bin:$PATH exec "${IDEA_HOME}/bin/idea.sh" $@ Index: pkg/PLIST =================================================================== RCS file: /usr/cvs/ports/devel/intellij/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 9 Apr 2010 22:23:26 -0000 1.1.1.1 +++ pkg/PLIST 24 Apr 2010 06:10:54 -0000 @@ -93,7 +93,7 @@ intellij/lib/microba.jar intellij/lib/nanoxml-2.2.3.jar intellij/lib/openapi.jar -intellij/lib/org.eclipse.jdt.core_3.4.4.v_894_R34x.jar +intellij/lib/org.eclipse.jdt.core_3.5.2.v_981_R35x.jar intellij/lib/oromatcher.jar intellij/lib/picocontainer.jar intellij/lib/resolver.jar @@ -158,8 +158,6 @@ intellij/plugins/IntentionPowerPack/lib/resources_en.jar intellij/plugins/SpellChecker/ intellij/plugins/SpellChecker/lib/ -intellij/plugins/SpellChecker/lib/jazzy-core.jar -intellij/plugins/SpellChecker/lib/patricia-trie-0.1.jar intellij/plugins/SpellChecker/lib/resources_en.jar intellij/plugins/SpellChecker/lib/spellchecker-core.jar intellij/plugins/ToString/ @@ -213,7 +211,7 @@ intellij/plugins/maven/lib/commons-beanutils.jar intellij/plugins/maven/lib/commons-logging-1.1.1.jar intellij/plugins/maven/lib/lucene-core-2.3.0.jar -intellij/plugins/maven/lib/maven-2.2.0-uber.jar +intellij/plugins/maven/lib/maven-2.2.1-uber.jar intellij/plugins/maven/lib/maven.jar intellij/plugins/maven/lib/mercury-artifact-1.0-alpha-6.jar intellij/plugins/maven/lib/nexus-indexer-1.2.3.jar