View | Details | Raw Unified | Return to bug 135833
Collapse All | Expand All

(-)neko/Makefile (-4 / +13 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	neko
8
PORTNAME=	neko
9
PORTVERSION=	1.6.0
9
PORTVERSION=	1.8.0
10
PORTREVISION=	2
11
CATEGORIES=	lang
10
CATEGORIES=	lang
12
MASTER_SITES=	http://nekovm.org/_media/
11
MASTER_SITES=	http://nekovm.org/_media/
13
12
Lines 43-49 Link Here
43
CFLAGS+=	-I${LOCALBASE}/include/apache
42
CFLAGS+=	-I${LOCALBASE}/include/apache
44
PLIST_SUB+=	APACHE13=
43
PLIST_SUB+=	APACHE13=
45
.else
44
.else
46
LIBKEYNAME+=	mod_neko
45
LIBKEYNAME+=	mod_neko mod_tora
47
PLIST_SUB+=	APACHE13="@comment "
46
PLIST_SUB+=	APACHE13="@comment "
48
.endif
47
.endif
49
48
Lines 53-59 Link Here
53
CFLAGS+=	-I${LOCALBASE}/include/apache22
52
CFLAGS+=	-I${LOCALBASE}/include/apache22
54
PLIST_SUB+=	APACHE22=
53
PLIST_SUB+=	APACHE22=
55
.else
54
.else
56
LIBKEYNAME+=	mod_neko2
55
LIBKEYNAME+=	mod_neko2 mod_tora2
57
PLIST_SUB+=	APACHE22="@comment "
56
PLIST_SUB+=	APACHE22="@comment "
58
.endif
57
.endif
59
58
Lines 139-144 Link Here
139
	@${REINPLACE_CMD} \
138
	@${REINPLACE_CMD} \
140
	    -e 's,NEKO_LINUX,NEKO_BSD,' ${WRKSRC}/libs/ui/ui.c
139
	    -e 's,NEKO_LINUX,NEKO_BSD,' ${WRKSRC}/libs/ui/ui.c
141
.endif
140
.endif
141
.if ${ARCH} == "amd64" && defined(WITH_MYSQL4)
142
	@${ECHO_CMD}
143
	@${ECHO_CMD} "======================================================="
144
	@${ECHO_CMD}
145
	@${ECHO_CMD} " Notice: When not building MYSQL with 'CFLAGS+=-fPIC'"
146
	@${ECHO_CMD} " first, It fails in building of a MYSQL module."
147
	@${ECHO_CMD}
148
	@${ECHO_CMD} "======================================================="
149
	@${ECHO_CMD}
150
.endif
142
151
143
pre-build:
152
pre-build:
144
	@(cd ${PORTSDIR}/devel/boehm-gc/ && \
153
	@(cd ${PORTSDIR}/devel/boehm-gc/ && \
(-)neko/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (neko-1.6.0.tar.gz) = ea3c16e6d396b0840a9d5bb1ef57c7dd
1
MD5 (neko-1.8.0.tar.gz) = b41da79e6f976818ab64805e9ba7298c
2
SHA256 (neko-1.6.0.tar.gz) = 75edb9b7f8ee13bf2e576dbdc03aee92adab8f2213b336c4058770826e7a47c8
2
SHA256 (neko-1.8.0.tar.gz) = 7a71c9cf3177c14e5afc114f060d43c4056cca8afa80ab08bdc76b83fdf803d3
3
SIZE (neko-1.6.0.tar.gz) = 375528
3
SIZE (neko-1.8.0.tar.gz) = 402210
(-)neko/files/patch-libs_mod_tora_protocol.c (+49 lines)
Line 0 Link Here
1
--- libs/mod_tora/protocol.c.orig	2009-06-19 17:15:56.000000000 +0900
2
+++ libs/mod_tora/protocol.c	2009-06-19 17:17:33.000000000 +0900
3
@@ -37,7 +37,7 @@
4
 			cursor++; \
5
 	}
6
 
7
-static int pwrite( mcontext *c, const char *buf, int len ) {
8
+static int _pwrite( mcontext *c, const char *buf, int len ) {
9
 	while( len > 0 ) {
10
 		int k = send(c->sock,buf,len,MSG_NOSIGNAL);
11
 		if( k <= 0 ) return 0;
12
@@ -47,7 +47,7 @@
13
 	return 1;
14
 }
15
 
16
-static int pread( mcontext *c, char *buf, int len ) {
17
+static int _pread( mcontext *c, char *buf, int len ) {
18
 	while( len > 0 ) {
19
 		int k = recv(c->sock,buf,len,MSG_NOSIGNAL);
20
 		if( k <= 0 ) return 0;
21
@@ -63,8 +63,8 @@
22
 	h[1] = (unsigned char)len;
23
 	h[2] = (unsigned char)(len >> 8);
24
 	h[3] = (unsigned char)(len >> 16);
25
-	pwrite(c,(char*)h,4);
26
-	pwrite(c,str,len);
27
+	_pwrite(c,(char*)h,4);
28
+	_pwrite(c,str,len);
29
 }
30
 
31
 static void psend( mcontext *c, proto_code code, const char *str ) {
32
@@ -329,7 +329,7 @@
33
 	int buflen = BUFSIZE;
34
 	*exc = 0;
35
 	while( true ) {
36
-		if( !pread(c,header,4) )
37
+		if( !_pread(c,header,4) )
38
 			ABORT("Connection Closed");
39
 		len = header[1] | (header[2] << 8) | (header[3] << 16);
40
 		if( buflen <= len ) {
41
@@ -338,7 +338,7 @@
42
 			free(buf);
43
 			buf = (char*)malloc(buflen);
44
 		}
45
-		if( !pread(c,buf,len) )
46
+		if( !_pread(c,buf,len) )
47
 			ABORT("Connection Closed");
48
 		buf[len] = 0;
49
 		switch( *header ) {
(-)neko/files/patch-libs_std_process.c (+11 lines)
Line 0 Link Here
1
--- libs/std/process.c.orig	2009-06-19 00:08:00.000000000 +0900
2
+++ libs/std/process.c	2009-06-19 00:08:06.000000000 +0900
3
@@ -23,7 +23,7 @@
4
 #	include <unistd.h>
5
 #	include <errno.h>
6
 #	ifndef NEKO_MAC
7
-#		include <wait.h>
8
+#		include <sys/wait.h>
9
 #	endif
10
 #endif
11
 
(-)neko/files/patch-libs_std_sys.c (+22 lines)
Line 0 Link Here
1
--- libs/std/sys.c.orig	2009-06-19 00:08:19.000000000 +0900
2
+++ libs/std/sys.c	2009-06-19 00:11:42.000000000 +0900
3
@@ -35,7 +35,9 @@
4
 #	include <termios.h>
5
 #	include <sys/time.h>
6
 #	include <sys/times.h>
7
+#ifndef __FreeBSD__
8
 #	include <xlocale.h>
9
+#endif
10
 #endif
11
 
12
 #ifdef NEKO_MAC
13
@@ -123,6 +125,9 @@
14
 	<doc>Set the locale for LC_TIME, returns true on success</doc>
15
 **/
16
 static value set_time_locale( value l ) {
17
+#ifdef __FreeBSD__
18
+#undef NEKO_POSIX
19
+#endif
20
 #ifdef NEKO_POSIX
21
 	locale_t lc, old;
22
 	val_check(l,string);
(-)neko/pkg-plist (+4 lines)
Lines 1-11 Link Here
1
bin/neko
1
bin/neko
2
bin/nekoc
2
bin/nekoc
3
bin/nekoml.std
4
bin/nekoml
3
bin/nekotools
5
bin/nekotools
4
lib/libneko.so
6
lib/libneko.so
5
lib/neko/std.ndll
7
lib/neko/std.ndll
6
lib/neko/zlib.ndll
8
lib/neko/zlib.ndll
7
%%APACHE13%%lib/neko/mod_neko.ndll
9
%%APACHE13%%lib/neko/mod_neko.ndll
10
%%APACHE13%%lib/neko/mod_tora.ndll
8
%%APACHE22%%lib/neko/mod_neko2.ndll
11
%%APACHE22%%lib/neko/mod_neko2.ndll
12
%%APACHE22%%lib/neko/mod_tora2.ndll
9
%%MYSQL4%%lib/neko/mysql.ndll
13
%%MYSQL4%%lib/neko/mysql.ndll
10
%%SQLITE3%%lib/neko/sqlite.ndll
14
%%SQLITE3%%lib/neko/sqlite.ndll
11
%%PCRE%%lib/neko/regexp.ndll
15
%%PCRE%%lib/neko/regexp.ndll

Return to bug 135833