Attachment #190969 for bug #226183




# $FreeBSD: head/lang/neko/Makefile 430235 2017-01-01 03:45:12Z sunpoet $

PORTNAME=	neko
PORTVERSION=	2.2.0
PORTREVISION=	1
CATEGORIES=	lang

MAINTAINER=	penzin.dev@gmail.com

		libapr-1.so:devel/apr1 libaprutil-1.so:devel/apr1 \
		libpcre.so:devel/pcre libpcreposix.so:devel/pcre \
		libmbedtls.so:security/mbedtls libmbedcrypto.so:security/mbedtls libmbedx509.so:security/mbedtls \
		libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2
		libmysqlclient.so:databases/mysql56-client

USES=		cmake pkgconfig sqlite:3 mysql

USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
USE_GITHUB=	yes
GH_ACCOUNT=	HaxeFoundation
# GH_PROJECT is the same as port name
GH_TAGNAME=	v${PORTVERSION:S/./-/g}

USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/neko
USE_APACHE_BUILD=	22+

MAKE_JOBS_UNSAFE=yes

post-patch:
	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' \
		${WRKSRC}/vm/load.c
	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
		${WRKSRC}/cmake/FindGTK2.cmake \
		${WRKSRC}/cmake/FindAPACHE.cmake

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1479575506	1	TIMESTAMP = 1517417277
2	SHA256 (HaxeFoundation-neko-2.1.0-f8d55f1_GH0.tar.gz) = bf4d115882c75ba138a3e7037896314243008d4a17620c77cb5666c58b7d7a3d	2	SHA256 (HaxeFoundation-neko-2.2.0-v2-2-0_GH0.tar.gz) = cf101ca05db6cb673504efe217d8ed7ab5638f30e12c5e3095f06fa0d43f64e3
3	SIZE (HaxeFoundation-neko-2.1.0-f8d55f1_GH0.tar.gz) = 508189	3	SIZE (HaxeFoundation-neko-2.2.0-v2-2-0_GH0.tar.gz) = 510643




--- CMakeLists.txt.orig	2017-12-19 06:38:08 UTC
+++ CMakeLists.txt
@@ -9,11 +9,6 @@ project(Neko C)
 set(CMAKE_OSX_ARCHITECTURES x86_64)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-  # FreeBSD puts all thirdparty libraries in /usr/local
-  link_directories(/usr/local/lib)
-endif()
-
 # put output in "bin"
 
 set(OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin)

Line 0 Link Here

(-)./files/patch-libs_sqlite_CMakeLists.txt (+11 lines)
	1	--- libs/sqlite/CMakeLists.txt.orig 2018-01-31 22:50:39 UTC
	2	+++ libs/sqlite/CMakeLists.txt
	3	@@ -29,7 +29,7 @@ else()
	4	add_library(sqlite.ndll MODULE sqlite.c)
	5	pkg_check_modules(SQLITE3 REQUIRED sqlite3)
	6	target_include_directories(sqlite.ndll PRIVATE ${SQLITE3_INCLUDEDIR} ${SQLITE3_INCLUDE_DIRS})
	7	- target_link_libraries(sqlite.ndll libneko ${SQLITE3_LIBRARIES})
	8	+ target_link_libraries(sqlite.ndll libneko ${SQLITE3_LDFLAGS} ${SQLITE3_LIBRARIES})
	9	endif()
	10
	11

Line 0 Link Here

(-)./files/patch-libs_ui_CMakeLists.txt (+11 lines)
	1	--- libs/ui/CMakeLists.txt.orig 2018-01-31 22:48:08 UTC
	2	+++ libs/ui/CMakeLists.txt
	3	@@ -16,7 +16,7 @@ elseif(UNIX)
	4	${GTK2_INCLUDEDIR}
	5	${GTK2_INCLUDE_DIRS}
	6	)
	7	- target_link_libraries(ui.ndll ${GTK2_LIBRARIES})
	8	+ target_link_libraries(ui.ndll ${GTK2_LDFLAGS} ${GTK2_LIBRARIES})
	9	endif()
	10
	11	set_target_properties(ui.ndll

Lines 6-14 Link Here

(-)./pkg-plist (-1 / +5 lines)
6	include/neko_elf.h	6	include/neko_elf.h
7	include/neko_mod.h	7	include/neko_mod.h
8	include/neko_vm.h	8	include/neko_vm.h
		9	lib/cmake/Neko/NekoConfig.cmake
		10	lib/cmake/Neko/NekoConfigVersion.cmake
		11	lib/cmake/Neko/NekoTargets-%%CMAKE_BUILD_TYPE%%.cmake
		12	lib/cmake/Neko/NekoTargets.cmake
9	lib/libneko.so	13	lib/libneko.so
10	lib/libneko.so.2	14	lib/libneko.so.2
11	lib/libneko.so.2.1.0	15	lib/libneko.so.2.2.0
12	lib/neko/mod_neko2.ndll	16	lib/neko/mod_neko2.ndll
13	lib/neko/mod_tora2.ndll	17	lib/neko/mod_tora2.ndll
14	lib/neko/mysql.ndll	18	lib/neko/mysql.ndll

Return to bug 226183

Lines 1-8 Link Here

(-)./Makefile (-8 / +13 lines)
1	# $FreeBSD: head/lang/neko/Makefile 462788 2018-02-24 11:22:17Z brnrd $	1	# $FreeBSD: head/lang/neko/Makefile 430235 2017-01-01 03:45:12Z sunpoet $
2		2
3	PORTNAME= neko	3	PORTNAME= neko
4	PORTVERSION= 2.1.0	4	PORTVERSION= 2.2.0
5	PORTREVISION= 1
6	CATEGORIES= lang	5	CATEGORIES= lang
7		6
8	MAINTAINER= penzin.dev@gmail.com	7	MAINTAINER= penzin.dev@gmail.com
Lines 15-34 Link Here
15	libapr-1.so:devel/apr1 libaprutil-1.so:devel/apr1 \	14	libapr-1.so:devel/apr1 libaprutil-1.so:devel/apr1 \
16	libpcre.so:devel/pcre libpcreposix.so:devel/pcre \	15	libpcre.so:devel/pcre libpcreposix.so:devel/pcre \
17	libmbedtls.so:security/mbedtls libmbedcrypto.so:security/mbedtls libmbedx509.so:security/mbedtls \	16	libmbedtls.so:security/mbedtls libmbedcrypto.so:security/mbedtls libmbedx509.so:security/mbedtls \
18	libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2 \	17	libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2
19	libmysqlclient.so:databases/mysql56-client
20		18
21	USES= cmake pkgconfig sqlite:3	19	USES= cmake pkgconfig sqlite:3 mysql
22		20
23	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango	21	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango
24	USE_GITHUB= yes	22	USE_GITHUB= yes
25	GH_ACCOUNT= HaxeFoundation	23	GH_ACCOUNT= HaxeFoundation
26	# GH_PROJECT is the same as port name	24	# GH_PROJECT is the same as port name
27	GH_TAGNAME= f8d55f1	25	GH_TAGNAME= v${PORTVERSION:S/./-/g}
28		26
29	USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/neko	27	USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/neko
30	USE_APACHE_BUILD= yes	28	USE_APACHE_BUILD= 22+
31		29
32	MAKE_JOBS_UNSAFE=yes	30	MAKE_JOBS_UNSAFE=yes
33		31
		32	post-patch:
		33	${REINPLACE_CMD} 's\|/usr/local\|${PREFIX}\|g' \
		34	${WRKSRC}/vm/load.c
		35	${REINPLACE_CMD} 's\|/usr/local\|${LOCALBASE}\|g' \
		36	${WRKSRC}/cmake/FindGTK2.cmake \
		37	${WRKSRC}/cmake/FindAPACHE.cmake
		38
34	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-CMakeLists.txt (+14 lines)
	1	--- CMakeLists.txt.orig 2017-12-19 06:38:08 UTC
	2	+++ CMakeLists.txt
	3	@@ -9,11 +9,6 @@ project(Neko C)
	4	set(CMAKE_OSX_ARCHITECTURES x86_64)
	5	set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
	6
	7	-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
	8	- # FreeBSD puts all thirdparty libraries in /usr/local
	9	- link_directories(/usr/local/lib)
	10	-endif()
	11	-
	12	# put output in "bin"
	13
	14	set(OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin)