[Olena-patches] last-svn-commit-984-g2bad7ae Fix Portfile related dependencies.

* Makefile.am: Improve Portfile dependencies. * distrib/macports/Portfile.in: Add package dependencies. --- ChangeLog | 8 ++++++++ Makefile.am | 2 +- distrib/macports/Portfile.in | 8 +++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e0ea05..1909858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Portfile related dependencies. + + * Makefile.am: Improve Portfile dependencies. + + * distrib/macports/Portfile.in: Add package dependencies. + 2011-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> Generate a valid Portfile for MacPorts support. diff --git a/Makefile.am b/Makefile.am index 636f10b..66dc10c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ do_subst = sed -e 's|@packagename[@]|$(PACKAGE_TARNAME)|g' \ -e "s|@package_sha1[@]|`openssl sha1 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" \ -e "s|@package_rmd160[@]|`openssl rmd160 $(TARBALL_GZ) | cut -d ' ' -f 2`|g" -$(PORTFILE): dist $(top_srcdir)/distrib/macports/Portfile.in Makefile +$(PORTFILE): $(top_srcdir)/distrib/macports/Portfile.in Makefile dist rm -f $@ $@.tmp rm -Rf distrib srcdir=''; \ diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index 129a5e8..54e45eb 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -20,15 +20,17 @@ checksums md5 @package_md5@ \ sha1 @package_sha1@ \ rmd160 @package_rmd160@ -depends_lib port:GraphicsMagick \ +depends_lib port:ImageMagick \ port:tiff supported_archs i386 x86_64 variant scribo description {Add a DIA framework} { depends_lib-append port:tesseract \ - port:qt4-mac \ - port:fop + port:qt4-mac \ + port:fop \ + port:libxslt + configure.args-append --enable-scribo } -- 1.7.2.5