[107095] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Mon Jun 17 20:43:25 PDT 2013


Revision: 107095
          https://trac.macports.org/changeset/107095
Author:   ryandesign at macports.org
Date:     2013-06-17 20:43:24 -0700 (Mon, 17 Jun 2013)
Log Message:
-----------
libgphoto2, gphoto2: update to 2.5.2

Modified Paths:
--------------
    trunk/dports/devel/libgphoto2/Portfile
    trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff
    trunk/dports/graphics/gphoto2/Portfile

Removed Paths:
-------------
    trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff
    trunk/dports/devel/libgphoto2/files/patch-configure.diff

Modified: trunk/dports/devel/libgphoto2/Portfile
===================================================================
--- trunk/dports/devel/libgphoto2/Portfile	2013-06-18 02:28:18 UTC (rev 107094)
+++ trunk/dports/devel/libgphoto2/Portfile	2013-06-18 03:43:24 UTC (rev 107095)
@@ -3,7 +3,7 @@
 
 PortSystem          1.0
 name                libgphoto2
-version             2.5.1.1
+version             2.5.2
 categories          devel
 license             LGPL-2+
 maintainers         nomaintainer
@@ -18,8 +18,8 @@
 master_sites        sourceforge:project/gphoto/libgphoto/${version}
 use_bzip2           yes
 
-checksums           rmd160  7880e6d0ddd7e9f6c4b4c0d53507bd52be01055c \
-                    sha256  b4a3a9eeb89bc90d1d10f291e792d7744f415ebc4c4347f4177e83dcb3b7ed14
+checksums           rmd160  bb7ab0c59b6c9f0909a2c5047d222b713295a952 \
+                    sha256  a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
 
 depends_build       port:pkgconfig
 depends_lib         path:bin/dbus-daemon:dbus \
@@ -29,12 +29,10 @@
                     port:libiconv \
                     port:libpng \
                     port:libusb-compat \
+                    port:libxml2 \
                     port:libtool \
                     port:gd2
 
-patchfiles          patch-configure.diff patch-configure-nodoxygen.diff \
-                    patch-camlibs_Makefile.in.diff
-
 # Use CPATH and LIBRARY_PATH for ${prefix}/include and ${prefix}/lib
 configure.ldflags-delete  -L${prefix}/lib
 configure.cppflags-delete -I${prefix}/include
@@ -42,20 +40,19 @@
 # https://sourceforge.net/p/gphoto/bugs/935/
 configure.cppflags-append -D_DARWIN_C_SOURCE
 
-configure.args      --mandir=${prefix}/share/man \
-                    --with-drivers=all --with-libexif=auto
+# https://sourceforge.net/p/gphoto/bugs/957/
+configure.cppflags-append -I${prefix}/include/libxml2
 
-variant without_libexif description {Disable libexif support} {
-   depends_lib-delete      port:libexif
-   configure.args-delete   --with-libexif=auto
-   configure.args-append   --with-libexif=no
-}
+configure.args      --with-drivers=all \
+                    --with-libexif=${prefix}
 
 variant doxygen description {Use doxygen to generate API docs} {
    depends_build-append   port:doxygen \
                           path:bin/dot:graphviz
-   patchfiles-delete      patch-configure-nodoxygen.diff
 }
+if {![variant_isset doxygen]} {
+    patchfiles-append       patch-configure-nodoxygen.diff
+}
 
 livecheck.type      regex
 livecheck.url       http://sourceforge.net/projects/gphoto/files/

Deleted: trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff	2013-06-18 02:28:18 UTC (rev 107094)
+++ trunk/dports/devel/libgphoto2/files/patch-camlibs_Makefile.in.diff	2013-06-18 03:43:24 UTC (rev 107095)
@@ -1,38 +0,0 @@
---- camlibs/Makefile.in.orig	2013-01-29 02:40:46.000000000 -0600
-+++ camlibs/Makefile.in	2013-02-18 03:43:28.000000000 -0600
-@@ -1071,7 +1071,7 @@
- 	-export-symbols '$(top_srcdir)/camlibs/camlib.sym' \
- 	-rpath '$(camlibdir)'
- 
--camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la
-+camlib_libadd = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
- adc65_la_SOURCES = adc65/adc65.c
- adc65_la_LDFLAGS = $(camlib_ldflags)
- adc65_la_DEPENDENCIES = $(camlib_dependencies)
-@@ -1161,7 +1161,7 @@
- directory_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBEXIF_CFLAGS)
- directory_la_LDFLAGS = $(camlib_ldflags)
- directory_la_DEPENDENCIES = $(camlib_dependencies)
--directory_la_LIBADD = $(LIBEXIF_LIBS) $(top_builddir)/libgphoto2/libgphoto2.la
-+directory_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la $(LIBEXIF_LIBS)
- enigma13_la_SOURCES = enigma13/enigma13.c
- enigma13_la_LDFLAGS = $(camlib_ldflags)
- enigma13_la_DEPENDENCIES = $(camlib_dependencies)
-@@ -1394,7 +1394,7 @@
- 
- sierra_la_LDFLAGS = $(camlib_ldflags)
- sierra_la_DEPENDENCIES = $(camlib_dependencies)
--sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(LIBEXIF_LIBS)
-+sierra_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la $(LIBEXIF_LIBS)
- sipix_blink_la_SOURCES = sipix/blink.c
- sipix_blink_la_LDFLAGS = $(camlib_ldflags)
- sipix_blink_la_DEPENDENCIES = $(camlib_dependencies)
-@@ -1428,7 +1428,7 @@
- 
- sony_dscf1_la_LDFLAGS = $(camlib_ldflags)
- sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies)
--sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la 
-+sony_dscf1_la_LIBADD = $(top_builddir)/libgphoto2/libgphoto2.la $(top_builddir)/libgphoto2_port/libgphoto2_port/libgphoto2_port.la
- sony_dscf55_la_SOURCES = \
- 	sonydscf55/sony.c sonydscf55/sony.h \
- 	sonydscf55/camera.c sonydscf55/nls.h

Modified: trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff	2013-06-18 02:28:18 UTC (rev 107094)
+++ trunk/dports/devel/libgphoto2/files/patch-configure-nodoxygen.diff	2013-06-18 03:43:24 UTC (rev 107095)
@@ -1,6 +1,6 @@
---- configure.orig	2013-02-18 03:43:28.000000000 -0600
-+++ configure	2013-02-18 03:43:28.000000000 -0600
-@@ -21150,7 +21150,7 @@
+--- configure.orig	2013-05-05 09:51:42.000000000 -0500
++++ configure	2013-06-15 23:16:16.000000000 -0500
+@@ -21124,7 +21124,7 @@
    ;;
  esac
  fi

Deleted: trunk/dports/devel/libgphoto2/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/libgphoto2/files/patch-configure.diff	2013-06-18 02:28:18 UTC (rev 107094)
+++ trunk/dports/devel/libgphoto2/files/patch-configure.diff	2013-06-18 03:43:24 UTC (rev 107095)
@@ -1,18 +0,0 @@
---- configure.orig	2013-01-29 02:40:47.000000000 -0600
-+++ configure	2013-02-18 03:44:38.000000000 -0600
-@@ -3269,7 +3269,6 @@
- 
- 
- 
--AM_CPPFLAGS="$CPPFLAGS"
- 
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)"
-@@ -3277,6 +3276,7 @@
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/libgphoto2"
- AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_builddir)/libgphoto2"
- 
-+AM_CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
- 
- 
- ac_ext=c

Modified: trunk/dports/graphics/gphoto2/Portfile
===================================================================
--- trunk/dports/graphics/gphoto2/Portfile	2013-06-18 02:28:18 UTC (rev 107094)
+++ trunk/dports/graphics/gphoto2/Portfile	2013-06-18 03:43:24 UTC (rev 107095)
@@ -2,7 +2,7 @@
 
 PortSystem          1.0
 name                gphoto2
-version             2.5.1
+version             2.5.2
 categories          graphics
 license             LGPL-2.1+
 maintainers         nomaintainer
@@ -17,8 +17,8 @@
 master_sites        sourceforge:project/gphoto/gphoto/${version}
 use_bzip2           yes
 
-checksums           rmd160  9794da2123908b640b8af2cc7a8d153f81e752f3 \
-                    sha256  4ddd48aa6db00e318de3f4f3d0e1f171eebcc5641bbc0b4eaf2bf0edce31f68b
+checksums           rmd160  b269600cea3d53f7081d4dc18f37b11954e8e644 \
+                    sha256  8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
 
 depends_build       path:bin/pkg-config:pkgconfig
 depends_lib         port:gettext \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130617/04f9d5a1/attachment.html>


More information about the macports-changes mailing list