diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2008-08-01 11:43:55 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2008-08-01 11:43:55 +0000 |
commit | d4b2a52be74e836dffa0267d5519839589ebf8f1 (patch) | |
tree | 6bbf15a6dd33a53f1c30f67325fc8884228e8813 /editors/xmlcopyeditor/files | |
parent | - Update to 1.5.7 (diff) |
- Update to 1.2.0
PR: ports/126129
Submitted by: Jose Garcia Juanino <jjuanino@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=217909
Diffstat (limited to 'editors/xmlcopyeditor/files')
6 files changed, 12 insertions, 113 deletions
diff --git a/editors/xmlcopyeditor/files/patch-aclocal.m4.diff b/editors/xmlcopyeditor/files/patch-aclocal.m4.diff deleted file mode 100644 index 050d19fb31f8..000000000000 --- a/editors/xmlcopyeditor/files/patch-aclocal.m4.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- aclocal.m4.orig Thu Dec 20 19:29:53 2007 -+++ aclocal.m4 Thu Dec 20 19:30:48 2007 -@@ -7243,3 +7243,80 @@ - ]) # _AM_PROG_TAR - - -+# --------------------------------------------------------------------------- -+# test for availability of iconv() -+# --------------------------------------------------------------------------- -+ -+# From Bruno Haible. -+ -+AC_DEFUN([AM_ICONV], -+[ -+ # Some systems have iconv in libc, some have it in libiconv (OSF/1 and -+ # those with the standalone portable GNU libiconv installed). -+ -+ AC_ARG_WITH([libiconv-prefix], -+[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ -+ for dir in `echo "$withval" | tr : ' '`; do -+ if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi -+ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -+ done -+ ]) -+ -+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ -+ am_cv_func_iconv="no, consider installing GNU libiconv" -+ am_cv_lib_iconv=no -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_func_iconv=yes) -+ if test "$am_cv_func_iconv" != yes; then -+ am_save_LIBS="$LIBS" -+ LIBS="$LIBS -liconv" -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_lib_iconv=yes -+ am_cv_func_iconv=yes) -+ LIBS="$am_save_LIBS" -+ fi -+ ]) -+ if test "$am_cv_func_iconv" = yes; then -+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) -+ AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const, -+ AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <iconv.h> -+extern -+#ifdef __cplusplus -+"C" -+#endif -+#if defined(__STDC__) || defined(__cplusplus) -+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+#else -+size_t iconv(); -+#endif -+ ], -+ [], -+ wx_cv_func_iconv_const="no", -+ wx_cv_func_iconv_const="yes" -+ ) -+ ) -+ -+ iconv_const= -+ if test "x$wx_cv_func_iconv_const" = "xyes"; then -+ iconv_const="const" -+ fi -+ -+ AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const, -+ [Define as const if the declaration of iconv() needs const.]) -+ fi -+ LIBICONV= -+ if test "$am_cv_lib_iconv" = yes; then -+ LIBICONV="-liconv" -+ fi -+ AC_SUBST(LIBICONV) -+]) diff --git a/editors/xmlcopyeditor/files/patch-configure.in.diff b/editors/xmlcopyeditor/files/patch-configure.in.diff index 014784eba2da..0e7f6af76fb8 100644 --- a/editors/xmlcopyeditor/files/patch-configure.in.diff +++ b/editors/xmlcopyeditor/files/patch-configure.in.diff @@ -1,5 +1,5 @@ ---- configure.in.orig Thu Dec 20 16:54:28 2007 -+++ configure.in Thu Dec 20 16:56:11 2007 +--- configure.in.orig ++++ configure.in @@ -35,6 +35,9 @@ # Call WXTEST func WXTEST diff --git a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff b/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff index d2a952a4ed57..b31b629663b3 100644 --- a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff +++ b/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig 2008-01-22 18:07:11.000000000 +0100 -+++ src/Makefile.am 2008-01-22 18:12:05.000000000 +0100 +--- src/Makefile.am.orig ++++ src/Makefile.am @@ -9,8 +9,8 @@ bin_PROGRAMS = xmlcopyeditor bindir = ${prefix}/bin @@ -11,15 +11,14 @@ # the application source, library search path, and link libraries xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \ -@@ -50,16 +50,6 @@ +@@ -49,15 +49,6 @@ templates/*.lzx \ templates/*.xlf \ help/*.* help/html/*.* \ - copying/*.txt copying/boost_shared_ptr/* \ - copying/Expat/* copying/libxml2/* copying/libxslt/* \ - copying/PCRE/* copying/Scintilla/* \ -- copying/scowl/* \ -- copying/wxStyledTextCtrl/* copying/ximian/* \ +- copying/wxStyledTextCtrl/* \ - copying/wxStEditor/* \ - copying/xmlcopyeditor/* \ - copying/Aspell/* \ @@ -28,12 +27,3 @@ po/sk/messages.mo \ po/sv/messages.mo \ po/fr/messages.mo \ -@@ -68,7 +58,7 @@ - po/zh_TW/messages.mo \ - po/uk_UA/messages.mo \ - po/uk_UA/messages.mo \ -- po/en_us/messages.po \ -+ po/en_us/messages.po - - pixmap_DATA = xmlcopyeditor.png - diff --git a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff index 43f8918a4317..903010c61ccf 100644 --- a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff +++ b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff @@ -1,6 +1,6 @@ ---- src/xmlcopyeditor.cpp.orig 2008-01-22 18:07:12.000000000 +0100 -+++ src/xmlcopyeditor.cpp 2008-01-22 18:15:34.000000000 +0100 -@@ -2984,10 +2984,7 @@ +--- src/xmlcopyeditor.cpp.orig ++++ src/xmlcopyeditor.cpp +@@ -3002,10 +3002,7 @@ nconv = iconv ( cd, @@ -12,7 +12,7 @@ &docBufferLeft, &iconvBuffer, &iconvBufferLeft ); -@@ -4637,10 +4634,7 @@ +@@ -4617,10 +4614,7 @@ nconv = iconv ( cd, diff --git a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff index 15e95cf2ca24..b16e464409dc 100644 --- a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff +++ b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff @@ -1,5 +1,5 @@ ---- src/xmlcopyeditor.h.orig Thu Dec 20 19:39:44 2007 -+++ src/xmlcopyeditor.h Thu Dec 20 19:40:47 2007 +--- src/xmlcopyeditor.h.orig ++++ src/xmlcopyeditor.h @@ -21,6 +21,7 @@ #define XMLCOPYEDITOR_H diff --git a/editors/xmlcopyeditor/files/pkg-message.in b/editors/xmlcopyeditor/files/pkg-message.in deleted file mode 100644 index bb829a351842..000000000000 --- a/editors/xmlcopyeditor/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -************************************************************************ -Note for XML docbook users: - - 1) In Edit->Preferences menu change "Application directory" text box to - "%%LOCALBASE%%/share/xsl". - - 2) Install textproc/docbook-xml port. -************************************************************************ |