Requires Lua 5.1.

-p.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/luagd/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile    4 May 2006 22:53:57 -0000       1.1.1.1
+++ Makefile    21 May 2006 20:55:20 -0000
@@ -2,13 +2,13 @@
 
 COMMENT=       "gd binding for the lua language"
 
-V=             2.0.33r1
+V=             2.0.33r2
 PKGNAME=       luagd-$(V)
 DISTNAME=      lua-gd-$(V)
 CATEGORIES=    graphics
 
 HOMEPAGE=      http://lua-gd.luaforge.net/
-MASTER_SITES=  http://luaforge.net/frs/download.php/1015/
+MASTER_SITES=  http://luaforge.net/frs/download.php/1592/
 
 MAINTAINER=    Pedro Martelletto <[EMAIL PROTECTED]>
 
@@ -19,34 +19,27 @@
 PERMIT_DISTFILES_FTP=  Yes
 
 WANTLIB=       freetype fontconfig iconv m z
-LIB_DEPENDS=   lua.5,lualib.5::lang/lua jpeg.62::graphics/jpeg \
-               png.2::graphics/png gd.20.33::graphics/gd
+LIB_DEPENDS=   jpeg.62::graphics/jpeg png.2::graphics/png gd.20.33::graphics/gd
+BUILD_DEPENDS= :lua->=5.1:lang/lua
 
 NO_REGRESS=    Yes
 USE_X11=       Yes
 
-post-extract:
-       @sed -e "s:@gdpath@:${PREFIX}/lua/luagd/?.lua:g" \
-            -e "s:@gdcpath@:${PREFIX}/lua/luagd/?.so:g" \
-               ${FILESDIR}/init.lua > ${WRKSRC}/init.lua
-
 do-build:
        $(CC) $(CFLAGS) -DGD_JPEG -DGD_FONTCONFIG -DGD_FREETYPE -DGD_PNG\
-       -DGD_GIF -fPIC -I$(LOCALBASE)/include -L$(LOCALBASE)/lib\
-       -L$(X11BASE)/lib -shared $(WRKDIST)/luagd.c -o ${WRKDIST}/core.so\
-       -llua -llualib -lm -ljpeg -lfontconfig -lfreetype -lpng -lz -liconv\
-       -lgd
+       -DGD_GIF -fPIC -I$(LOCALBASE)/include -shared -L$(LOCALBASE)/lib\
+       -llua -lm -L$(X11BASE)/lib $(WRKDIST)/luagd.c -o ${WRKDIST}/core.so\
+       -ljpeg -lfontconfig -lfreetype -lpng -lz -liconv -lgd
 
-LUAGDDIR=      $(PREFIX)/lua/luagd
+SHAREDIR=      ${PREFIX}/share/lua/5.1
+LIBDIR=                ${PREFIX}/lib/lua/5.1
 
 do-install:
-       ${INSTALL_DATA_DIR} ${LUAGDDIR}
-       ${INSTALL_DATA_DIR} ${LUAGDDIR}/gd
+       ${INSTALL_DATA_DIR} ${SHAREDIR} ${LIBDIR}/gd
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/luagd
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/luagd
-       ${INSTALL_DATA} ${FILESDIR}/gd.lua ${LUAGDDIR}
-       ${INSTALL_DATA} ${WRKSRC}/core.so ${LUAGDDIR}/gd
-       ${INSTALL_DATA} ${WRKSRC}/init.lua ${LUAGDDIR}
+       ${INSTALL_DATA} ${FILESDIR}/gd.lua ${SHAREDIR}
+       ${INSTALL_DATA} ${WRKSRC}/core.so ${LIBDIR}/gd
        ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/luagd
        ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/examples/luagd
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/luagd/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    4 May 2006 22:53:57 -0000       1.1.1.1
+++ distinfo    21 May 2006 20:55:20 -0000
@@ -1,4 +1,4 @@
-MD5 (lua-gd-2.0.33r1.tar.gz) = db243165c7e43636f6b4fa94a06b453e
-RMD160 (lua-gd-2.0.33r1.tar.gz) = 091b644bafe9fe52597007b01e9e642bc935fd22
-SHA1 (lua-gd-2.0.33r1.tar.gz) = cf2c64756a635e0b7a13d98bbb44c9cf1b4fc465
-SIZE (lua-gd-2.0.33r1.tar.gz) = 442074
+MD5 (lua-gd-2.0.33r2.tar.gz) = 69e9c07ce208ce13d4373177c2e24df0
+RMD160 (lua-gd-2.0.33r2.tar.gz) = 806cd4210a6eb6d4da40167c5b1225fdaf786f71
+SHA1 (lua-gd-2.0.33r2.tar.gz) = 5e7a4e3a62c005de6d243e891411175957ff087e
+SIZE (lua-gd-2.0.33r2.tar.gz) = 448606
Index: files/init.lua
===================================================================
RCS file: files/init.lua
diff -N files/init.lua
--- files/init.lua      4 May 2006 22:53:57 -0000       1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
--- $OpenBSD: init.lua,v 1.1.1.1 2006/05/04 22:53:57 pedro Exp $
--- luagd's initialization steps
-lua_addpath("@gdpath@")
-lua_addcpath("@gdcpath@")
Index: patches/patch-luagd_c
===================================================================
RCS file: /cvs/ports/graphics/luagd/patches/patch-luagd_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-luagd_c
--- patches/patch-luagd_c       4 May 2006 22:53:57 -0000       1.1.1.1
+++ patches/patch-luagd_c       21 May 2006 20:55:20 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-luagd_c,v 1.1.1.1 2006/05/04 22:53:57 pedro Exp $
---- luagd.c.orig       Thu May  4 14:48:41 2006
-+++ luagd.c    Thu May  4 14:48:52 2006
-@@ -2466,7 +2466,7 @@ static const luaL_reg LgdMetatable[] =
+--- luagd.c.orig       Wed May  3 22:03:48 2006
++++ luagd.c    Fri May 19 15:47:39 2006
+@@ -2294,7 +2294,7 @@ static const luaL_reg LgdMetatable[] =
  };
  
  
--int luaopen_gd(lua_State *L)
-+int luaopen_gd_core(lua_State *L)
- {
-     luaL_openlib(L, LIB_NAME, LgdFunctions, 0);
+-int luaopen_gd(lua_State *L) {
++int luaopen_gd_core(lua_State *L) {
+     luaL_register(L, LIB_NAME, LgdFunctions);
+ 
      lua_pushliteral(L, "VERSION");
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/luagd/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared    4 May 2006 22:53:57 -0000       1.1.1.1
+++ pkg/PFRAG.shared    21 May 2006 20:55:20 -0000
@@ -1,2 +1,5 @@
 @comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/05/04 22:53:57 pedro Exp $
-lua/luagd/gd/core.so
+lib/lua/
+lib/lua/5.1/
+lib/lua/5.1/gd/
+lib/lua/5.1/gd/core.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/luagd/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   4 May 2006 22:53:57 -0000       1.1.1.1
+++ pkg/PLIST   21 May 2006 20:55:20 -0000
@@ -1,11 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/04 22:53:57 pedro Exp $
[EMAIL PROTECTED] lua ${SYSCONFDIR}/lua/luapkg.lua del luagd
 %%SHARED%%
-lua/
-lua/luagd/
-lua/luagd/gd/
-lua/luagd/gd.lua
-lua/luagd/init.lua
 share/doc/luagd/
 share/doc/luagd/cat.png
 share/doc/luagd/catdiff.png
@@ -18,7 +12,6 @@
 share/doc/luagd/sierpinski.png
 share/doc/luagd/stdfonts.png
 share/examples/luagd/
[EMAIL PROTECTED] lua ${SYSCONFDIR}/lua/luapkg.lua add luagd 
${PREFIX}/lua/luagd/init.lua
 share/examples/luagd/Vera.ttf
 share/examples/luagd/brush.lua
 share/examples/luagd/bugs.jpg
@@ -29,14 +22,13 @@
 share/examples/luagd/ellipse.lua
 share/examples/luagd/fontconfig.lua
 share/examples/luagd/fractal.lua
-share/examples/luagd/gd.lua
 share/examples/luagd/gifanim.lua
 share/examples/luagd/gifanim2.lua
 share/examples/luagd/gifanim3.lua
 share/examples/luagd/grid.png
 share/examples/luagd/lua-gd.png
-share/examples/luagd/mkthumbs.lua
-share/examples/luagd/one.lua
+share/examples/luagd/lualogo.lua
+share/examples/luagd/lualogo.png
 share/examples/luagd/paper.png
 share/examples/luagd/poly.lua
 share/examples/luagd/stdfont.lua
@@ -45,3 +37,8 @@
 share/examples/luagd/test2.lua
 share/examples/luagd/ttftext.lua
 share/examples/luagd/ttftextex.lua
+share/examples/luagd/utf-8.lua
+share/examples/luagd/utf-8.png
+share/lua/
+share/lua/5.1/
+share/lua/5.1/gd.lua

Reply via email to