[121998] trunk/dports/gnome/gexiv2

devans at macports.org devans at macports.org
Sat Jul 12 17:28:48 PDT 2014


Revision: 121998
          https://trac.macports.org/changeset/121998
Author:   devans at macports.org
Date:     2014-07-12 17:28:48 -0700 (Sat, 12 Jul 2014)
Log Message:
-----------
gexiv2: update to version 0.10.1, livecheck, add +python34 variant.

Modified Paths:
--------------
    trunk/dports/gnome/gexiv2/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff
    trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/gnome/gexiv2/files/patch-Makefile.diff
    trunk/dports/gnome/gexiv2/files/patch-configure.diff

Property Changed:
----------------
    trunk/dports/gnome/gexiv2/


Property changes on: trunk/dports/gnome/gexiv2
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/gnome/gexiv2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/dports/gnome/gexiv2:116764-121996
/users/rmstonecipher/gnome/gexiv2:102363-103172

Modified: trunk/dports/gnome/gexiv2/Portfile
===================================================================
--- trunk/dports/gnome/gexiv2/Portfile	2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/Portfile	2014-07-13 00:28:48 UTC (rev 121998)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            gexiv2
-version         0.7.0
-revision        1
+version         0.10.1
 license         GPL-2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     gexiv2 is a GObject-based wrapper around the exiv2 library.
@@ -23,22 +22,24 @@
 
 use_xz          yes
 
-checksums       rmd160  1a94722c86544c5b788364b60ec178e631809222 \
-                sha256  b631fe02402014cb52f22647b384972776ada31cbd3c3f187014b6535461ee8a
+checksums       rmd160  d5bd9a657171527b1af05ef04ad1073e9be9b7d2 \
+                sha256  7675752a59c2f091560be1f39514ef492ec705b9fdea5f52281672e6b3eba2c7
 
-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 \
+                patch-Makefile.am.diff
 
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args  --enable-introspection \
-                --with-libtool=${prefix}/bin/glibtool
+                --disable-silent-rules
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
@@ -50,20 +51,25 @@
     configure.env-append    PYTHON2=${prefix}/bin/python2.7
 }
 
-variant python32 conflicts python33 description {Build with support for Python 3.2} {
+variant python32 conflicts python33 python34 description {Build with support for Python 3.2} {
     depends_lib-append      port:py32-gobject3
     configure.env-append    PYTHON3=${prefix}/bin/python3.2
 }
 
-variant python33 conflicts python32 description {Build with support for Python 3.3} {
+variant python33 conflicts python32 python34 description {Build with support for Python 3.3} {
     depends_lib-append      port:py33-gobject3
     configure.env-append    PYTHON3=${prefix}/bin/python3.3
 }
 
-if {![variant_isset python33]} {
-    default_variants +python32
+variant python34 conflicts python32 python33 description {Build with support for Python 3.4} {
+    depends_lib-append      port:py34-gobject3
+    configure.env-append    PYTHON3=${prefix}/bin/python3.4
 }
 
+if {![variant_isset python32] & ![variant_isset python34]} {
+    default_variants +python33
+}
+
 default_variants +python27
 
-livecheck.type  gnome-with-unstable
+livecheck.type  gnome

Copied: trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff (from rev 121996, users/devans/dports/gnome/gexiv2/files/patch-Makefile.am.diff)
===================================================================
--- trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/gnome/gexiv2/files/patch-Makefile.am.diff	2014-07-13 00:28:48 UTC (rev 121998)
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2014-07-12 11:56:37.000000000 -0700
++++ Makefile.am	2014-07-12 11:57:40.000000000 -0700
+@@ -140,6 +140,6 @@
+ 		-I @PACKAGE_NAME@                           \
+ 		$(GEXIV2_public_HEADERS)      \
+ 		--library lib at PACKAGE_NAME@.la                \
+-		$(LIBTOOL)                              \
++		--libtool "$(LIBTOOL)"                  \
+ 		--pkg=gobject-2.0
+ 

Deleted: trunk/dports/gnome/gexiv2/files/patch-Makefile.diff
===================================================================
--- trunk/dports/gnome/gexiv2/files/patch-Makefile.diff	2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/files/patch-Makefile.diff	2014-07-13 00:28:48 UTC (rev 121998)
@@ -1,106 +0,0 @@
---- Makefile.orig	2013-10-03 16:16:08.000000000 -0700
-+++ Makefile	2013-11-17 11:51:19.000000000 -0800
-@@ -24,14 +24,17 @@
- BUILD_RELEASE=1
- BUILD_DIR=gexiv2
- LIB=lib
-+LIBTOOL=libtool
-+PYTHON2=python2
-+PYTHON3=python3
- 
- -include configure.mk
- 
- # Used to determine where Python wants the .gi file to be installed ... if Python is not installed,
--# PYTHON2 and PYTHON3 will be empty
-+# PYTHON2_OVERRIDES_DIR and PYTHON3_OVERRIDES_DIR will be empty
- PYTHON="import gi; print(gi._overridesdir)"
--PYTHON2=$(shell python2 -c $(PYTHON) 2> /dev/null)
--PYTHON3=$(shell python3 -c $(PYTHON) 2> /dev/null)
-+PYTHON2_OVERRIDES_DIR=$(shell $(PYTHON2) -c $(PYTHON) 2> /dev/null)
-+PYTHON3_OVERRIDES_DIR=$(shell $(PYTHON3) -c $(PYTHON) 2> /dev/null)
- 
- TYPELIB=`pkg-config gobject-introspection-no-export-1.0 --variable typelibdir`
- 
-@@ -133,7 +136,7 @@
- endif
- endif
- 
--CFLAGS += $(REQUIRED_CFLAGS)
-+#CFLAGS += $(REQUIRED_CFLAGS)
- 
- all: $(LIBRARY_BIN) $(PC_FILE) $(TYPELIB_FILE)
- 
-@@ -152,7 +155,7 @@
- 		$(EXPANDED_INSTALLED_HEADER_FILES)      \
- 		$(EXPANDED_SRC_FILES)                   \
- 		--library $(LIBRARY_BIN)                \
--		$(LIBTOOL)                              \
-+		--libtool=$(LIBTOOL)                              \
- 		--pkg=gobject-2.0
- 
- clean:
-@@ -181,7 +184,7 @@
- .PHONY: install
- install:
- 	@mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)
--	libtool --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(LIBRARY).la $(DESTDIR)$(PREFIX)/$(LIB)
- 	@mkdir -p $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- 	$(INSTALL_DATA) $(EXPANDED_INSTALLED_HEADER_FILES) $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- 	@mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-@@ -194,13 +197,13 @@
- 	@mkdir -p $(DESTDIR)$(TYPELIB)
- 	$(INSTALL_DATA) GExiv2-$(GIR_VERSION).typelib $(DESTDIR)$(TYPELIB)
- # No introspection, no .gi file for the Python module to call into
--ifneq "$(PYTHON2)" ""
--	@mkdir -p $(DESTDIR)$(PYTHON2)
--	$(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON2)
--endif
--ifneq "$(PYTHON3)" ""
--	@mkdir -p $(DESTDIR)$(PYTHON3)
--	$(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON3)
-+ifneq "$(PYTHON2_OVERRIDES_DIR)" ""
-+	@mkdir -p $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)
-+	$(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)
-+endif
-+ifneq "$(PYTHON3_OVERRIDES_DIR)" ""
-+	@mkdir -p $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)
-+	$(INSTALL_DATA) GExiv2.py $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)
- endif
- endif
- 
-@@ -209,18 +212,18 @@
- 	$(INSTALL_DATA) $(VAPI_FILE) $(DESTDIR)$(PREFIX)/share/vala/vapi
- 
- uninstall:
--	libtool --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
-+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(PREFIX)/$(LIB)/$(LIBRARY).la
- 	rm -rf $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
- 	rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PKGNAME).pc
- 	rm -f $(DESTDIR)$(PREFIX)/share/vala/vapi/$(PKGNAME).vapi
- ifdef ENABLE_INTROSPECTION
- 	rm -f $(DESTDIR)$(PREFIX)/share/gir-1.0/GExiv2-$(GIR_VERSION).gir
- 	rm -f $(DESTDIR)$(TYPELIB)/GExiv2-$(GIR_VERSION).typelib
--ifneq "$(PYTHON2)" ""
--	rm -rf $(DESTDIR)$(PYTHON2)/GExiv2.py
-+ifneq "$(PYTHON2_OVERRIDES_DIR)" ""
-+	rm -rf $(DESTDIR)$(PYTHON2_OVERRIDES_DIR)/GExiv2.py
- endif
--ifneq "$(PYTHON3)" ""
--	rm -rf $(DESTDIR)$(PYTHON3)/GExiv2.py
-+ifneq "$(PYTHON3_OVERRIDES_DIR)" ""
-+	rm -rf $(DESTDIR)$(PYTHON3_OVERRIDES_DIR)/GExiv2.py
- endif
- endif
- 
-@@ -236,8 +239,8 @@
- $(EXPANDED_LO_FILES): $(BUILD_DIR)/%.lo: gexiv2/%.cpp $(EXPANDED_HEADER_FILES) $(CONFIG_IN) Makefile
- 	@pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)'
- 	@mkdir -p $(BUILD_DIR)
--	libtool --mode=compile --tag=CC $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I. -o $@ $<
-+	$(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) $(CPPFLAGS) -I. -o $@ $<
- 
- $(LIBRARY_BIN): $(EXPANDED_LO_FILES)
--	libtool --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -version-info $(VERSION_INFO) -o $(LIBRARY_BIN)
-+	$(LIBTOOL) --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -version-info $(VERSION_INFO) -o $(LIBRARY_BIN)
- 

Copied: trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff (from rev 121996, users/devans/dports/gnome/gexiv2/files/patch-configure.ac.diff)
===================================================================
--- trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/gexiv2/files/patch-configure.ac.diff	2014-07-13 00:28:48 UTC (rev 121998)
@@ -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: trunk/dports/gnome/gexiv2/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/gexiv2/files/patch-configure.diff	2014-07-13 00:03:56 UTC (rev 121997)
+++ trunk/dports/gnome/gexiv2/files/patch-configure.diff	2014-07-13 00:28:48 UTC (rev 121998)
@@ -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/20140712/82d75dd8/attachment-0001.html>


More information about the macports-changes mailing list