From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 22 21:50:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DE8B16A41B for ; Tue, 22 Jan 2008 21:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 452F413C4D3 for ; Tue, 22 Jan 2008 21:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0MLo12c034436 for ; Tue, 22 Jan 2008 21:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0MLo134034435; Tue, 22 Jan 2008 21:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 22 Jan 2008 21:50:01 GMT Resent-Message-Id: <200801222150.m0MLo134034435@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, José García Juanino Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 029FC16A41A for ; Tue, 22 Jan 2008 21:40:41 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id EDDE713C474 for ; Tue, 22 Jan 2008 21:40:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0MLd8PC098255 for ; Tue, 22 Jan 2008 21:39:08 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m0MLd8gb098254; Tue, 22 Jan 2008 21:39:08 GMT (envelope-from nobody) Message-Id: <200801222139.m0MLd8gb098254@www.freebsd.org> Date: Tue, 22 Jan 2008 21:39:08 GMT From: José García Juanino To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/119905: maintainer update] editors/xmlcopyeditor version update from 1.1.0.4 to 1.1.0.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2008 21:50:01 -0000 >Number: 119905 >Category: ports >Synopsis: maintainer update] editors/xmlcopyeditor version update from 1.1.0.4 to 1.1.0.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 22 21:50:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: José García Juanino >Release: 6.3-RELEASE >Organization: >Environment: FreeBSD sanabria.inad.es 6.3-RELEASE FreeBSD 6.3-RELEASE #1: Mon Jan 21 00:48:47 CET 2008 >Description: # cd /usr/ports/editors/xmlcopyeditor # patch -E -p1 < xmlcopyeditor.diff # rm *.orig files/*.orig >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uNr xmlcopyeditor.orig/Makefile xmlcopyeditor/Makefile --- xmlcopyeditor.orig/Makefile 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/Makefile 2008-01-22 22:17:29.000000000 +0100 @@ -1,12 +1,12 @@ -# New ports collection makefile for: xmlcopyeditor -# Date created: 6 December 2007 -# Whom: José García Juanino +# New ports collection makefile for: xmlcopyeditor +# Date created: 6 December 2007 +# Whom: José García Juanino # # $FreeBSD: ports/editors/xmlcopyeditor/Makefile,v 1.1 2008/01/02 22:23:28 beech Exp $ # PORTNAME= xmlcopyeditor -PORTVERSION= 1.1.0.3 +PORTVERSION= 1.1.0.6 CATEGORIES= editors MASTER_SITES= SF MASTER_SITE_SUBDIR=xml-copy-editor @@ -19,13 +19,31 @@ WX_CONF_ARGS= absolute WX_UNICODE= yes USE_GETTEXT= yes -USE_DOS2UNIX= src/mynotebook.cpp src/mynotebook.h \ - src/xmlcopyeditor.cpp src/xmlcopyeditor.h -SUB_FILES= pkg-message +USE_DOS2UNIX= src/rulesets/ruleset.css \ + src/rulesets/ruleset.xsd \ + src/rulesets/Contractions.xml \ + src/aspellpaths.h \ + src/po/sk/backup/sk.po \ + src/po/sk/sk.po \ + src/po/fr/messages.po \ + src/po/sv/messages.po \ + src/po/translate.txt \ + src/po/de/messages.po \ + src/po/en_us/messages.po \ + src/help/xmlcopyeditor.hhp \ + src/help/html/generic.css \ + src/rng/docbook.rnc \ + src/rng/tei_all.rnc \ + src/rng/tei_minimal.rnc \ + src/rng/docbookxi.rnc \ + src/templates/DTD.dtd \ + src/filters/WordprocessingML.xml BUILD_DEPENDS+= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \ - xslt.2:${PORTSDIR}/textproc/libxslt + xslt.2:${PORTSDIR}/textproc/libxslt \ + aspell.16:${PORTSDIR}/textproc/aspell \ + pcre.0:${PORTSDIR}/devel/pcre USE_AUTOTOOLS= autoconf:261 automake:19 @@ -35,7 +53,4 @@ -I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" -post-install: - @${CAT} ${PKGMESSAGE} - .include diff -uNr xmlcopyeditor.orig/distinfo xmlcopyeditor/distinfo --- xmlcopyeditor.orig/distinfo 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/distinfo 2008-01-22 17:56:38.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (xmlcopyeditor-1.1.0.3.tar.gz) = 95d422fcf9f5a924374780372df8099c -SHA256 (xmlcopyeditor-1.1.0.3.tar.gz) = 1df5b9b24e9fba2870bce07fbb70bdeece4856d1ea70e417a0d1cfc2f1356960 -SIZE (xmlcopyeditor-1.1.0.3.tar.gz) = 2601213 +MD5 (xmlcopyeditor-1.1.0.6.tar.gz) = 29350234faca3ad978ff74dbbf7f3ef5 +SHA256 (xmlcopyeditor-1.1.0.6.tar.gz) = b4b9a203c23daddf926cc41841416c2fc08a6979f3019feae984d087e2851111 +SIZE (xmlcopyeditor-1.1.0.6.tar.gz) = 2202764 diff -uNr xmlcopyeditor.orig/files/patch-aclocal.m4 xmlcopyeditor/files/patch-aclocal.m4 --- xmlcopyeditor.orig/files/patch-aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ xmlcopyeditor/files/patch-aclocal.m4 2008-01-22 18:18:23.000000000 +0100 @@ -0,0 +1,84 @@ +--- aclocal.m4.orig 2008-01-22 18:07:14.000000000 +0100 ++++ aclocal.m4 2008-01-22 18:08:07.000000000 +0100 +@@ -7242,4 +7242,80 @@ + AC_SUBST([am__untar]) + ]) # _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 ++#include ], ++ [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 ++#include ], ++ [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 ++#include ++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 -uNr xmlcopyeditor.orig/files/patch-aclocal.m4.diff xmlcopyeditor/files/patch-aclocal.m4.diff --- xmlcopyeditor.orig/files/patch-aclocal.m4.diff 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/patch-aclocal.m4.diff 1970-01-01 01:00:00.000000000 +0100 @@ -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 -+#include ], -+ [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 -+#include ], -+ [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 -+#include -+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 -uNr xmlcopyeditor.orig/files/patch-configure.in xmlcopyeditor/files/patch-configure.in --- xmlcopyeditor.orig/files/patch-configure.in 1970-01-01 01:00:00.000000000 +0100 +++ xmlcopyeditor/files/patch-configure.in 2008-01-22 18:18:55.000000000 +0100 @@ -0,0 +1,12 @@ +--- configure.in.orig 2008-01-22 18:07:14.000000000 +0100 ++++ configure.in 2008-01-22 18:08:54.000000000 +0100 +@@ -35,6 +35,9 @@ + # Call WXTEST func + WXTEST + ++# Call iconv checks ++AM_ICONV ++ + # Verify minimus requires + vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test -n "$vers" && test "$vers" -ge 2008000; then diff -uNr xmlcopyeditor.orig/files/patch-configure.in.diff xmlcopyeditor/files/patch-configure.in.diff --- xmlcopyeditor.orig/files/patch-configure.in.diff 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/patch-configure.in.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ ---- configure.in.orig Thu Dec 20 16:54:28 2007 -+++ configure.in Thu Dec 20 16:56:11 2007 -@@ -35,6 +35,9 @@ - # Call WXTEST func - WXTEST - -+# Call iconv checks -+AM_ICONV -+ - # Verify minimus requires - vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test -n "$vers" && test "$vers" -ge 2008000; then diff -uNr xmlcopyeditor.orig/files/patch-src_Makefile.am xmlcopyeditor/files/patch-src_Makefile.am --- xmlcopyeditor.orig/files/patch-src_Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ xmlcopyeditor/files/patch-src_Makefile.am 2008-01-22 18:19:27.000000000 +0100 @@ -0,0 +1,40 @@ +--- src/Makefile.am.orig 2008-01-22 18:07:11.000000000 +0100 ++++ src/Makefile.am 2008-01-22 18:12:05.000000000 +0100 +@@ -9,8 +9,8 @@ + bin_PROGRAMS = xmlcopyeditor + bindir = ${prefix}/bin + xmlcopyeditordir = ${prefix}/share/xmlcopyeditor +-pixmapdir = /usr/share/pixmaps +-applicationsdir = /usr/share/applications ++pixmapdir = ${prefix}/share/pixmaps ++applicationsdir = ${prefix}/share/applications + + # the application source, library search path, and link libraries + xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \ +@@ -50,16 +50,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/wxStEditor/* \ +- copying/xmlcopyeditor/* \ +- copying/Aspell/* \ +- copying/Apache/LICENSE-2.0 \ +- copying/Apache/LICENSE-2_files/* \ + 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 -uNr xmlcopyeditor.orig/files/patch-src_Makefile.am.diff xmlcopyeditor/files/patch-src_Makefile.am.diff --- xmlcopyeditor.orig/files/patch-src_Makefile.am.diff 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/patch-src_Makefile.am.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ ---- src/Makefile.am.orig Tue Jan 1 12:20:45 2008 -+++ src/Makefile.am Tue Jan 1 12:21:28 2008 -@@ -9,8 +9,8 @@ - bin_PROGRAMS = xmlcopyeditor - bindir = ${prefix}/bin - xmlcopyeditordir = ${prefix}/share/xmlcopyeditor --pixmapdir = /usr/share/pixmaps --applicationsdir = /usr/share/applications -+pixmapdir = ${prefix}/share/pixmaps -+applicationsdir = ${prefix}/share/applications - - # the application source, library search path, and link libraries - xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \ -@@ -41,15 +41,13 @@ - xpm/*.xpm \ - templates/*.* \ - 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/wxStEditor/* \ -- copying/xmlcopyeditor/* \ -- copying/Apache/LICENSE-2.0 \ -- copying/Apache/LICENSE-2_files/* \ -+ copying/boost_license_1_0.txt copying/boost_shared_ptr/* \ -+ copying/scowl/copying.txt \ -+ copying/mit.txt \ -+ copying/libxslt/libxslt-lic.txt \ -+ copying/libxml2/libxml2-lic.txt \ -+ copying/Scintilla/scintilla-lic.txt \ -+ copying/Expat/copying.txt \ - po/sk/messages.mo \ - po/sv/messages.mo \ - po/fr/messages.mo \ -@@ -58,7 +56,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 -uNr xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.cpp xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp --- xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.cpp 1970-01-01 01:00:00.000000000 +0100 +++ xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp 2008-01-22 18:19:57.000000000 +0100 @@ -0,0 +1,26 @@ +--- 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 @@ + + nconv = iconv ( + cd, +-#ifdef __WXMSW__ +- ( const char ** ) +-#endif +- &docBuffer, ++ ICONV_CHAR_CAST(&docBuffer), + &docBufferLeft, + &iconvBuffer, + &iconvBufferLeft ); +@@ -4637,10 +4634,7 @@ + + nconv = iconv ( + cd, +-#ifdef __WXMSW__ +- ( const char ** ) +-#endif +- &utf8BufferPtr, ++ ICONV_CHAR_CAST(&utf8BufferPtr), + &utf8BufferLeft, + &iconvBuffer, + &iconvBufferLeft ); diff -uNr xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.cpp.diff xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff --- xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.cpp.diff 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ ---- src/xmlcopyeditor.cpp.orig Thu Dec 20 19:39:44 2007 -+++ src/xmlcopyeditor.cpp Thu Dec 20 19:42:26 2007 -@@ -2977,10 +2977,7 @@ - - nconv = iconv ( - cd, --#ifdef __WXMSW__ -- ( const char ** ) --#endif -- &docBuffer, -+ ICONV_CHAR_CAST(&docBuffer), - &docBufferLeft, - &iconvBuffer, - &iconvBufferLeft ); -@@ -4685,10 +4682,7 @@ - - nconv = iconv ( - cd, --#ifdef __WXMSW__ -- ( const char ** ) --#endif -- &utf8BufferPtr, -+ ICONV_CHAR_CAST(&utf8BufferPtr), - &utf8BufferLeft, - &iconvBuffer, - &iconvBufferLeft ); diff -uNr xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.h xmlcopyeditor/files/patch-src_xmlcopyeditor.h --- xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.h 1970-01-01 01:00:00.000000000 +0100 +++ xmlcopyeditor/files/patch-src_xmlcopyeditor.h 2008-01-22 18:20:30.000000000 +0100 @@ -0,0 +1,10 @@ +--- src/xmlcopyeditor.h.orig 2008-01-22 18:07:11.000000000 +0100 ++++ src/xmlcopyeditor.h 2008-01-22 18:16:19.000000000 +0100 +@@ -21,6 +21,7 @@ + #define XMLCOPYEDITOR_H + + #define NEWFINDREPLACE 1 ++#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x)) + + #include + #include diff -uNr xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.h.diff xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff --- xmlcopyeditor.orig/files/patch-src_xmlcopyeditor.h.diff 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/patch-src_xmlcopyeditor.h.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- src/xmlcopyeditor.h.orig Thu Dec 20 19:39:44 2007 -+++ src/xmlcopyeditor.h Thu Dec 20 19:40:47 2007 -@@ -21,6 +21,7 @@ - #define XMLCOPYEDITOR_H - - #define NEWFINDREPLACE 1 -+#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x)) - - #include - #include diff -uNr xmlcopyeditor.orig/files/pkg-message.in xmlcopyeditor/files/pkg-message.in --- xmlcopyeditor.orig/files/pkg-message.in 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/files/pkg-message.in 1970-01-01 01:00:00.000000000 +0100 @@ -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. -************************************************************************ diff -uNr xmlcopyeditor.orig/pkg-plist xmlcopyeditor/pkg-plist --- xmlcopyeditor.orig/pkg-plist 2008-01-22 17:56:03.000000000 +0100 +++ xmlcopyeditor/pkg-plist 2008-01-22 18:38:30.000000000 +0100 @@ -1,12 +1,6 @@ bin/xmlcopyeditor -%%DATADIR%%/copying/Expat/copying.txt -%%DATADIR%%/copying/Scintilla/scintilla-lic.txt -%%DATADIR%%/copying/boost_license_1_0.txt -%%DATADIR%%/copying/boost_shared_ptr/copying.txt -%%DATADIR%%/copying/libxml2/libxml2-lic.txt -%%DATADIR%%/copying/libxslt/libxslt-lic.txt -%%DATADIR%%/copying/mit.txt -%%DATADIR%%/copying/scowl/copying.txt +share/applications/xmlcopyeditor.desktop +share/pixmaps/xmlcopyeditor.png %%DATADIR%%/filters/OpenDocument.xml %%DATADIR%%/filters/WordprocessingML.xml %%DATADIR%%/filters/filter.xsd @@ -40,6 +34,7 @@ %%DATADIR%%/help/html/xmlcopyeditor.html %%DATADIR%%/help/xmlcopyeditor.chm %%DATADIR%%/help/xmlcopyeditor.hhp +%%DATADIR%%/png/stock_calc-accept-green.png %%DATADIR%%/png/stock_calc-accept.png %%DATADIR%%/png/stock_close.png %%DATADIR%%/png/stock_copy-16.png @@ -129,8 +124,6 @@ %%DATADIR%%/rulesets/American.xml %%DATADIR%%/rulesets/Commonwealth.xml %%DATADIR%%/rulesets/Contractions.xml -%%DATADIR%%/rulesets/Default dictionary and style.xml -%%DATADIR%%/rulesets/Default dictionary.xml %%DATADIR%%/rulesets/Default style.xml %%DATADIR%%/rulesets/Disability.xml %%DATADIR%%/rulesets/Diversity.xml @@ -198,8 +191,6 @@ %%DATADIR%%/xpm/stock_spellcheck.xpm %%DATADIR%%/xpm/stock_spellcheck_16.xpm %%DATADIR%%/xpm/stock_undo_16.xpm -share/pixmaps/xmlcopyeditor.png -share/applications/xmlcopyeditor.desktop @dirrm %%DATADIR%%/xpm @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%%/rulesets @@ -219,13 +210,6 @@ @dirrm %%DATADIR%%/help/html @dirrm %%DATADIR%%/help @dirrm %%DATADIR%%/filters -@dirrm %%DATADIR%%/copying/scowl -@dirrm %%DATADIR%%/copying/libxslt -@dirrm %%DATADIR%%/copying/libxml2 -@dirrm %%DATADIR%%/copying/boost_shared_ptr -@dirrm %%DATADIR%%/copying/Scintilla -@dirrm %%DATADIR%%/copying/Expat -@dirrm %%DATADIR%%/copying @dirrm %%DATADIR%% @dirrmtry share/pixmaps @dirrmtry share/applications >Release-Note: >Audit-Trail: >Unformatted: