Index: head/editors/AbiWord/Makefile =================================================================== --- head/editors/AbiWord/Makefile (revision 36927) +++ head/editors/AbiWord/Makefile (revision 36928) @@ -1,47 +1,47 @@ # New ports collection makefile for: AbiWord # Date created: 3 Mar 1999 # Whom: Donald Burr # # $FreeBSD$ # # Note: this port cannot be built when the textproc/mswordview port is # already installed, due to header file conflicts and the very broken # AbiWord build system. PORTNAME= AbiWord PORTVERSION= 0.7.12 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 WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include # start by deleting some junk files that should never have been placed # in the tar file pre-build: cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?line.jpg cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?space.jpg post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/editors/AbiWord/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/editors/AbiWord/distinfo =================================================================== --- head/editors/AbiWord/distinfo (revision 36927) +++ head/editors/AbiWord/distinfo (revision 36928) @@ -1,5 +1,6 @@ MD5 (AbiWord/abi-0.7.12.tar.gz) = 3c7eb8cfaef1971d97a44b2fba1fa7a9 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 Property changes on: head/editors/AbiWord/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/editors/AbiWord/files/patch-at =================================================================== --- head/editors/AbiWord/files/patch-at (revision 36927) +++ head/editors/AbiWord/files/patch-at (revision 36928) @@ -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_: + include $(ABI_ROOT)/src/config/abi_defs.mk --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 - - ################################################################# - +-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) Property changes on: head/editors/AbiWord/files/patch-at ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/AbiWord/files/patch-av =================================================================== --- head/editors/AbiWord/files/patch-av (nonexistent) +++ head/editors/AbiWord/files/patch-av (revision 36928) @@ -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 Property changes on: head/editors/AbiWord/files/patch-av ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/AbiWord2/Makefile =================================================================== --- head/editors/AbiWord2/Makefile (revision 36927) +++ head/editors/AbiWord2/Makefile (revision 36928) @@ -1,47 +1,47 @@ # New ports collection makefile for: AbiWord # Date created: 3 Mar 1999 # Whom: Donald Burr # # $FreeBSD$ # # Note: this port cannot be built when the textproc/mswordview port is # already installed, due to header file conflicts and the very broken # AbiWord build system. PORTNAME= AbiWord PORTVERSION= 0.7.12 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 WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include # start by deleting some junk files that should never have been placed # in the tar file pre-build: cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?line.jpg cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?space.jpg post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/editors/AbiWord2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/editors/AbiWord2/distinfo =================================================================== --- head/editors/AbiWord2/distinfo (revision 36927) +++ head/editors/AbiWord2/distinfo (revision 36928) @@ -1,5 +1,6 @@ MD5 (AbiWord/abi-0.7.12.tar.gz) = 3c7eb8cfaef1971d97a44b2fba1fa7a9 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 Property changes on: head/editors/AbiWord2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/editors/AbiWord2/files/patch-at =================================================================== --- head/editors/AbiWord2/files/patch-at (revision 36927) +++ head/editors/AbiWord2/files/patch-at (revision 36928) @@ -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_: + include $(ABI_ROOT)/src/config/abi_defs.mk --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 - - ################################################################# - +-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) Property changes on: head/editors/AbiWord2/files/patch-at ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/AbiWord2/files/patch-av =================================================================== --- head/editors/AbiWord2/files/patch-av (nonexistent) +++ head/editors/AbiWord2/files/patch-av (revision 36928) @@ -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 Property changes on: head/editors/AbiWord2/files/patch-av ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/abiword/Makefile =================================================================== --- head/editors/abiword/Makefile (revision 36927) +++ head/editors/abiword/Makefile (revision 36928) @@ -1,47 +1,47 @@ # New ports collection makefile for: AbiWord # Date created: 3 Mar 1999 # Whom: Donald Burr # # $FreeBSD$ # # Note: this port cannot be built when the textproc/mswordview port is # already installed, due to header file conflicts and the very broken # AbiWord build system. PORTNAME= AbiWord PORTVERSION= 0.7.12 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 WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include # start by deleting some junk files that should never have been placed # in the tar file pre-build: cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?line.jpg cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?space.jpg post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/editors/abiword/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/editors/abiword/distinfo =================================================================== --- head/editors/abiword/distinfo (revision 36927) +++ head/editors/abiword/distinfo (revision 36928) @@ -1,5 +1,6 @@ MD5 (AbiWord/abi-0.7.12.tar.gz) = 3c7eb8cfaef1971d97a44b2fba1fa7a9 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 Property changes on: head/editors/abiword/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/editors/abiword/files/patch-at =================================================================== --- head/editors/abiword/files/patch-at (revision 36927) +++ head/editors/abiword/files/patch-at (revision 36928) @@ -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_: + include $(ABI_ROOT)/src/config/abi_defs.mk --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 - - ################################################################# - +-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) Property changes on: head/editors/abiword/files/patch-at ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/abiword/files/patch-av =================================================================== --- head/editors/abiword/files/patch-av (nonexistent) +++ head/editors/abiword/files/patch-av (revision 36928) @@ -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 Property changes on: head/editors/abiword/files/patch-av ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/editors/abiword-devel/Makefile =================================================================== --- head/editors/abiword-devel/Makefile (revision 36927) +++ head/editors/abiword-devel/Makefile (revision 36928) @@ -1,47 +1,47 @@ # New ports collection makefile for: AbiWord # Date created: 3 Mar 1999 # Whom: Donald Burr # # $FreeBSD$ # # Note: this port cannot be built when the textproc/mswordview port is # already installed, due to header file conflicts and the very broken # AbiWord build system. PORTNAME= AbiWord PORTVERSION= 0.7.12 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 WRKSRC= ${WRKDIR}/abi-${PORTVERSION}/src USE_XLIB= yes USE_GMAKE= yes USE_GTK= yes MAKE_ENV= prefix="${PREFIX}" .include # start by deleting some junk files that should never have been placed # in the tar file pre-build: cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?line.jpg cd ${WRKSRC} && ${RM} -f ../user/wp/help/en-US/images/?space.jpg post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/editors/abiword-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/editors/abiword-devel/distinfo =================================================================== --- head/editors/abiword-devel/distinfo (revision 36927) +++ head/editors/abiword-devel/distinfo (revision 36928) @@ -1,5 +1,6 @@ MD5 (AbiWord/abi-0.7.12.tar.gz) = 3c7eb8cfaef1971d97a44b2fba1fa7a9 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 Property changes on: head/editors/abiword-devel/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/editors/abiword-devel/files/patch-at =================================================================== --- head/editors/abiword-devel/files/patch-at (revision 36927) +++ head/editors/abiword-devel/files/patch-at (revision 36928) @@ -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_: + include $(ABI_ROOT)/src/config/abi_defs.mk --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 - - ################################################################# - +-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) Property changes on: head/editors/abiword-devel/files/patch-at ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/editors/abiword-devel/files/patch-av =================================================================== --- head/editors/abiword-devel/files/patch-av (nonexistent) +++ head/editors/abiword-devel/files/patch-av (revision 36928) @@ -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 Property changes on: head/editors/abiword-devel/files/patch-av ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property