Attachment #165946 for bug #206489

Lines 5-15 Link Here

(-)Makefile (-8 / +50 lines)
5	# Vadim Zhukov <zhuk@openbsd.org>	5	# Vadim Zhukov <zhuk@openbsd.org>
6		6
7	PORTNAME= intellij	7	PORTNAME= intellij
8	PORTVERSION= 15.0.1	8	PORTVERSION= 15.0.3
9	CATEGORIES= java devel	9	CATEGORIES= java devel
10	MASTER_SITES= https://download.jetbrains.com/idea/ \	10	MASTER_SITES= https://download.jetbrains.com/idea/:jetbrains \
11	http://download.jetbrains.com/idea/	11	http://download.jetbrains.com/idea/:jetbrains \
12	DISTNAME= ideaIC-${PORTVERSION}	12	GH:pty4j
		13	DISTFILES= ideaIC-${PORTVERSION}.tar.gz:jetbrains \
		14	${DISTNAME}.tar.gz:pty4j
13		15
14	MAINTAINER= t@tobik.me	16	MAINTAINER= t@tobik.me
15	COMMENT= IntelliJ IDEA Java IDE	17	COMMENT= IntelliJ IDEA Java IDE
Lines 16-34 Link Here
16		18
17	LICENSE= APACHE20	19	LICENSE= APACHE20
18		20
		21	# Upstream has merged pty4j FreeBSD support but no offical release/tag
		22	# with it yet
		23	USE_GITHUB= yes
		24	GH_ACCOUNT= traff
		25	GH_PROJECT= pty4j
		26	GH_TAGNAME= 335982264104fd4529f2ee75f08d1e1d9f9d544a
		27
19	USE_JAVA= yes	28	USE_JAVA= yes
20	JAVA_VERSION= 1.7+	29	JAVA_VERSION= 1.7+
21		30
22	NO_BUILD= yes	31	WRKDIST= ${WRKDIR}/idea-IC-143.1821.5
23		32
24	WRKDIST= ${WRKDIR}/idea-IC-143.382.35
25
26	IDEA_HOME= ${PREFIX}/lib/intellij	33	IDEA_HOME= ${PREFIX}/lib/intellij
27		34
28	PLIST_SUB+= IDEA_HOME=${IDEA_HOME}	35	USES= gmake
		36
		37	PLIST_SUB+= IDEA_HOME=${IDEA_HOME} \
		38	PTY4J_ARCH=${PTY4J_ARCH}
29	SUB_FILES+= idea idea.desktop	39	SUB_FILES+= idea idea.desktop
30	SUB_LIST+= IDEA_HOME=${IDEA_HOME}	40	SUB_LIST+= IDEA_HOME=${IDEA_HOME}
31		41
		42	.include <bsd.port.options.mk>
		43
		44	# The directory we need to install Pty4J's native library in depends
		45	# on the install target's architecture. We rebuild libpty.so instead
		46	# of using one of the bundled ones which are FreeBSD 10.x only.
		47	.if ${ARCH} == "amd64"
		48	PTY4J_ARCH= x86_64
		49	.elif ${ARCH} == "i386"
		50	PTY4J_ARCH= x86
		51	.else
		52	PTY4J_ARCH=
		53	.endif
		54
		55	.if ${PTY4J_ARCH} != ""
		56	# Despite what the name might suggest using the linux_x86_64 target
		57	# will always build libpty.so for the native platform.
		58	BUILD_WRKSRC= ${WRKSRC}/native
		59	MAKEFILE= Makefile_freebsd
		60	ALL_TARGET= linux_x86_64
		61	.else
		62	# If native Pty4J support is missing IntelliJ IDEA will still work but
		63	# without the ability to open terminals.
		64	NO_BUILD= yes
		65	.endif
		66
32	do-install:	67	do-install:
33	${MKDIR} ${STAGEDIR}${IDEA_HOME}	68	${MKDIR} ${STAGEDIR}${IDEA_HOME}
34	@${TAR} -czf - -C ${WRKDIST} . \| ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME}	69	@${TAR} -czf - -C ${WRKDIST} . \| ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME}
Lines 44-50 Link Here
44	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-i386-0.10.jar \	79	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-i386-0.10.jar \
45	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-amd64-0.10.jar \	80	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-amd64-0.10.jar \
46	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-i386-0.10.jar	81	${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-i386-0.10.jar
		82	# Remove the bundled native Pty4J support libraries and replace with our own
47	@${RM} -r ${STAGEDIR}${IDEA_HOME}/lib/libpty	83	@${RM} -r ${STAGEDIR}${IDEA_HOME}/lib/libpty
		84	.if ${PTY4J_ARCH} != ""
		85	${MKDIR} ${STAGEDIR}${IDEA_HOME}/lib/libpty/freebsd/${PTY4J_ARCH}
		86	# See above why we always use freebsd/x86_64/ here
		87	${INSTALL_LIB} ${WRKSRC}/os/freebsd/x86_64/libpty.so ${STAGEDIR}${IDEA_HOME}/lib/libpty/freebsd/${PTY4J_ARCH}/
		88	${INSTALL_DATA} ${WRKSRC}/build/pty4j-0.5.jar ${STAGEDIR}${IDEA_HOME}/lib/pty4j-0.5.jar
		89	.endif
48	${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea	90	${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea
49	${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1	91	${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1
50	${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/	92	${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/

Lines 1-2 Link Here

(-)distinfo (-2 / +4 lines)
1	SHA256 (ideaIC-15.0.1.tar.gz) = faca173b216cb3eeff53b499b432780a12c1543a27c36c0bef62cf2e82fc7cb5	1	SHA256 (ideaIC-15.0.3.tar.gz) = 0a4b755f3a48b3b5ad1000e17a92462c33ad5a8cc4912d6e276bbc4bf1241296
2	SIZE (ideaIC-15.0.1.tar.gz) = 230760554	2	SIZE (ideaIC-15.0.3.tar.gz) = 232760076
		3	SHA256 (traff-pty4j-15.0.3-335982264104fd4529f2ee75f08d1e1d9f9d544a_GH0.tar.gz) = bf2ffe37e9ecc5cbca879023ce7822461b1996c4affc50aa71265bce5cda6e93
		4	SIZE (traff-pty4j-15.0.3-335982264104fd4529f2ee75f08d1e1d9f9d544a_GH0.tar.gz) = 4856849

Lines 2-9 Link Here

(-)files/idea.desktop.in (-2 / +2 lines)
2	Version=1.0	2	Version=1.0
3	Encoding=UTF-8	3	Encoding=UTF-8
4	Type=Application	4	Type=Application
5	Name=IntelliJ Idea	5	Name=IntelliJ IDEA
6	GenericName=IntelliJ IDE	6	GenericName=IntelliJ IDEA
7	Comment=IntelliJ Integrated Development Environment	7	Comment=IntelliJ Integrated Development Environment
8	Icon=%%IDEA_HOME%%/idea.png	8	Icon=%%IDEA_HOME%%/idea.png
9	Exec=%%IDEA_HOME%%/bin/idea.sh	9	Exec=%%IDEA_HOME%%/bin/idea.sh




%%IDEA_HOME%%/lib/jzlib-1.1.1.jar
%%IDEA_HOME%%/lib/kotlin-reflect.jar
%%IDEA_HOME%%/lib/kotlin-runtime.jar
%%IDEA_HOME%%/lib/libpty/freebsd/%%PTY4J_ARCH%%/libpty.so
@comment %%IDEA_HOME%%/lib/libpty/linux/x86/libpty.so
@comment %%IDEA_HOME%%/lib/libpty/linux/x86_64/libpty.so
@comment %%IDEA_HOME%%/lib/libpty/macosx/x86/libpty.dylib

%%IDEA_HOME%%/lib/miglayout-swing.jar
%%IDEA_HOME%%/lib/nanoxml-2.2.3.jar
%%IDEA_HOME%%/lib/nekohtml-1.9.14.jar
%%IDEA_HOME%%/lib/netty-all-4.1.0.Beta8.jar
%%IDEA_HOME%%/lib/openapi.jar
%%IDEA_HOME%%/lib/optimizedFileManager.jar
%%IDEA_HOME%%/lib/oromatcher.jar

%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime-sources.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlinr.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/LICENSE.txt
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/NOTICE.txt
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/args4j_LICENSE.txt

%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-plugin.jar
%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-reflect.jar
%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-runtime.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar
%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test.jar
%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-compiler-plugin.jar
%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-plugin.jar
%%IDEA_HOME%%/plugins/Kotlin/lib/markdown.jar
%%IDEA_HOME%%/plugins/android/lib/GoogleFeedback.jar
%%IDEA_HOME%%/plugins/android/lib/android-common.jar

Return to bug 206489

Lines 136-141 Link Here

(-)pkg-plist (-2 / +6 lines)
136	%%IDEA_HOME%%/lib/jzlib-1.1.1.jar	136	%%IDEA_HOME%%/lib/jzlib-1.1.1.jar
137	%%IDEA_HOME%%/lib/kotlin-reflect.jar	137	%%IDEA_HOME%%/lib/kotlin-reflect.jar
138	%%IDEA_HOME%%/lib/kotlin-runtime.jar	138	%%IDEA_HOME%%/lib/kotlin-runtime.jar
		139	%%IDEA_HOME%%/lib/libpty/freebsd/%%PTY4J_ARCH%%/libpty.so
139	@comment %%IDEA_HOME%%/lib/libpty/linux/x86/libpty.so	140	@comment %%IDEA_HOME%%/lib/libpty/linux/x86/libpty.so
140	@comment %%IDEA_HOME%%/lib/libpty/linux/x86_64/libpty.so	141	@comment %%IDEA_HOME%%/lib/libpty/linux/x86_64/libpty.so
141	@comment %%IDEA_HOME%%/lib/libpty/macosx/x86/libpty.dylib	142	@comment %%IDEA_HOME%%/lib/libpty/macosx/x86/libpty.dylib
Lines 154-160 Link Here
154	%%IDEA_HOME%%/lib/miglayout-swing.jar	155	%%IDEA_HOME%%/lib/miglayout-swing.jar
155	%%IDEA_HOME%%/lib/nanoxml-2.2.3.jar	156	%%IDEA_HOME%%/lib/nanoxml-2.2.3.jar
156	%%IDEA_HOME%%/lib/nekohtml-1.9.14.jar	157	%%IDEA_HOME%%/lib/nekohtml-1.9.14.jar
157	%%IDEA_HOME%%/lib/netty-all-4.1.0.Beta6.jar	158	%%IDEA_HOME%%/lib/netty-all-4.1.0.Beta8.jar
158	%%IDEA_HOME%%/lib/openapi.jar	159	%%IDEA_HOME%%/lib/openapi.jar
159	%%IDEA_HOME%%/lib/optimizedFileManager.jar	160	%%IDEA_HOME%%/lib/optimizedFileManager.jar
160	%%IDEA_HOME%%/lib/oromatcher.jar	161	%%IDEA_HOME%%/lib/oromatcher.jar
Lines 262-268 Link Here
262	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar	263	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar
263	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime-sources.jar	264	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime-sources.jar
264	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime.jar	265	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime.jar
265	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlinr.jar
266	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/LICENSE.txt	266	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/LICENSE.txt
267	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/NOTICE.txt	267	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/NOTICE.txt
268	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/args4j_LICENSE.txt	268	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/args4j_LICENSE.txt
Lines 279-284 Link Here
279	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-plugin.jar	279	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-plugin.jar
280	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-reflect.jar	280	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-reflect.jar
281	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-runtime.jar	281	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-runtime.jar
		282	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar
		283	%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test.jar
		284	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-compiler-plugin.jar
		285	%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-plugin.jar
282	%%IDEA_HOME%%/plugins/Kotlin/lib/markdown.jar	286	%%IDEA_HOME%%/plugins/Kotlin/lib/markdown.jar
283	%%IDEA_HOME%%/plugins/android/lib/GoogleFeedback.jar	287	%%IDEA_HOME%%/plugins/android/lib/GoogleFeedback.jar
284	%%IDEA_HOME%%/plugins/android/lib/android-common.jar	288	%%IDEA_HOME%%/plugins/android/lib/android-common.jar