Revision
129018
Author
devans@macports.org
Date
2014-12-03 05:57:25 -0800 (Wed, 03 Dec 2014)

Log Message

rrdtool: configure to build with perl5.16, drop +python2[56] variants, optional +python27 remains, dependencies, increment revision.

Modified Paths

Diff

Modified: trunk/dports/net/rrdtool/Portfile (129017 => 129018)


--- trunk/dports/net/rrdtool/Portfile	2014-12-03 13:19:01 UTC (rev 129017)
+++ trunk/dports/net/rrdtool/Portfile	2014-12-03 13:57:25 UTC (rev 129018)
@@ -5,6 +5,7 @@
 
 name                rrdtool
 version             1.4.9
+revision            1
 categories          net
 license             GPL-2+
 maintainers         nomaintainer
@@ -25,15 +26,18 @@
                     port:libffi \
                     port:gettext \
                     path:lib/pkgconfig/pango.pc:pango \
-                    path:bin/perl:perl5 \
+                    port:perl5.16 \
                     port:tcl \
                     port:zlib \
                     port:libpng \
                     port:libxml2 \
-                    port:intltool
+                    port:intltool \
+                    port:tcp_wrappers
 
 patchfiles          patch-bindings_lua_Makefile_in.diff
 
+configure.perl      ${prefix}/bin/perl5.16
+
 configure.args      --enable-perl-site-install \
                     --with-perl-options="INSTALLDIRS=vendor" \
                     --with-tcllib=${prefix}/lib \
@@ -56,21 +60,7 @@
     }
 }
 
-variant python25 description {Python 2.5 bindings for RRDtool} conflicts python26 python27 {
-    depends_lib-append      port:python25
-    configure.python        ${prefix}/bin/python2.5
-    configure.args-delete   --disable-python
-    configure.args-append   --enable-python
-}
-
-variant python26 description {Python 2.6 bindings for RRDtool} conflicts python25 python27 {
-    depends_lib-append      port:python26
-    configure.python        ${prefix}/bin/python2.6
-    configure.args-delete   --disable-python
-    configure.args-append   --enable-python
-}
-
-variant python27 description {Python 2.7 bindings for RRDtool} conflicts python25 python26 {
+variant python27 description {Python 2.7 bindings for RRDtool} {
     depends_lib-append      port:python27
     configure.python        ${prefix}/bin/python2.7
     configure.args-delete   --disable-python

Modified: trunk/dports/net/rrdtool/files/patch-bindings_lua_Makefile_in.diff (129017 => 129018)


--- trunk/dports/net/rrdtool/files/patch-bindings_lua_Makefile_in.diff	2014-12-03 13:19:01 UTC (rev 129017)
+++ trunk/dports/net/rrdtool/files/patch-bindings_lua_Makefile_in.diff	2014-12-03 13:57:25 UTC (rev 129018)
@@ -1,6 +1,6 @@
---- bindings/lua/Makefile.in.orig	2011-01-21 22:34:18.000000000 +0100
-+++ bindings/lua/Makefile.in	2011-01-21 22:36:49.000000000 +0100
-@@ -330,7 +330,7 @@
+--- bindings/lua/Makefile.in.orig	2014-09-29 15:46:44.000000000 -0700
++++ bindings/lua/Makefile.in	2014-12-03 05:41:40.000000000 -0800
+@@ -416,7 +416,7 @@
  @LUA_NEED_OUR_COMPAT51_TRUE@compatdir = $(LUA_INSTALL_LMOD)
  @LUA_NEED_OUR_COMPAT51_TRUE@compat_DATA = compat-5.1r5/compat-5.1.lua
  rrd_la_LIBADD = -lrrd -lm