Attachment 190974 Details for Bug 226183 – Update port to neko 2.2.0

[patch] Update port to neko 2.2.0

neko-2-2-0.diff (text/plain), 4.85 KB, created by Marcin Cieślak on 2018-02-24 21:22:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieślak

Created: 2018-02-24 21:22:23 UTC

Size: 4.85 KB

patch

obsolete

>Diff mode was set to SVN, but /home/saper/sw/FreeBSD/ports/lang/neko is not a svn working copy.
>Trying /usr/ports ... found
>===> Generating patch
>===> Viewing diff with more
>diff -ruN /usr/ports/lang/neko/Makefile ./Makefile
>--- /usr/ports/lang/neko/Makefile	2018-02-24 16:49:50.463884000 +0000
>+++ ./Makefile	2018-02-24 21:03:51.006775000 +0000
>@@ -1,8 +1,8 @@
>-# $FreeBSD: head/lang/neko/Makefile 462788 2018-02-24 11:22:17Z brnrd $
>+# $FreeBSD: head/lang/neko/Makefile 430235 2017-01-01 03:45:12Z sunpoet $
> 
> PORTNAME=	neko
>-PORTVERSION=	2.1.0
>-PORTREVISION=	1
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2-2-0
> CATEGORIES=	lang
> 
> MAINTAINER=	penzin.dev@gmail.com
>@@ -15,20 +15,24 @@
> 		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
>+		libfontconfig.so:x11-fonts/fontconfig libfreetype.so:print/freetype2
> 
>-USES=		cmake pkgconfig sqlite:3
>+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=	f8d55f1
> 
> USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/neko
>-USE_APACHE_BUILD=	yes
>+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>
>diff -ruN /usr/ports/lang/neko/distinfo ./distinfo
>--- /usr/ports/lang/neko/distinfo	2017-08-10 22:38:02.376417000 +0000
>+++ ./distinfo	2018-02-24 21:00:59.952201000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1479575506
>-SHA256 (HaxeFoundation-neko-2.1.0-f8d55f1_GH0.tar.gz) = bf4d115882c75ba138a3e7037896314243008d4a17620c77cb5666c58b7d7a3d
>-SIZE (HaxeFoundation-neko-2.1.0-f8d55f1_GH0.tar.gz) = 508189
>+TIMESTAMP = 1519506059
>+SHA256 (HaxeFoundation-neko-v2-2-0_GH0.tar.gz) = cf101ca05db6cb673504efe217d8ed7ab5638f30e12c5e3095f06fa0d43f64e3
>+SIZE (HaxeFoundation-neko-v2-2-0_GH0.tar.gz) = 510643
>diff -ruN /usr/ports/lang/neko/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/lang/neko/files/patch-CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-CMakeLists.txt	2018-02-09 17:14:02.235117000 +0000
>@@ -0,0 +1,14 @@
>+--- 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)
>diff -ruN /usr/ports/lang/neko/files/patch-libs_sqlite_CMakeLists.txt ./files/patch-libs_sqlite_CMakeLists.txt
>--- /usr/ports/lang/neko/files/patch-libs_sqlite_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-libs_sqlite_CMakeLists.txt	2018-02-09 17:14:02.236312000 +0000
>@@ -0,0 +1,11 @@
>+--- libs/sqlite/CMakeLists.txt.orig	2018-01-31 22:50:39 UTC
>++++ libs/sqlite/CMakeLists.txt
>+@@ -29,7 +29,7 @@ else()
>+ 	add_library(sqlite.ndll MODULE sqlite.c)
>+ 	pkg_check_modules(SQLITE3 REQUIRED sqlite3)
>+ 	target_include_directories(sqlite.ndll PRIVATE ${SQLITE3_INCLUDEDIR} ${SQLITE3_INCLUDE_DIRS})
>+-	target_link_libraries(sqlite.ndll libneko ${SQLITE3_LIBRARIES})
>++	target_link_libraries(sqlite.ndll libneko ${SQLITE3_LDFLAGS} ${SQLITE3_LIBRARIES})
>+ endif()
>+ 
>+ 
>diff -ruN /usr/ports/lang/neko/files/patch-libs_ui_CMakeLists.txt ./files/patch-libs_ui_CMakeLists.txt
>--- /usr/ports/lang/neko/files/patch-libs_ui_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-libs_ui_CMakeLists.txt	2018-02-09 17:14:02.237502000 +0000
>@@ -0,0 +1,11 @@
>+--- libs/ui/CMakeLists.txt.orig	2018-01-31 22:48:08 UTC
>++++ libs/ui/CMakeLists.txt
>+@@ -16,7 +16,7 @@ elseif(UNIX)
>+ 		${GTK2_INCLUDEDIR}
>+ 		${GTK2_INCLUDE_DIRS}
>+ 	)
>+-	target_link_libraries(ui.ndll ${GTK2_LIBRARIES})
>++	target_link_libraries(ui.ndll ${GTK2_LDFLAGS} ${GTK2_LIBRARIES})
>+ endif()
>+ 
>+ set_target_properties(ui.ndll
>diff -ruN /usr/ports/lang/neko/pkg-plist ./pkg-plist
>--- /usr/ports/lang/neko/pkg-plist	2017-08-10 22:38:02.422628000 +0000
>+++ ./pkg-plist	2018-02-09 17:14:02.239898000 +0000
>@@ -6,9 +6,13 @@
> include/neko_elf.h
> include/neko_mod.h
> include/neko_vm.h
>+lib/cmake/Neko/NekoConfig.cmake
>+lib/cmake/Neko/NekoConfigVersion.cmake
>+lib/cmake/Neko/NekoTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/Neko/NekoTargets.cmake
> lib/libneko.so
> lib/libneko.so.2
>-lib/libneko.so.2.1.0
>+lib/libneko.so.2.2.0
> lib/neko/mod_neko2.ndll
> lib/neko/mod_tora2.ndll
> lib/neko/mysql.ndll
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 226183: 190969 | 190974 | 191351 | 191352 | 191353