[104576] trunk/dports/devel
and.damore at macports.org
and.damore at macports.org
Thu Mar 28 14:22:31 PDT 2013
Revision: 104576
https://trac.macports.org/changeset/104576
Author: and.damore at macports.org
Date: 2013-03-28 14:22:31 -0700 (Thu, 28 Mar 2013)
Log Message:
-----------
ports lpeg, lua-lpeg: replacing port lpeg with lua-lpeg, merging the portfiles, adding license, adding subdir due to stealth update; fix #38563
Modified Paths:
--------------
trunk/dports/devel/lpeg/Portfile
trunk/dports/devel/lua-lpeg/Portfile
trunk/dports/devel/lua-lpeg/files/patch-makefile.diff
Removed Paths:
-------------
trunk/dports/devel/lpeg/files/
Modified: trunk/dports/devel/lpeg/Portfile
===================================================================
--- trunk/dports/devel/lpeg/Portfile 2013-03-28 19:44:15 UTC (rev 104575)
+++ trunk/dports/devel/lpeg/Portfile 2013-03-28 21:22:31 UTC (rev 104576)
@@ -4,46 +4,21 @@
PortSystem 1.0
name lpeg
+license MIT
version 0.11
+revision 1
+replaced_by lua-lpeg
categories devel
platforms darwin
maintainers gmail.com:andremm
-
description Parsing Expression Grammars for Lua
-
long_description LPeg is a new pattern-matching library for Lua, based on \
Parsing Expression Grammars (PEGs).
homepage http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html
-master_sites http://www.inf.puc-rio.br/~roberto/lpeg/
-
-checksums rmd160 b64e4aa32cef4c6143c9a48c84b3d74e858e3dd4 \
- sha256 dd2950126c7539909ca69a25089fb1b5e5bf9ca676a732f7e9015ea4f3ecbcce
-
-depends_build port:pkgconfig
-
-depends_lib port:lua
-
-patchfiles patch-makefile.diff
-
-use_configure no
-
-variant universal {}
-
-build.target
-build.args CC="${configure.cc} [get_canonical_archflags]" \
- LUADIR=${prefix}/include
-
-destroot {
- set lua_cmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_CMOD]
- set lua_lmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_LMOD]
-
- xinstall -m 755 -d ${destroot}${lua_cmod} ${destroot}${lua_lmod}
-
- xinstall ${worksrcpath}/lpeg.so ${destroot}${lua_cmod}
- xinstall ${worksrcpath}/re.lua ${destroot}${lua_lmod}
-
- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/html/
- xinstall -m 644 ${worksrcpath}/HISTORY ${destroot}${prefix}/share/doc/${name}/
- xinstall -m 644 -W ${worksrcpath} lpeg-128.gif lpeg.html re.html ${destroot}${prefix}/share/doc/${name}/html/
+distfiles
+pre-configure {
+ ui_error "Please do not install this port since it has been replaced by 'lua-lpeg'."
+ return -code error
}
+
Modified: trunk/dports/devel/lua-lpeg/Portfile
===================================================================
--- trunk/dports/devel/lua-lpeg/Portfile 2013-03-28 19:44:15 UTC (rev 104575)
+++ trunk/dports/devel/lua-lpeg/Portfile 2013-03-28 21:22:31 UTC (rev 104576)
@@ -1,52 +1,60 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
+
PortSystem 1.0
name lua-lpeg
-version 0.10.2
-revision 1
+license MIT
+version 0.11
categories devel
platforms darwin
-maintainers and.damore openmaintainer
-description Parsing Expression Grammars For Lua
-long_description LPeg is a new pattern-matching library for Lua, based on Parsing \
- Expression Grammars (PEGs). This text is a reference manual for the \
- library
+maintainers and.damore gmail.com:andremm
+description Parsing Expression Grammars for Lua
+long_description LPeg is a new pattern-matching library for Lua, based on \
+ Parsing Expression Grammars (PEGs).
homepage http://www.inf.puc-rio.br/~roberto/lpeg
master_sites ${homepage}
distname lpeg-${version}
-checksums md5 1402433f02e37ddadff04a3d4118b026 \
- sha1 f2cd5857efb6e1bb02dfb9fbd68e74a451467462 \
- rmd160 77dc2f7ca88ac84e6f185cf6077aaf88a130c3af
+# upstream archive had a stealth update, setting subdir since it's likely to happen again
+dist_subdir ${name}/${version}_1
+checksums rmd160 2738018cab6231afbaee8045c45543e59ba8fa8d \
+ sha256 234a3be92be6b263bb5b91df7067f1c1e14be2d38dae11184af5fa37436a0571
+
+depends_build port:pkgconfig
depends_lib port:lua
-use_configure no
patchfiles patch-makefile.diff
post-patch {
- reinplace "s|%PREFIX%|${prefix}|" ${worksrcpath}/makefile
- reinplace "s|%COMPILER%|${configure.compiler}|" ${worksrcpath}/makefile
-
reinplace "s|/usr/bin/env lua5.1|${prefix}/bin/lua|" ${worksrcpath}/test.lua
}
-build.env-append CFLAGS="${configure.cflags}" \
- LDFLAGS="${configure.ldflags} -llua -lm"G
+use_configure no
-build.target lpeg.so
+variant universal {}
-# makefile is missing install target, override destroot
+build.target
+build.args CC="${configure.cc} [get_canonical_archflags]" \
+ LUADIR=${prefix}/include \
+ CFLAGS="${configure.cflags}" \
+ LDFLAGS="${configure.ldflags} [exec ${prefix}/bin/pkg-config lua --libs]"
+
destroot {
- xinstall -d 755 ${destroot}${prefix}/lib/lua/5.1
- xinstall -m 644 ${worksrcpath}/lpeg.so ${destroot}${prefix}/lib/lua/5.1
+ set lua_cmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_CMOD]
+ set lua_lmod [exec ${prefix}/bin/pkg-config lua --variable INSTALL_LMOD]
+ set lua_docdir ${prefix}/share/doc/${name}
+ set lua_exampledir ${prefix}/share/examples/${name}
- xinstall -d 755 ${destroot}${prefix}/share/doc/${name}
- xinstall -m 644 \
- -W ${worksrcpath} lpeg.html re.html lpeg-128.gif HISTORY \
- ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 755 -d \
+ ${destroot}${lua_cmod} \
+ ${destroot}${lua_lmod} \
+ ${destroot}${lua_docdir} \
+ ${destroot}${lua_exampledir}
- xinstall -d 755 ${destroot}${prefix}/share/examples/${name}
- xinstall -m 755 ${worksrcpath}/test.lua ${destroot}${prefix}/share/examples/${name}
- xinstall -m 644 ${worksrcpath}/re.lua ${destroot}${prefix}/share/examples/${name}
+ xinstall ${worksrcpath}/lpeg.so ${destroot}${lua_cmod}
+ xinstall ${worksrcpath}/re.lua ${destroot}${lua_lmod}
+
+ xinstall -m 644 -W ${worksrcpath} HISTORY lpeg-128.gif lpeg.html re.html ${destroot}${lua_docdir}
+ xinstall -m 755 ${worksrcpath}/test.lua ${destroot}${lua_exampledir}
}
-
Modified: trunk/dports/devel/lua-lpeg/files/patch-makefile.diff
===================================================================
--- trunk/dports/devel/lua-lpeg/files/patch-makefile.diff 2013-03-28 19:44:15 UTC (rev 104575)
+++ trunk/dports/devel/lua-lpeg/files/patch-makefile.diff 2013-03-28 21:22:31 UTC (rev 104576)
@@ -1,42 +1,18 @@
---- makefile.orig 2012-02-13 17:04:53.000000000 +0100
-+++ makefile 2012-02-13 17:09:39.000000000 +0100
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
--LUADIR = /usr/include/lua5.1/
-+LUADIR = %PREFIX%/include
+--- makefile.orig 2013-03-27 20:08:01.000000000 +0100
++++ makefile 2013-03-27 22:33:43.000000000 +0100
+@@ -26,12 +26,12 @@
+ CC = gcc
--COPT = -O2 -DNDEBUG
-+COPT = -DNDEBUG
-
- CWARNS = -Wall -Wextra -pedantic \
- -Waggregate-return \
-@@ -21,16 +21,16 @@
- # -Wunreachable-code \
-
-
--CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR)
--CC = gcc
-+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR)
-+CC = %COMPILER%
-
# For Linux
--DLLFLAGS = -shared -fpic
+-DLLFLAGS = -shared -fPIC
-ENV =
-+#DLLFLAGS = -shared -fpic
++#DLLFLAGS = -shared -fPIC
+#ENV =
# For Mac OS
--# ENV = MACOSX_DEPLOYMENT_TARGET=10.4
+ # ENV = MACOSX_DEPLOYMENT_TARGET=10.4
-# DLLFLAGS = -bundle -undefined dynamic_lookup
-+ENV = MACOSX_DEPLOYMENT_TARGET=10.4
-+DLLFLAGS = $(LDFLAGS) -bundle -undefined dynamic_lookup
++ DLLFLAGS = -bundle -undefined dynamic_lookup
- lpeg.so: lpeg.o
- env $(ENV) $(CC) $(DLLFLAGS) lpeg.o -o lpeg.so
-@@ -38,5 +38,5 @@
- lpeg.o: makefile lpeg.c lpeg.h
- test: test.lua re.lua lpeg.so
-- test.lua
-+ ./test.lua
-
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130328/35e3ac2c/attachment-0001.html>
More information about the macports-changes
mailing list