diff options
| author | Jing-Tang Keith Jang <keith@FreeBSD.org> | 2001-01-08 06:28:38 +0000 |
|---|---|---|
| committer | Jing-Tang Keith Jang <keith@FreeBSD.org> | 2001-01-08 06:28:38 +0000 |
| commit | dc8aedccce47ff24c30a945a6b1881f6664279ef (patch) | |
| tree | aa61914a6d81b2c43d07e9400367adc3e339865a /editors/AbiWord2 | |
| parent | 292d45f10f3deef27f80ead48a389dbab965f3ff (diff) | |
| download | ports-dc8aedccce47ff24c30a945a6b1881f6664279ef.tar.gz ports-dc8aedccce47ff24c30a945a6b1881f6664279ef.zip | |
Sigh, go back to use AbiWord's builtin version of libiconv.
AbiWord will coredump and unable to display ANY character
correctly when linking against converters/iconv.
This is a temporary workaround.
Approved by: "Alec Wolman" <wolman@cs.washington.edu> (MAINTAINER)
Notes
Notes:
svn path=/head/; revision=36928
Diffstat (limited to 'editors/AbiWord2')
| -rw-r--r-- | editors/AbiWord2/Makefile | 6 | ||||
| -rw-r--r-- | editors/AbiWord2/distinfo | 1 | ||||
| -rw-r--r-- | editors/AbiWord2/files/patch-at | 40 | ||||
| -rw-r--r-- | editors/AbiWord2/files/patch-av | 11 |
4 files changed, 24 insertions, 34 deletions
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index b0d9bffb7465..9b99fca5143e 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -15,14 +15,14 @@ CATEGORIES= editors MASTER_SITES= http://download.abisource.com/releases/${PORTVERSION}/src/ DISTNAME= abi-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz unixfonts.tar.gz \ - wv.tar.gz abidistfiles.tar.gz + wv.tar.gz abidistfiles.tar.gz libiconv.tar.gz MAINTAINER= wolman@cs.washington.edu # unzip is needed during the installation process BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png +# iconv.2:${PORTSDIR}/converters/iconv RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo index 531a3a3cc775..3046d318a120 100644 --- a/editors/AbiWord2/distinfo +++ b/editors/AbiWord2/distinfo @@ -3,3 +3,4 @@ MD5 (AbiWord/expat.tar.gz) = 75d92a57bb22498ff5d6c76990a8738d MD5 (AbiWord/unixfonts.tar.gz) = 618cfbc3de9b73407d47ba283b5955a9 MD5 (AbiWord/wv.tar.gz) = a956dc042c470d1d13a683e1d47d83f4 MD5 (AbiWord/abidistfiles.tar.gz) = 21634e08ddbc83ff55a59158515726f3 +MD5 (AbiWord/libiconv.tar.gz) = a13838bc277a3b73a25781eff8beead2 diff --git a/editors/AbiWord2/files/patch-at b/editors/AbiWord2/files/patch-at index 0793c7dca316..a398c6a2efb8 100644 --- a/editors/AbiWord2/files/patch-at +++ b/editors/AbiWord2/files/patch-at @@ -1,33 +1,11 @@ ---- config/require/unix/Makefile.orig Tue Jan 2 16:21:42 2001 -+++ config/require/unix/Makefile Tue Jan 2 16:23:08 2001 -@@ -164,22 +164,6 @@ +--- config/require/unix/Makefile.orig Sun Jan 7 01:24:20 2001 ++++ config/require/unix/Makefile Sun Jan 7 01:24:39 2001 +@@ -22,7 +22,7 @@ - _LIBICONV_: - --ifdef __FreeBSD__ -- @if [ -d $(ABI_ROOT)/../libiconv ]; then \ -- echo Found libiconv in peer directory; \ -- if [ ! -r $(ABI_ROOT)/../libiconv/src/config.h ]; then \ -- cd $(ABI_ROOT)/../libiconv; \ -- ./configure; \ -- fi; \ -- $(MAKE) -f Makefile.abi -C $(ABI_ROOT)/../libiconv; \ -- else \ -- echo libiconv not found; \ -- echo TODO provide a nicer error message; \ -- echo TODO with instructions for obtaining it; \ -- exit 1; \ -- fi -- --else - @if [ ! -r /usr/include/iconv.h -a ! -r /usr/local/include/iconv.h ]; then \ - if [ -d $(ABI_ROOT)/../libiconv ]; then \ - echo Found libiconv in peer directory; \ -@@ -200,7 +184,6 @@ - echo "*** are the versions of the libraries we should link against."; \ - echo ; \ - fi --endif - - ################################################################# + include $(ABI_ROOT)/src/config/abi_defs.mk +-REQUIRE= _GCC_ _GLIB_ _GTK_ _ZLIB_ _LIBPNG_ _LIBWV_ _UNIXFONTS_ _ABIDISTFILES_ _GNOME_ _LIBICONV_ ++REQUIRE= _GCC_ _GLIB_ _GTK_ _ZLIB_ _LIBPNG_ _LIBICONV_ _LIBWV_ _UNIXFONTS_ _ABIDISTFILES_ _GNOME_ + REQUIREABICLEAN= + REQUIRECLEAN= clean_ZLIB_ clean_LIBPNG_ clean_LIBWV_ clean_LIBICONV_ + REQUIREREALCLEAN= $(REQUIRECLEAN) diff --git a/editors/AbiWord2/files/patch-av b/editors/AbiWord2/files/patch-av new file mode 100644 index 000000000000..bf783198b6ab --- /dev/null +++ b/editors/AbiWord2/files/patch-av @@ -0,0 +1,11 @@ +--- config/platforms/freebsd.mk.orig Sun Jan 7 01:04:09 2001 ++++ config/platforms/freebsd.mk Sun Jan 7 01:07:26 2001 +@@ -57,7 +57,7 @@ + endif + + # Includes +-OS_INCLUDES = -I/usr/local/include ++OS_INCLUDES = -I/usr/local/include -I$(ABI_ROOT)/../libiconv/include + G++INCLUDES = -I/usr/include/g++ + + # Compiler flags |