Attachment #156899 for bug #200299

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




# $FreeBSD: head/devel/lua-posix/Makefile 385521 2015-05-06 15:16:53Z mat $

PORTNAME=	posix
PORTVERSION=	33.3.1
DISTVERSIONPREFIX=	release-v
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	GH
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}

MAINTAINER=	ports@FreeBSD.org


LICENSE=	MIT

USES=		lua perl5
USE_PERL5=	build
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LUA_INCLUDE=-I${LUA_INCDIR} \
		LUA=${LOCALBASE}/bin/lua${LUA_VER_STR}

USE_GITHUB=	yes
GH_PROJECT=	luaposix
GH_ACCOUNT=	luaposix

USES=		lua libtool perl5
USE_PERL5=	build
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	LUA_INCLUDE="-I${LUA_INCDIR}" \
		LUA="${LOCALBASE}/bin/lua${LUA_VER_STR}"
CONFIGURE_ARGS=	--disable-silent-rules
MAKE_ARGS=	POSIX_EXTRA_CFLAGS="" POSIX_EXTRA_LDFLAGS=""
INSTALL_TARGET=	install-strip

DOCSDIR=	${PREFIX}/share/doc/${GH_PROJECT}
		%%LUA_MODLIBDIR%%/curses_c.so \
		%%LUA_MODSHAREDIR%%/posix.lua \
		%%LUA_MODLIBDIR%%/posix_c.so

PORTDOCS=	*
PLIST_FILES=	%%LUA_MODLIBDIR%%/posix.so \
		%%LUA_MODSHAREDIR%%/curses.lua \
		%%LUA_MODSHAREDIR%%/posix/_argcheck.lua \
		%%LUA_MODSHAREDIR%%/posix/compat.lua \
		%%LUA_MODSHAREDIR%%/posix/deprecated.lua \
		%%LUA_MODSHAREDIR%%/posix/init.lua \
		%%LUA_MODSHAREDIR%%/posix/sys.lua \
		%%LUA_MODSHAREDIR%%/posix/util.lua

OPTIONS_DEFINE=	DOCS

post-patch:
	@${REINPLACE_CMD} -e \
		's|\(\*\|\)\(openbsd\*)\)|\1freebsd*\|\2| ; \
		 s|"GNU strip"|"strip"|' ${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/lua-posix/distinfo (-2 / +2 lines)
1	SHA256 (luaposix-luaposix-release-v31_GH0.tar.gz) = c5ed2f6c16b9f31d3ca0db05f9b660db69c966baab244878480ab6658abbbe24	1	SHA256 (luaposix-luaposix-release-v33.3.1_GH0.tar.gz) = 49e1eda64d0c03d0f2977fc1e04ce8c620dc3bb9a5c54c342904751d21b1b3cf
2	SIZE (luaposix-luaposix-release-v31_GH0.tar.gz) = 528979	2	SIZE (luaposix-luaposix-release-v33.3.1_GH0.tar.gz) = 692452




--- ./ext/posix/posix.c.orig	2013-09-09 09:15:14.000000000 +0200
+++ ./ext/posix/posix.c	2014-01-17 18:05:10.399556496 +0100
@@ -68,6 +68,10 @@
 #include "lauxlib.h"
 #include "lua52compat.h"
 
+#ifdef __FreeBSD__
+#define	O_DSYNC	O_SYNC
+#endif
+
 #ifndef STREQ
 #  define STREQ(a, b)     (strcmp (a, b) == 0)
 #endif
@@ -3697,6 +3701,7 @@
   return pushresult(L, fsync(fd), NULL);
 }
 
+#if 0
 #if _POSIX_VERSION >= 200112L
 /***
  synchronize a file's in-core state with storage device without metadata
@@ -3712,6 +3717,7 @@
   return pushresult(L, fdatasync(fd), NULL);
 }
 #endif
+#endif
 
 /***
 reposition read/write file offset
@@ -3771,9 +3777,11 @@
 	MENTRY( Perrno		),
 	MENTRY( Pexec		),
 	MENTRY( Pexecp		),
+#if 0
 #if _POSIX_VERSION >= 200112L
 	MENTRY( Pfdatasync	),
 #endif
+#endif
 	MENTRY( Pfcntl		),
 	MENTRY( Pfileno		),
 	MENTRY( Pfiles		),




--- ext/posix/unistd.c.orig	2015-03-01 18:26:42 UTC
+++ ext/posix/unistd.c
@@ -326,6 +326,7 @@ Pexecp(lua_State *L)
 }
 
 
+#if 0
 #if LPOSIX_2001_COMPLIANT
 
 #if !HAVE_DECL_FDATASYNC
@@ -350,6 +351,7 @@ Pfdatasync(lua_State *L)
   return pushresult(L, fdatasync(fd), NULL);
 }
 #endif
+#endif
 
 
 /***
@@ -1032,9 +1034,11 @@ static const luaL_Reg posix_unistd_fns[]
 	LPOSIX_FUNC( Pdup2		),
 	LPOSIX_FUNC( Pexec		),
 	LPOSIX_FUNC( Pexecp		),
+#if 0
 #if LPOSIX_2001_COMPLIANT
 	LPOSIX_FUNC( Pfdatasync		),
 #endif
+#endif
 	LPOSIX_FUNC( Pfork		),
 	LPOSIX_FUNC( Pfsync		),
 	LPOSIX_FUNC( Pgetcwd		),

Line 1 Link Here

(-)devel/lua-posix/pkg-descr (+2 lines)
1	LuaPosix is a Lua extension library that provides support for POSIX.	1	LuaPosix is a Lua extension library that provides support for POSIX.
		2
		3	WWW: http://luaposix.github.io/luaposix

Return to bug 200299

Lines 2-11 Link Here

(-)devel/lua-posix/Makefile (-22 / +25 lines)
2	# $FreeBSD: head/devel/lua-posix/Makefile 385521 2015-05-06 15:16:53Z mat $	2	# $FreeBSD: head/devel/lua-posix/Makefile 385521 2015-05-06 15:16:53Z mat $
3		3
4	PORTNAME= posix	4	PORTNAME= posix
5	PORTVERSION= 31	5	PORTVERSION= 33.3.1
6	DISTVERSIONPREFIX= release-v	6	DISTVERSIONPREFIX= release-v
7	PORTREVISION= 1
8	CATEGORIES= devel	7	CATEGORIES= devel
		8	MASTER_SITES= GH
9	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
Lines 13-45 Link Here
13		13
14	LICENSE= MIT	14	LICENSE= MIT
15		15
16	USES= lua perl5
17	USE_PERL5= build
18	GNU_CONFIGURE= yes
19	CONFIGURE_ENV= LUA_INCLUDE=-I${LUA_INCDIR} \
20	LUA=${LOCALBASE}/bin/lua${LUA_VER_STR}
21
22	USE_GITHUB= yes	16	USE_GITHUB= yes
23	GH_PROJECT= luaposix	17	GH_PROJECT= luaposix
24	GH_ACCOUNT= luaposix	18	GH_ACCOUNT= luaposix
25		19
		20	USES= lua libtool perl5
		21	USE_PERL5= build
		22	GNU_CONFIGURE= yes
		23	CONFIGURE_ENV= LUA_INCLUDE="-I${LUA_INCDIR}" \
		24	LUA="${LOCALBASE}/bin/lua${LUA_VER_STR}"
		25	CONFIGURE_ARGS= --disable-silent-rules
26	MAKE_ARGS= POSIX_EXTRA_CFLAGS="" POSIX_EXTRA_LDFLAGS=""	26	MAKE_ARGS= POSIX_EXTRA_CFLAGS="" POSIX_EXTRA_LDFLAGS=""
		27	INSTALL_TARGET= install-strip
27		28
28	PLIST_FILES= %%LUA_MODSHAREDIR%%/curses.lua \	29	DOCSDIR= ${PREFIX}/share/doc/${GH_PROJECT}
29	%%LUA_MODLIBDIR%%/curses_c.so \
30	%%LUA_MODSHAREDIR%%/posix.lua \
31	%%LUA_MODLIBDIR%%/posix_c.so
32		30
33	PORTDOCS= *	31	PORTDOCS= *
34		32	PLIST_FILES= %%LUA_MODLIBDIR%%/posix.so \
35	do-install:	33	%%LUA_MODSHAREDIR%%/curses.lua \
36	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}	34	%%LUA_MODSHAREDIR%%/posix/_argcheck.lua \
37	${INSTALL_LIB} ${WRKSRC}/ext/posix/.libs/posix_c.so ${STAGEDIR}${LUA_MODLIBDIR}/	35	%%LUA_MODSHAREDIR%%/posix/compat.lua \
38	${INSTALL_LIB} ${WRKSRC}/ext/curses/.libs/curses_c.so ${STAGEDIR}${LUA_MODLIBDIR}/	36	%%LUA_MODSHAREDIR%%/posix/deprecated.lua \
39	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}	37	%%LUA_MODSHAREDIR%%/posix/init.lua \
40	${INSTALL_SCRIPT} ${WRKSRC}/lib/curses.lua ${STAGEDIR}${LUA_MODSHAREDIR}/	38	%%LUA_MODSHAREDIR%%/posix/sys.lua \
41	${INSTALL_SCRIPT} ${WRKSRC}/lib/posix.lua ${STAGEDIR}${LUA_MODSHAREDIR}/	39	%%LUA_MODSHAREDIR%%/posix/util.lua
42	@${MKDIR} ${STAGEDIR}${DOCSDIR}	40
43	cd ${WRKSRC}/doc ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	41	OPTIONS_DEFINE= DOCS
		42
		43	post-patch:
		44	@${REINPLACE_CMD} -e \
		45	's\|\(\\\|\)\(openbsd\)\)\|\1freebsd*\\|\2\| ; \
		46	s\|"GNU strip"\|"strip"\|' ${WRKSRC}/configure
44		47
45	.include <bsd.port.mk>	48	.include <bsd.port.mk>

Lines 1-41 Link Here

(-)devel/lua-posix/files/patch-ext__posix__posix.c (-41 lines)
1	--- ./ext/posix/posix.c.orig 2013-09-09 09:15:14.000000000 +0200
2	+++ ./ext/posix/posix.c 2014-01-17 18:05:10.399556496 +0100
3	@@ -68,6 +68,10 @@
4	#include "lauxlib.h"
5	#include "lua52compat.h"
6
7	+#ifdef __FreeBSD__
8	+#define O_DSYNC O_SYNC
9	+#endif
10	+
11	#ifndef STREQ
12	# define STREQ(a, b) (strcmp (a, b) == 0)
13	#endif
14	@@ -3697,6 +3701,7 @@
15	return pushresult(L, fsync(fd), NULL);
16	}
17
18	+#if 0
19	#if _POSIX_VERSION >= 200112L
20	/***
21	synchronize a file's in-core state with storage device without metadata
22	@@ -3712,6 +3717,7 @@
23	return pushresult(L, fdatasync(fd), NULL);
24	}
25	#endif
26	+#endif
27
28	/***
29	reposition read/write file offset
30	@@ -3771,9 +3777,11 @@
31	MENTRY( Perrno ),
32	MENTRY( Pexec ),
33	MENTRY( Pexecp ),
34	+#if 0
35	#if _POSIX_VERSION >= 200112L
36	MENTRY( Pfdatasync ),
37	#endif
38	+#endif
39	MENTRY( Pfcntl ),
40	MENTRY( Pfileno ),
41	MENTRY( Pfiles ),

Line 0 Link Here

(-)devel/lua-posix/files/patch-ext__posix__unistd.c (+30 lines)
	1	--- ext/posix/unistd.c.orig 2015-03-01 18:26:42 UTC
	2	+++ ext/posix/unistd.c
	3	@@ -326,6 +326,7 @@ Pexecp(lua_State *L)
	4	}
	5
	6
	7	+#if 0
	8	#if LPOSIX_2001_COMPLIANT
	9
	10	#if !HAVE_DECL_FDATASYNC
	11	@@ -350,6 +351,7 @@ Pfdatasync(lua_State *L)
	12	return pushresult(L, fdatasync(fd), NULL);
	13	}
	14	#endif
	15	+#endif
	16
	17
	18	/***
	19	@@ -1032,9 +1034,11 @@ static const luaL_Reg posix_unistd_fns[]
	20	LPOSIX_FUNC( Pdup2 ),
	21	LPOSIX_FUNC( Pexec ),
	22	LPOSIX_FUNC( Pexecp ),
	23	+#if 0
	24	#if LPOSIX_2001_COMPLIANT
	25	LPOSIX_FUNC( Pfdatasync ),
	26	#endif
	27	+#endif
	28	LPOSIX_FUNC( Pfork ),
	29	LPOSIX_FUNC( Pfsync ),
	30	LPOSIX_FUNC( Pgetcwd ),