[72374] trunk/dports/databases/kyototycoon

[stromnov at macports.org]

Revision: 72374
          http://trac.macports.org/changeset/72374
Author:   stromnov at macports.org
Date:     2010-10-12 02:42:58 -0700 (Tue, 12 Oct 2010)
Log Message:
-----------
kyototycoon: add lua variant

Modified Paths:
--------------
    trunk/dports/databases/kyototycoon/Portfile
    trunk/dports/databases/kyototycoon/files/patch-configure.diff

Added Paths:
-----------
    trunk/dports/databases/kyototycoon/files/patch-Makefile.in.diff

Modified: trunk/dports/databases/kyototycoon/Portfile
===================================================================
--- trunk/dports/databases/kyototycoon/Portfile	2010-10-12 09:29:01 UTC (rev 72373)
+++ trunk/dports/databases/kyototycoon/Portfile	2010-10-12 09:42:58 UTC (rev 72374)
@@ -5,7 +5,7 @@
 
 name                kyototycoon
 version             0.8.1
-revision            0
+revision            1
 categories          databases
 maintainers         stromnov openmaintainer
 platforms           darwin
@@ -31,7 +31,8 @@
                     sha1    60254fb628382b54881fc5d5ee2c11814a5e9c7b \
                     rmd160  dfbfe3835ce140f8e48acc90e677d9994d1f54c1
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff \
+                    patch-Makefile.in.diff
 
 depends_lib         port:kyotocabinet
 
@@ -62,6 +63,12 @@
     configure.args-append   --enable-profile
 }
 
+variant lua description {build with Lua extension} {
+    configure.args-delete   --disable-lua
+    configure.args-append   --enable-lua
+    depends_lib-append      port:lua
+}
+
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/databases/kyototycoon/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/databases/kyototycoon/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/databases/kyototycoon/files/patch-Makefile.in.diff	2010-10-12 09:42:58 UTC (rev 72374)
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2010-10-12 13:32:27.000000000 +0400
++++ Makefile.in	2010-10-12 13:33:55.000000000 +0400
+@@ -52,8 +52,8 @@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = LD_RUN_PATH=$(LIBDIR):/lib:/usr/lib:@MYRUNPATH@
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR):/lib:/usr/lib:@MYRUNPATH@
+ POSTCMD = @MYPOSTCMD@
+ 
+ 

Modified: trunk/dports/databases/kyototycoon/files/patch-configure.diff
===================================================================
--- trunk/dports/databases/kyototycoon/files/patch-configure.diff	2010-10-12 09:29:01 UTC (rev 72373)
+++ trunk/dports/databases/kyototycoon/files/patch-configure.diff	2010-10-12 09:42:58 UTC (rev 72374)
@@ -1,5 +1,5 @@
---- configure.orig	2010-10-12 13:23:29.000000000 +0400
-+++ configure	2010-10-12 13:24:43.000000000 +0400
+--- configure.orig	2010-10-12 13:35:03.000000000 +0400
++++ configure	2010-10-12 13:39:31.000000000 +0400
 @@ -2093,26 +2093,15 @@
  # Building flags
  MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -O2"
@@ -29,7 +29,24 @@
  #================================================================
  # Options
  #================================================================
-@@ -3384,25 +3373,6 @@
+@@ -2210,16 +2199,6 @@
+ then
+   luaver=`lua -e 'v = string.gsub(_VERSION, ".* ", ""); print(v)'`
+   MYCPPFLAGS="$MYCPPFLAGS -D_MYLUA"
+-  MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua$luaver -I/usr/local/include/lua$luaver"
+-  MYCPPFLAGS="$MYCPPFLAGS -I/usr/include/lua -I/usr/local/include/lua"
+-  MYLDFLAGS="$MYLDFLAGS -L/usr/lib/lua$luaver -L/usr/local/lib/lua$luaver"
+-  MYLDFLAGS="$MYLDFLAGS -L/usr/lib/lua -L/usr/local/lib/lua"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/lua$luaver:/usr/local/lib/lua$luaver"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/lua:/usr/local/lib/lua"
+-  LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua$luaver:/usr/local/lib/lua$luaver"
+-  LIBRARY_PATH="$LIBRARY_PATH:/usr/lib/lua:/usr/local/lib/lua"
+-  CPATH="$CPATH:/usr/include/lua$luaver:/usr/local/include/lua$luaver"
+-  CPATH="$CPATH:/usr/include/lua:/usr/local/include/lua"
+   enables="$enables (lua)"
+ fi
+ 
+@@ -3384,25 +3363,6 @@
  test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
  test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101012/bfbc1691/attachment.html>