Attachment 98683 Details for Bug 137631 – file.diff

[patch] file.diff

file.diff (text/plain), 2.77 KB, created by Masanori OZAWA on 2009-08-10 11:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Masanori OZAWA

Created: 2009-08-10 11:50:03 UTC

Size: 2.77 KB

patch

obsolete

>diff -urBN neko.orig/Makefile neko/Makefile
>--- neko.orig/Makefile	2009-08-03 04:34:28.000000000 +0900
>+++ neko/Makefile	2009-08-10 18:24:04.000000000 +0900
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	neko
>-PORTVERSION=	1.8.0
>-PORTREVISION=	1
>+PORTVERSION=	1.8.1
> CATEGORIES=	lang
> MASTER_SITES=	http://nekovm.org/_media/
> 
>@@ -22,6 +21,7 @@
> OPTIONS=	APACHE13 "Build with mod_neko for Apache 1.3.x" off \
> 		APACHE22 "Build with mod_neko for Apache 2.2.x" off \
> 		MYSQL4   "Build with MySQL 4.x library" off \
>+		MYSQL5   "Build with MySQL 5.x library" off \
> 		SQLITE3  "Build with Sqlite 3.x SQL library" off \
> 		PCRE     "Build with PCRE library" on \
> 		GTK2     "Build with Gtk 2.x UI library" on
>@@ -37,6 +37,10 @@
> LDFLAGS+=	-L${BC_DIR}/.libs -L${LOCALBASE}/lib
> LIBKEYNAME=
> 
>+.if defined(WITH_APACHE13) && defined(WITH_APACHE22)
>+IGNORE= option APACHE13 and APACHE22 conflict
>+.endif
>+
> .if defined(WITH_APACHE13)
> BUILD_DEPENDS+=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
> RUN_DEPENDS+=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
>@@ -57,6 +61,10 @@
> PLIST_SUB+=	APACHE22="@comment "
> .endif
> 
>+.if defined(WITH_MYSQL4) && defined(WITH_MYSQL5)
>+IGNORE= option MYSQL4 and MYSQL5 conflict
>+.endif
>+
> .if defined(WITH_MYSQL4)
> BUILD_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql41-client
> RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql41-client
>@@ -67,6 +75,16 @@
> PLIST_SUB+=	MYSQL4="@comment "
> .endif
> 
>+.if defined(WITH_MYSQL5)
>+BUILD_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql51-client
>+RUN_DEPENDS+=	mysql:${PORTSDIR}/databases/mysql51-client
>+CFLAGS+=	-I${LOCALBASE}/include/mysql
>+PLIST_SUB+=	MYSQL5=
>+.else
>+LIBKEYNAME+=	mysql5
>+PLIST_SUB+=	MYSQL5="@comment "
>+.endif
>+
> .if defined(WITH_SQLITE3)
> BUILD_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
> RUN_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
>diff -urBN neko.orig/distinfo neko/distinfo
>--- neko.orig/distinfo	2009-06-28 10:39:10.000000000 +0900
>+++ neko/distinfo	2009-08-10 14:05:45.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (neko-1.8.0.tar.gz) = b41da79e6f976818ab64805e9ba7298c
>-SHA256 (neko-1.8.0.tar.gz) = 7a71c9cf3177c14e5afc114f060d43c4056cca8afa80ab08bdc76b83fdf803d3
>-SIZE (neko-1.8.0.tar.gz) = 402210
>+MD5 (neko-1.8.1.tar.gz) = 0e2029465a49e1da929f0e254c017701
>+SHA256 (neko-1.8.1.tar.gz) = a51f861959056d02d46f8e7d0a59c9c154f371ceec16d4c4b0e93ff1f391775b
>+SIZE (neko-1.8.1.tar.gz) = 438047
>diff -urBN neko.orig/files/patch-libs_mod_tora_protocol.c neko/files/patch-libs_mod_tora_protocol.c
>--- neko.orig/files/patch-libs_mod_tora_protocol.c	2009-06-28 10:40:02.000000000 +0900
>+++ neko/files/patch-libs_mod_tora_protocol.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,49 +0,0 @@
>---- libs/mod_tora/protocol.c.orig	2009-06-19 17:15:56.000000000 +0900
>-+++ libs/mod_tora/protocol.c	2009-06-19 17:17:33.000000000 +0900
>-@@ -37,7 +37,7 @@
>- 			cursor++; \

Actions: View | Diff

Attachments on bug 137631: 98683 | 98684