[120111] users/devans/dports
devans at macports.org
devans at macports.org
Thu May 15 14:10:46 PDT 2014
Revision: 120111
https://trac.macports.org/changeset/120111
Author: devans at macports.org
Date: 2014-05-15 14:10:45 -0700 (Thu, 15 May 2014)
Log Message:
-----------
devans/dports: copy abiword-x11 from trunk and update to version 3.0.0 for testing.
Modified Paths:
--------------
users/devans/dports/comms/telepathy-haze/Portfile
users/devans/dports/editors/abiword-x11/Portfile
users/devans/dports/editors/abiword-x11/files/patch-configure.diff
users/devans/dports/gnome/gexiv2/Portfile
users/devans/dports/graphics/poppler/Portfile
users/devans/dports/net/pidgin/Portfile
users/devans/dports/textproc/libplist/Portfile
Added Paths:
-----------
users/devans/dports/comms/
users/devans/dports/comms/telepathy-haze/
users/devans/dports/editors/
users/devans/dports/editors/abiword-x11/
users/devans/dports/graphics/poppler/
users/devans/dports/textproc/
users/devans/dports/textproc/libplist/
Removed Paths:
-------------
users/devans/dports/editors/abiword-x11/files/patch-glib-2.32.diff
users/devans/dports/editors/abiword-x11/files/patch-libpng-1.5.diff
users/devans/dports/editors/abiword-x11/files/patch-src-Makefile.in.diff
Modified: users/devans/dports/comms/telepathy-haze/Portfile
===================================================================
--- trunk/dports/comms/telepathy-haze/Portfile 2014-05-07 14:51:18 UTC (rev 119812)
+++ users/devans/dports/comms/telepathy-haze/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -28,7 +28,7 @@
depends_lib port:dbus-glib \
port:telepathy-glib \
- port:pidgin
+ port:libpurple
#
# pidgin is not universal
Modified: users/devans/dports/editors/abiword-x11/Portfile
===================================================================
--- trunk/dports/editors/abiword-x11/Portfile 2014-05-15 15:32:23 UTC (rev 120104)
+++ users/devans/dports/editors/abiword-x11/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -5,8 +5,7 @@
name abiword-x11
set dname abiword
-version 2.8.6
-revision 4
+version 3.0.0
license GPL
description A word processor with gnome support.
long_description \
@@ -18,33 +17,51 @@
master_sites http://www.abisource.org/downloads/${dname}/${version}/source \
http://www.nl.abisource.com/downloads/${dname}/${version}/source
-checksums md5 f883b0a7f26229a9c66fd6a1a94381aa \
- sha1 998f69d038000b3fc027d4259548f02d67c8d0df \
- rmd160 caabab25d197f9553ea12376de36fc7f5a771a58
-
distname ${dname}-${version}
-patchfiles patch-configure.diff \
- patch-glib-2.32.diff \
- patch-libpng-1.5.diff \
- patch-src-Makefile.in.diff
+checksums rmd160 a3252631bebf28ac22308ce71ad276d9c5280592 \
+ sha256 d17e318c00ff4eb353e0e7994b098b1d4f9ddd8712ac0261a0e38b89081fac01
+patchfiles patch-configure.diff
+
depends_build port:pkgconfig
-depends_lib port:desktop-file-utils \
- port:libgnomeui \
+depends_lib port:gtk3 \
+ port:boost \
+ port:libpng \
+ port:jpeg \
+ port:libwmf \
+ port:librsvg \
+ port:zlib \
+ port:fribidi \
port:libgsf \
- port:fribidi \
+ port:libwpd \
+ port:libwpg \
port:wv \
+ port:libxslt \
port:enchant \
- port:libpng \
- port:librsvg
+ port:goffice \
+ port:libchamplain \
+ port:libical \
+ port:redland \
+ port:rasqal \
+ port:dbus-glib \
+ port:telepathy-glib \
+ port:gobject-introspection \
+ port:python27 \
+ port:xorg-libX11
-configure.args --disable-default-plugins
+configure.python ${prefix}/bin/python2.7
-#
+configure.args --enable-introspection \
+ --enable-menubutton \
+ --enable-collab-backend-telepathy \
+ --enable-plugins="applix babelfish bmp clarisworks collab command docbook eml epub freetranslation \
+ garble gdict gimp goffice google hancom hrtext iscii kword latex loadbindings mht \
+ mif mswrite opendocument openwriter openxml opml paint passepartout pdb pdf presentation \
+ s5 sdw t602 urldict wikipedia wmf wml wordperfect wpg xslfo"
+
# port wv is not universal
-#
universal_variant no
Modified: users/devans/dports/editors/abiword-x11/files/patch-configure.diff
===================================================================
--- trunk/dports/editors/abiword-x11/files/patch-configure.diff 2014-05-15 15:32:23 UTC (rev 120104)
+++ users/devans/dports/editors/abiword-x11/files/patch-configure.diff 2014-05-15 21:10:45 UTC (rev 120111)
@@ -1,6 +1,6 @@
---- configure.orig 2010-09-23 10:03:49.000000000 -0700
-+++ configure 2010-09-23 10:04:57.000000000 -0700
-@@ -15745,10 +15745,10 @@
+--- configure.orig 2013-10-13 12:02:16.000000000 -0700
++++ configure 2014-05-15 09:39:58.000000000 -0700
+@@ -16748,10 +16748,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform and toolkit" >&5
$as_echo_n "checking for platform and toolkit... " >&6; }
case ${host_os} in
Deleted: users/devans/dports/editors/abiword-x11/files/patch-glib-2.32.diff
===================================================================
--- trunk/dports/editors/abiword-x11/files/patch-glib-2.32.diff 2014-05-15 15:32:23 UTC (rev 120104)
+++ users/devans/dports/editors/abiword-x11/files/patch-glib-2.32.diff 2014-05-15 21:10:45 UTC (rev 120111)
@@ -1,21 +0,0 @@
---- goffice-bits/goffice/app/goffice-app.h.orig 2007-01-16 17:17:27.000000000 -0600
-+++ goffice-bits/goffice/app/goffice-app.h 2012-07-27 16:05:22.000000000 -0500
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
-
--#include <glib/gmacros.h>
-+#include <glib.h>
-
- G_BEGIN_DECLS
-
---- src/af/util/xp/ut_go_file.h.orig 2009-08-27 08:27:10.000000000 -0500
-+++ src/af/util/xp/ut_go_file.h 2012-07-27 16:05:22.000000000 -0500
-@@ -31,7 +31,6 @@
-
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
-
- G_BEGIN_DECLS
Deleted: users/devans/dports/editors/abiword-x11/files/patch-libpng-1.5.diff
===================================================================
--- trunk/dports/editors/abiword-x11/files/patch-libpng-1.5.diff 2014-05-15 15:32:23 UTC (rev 120104)
+++ users/devans/dports/editors/abiword-x11/files/patch-libpng-1.5.diff 2014-05-15 21:10:45 UTC (rev 120111)
@@ -1,139 +0,0 @@
-https://build.opensuse.org/package/view_file?file=abiword-2.8.6-libpng15.patch&package=mingw64-abiword&project=windows%3Amingw%3Awin64
---- src/af/util/xp/ut_png.cpp 2008-02-24 04:33:07.000000000 +0100
-+++ src/af/util/xp/ut_png.cpp 2011-02-24 11:53:18.954524499 +0100
-@@ -71,7 +71,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2009-07-01 06:02:04.000000000 +0200
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2011-02-24 11:53:19.039523946 +0100
-@@ -185,7 +185,7 @@
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- DELETEP(m_pPngBB);
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp 2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp 2011-03-01 20:09:04.810810063 +0000
-@@ -191,7 +191,7 @@
-
- /* Clean Up Memory Used */
-
-- FREEP(m_pPNGInfo->palette);
-+// FREEP(m_pPNGInfo->palette);
- DELETEP(pBB);
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-
-@@ -313,7 +313,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +332,7 @@
- UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- {
- /* Reset error handling for libpng */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- return UT_ERROR;
-@@ -372,7 +372,7 @@
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- /* Reset error handling for libpng */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- return UT_ERROR;
---- plugins/garble/xp/abiword-garble-png.cpp 2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp 2011-03-01 19:39:57.591809416 +0000
-@@ -79,7 +79,7 @@
- png_set_strip_alpha( png_ptr );
- png_set_interlace_handling( png_ptr );
- png_set_bgr( png_ptr );
-- rowbytes = info_ptr->rowbytes;
-+ rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- }
-
---- src/af/gr/win/gr_Win32Image.cpp 2009-07-08 17:33:53.000000000 +0000
-+++ src/af/gr/win/gr_Win32Image.cpp 2011-03-01 18:01:21.651747071 +0000
-@@ -148,7 +148,7 @@
- info_ptr = png_create_info_struct(png_ptr);
-
- // libpng will longjmp back to here if a fatal error occurs
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* If we get here, we had a problem reading the file */
- png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-@@ -547,7 +547,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
---- src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2009-07-07 16:50:18.000000000 +0000
-+++ src/wp/impexp/win/ie_impGraphic_Win32Native.cpp 2011-03-01 19:04:51.469746321 +0000
-@@ -405,7 +405,7 @@
-
- /* Clean Up Memory Used */
-
-- FREEP(m_pPNGInfo->palette);
-+// FREEP(m_pPNGInfo->palette);
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-
- return UT_OK;
-@@ -501,7 +501,7 @@
- * the normal method of doing things with libpng). REQUIRED unless you
- * set up your own error handlers in the png_create_read_struct() earlier.
- */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -520,7 +520,7 @@
- UT_Error IE_ImpGraphic_Win32Native::Convert_BMP_Palette(UT_ByteBuf* pBB)
- {
- /* Reset error handling for libpng */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- return UT_ERROR;
-@@ -560,7 +560,7 @@
- UT_Error IE_ImpGraphic_Win32Native::Convert_BMP(UT_ByteBuf* pBB)
- {
- /* Reset error handling for libpng */
-- if (setjmp(m_pPNG->jmpbuf))
-+ if (setjmp(png_jmpbuf(m_pPNG)))
- {
- png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- return UT_ERROR;
Deleted: users/devans/dports/editors/abiword-x11/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/editors/abiword-x11/files/patch-src-Makefile.in.diff 2014-05-15 15:32:23 UTC (rev 120104)
+++ users/devans/dports/editors/abiword-x11/files/patch-src-Makefile.in.diff 2014-05-15 21:10:45 UTC (rev 120111)
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig 2010-06-13 16:17:56.000000000 -0500
-+++ src/Makefile.in 2012-07-27 16:56:52.000000000 -0500
-@@ -503,7 +503,7 @@
- $(WP_CPPFLAGS) \
- -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
-
--libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
-+libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -no-undefined -avoid-version \
- -export-dynamic $(am__append_6)
- libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
- text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
-@@ -538,7 +538,7 @@
-
- @TOOLKIT_COCOA_TRUE at AbiWord_LDFLAGS = \
- @TOOLKIT_COCOA_TRUE@ $(DEPS_LIBS) \
-- at TOOLKIT_COCOA_TRUE@ --no-undefined \
-+ at TOOLKIT_COCOA_TRUE@ -no-undefined \
- @TOOLKIT_COCOA_TRUE@ -avoid-version \
- @TOOLKIT_COCOA_TRUE@ -export-dynamic \
- @TOOLKIT_COCOA_TRUE@ -headerpad_max_install_names
-@@ -554,7 +554,7 @@
-
- @TOOLKIT_COCOA_FALSE at abiword_LDFLAGS = \
- @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \
-- at TOOLKIT_COCOA_FALSE@ --no-undefined \
-+ at TOOLKIT_COCOA_FALSE@ -no-undefined \
- @TOOLKIT_COCOA_FALSE@ -avoid-version \
- @TOOLKIT_COCOA_FALSE@ -export-dynamic
-
Modified: users/devans/dports/gnome/gexiv2/Portfile
===================================================================
--- users/devans/dports/gnome/gexiv2/Portfile 2014-05-15 21:08:24 UTC (rev 120110)
+++ users/devans/dports/gnome/gexiv2/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gexiv2
-version 0.10.0
+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.
@@ -22,8 +22,8 @@
use_xz yes
-checksums rmd160 b53717fbc50d74aa76717af5cc57ba6a86b5f18d \
- sha256 9c8c97b36a0d4ca6656488b88908e4c94efb0dfc1b0e3e0850e38b90a9a30031
+checksums rmd160 d5bd9a657171527b1af05ef04ad1073e9be9b7d2 \
+ sha256 7675752a59c2f091560be1f39514ef492ec705b9fdea5f52281672e6b3eba2c7
depends_build port:pkgconfig
Modified: users/devans/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile 2014-05-13 16:44:43 UTC (rev 120018)
+++ users/devans/dports/graphics/poppler/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -7,7 +7,7 @@
name poppler
conflicts pdf2json xpdf-tools
-version 0.24.5
+version 0.26.0
license GPL-2+
maintainers devans openmaintainer
categories graphics
@@ -22,8 +22,8 @@
use_xz yes
-checksums rmd160 34a017f79e624091a62845beb26b3f81fb971645 \
- sha256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84
+checksums rmd160 9c74dd6fb617928375b64c3576575603ed2a72a5 \
+ sha256 8547032fc8ff34ba5f47b47eddfe67d0f2ff0ffcdcf5d189f52dc516770c621f
depends_build port:pkgconfig
@@ -80,7 +80,6 @@
subport poppler-qt4-mac {
PortGroup qt4 1.0
- revision 1
depends_lib-append port:poppler
configure.args-delete --disable-poppler-qt4
@@ -95,7 +94,7 @@
delete ${destroot}${prefix}/include/poppler/fofi \
${destroot}${prefix}/include/poppler/goo \
${destroot}${prefix}/include/poppler/splash \
- ${destroot}${prefix}/lib/libpoppler.44.dylib \
+ ${destroot}${prefix}/lib/libpoppler.46.dylib \
${destroot}${prefix}/lib/libpoppler.a \
${destroot}${prefix}/lib/libpoppler.dylib \
${destroot}${prefix}/lib/libpoppler.la \
Modified: users/devans/dports/net/pidgin/Portfile
===================================================================
--- users/devans/dports/net/pidgin/Portfile 2014-05-15 21:08:24 UTC (rev 120110)
+++ users/devans/dports/net/pidgin/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -29,19 +29,22 @@
depends_build port:pkgconfig \
port:intltool
-depends_lib port:audiofile \
+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:libxml2 \
port:gconf \
+ port:libidn \
+ port:gnutls
+
+if {${subport} ne "libpurple"} {
+ depends_lib-append \
+ port:libpurple \
+ port:audiofile \
port:gtk2 \
- port:gnutls \
port:libao \
- port:libidn \
- port:libxml2 \
port:nspr \
port:nss \
port:perl5.16
-if {${subport} ne "libpurple"} {
- depends_lib-append port:libpurple
post-destroot {
foreach file [glob -nocomplain -directory ${destroot}${prefix}/bin purple-*] {
delete $file
@@ -57,9 +60,6 @@
}
}
-# nss is not universal
-universal_variant no
-
patchfiles patch-configure.ac.diff \
patch-libpurple-internal.h.diff
@@ -103,6 +103,9 @@
if {${subport} eq $name} {
+# nss is not universal
+universal_variant no
+
variant finch_only requires finch description {Build without pidgin} {
configure.args-append --disable-gtkui
}
Modified: users/devans/dports/textproc/libplist/Portfile
===================================================================
--- trunk/dports/textproc/libplist/Portfile 2014-05-06 04:30:23 UTC (rev 119767)
+++ users/devans/dports/textproc/libplist/Portfile 2014-05-15 21:10:45 UTC (rev 120111)
@@ -2,10 +2,9 @@
# $Id$
PortSystem 1.0
-PortGroup cmake 1.0
name libplist
-version 1.10
+version 1.11
categories textproc multimedia
maintainers rmstonecipher openmaintainer
description Library for working with Apple Binary and XML Property Lists
@@ -16,38 +15,30 @@
master_sites http://libimobiledevice.org/downloads/
use_bzip2 yes
-checksums rmd160 b9d8d69a064054acd82d53cbb34d8a604dbaa915 \
- sha256 f44c52a0f8065d41d44772a7484f93bc5e7da21a8f4a9ad3f38a36b827eeff0b
+checksums rmd160 43169114c5f6ecd65ed27eb6daeb710af62a0f76 \
+ sha256 28e1518eeea054f4eec9a1c93d9575d56193b290c53c1b753773a5e0add95235
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:libxml2 \
- port:swig-python
+ port:libxml2
-patchfiles patch-iterator.diff
+configure.args --without-cython
-configure.args-append -DENABLE_CYTHON=OFF
-
-use_parallel_build no
-
variant python26 conflicts python27 description {Use Python 2.6} {
- depends_lib-append port:python26
- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 \
- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.6/include/python2.6 \
- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.6/Python
+ configure.python ${prefix}/bin/python2.6
+ configure.env-append CYTHON=${prefix}/bin/cython-2.6
+ configure.args-delete --without-cython
+ depends_lib-append port:py26-cython
}
variant python27 conflicts python26 description {Use Python 2.7} {
- depends_lib-append port:python27
- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 \
- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7 \
- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python
+ configure.python ${prefix}/bin/python2.7
+ configure.env-append CYTHON=${prefix}/bin/cython-2.7
+ configure.args-delete --without-cython
+ depends_lib-append port:py27-cython
}
+
if {![variant_isset python26]} {
default_variants +python27
}
-if {![variant_isset python26] && ![variant_isset python27]} {
- depends_lib-delete port:swig-python
- configure.args-append -DENABLE_SWIG=OFF
-}
livecheck.type regex
livecheck.url ${homepage}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140515/d3cd152a/attachment-0001.html>
More information about the macports-changes
mailing list