Date: Mon, 10 Aug 2009 10:45:10 GMT From: Masanori OZAWA <ozawa@ongs.co.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/137631: [PATCH] lang/neko: update to 1.8.1 Message-ID: <200908101045.n7AAjAbw052742@www.freebsd.org> Resent-Message-ID: <200908101050.n7AAo4Xq010115@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137631 >Category: ports >Synopsis: [PATCH] lang/neko: update to 1.8.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 10 10:50:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Masanori OZAWA >Release: 8.0-BETA2 >Organization: ONGS Inc. >Environment: FreeBSD mithos.ongs.co.jp 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Sun Aug 9 19:17:49 JST 2009 root@mithos.ongs.co.jp:/usr/obj/usr/src/sys/MITHOS i386 >Description: - update to 1.8.1 >How-To-Repeat: >Fix: (note: files/patch-libs_mod_tora_protocol.c removed) 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++; \ - } - --static int pwrite( mcontext *c, const char *buf, int len ) { -+static int _pwrite( mcontext *c, const char *buf, int len ) { - while( len > 0 ) { - int k = send(c->sock,buf,len,MSG_NOSIGNAL); - if( k <= 0 ) return 0; -@@ -47,7 +47,7 @@ - return 1; - } - --static int pread( mcontext *c, char *buf, int len ) { -+static int _pread( mcontext *c, char *buf, int len ) { - while( len > 0 ) { - int k = recv(c->sock,buf,len,MSG_NOSIGNAL); - if( k <= 0 ) return 0; -@@ -63,8 +63,8 @@ - h[1] = (unsigned char)len; - h[2] = (unsigned char)(len >> 8); - h[3] = (unsigned char)(len >> 16); -- pwrite(c,(char*)h,4); -- pwrite(c,str,len); -+ _pwrite(c,(char*)h,4); -+ _pwrite(c,str,len); - } - - static void psend( mcontext *c, proto_code code, const char *str ) { -@@ -329,7 +329,7 @@ - int buflen = BUFSIZE; - *exc = 0; - while( true ) { -- if( !pread(c,header,4) ) -+ if( !_pread(c,header,4) ) - ABORT("Connection Closed"); - len = header[1] | (header[2] << 8) | (header[3] << 16); - if( buflen <= len ) { -@@ -338,7 +338,7 @@ - free(buf); - buf = (char*)malloc(buflen); - } -- if( !pread(c,buf,len) ) -+ if( !_pread(c,buf,len) ) - ABORT("Connection Closed"); - buf[len] = 0; - switch( *header ) { diff -urBN neko.orig/pkg-plist neko/pkg-plist --- neko.orig/pkg-plist 2009-06-28 10:39:10.000000000 +0900 +++ neko/pkg-plist 2009-08-10 17:51:10.000000000 +0900 @@ -11,6 +11,7 @@ %%APACHE22%%lib/neko/mod_neko2.ndll %%APACHE22%%lib/neko/mod_tora2.ndll %%MYSQL4%%lib/neko/mysql.ndll +%%MYSQL5%%lib/neko/mysql5.ndll %%SQLITE3%%lib/neko/sqlite.ndll %%PCRE%%lib/neko/regexp.ndll %%GTK2%%lib/neko/ui.ndll >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908101045.n7AAjAbw052742>