[119281] users/devans/dports/gnome/gexiv2

[devans at macports.org]

Revision: 119281
          https://trac.macports.org/changeset/119281
Author:   devans at macports.org
Date:     2014-04-21 19:46:49 -0700 (Mon, 21 Apr 2014)
Log Message:
-----------
devans/macports: gexiv2, patch configure.ac and autoreconf to fix python configuration, update build dependencies.

Modified Paths:
--------------
    users/devans/dports/gnome/gexiv2/Portfile

Added Paths:
-----------
    users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff

Removed Paths:
-------------
    users/devans/dports/gnome/gexiv2/files/patch-configure.diff

Modified: users/devans/dports/gnome/gexiv2/Portfile
===================================================================
--- users/devans/dports/gnome/gexiv2/Portfile	2014-04-22 00:35:36 UTC (rev 119280)
+++ users/devans/dports/gnome/gexiv2/Portfile	2014-04-22 02:46:49 UTC (rev 119281)
@@ -25,17 +25,18 @@
 checksums       rmd160  b53717fbc50d74aa76717af5cc57ba6a86b5f18d \
                 sha256  9c8c97b36a0d4ca6656488b88908e4c94efb0dfc1b0e3e0850e38b90a9a30031
 
-depends_build   port:pkgconfig \
-                port:libtool
+depends_build   port:pkgconfig
 
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:gobject-introspection \
                 port:vala \
                 port:exiv2
 
-#patchfiles      patch-configure.diff \
-#                patch-Makefile.diff
+patchfiles      patch-configure.ac.diff
 
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args  --enable-introspection
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env

Added: users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff
===================================================================
--- users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff	                        (rev 0)
+++ users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff	2014-04-22 02:46:49 UTC (rev 119281)
@@ -0,0 +1,16 @@
+--- configure.ac.orig	2014-04-21 15:56:32.000000000 -0700
++++ configure.ac	2014-04-21 15:59:00.000000000 -0700
+@@ -122,10 +122,10 @@
+ if test "x$enable_introspection" = "xyes"; then
+     # Used to determine where Python wants the .gi file to be installed ...
+     # if Python is not installed, PYTHON2 and PYTHON3 will be empty
+-    PYTHON="import gi; print(gi._overridesdir)"
+-    PYTHON2_GIDIR=$(python2 -c "$PYTHON")
++    PYTHON_SCRIPT="import gi; print(gi._overridesdir)"
++    PYTHON2_GIDIR=`$PYTHON2 -c "$PYTHON_SCRIPT"`
+     AC_MSG_RESULT([Python2 GObject Introspection directory: $PYTHON2_GIDIR])
+-    PYTHON3_GIDIR=$(python3 -c "$PYTHON")
++    PYTHON3_GIDIR=`$PYTHON3 -c "$PYTHON_SCRIPT"`
+     AC_MSG_RESULT([Python3 GObject Introspection directory: $PYTHON3_GIDIR])
+     if test "x$PYTHON2_GIDIR" != "x"; then
+         enable_python2=yes

Deleted: users/devans/dports/gnome/gexiv2/files/patch-configure.diff
===================================================================
--- users/devans/dports/gnome/gexiv2/files/patch-configure.diff	2014-04-22 00:35:36 UTC (rev 119280)
+++ users/devans/dports/gnome/gexiv2/files/patch-configure.diff	2014-04-22 02:46:49 UTC (rev 119281)
@@ -1,26 +0,0 @@
---- configure.orig	2013-06-06 16:44:40.000000000 -0700
-+++ configure	2013-11-17 11:53:19.000000000 -0800
-@@ -60,7 +60,7 @@
-                                 abort $1
-                             fi
-                             
--                            variables="${variables}LIBTOOL=--libtool=$value\n"
-+                            variables="${variables}LIBTOOL=$value\n"
-                             ;;
-         
-         --assume-pkgs)      variables="${variables}ASSUME_PKGS=1\n"
-@@ -97,6 +97,14 @@
- then
-     echo -e -n $variables > $CONFIG_IN
- fi
-+
-+echo "CXX=${CXX}" >> $CONFIG_IN
-+echo "CPPFLAGS=${CPPFLAGS}" >> $CONFIG_IN
-+echo "CFLAGS=${CXXFLAGS}" >> $CONFIG_IN
-+echo "LDFLAGS=${CXXFLAGS}" >> $CONFIG_IN
-+echo "PYTHON2=${PYTHON2}" >> $CONFIG_IN
-+echo "PYTHON3=${PYTHON3}" >> $CONFIG_IN
-+
- echo "CONFIG_IN=${CONFIG_IN}" >> $CONFIG_IN
- 
- printf "Configured.  Type 'make' to build, 'make install' to install.\n"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140421/096f07a8/attachment.html>