Attachment #178466 for bug #215724

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




# Created by: Sir l33tname <sirl33tname@gmail.com>
# $FreeBSD$

PORTNAME=	lua-zlib
PORTVERSION=	1.0
DISTVERSIONPREFIX=v
CATEGORIES=	archivers

MAINTAINER=	sirl33tname@gmail.com
COMMENT=	Simple streaming interface to zlib for the Lua Programming Language

LICENSE=	MIT

USE_GITHUB=	yes
GH_ACCOUNT=	brimworks

USES=		gmake lua:51

ALL_TARGET=	bsd
MAKE_ENV+=      LUAPATH="${LOCALBASE}"
MAKE_ENV+=	LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}"
MAKE_ENV+=	INCDIR="-I${LUA_INCDIR}"
MAKE_ENV+=	LUALIBDIR="-L${LUA_MODLIBDIR}"

PLIST_FILES=	${LUA_MODLIBDIR}/zlib.so

DOCSDIR=	${STAGEDIR}/share/doc/${UNIQUENAME}

pre-install:
	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}

.include <bsd.port.mk>

Line 0 Link Here

(-)archivers/lua-zlib/distinfo (+3 lines)
	1	TIMESTAMP = 1483297792
	2	SHA256 (brimworks-lua-zlib-v1.0_GH0.tar.gz) = 3c24a142fb758fa1efc91cd229462719be5ba8956dbe648e41a68069616b7dee
	3	SIZE (brimworks-lua-zlib-v1.0_GH0.tar.gz) = 16471




--- Makefile.orig	2016-11-05 19:21:22 UTC
+++ Makefile
@@ -3,7 +3,7 @@
 LUAPATH  ?= /usr/share/lua/5.1
 LUACPATH ?= /usr/lib/lua/5.1
 INCDIR   ?= -I/usr/include/lua5.1
-LIBDIR   ?= -L/usr/lib
+LUALIBDIR   ?= -L/usr/lib
 
 # For Mac OS X: set the system version
 MACOSX_VERSION = 10.4
@@ -11,21 +11,21 @@ MACOSX_VERSION = 10.4
 CMOD = zlib.so
 OBJS = lua_zlib.o
 
-LIBS = -lz -llua -lm
+LIBS = -lz -lm
 WARN = -Wall -pedantic
 
 BSD_CFLAGS  = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
-BSD_LDFLAGS = -O -shared -fPIC $(LIBDIR)
+BSD_LDFLAGS = -O -fPIC -shared $(LUALIBDIR)
 
 LNX_CFLAGS  = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
-LNX_LDFLAGS = -O -shared -fPIC $(LIBDIR)
+LNX_LDFLAGS = -O -shared -fPIC $(LUALIBDIR)
 
 MAC_ENV     = env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
 MAC_CFLAGS  = -O2 -fPIC -fno-common $(WARN) $(INCDIR) $(DEFS)
-MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LIBDIR)
+MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LUALIBDIR)
 
-CC = gcc
-LD = $(MYENV) gcc
+CC ?= gcc
+LD ?= $(MYENV) gcc
 CFLAGS  = $(MYCFLAGS)
 LDFLAGS = $(MYLDFLAGS)
 
@@ -44,13 +44,13 @@ uninstall:
 	rm $(LUACPATH)/zlib.so
 
 linux:
-	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
+	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
 
 bsd:
-	@$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
+	@$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
 
 macosx:
-	@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
+	@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
 
 clean:
 	rm -f $(OBJS) $(CMOD)
@@ -59,4 +59,4 @@ clean:
 	$(CC) -c $(CFLAGS) $(DEFS) $(INCDIR) -o $@ $<
 
 $(CMOD): $(OBJS)
-	$(LD) $(LDFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $@
+	$(LD) $(LDFLAGS) $(LUALIBDIR) $(OBJS) $(LIBS) -o $@

Line 0 Link Here

(-)archivers/lua-zlib/pkg-descr (+6 lines)
	1	lua-zlib is a simple streaming interface to zlib for the Lua Programming
	2	Language. It consists of two functions: inflate and deflate. Both functions
	3	return "stream functions" (takes a buffer of input and returns a buffer
	4	of output).
	5
	6	WWW: https://github.com/brimworks/lua-zlib/

Return to bug 215724

Line 0 Link Here

(-)archivers/lua-zlib/Makefile (+32 lines)
	1	# Created by: Sir l33tname <sirl33tname@gmail.com>
	2	# $FreeBSD$
	3
	4	PORTNAME= lua-zlib
	5	PORTVERSION= 1.0
	6	DISTVERSIONPREFIX=v
	7	CATEGORIES= archivers
	8
	9	MAINTAINER= sirl33tname@gmail.com
	10	COMMENT= Simple streaming interface to zlib for the Lua Programming Language
	11
	12	LICENSE= MIT
	13
	14	USE_GITHUB= yes
	15	GH_ACCOUNT= brimworks
	16
	17	USES= gmake lua:51
	18
	19	ALL_TARGET= bsd
	20	MAKE_ENV+= LUAPATH="${LOCALBASE}"
	21	MAKE_ENV+= LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}"
	22	MAKE_ENV+= INCDIR="-I${LUA_INCDIR}"
	23	MAKE_ENV+= LUALIBDIR="-L${LUA_MODLIBDIR}"
	24
	25	PLIST_FILES= ${LUA_MODLIBDIR}/zlib.so
	26
	27	DOCSDIR= ${STAGEDIR}/share/doc/${UNIQUENAME}
	28
	29	pre-install:
	30	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
	31
	32	.include <bsd.port.mk>

Line 0 Link Here

(-)archivers/lua-zlib/files/patch-Makefile (+62 lines)
	1	--- Makefile.orig 2016-11-05 19:21:22 UTC
	2	+++ Makefile
	3	@@ -3,7 +3,7 @@
	4	LUAPATH ?= /usr/share/lua/5.1
	5	LUACPATH ?= /usr/lib/lua/5.1
	6	INCDIR ?= -I/usr/include/lua5.1
	7	-LIBDIR ?= -L/usr/lib
	8	+LUALIBDIR ?= -L/usr/lib
	9
	10	# For Mac OS X: set the system version
	11	MACOSX_VERSION = 10.4
	12	@@ -11,21 +11,21 @@ MACOSX_VERSION = 10.4
	13	CMOD = zlib.so
	14	OBJS = lua_zlib.o
	15
	16	-LIBS = -lz -llua -lm
	17	+LIBS = -lz -lm
	18	WARN = -Wall -pedantic
	19
	20	BSD_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
	21	-BSD_LDFLAGS = -O -shared -fPIC $(LIBDIR)
	22	+BSD_LDFLAGS = -O -fPIC -shared $(LUALIBDIR)
	23
	24	LNX_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
	25	-LNX_LDFLAGS = -O -shared -fPIC $(LIBDIR)
	26	+LNX_LDFLAGS = -O -shared -fPIC $(LUALIBDIR)
	27
	28	MAC_ENV = env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
	29	MAC_CFLAGS = -O2 -fPIC -fno-common $(WARN) $(INCDIR) $(DEFS)
	30	-MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LIBDIR)
	31	+MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LUALIBDIR)
	32
	33	-CC = gcc
	34	-LD = $(MYENV) gcc
	35	+CC ?= gcc
	36	+LD ?= $(MYENV) gcc
	37	CFLAGS = $(MYCFLAGS)
	38	LDFLAGS = $(MYLDFLAGS)
	39
	40	@@ -44,13 +44,13 @@ uninstall:
	41	rm $(LUACPATH)/zlib.so
	42
	43	linux:
	44	- @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
	45	+ @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
	46
	47	bsd:
	48	- @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
	49	+ @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
	50
	51	macosx:
	52	- @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)"
	53	+ @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)"
	54
	55	clean:
	56	rm -f $(OBJS) $(CMOD)
	57	@@ -59,4 +59,4 @@ clean:
	58	$(CC) -c $(CFLAGS) $(DEFS) $(INCDIR) -o $@ $<
	59
	60	$(CMOD): $(OBJS)
	61	- $(LD) $(LDFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $@
	62	+ $(LD) $(LDFLAGS) $(LUALIBDIR) $(OBJS) $(LIBS) -o $@