diff options
| author | marcus <marcus@FreeBSD.org> | 2003-07-17 19:28:12 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-07-17 19:28:12 +0000 |
| commit | b2ec5aec8b7a56b5ecbfa23618356c8809c0553f (patch) | |
| tree | 8caf3cb8fb1aa8f1ba24c3ba22b42020f93fe75d /editors | |
| parent | 553fad5bcc988e2ecce6dfb16efc9e0b8b99d925 (diff) | |
| download | FreeBSD-ports-b2ec5aec8b7a56b5ecbfa23618356c8809c0553f.zip FreeBSD-ports-b2ec5aec8b7a56b5ecbfa23618356c8809c0553f.tar.gz | |
Fix build problems on -CURRENT.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/AbiWord2/Makefile | 6 | ||||
| -rw-r--r-- | editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp | 13 | ||||
| -rw-r--r-- | editors/abiword-devel/Makefile | 6 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp | 13 | ||||
| -rw-r--r-- | editors/abiword/Makefile | 6 | ||||
| -rw-r--r-- | editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp | 13 |
6 files changed, 57 insertions, 0 deletions
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index ff51fdd..3e9a8d4 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -70,6 +70,12 @@ post-patch: @${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \ s|%%ACLOCAL%%|${ACLOCAL}|g ; \ s|%%AUTOCONF%%|${AUTOCONF}|g' ${WRKSRC}/autogen.sh + @${FIND} ${WRKSRC}/ac-helpers -name "*.m4" | ${XARGS} ${REINPLACE_CMD} \ + 's|-ansi||g ; \ + s|-pedantic||g' + @${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \ + ${REINPLACE_CMD} 's|-ansi||g ; \ + s|-pedantic||g' pre-configure: @cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL diff --git a/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp new file mode 100644 index 0000000..72ff257 --- /dev/null +++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_iconv.cpp @@ -0,0 +1,13 @@ +--- src/af/util/xp/ut_iconv.cpp.orig Thu Jul 17 15:12:55 2003 ++++ src/af/util/xp/ut_iconv.cpp Thu Jul 17 15:16:40 2003 +@@ -295,8 +295,8 @@ + return (size_t)-1; + + +- ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); +- return iconv( cd, buf, inbytesleft, outbuf, outbytesleft ); ++ //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); ++ return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); + } + + int UT_iconv_close( UT_iconv_t cd ) diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index ff51fdd..3e9a8d4 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -70,6 +70,12 @@ post-patch: @${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \ s|%%ACLOCAL%%|${ACLOCAL}|g ; \ s|%%AUTOCONF%%|${AUTOCONF}|g' ${WRKSRC}/autogen.sh + @${FIND} ${WRKSRC}/ac-helpers -name "*.m4" | ${XARGS} ${REINPLACE_CMD} \ + 's|-ansi||g ; \ + s|-pedantic||g' + @${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \ + ${REINPLACE_CMD} 's|-ansi||g ; \ + s|-pedantic||g' pre-configure: @cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL diff --git a/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp new file mode 100644 index 0000000..72ff257 --- /dev/null +++ b/editors/abiword-devel/files/patch-src_af_util_xp_ut_iconv.cpp @@ -0,0 +1,13 @@ +--- src/af/util/xp/ut_iconv.cpp.orig Thu Jul 17 15:12:55 2003 ++++ src/af/util/xp/ut_iconv.cpp Thu Jul 17 15:16:40 2003 +@@ -295,8 +295,8 @@ + return (size_t)-1; + + +- ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); +- return iconv( cd, buf, inbytesleft, outbuf, outbytesleft ); ++ //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); ++ return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); + } + + int UT_iconv_close( UT_iconv_t cd ) diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index ff51fdd..3e9a8d4 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -70,6 +70,12 @@ post-patch: @${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \ s|%%ACLOCAL%%|${ACLOCAL}|g ; \ s|%%AUTOCONF%%|${AUTOCONF}|g' ${WRKSRC}/autogen.sh + @${FIND} ${WRKSRC}/ac-helpers -name "*.m4" | ${XARGS} ${REINPLACE_CMD} \ + 's|-ansi||g ; \ + s|-pedantic||g' + @${FIND} ${WRKSRC}/src/config/platforms -name "*.mk" | ${XARGS} \ + ${REINPLACE_CMD} 's|-ansi||g ; \ + s|-pedantic||g' pre-configure: @cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog INSTALL diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp new file mode 100644 index 0000000..72ff257 --- /dev/null +++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp @@ -0,0 +1,13 @@ +--- src/af/util/xp/ut_iconv.cpp.orig Thu Jul 17 15:12:55 2003 ++++ src/af/util/xp/ut_iconv.cpp Thu Jul 17 15:16:40 2003 +@@ -295,8 +295,8 @@ + return (size_t)-1; + + +- ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); +- return iconv( cd, buf, inbytesleft, outbuf, outbytesleft ); ++ //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf); ++ return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); + } + + int UT_iconv_close( UT_iconv_t cd ) |
