diff options
28 files changed, 728 insertions, 636 deletions
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index 25d2d9c99cfe..366918b2f2ea 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -1,42 +1,39 @@ # New ports collection makefile for: AbiWord -# Version required: 0.5.5 +# Version required: 0.7.5 # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.org> # # $FreeBSD$ # -DISTNAME= abi-0.5.5-src -PKGNAME= AbiWord-0.5.5 +DISTNAME= abi-${VERSION} +PKGNAME= AbiWord-${VERSION} CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ - unixfonts-0.5.4.tar.gz +MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \ + unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz MAINTAINER= dburr@FreeBSD.org -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord -WRKSRC= ${WRKDIR}/abi-0.5.5/src -USE_XLIB= YES -USE_GMAKE= YES - -# the build is placed in a directory name of the form -# FreeBSD_3.1-RELEASE_i386_OBJ. This variable makes it -# a bit easier to type this whenever it's needed in the -# do-install target. -OSDISTDIR= `uname -s`_`uname -r`_`uname -m`_OBJ +VERSION= 0.7.6 +WRKSRC= ${WRKDIR}/abi-${VERSION}/src +USE_XLIB= yes +USE_GMAKE= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" +OSDISTDIR= ${OPSYS}_`uname -r`_${ARCH}_OBJ .include <bsd.port.pre.mk> post-patch: - @ cd ${WRKDIR} && ${LN} -sf abi-0.5.5 abi -.if ${OSVERSION} > 310000 +.if ${OSVERSION} != 310000 @${CP} ${WRKSRC}/config/platforms/freebsd.mk \ ${WRKSRC}/config/platforms/freebsd.mk.version @${SED} -e s,3.1-RELEASE,`uname -r`,g \ @@ -44,18 +41,29 @@ post-patch: ${WRKSRC}/config/platforms/freebsd.mk .endif +pre-build: + @(cd ${WRKDIR}/wv && ./configure) + do-install: - ${MKDIR} ${PREFIX}/AbiSuite/bin - ${MKDIR} ${PREFIX}/AbiSuite/lib - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done ) - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done ) - @${CP} ${WRKDIR}/unixfonts-0.5.4/install.sh \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig + @${MKDIR} ${PREFIX}/AbiSuite/bin + @${MKDIR} ${PREFIX}/AbiSuite/docs + @(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \ + ${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \ + ${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \ + ${PREFIX}/AbiSuite/bin/ + @${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord + @${CP} ${WRKDIR}/unixfonts/install.sh \ + ${WRKDIR}/unixfonts/install.sh.orig @${SED} s,/usr/local,${PREFIX}, \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \ - ${WRKDIR}/unixfonts-0.5.4/install.sh - ( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh ) - for BIN in ${PREFIX}/AbiSuite/bin/* ; do ${LN} -sf $${BIN} ${PREFIX}/bin ; done + ${WRKDIR}/unixfonts/install.sh.orig > \ + ${WRKDIR}/unixfonts/install.sh + @(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh) @${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX}, - + @(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \ + AbiWord ${PREFIX}/AbiSuite) + .include <bsd.port.post.mk> diff --git a/editors/AbiWord/distinfo b/editors/AbiWord/distinfo index a2d2cadf1f9f..7ae219276a27 100644 --- a/editors/AbiWord/distinfo +++ b/editors/AbiWord/distinfo @@ -1,3 +1,4 @@ -MD5 (AbiWord/abi-0.5.5-src.tar.gz) = b22110939863bf00d724f8aa9c26e0bd -MD5 (AbiWord/expat.tar.gz) = 9eb717e45f14995754711a5816f2c6dc -MD5 (AbiWord/unixfonts-0.5.4.tar.gz) = 44da988a7a96e1f995999a039ce33537 +MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55 +MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a +MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd +MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50 diff --git a/editors/AbiWord/files/patch-aa b/editors/AbiWord/files/patch-aa index ce0149fac22c..3d086340d1b6 100644 --- a/editors/AbiWord/files/patch-aa +++ b/editors/AbiWord/files/patch-aa @@ -1,11 +1,11 @@ ---- af/gr/unix/Makefile.orig Fri Apr 9 08:47:46 1999 -+++ af/gr/unix/Makefile Sun May 9 10:40:19 1999 -@@ -25,7 +25,7 @@ - CPPSRCS= gr_UnixGraphics.cpp \ - gr_UnixImage.cpp - --INCLUDES= -I/usr/X11R6/include -+INCLUDES= -I/usr/local/include -I/usr/X11R6/include - - TARGETS= $(OBJS) - +--- wp/impexp/xp/ie_imp_MsWord_97.h Sun Oct 31 14:05:06 1999 ++++ wp/impexp/xp/ie_imp_MsWord_97.h.new Sun Oct 31 14:05:27 1999 +@@ -24,7 +24,7 @@ + //#include <stdlib.h> + #include <stdio.h> + #include "wv.h" +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/AbiWord/files/patch-af b/editors/AbiWord/files/patch-af index dc6c520f1370..9d748542c247 100644 --- a/editors/AbiWord/files/patch-af +++ b/editors/AbiWord/files/patch-af @@ -1,10 +1,11 @@ ---- af/xap/unix/xap_UnixFont.cpp.orig Tue Apr 20 07:35:11 1999 -+++ af/xap/unix/xap_UnixFont.cpp Sun May 9 10:40:19 1999 -@@ -21,6 +21,7 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #include <sys/stat.h> +--- af/util/xp/ut_png.cpp Fri Feb 19 12:20:25 1999 ++++ af/util/xp/ut_png.cpp.new Sat Oct 30 19:10:59 1999 +@@ -17,7 +17,7 @@ + * 02111-1307, USA. + */ - #include "ut_string.h" +-#include "png.h" ++#include <png.h> + + #include "ut_assert.h" + #include "ut_bytebuf.h" diff --git a/editors/AbiWord/files/patch-ag b/editors/AbiWord/files/patch-ag index 1681bef3593e..6405e7d1a262 100644 --- a/editors/AbiWord/files/patch-ag +++ b/editors/AbiWord/files/patch-ag @@ -1,13 +1,11 @@ ---- config/abi_defs.mk.orig Thu Apr 29 10:46:27 1999 -+++ config/abi_defs.mk Sun May 9 10:40:19 1999 -@@ -230,8 +230,8 @@ - ## We should change this when get non-gtk versions on unix.... +--- wp/impexp/xp/ie_imp_AbiWord_1.h Thu Jul 22 14:29:34 1999 ++++ wp/impexp/xp/ie_imp_AbiWord_1.h.new Sat Oct 30 21:37:43 1999 +@@ -22,7 +22,7 @@ + #define IE_IMP_ABIWORD_1_H - ifeq ($(ABI_NATIVE),unix) --CFLAGS += `gtk-config --cflags` --EXTRA_LIBS += `gtk-config --libs` -+CFLAGS += `gtk12-config --cflags` -+EXTRA_LIBS += `gtk12-config --libs` - endif - - ################################################################## + #include <stdio.h> +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/AbiWord/pkg-message b/editors/AbiWord/pkg-message index 583418f26ac1..41799bba5851 100644 --- a/editors/AbiWord/pkg-message +++ b/editors/AbiWord/pkg-message @@ -1,7 +1,7 @@ -You must add the ${PREFIX}/AbiSuite/lib/fonts directory to your X server's +You must add the /usr/local/AbiSuite/fonts directory to your X server's font path. For XFree86, add the line: -FontPath "/usr/local/AbiSuite/lib/fonts/" +FontPath "/usr/local/AbiSuite/fonts/" in the "Files" section of your /etc/XF86Config file. If you use a different X server, please see its documentation on how to do diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist index 31089b720a94..77eee5b0bc34 100644 --- a/editors/AbiWord/pkg-plist +++ b/editors/AbiWord/pkg-plist @@ -1,97 +1,112 @@ bin/AbiWord AbiSuite/bin/AbiWord -AbiSuite/lib/libAbiEv.a -AbiSuite/lib/libAbiFmt.a -AbiSuite/lib/libAbiGr.a -AbiSuite/lib/libAbiImpExp.a -AbiSuite/lib/libAbiPTbl.a -AbiSuite/lib/libAbiSpell.a -AbiSuite/lib/libAbiUtil.a -AbiSuite/lib/libAbiWPAp.a -AbiSuite/lib/libAbiWordVer.a -AbiSuite/lib/libAbiXAp.a -AbiSuite/lib/libAbi_expat.a -AbiSuite/lib/libMsWordView.a -AbiSuite/lib/fonts/a010013l.afm -AbiSuite/lib/fonts/a010013l.pfa -AbiSuite/lib/fonts/a010015l.afm -AbiSuite/lib/fonts/a010015l.pfa -AbiSuite/lib/fonts/a010033l.afm -AbiSuite/lib/fonts/a010033l.pfa -AbiSuite/lib/fonts/a010035l.afm -AbiSuite/lib/fonts/a010035l.pfa -AbiSuite/lib/fonts/b018012l.afm -AbiSuite/lib/fonts/b018012l.pfa -AbiSuite/lib/fonts/b018015l.afm -AbiSuite/lib/fonts/b018015l.pfa -AbiSuite/lib/fonts/b018032l.afm -AbiSuite/lib/fonts/b018032l.pfa -AbiSuite/lib/fonts/b018035l.afm -AbiSuite/lib/fonts/b018035l.pfa -AbiSuite/lib/fonts/bchb.afm -AbiSuite/lib/fonts/bchb.pfa -AbiSuite/lib/fonts/bchbi.afm -AbiSuite/lib/fonts/bchbi.pfa -AbiSuite/lib/fonts/bchr.afm -AbiSuite/lib/fonts/bchr.pfa -AbiSuite/lib/fonts/bchri.afm -AbiSuite/lib/fonts/bchri.pfa -AbiSuite/lib/fonts/c059013l.afm -AbiSuite/lib/fonts/c059013l.pfa -AbiSuite/lib/fonts/c059016l.afm -AbiSuite/lib/fonts/c059016l.pfa -AbiSuite/lib/fonts/c059033l.afm -AbiSuite/lib/fonts/c059033l.pfa -AbiSuite/lib/fonts/c059036l.afm -AbiSuite/lib/fonts/c059036l.pfa -AbiSuite/lib/fonts/d050000l.afm -AbiSuite/lib/fonts/d050000l.pfa -AbiSuite/lib/fonts/fonts.dir -AbiSuite/lib/fonts/n019003l.afm -AbiSuite/lib/fonts/n019003l.pfa -AbiSuite/lib/fonts/n019004l.afm -AbiSuite/lib/fonts/n019004l.pfa -AbiSuite/lib/fonts/n019023l.afm -AbiSuite/lib/fonts/n019023l.pfa -AbiSuite/lib/fonts/n019024l.afm -AbiSuite/lib/fonts/n019024l.pfa -AbiSuite/lib/fonts/n019043l.afm -AbiSuite/lib/fonts/n019043l.pfa -AbiSuite/lib/fonts/n019044l.afm -AbiSuite/lib/fonts/n019044l.pfa -AbiSuite/lib/fonts/n019063l.afm -AbiSuite/lib/fonts/n019063l.pfa -AbiSuite/lib/fonts/n019064l.afm -AbiSuite/lib/fonts/n019064l.pfa -AbiSuite/lib/fonts/n021003l.afm -AbiSuite/lib/fonts/n021003l.pfa -AbiSuite/lib/fonts/n021004l.afm -AbiSuite/lib/fonts/n021004l.pfa -AbiSuite/lib/fonts/n021023l.afm -AbiSuite/lib/fonts/n021023l.pfa -AbiSuite/lib/fonts/n021024l.afm -AbiSuite/lib/fonts/n021024l.pfa -AbiSuite/lib/fonts/n022003l.afm -AbiSuite/lib/fonts/n022003l.pfa -AbiSuite/lib/fonts/n022004l.afm -AbiSuite/lib/fonts/n022004l.pfa -AbiSuite/lib/fonts/n022023l.afm -AbiSuite/lib/fonts/n022023l.pfa -AbiSuite/lib/fonts/n022024l.afm -AbiSuite/lib/fonts/n022024l.pfa -AbiSuite/lib/fonts/p052003l.afm -AbiSuite/lib/fonts/p052003l.pfa -AbiSuite/lib/fonts/p052004l.afm -AbiSuite/lib/fonts/p052004l.pfa -AbiSuite/lib/fonts/p052023l.afm -AbiSuite/lib/fonts/p052023l.pfa -AbiSuite/lib/fonts/p052024l.afm -AbiSuite/lib/fonts/p052024l.pfa -AbiSuite/lib/fonts/s050000l.afm -AbiSuite/lib/fonts/s050000l.pfa -AbiSuite/lib/fonts/z003034l.afm -AbiSuite/lib/fonts/z003034l.pfa -@dirrm AbiSuite/lib/fonts -@dirrm AbiSuite/lib +AbiSuite/bin/AbiWord_s +AbiSuite/fonts/a010013l.afm +AbiSuite/fonts/a010013l.pfa +AbiSuite/fonts/a010015l.afm +AbiSuite/fonts/a010015l.pfa +AbiSuite/fonts/a010033l.afm +AbiSuite/fonts/a010033l.pfa +AbiSuite/fonts/a010035l.afm +AbiSuite/fonts/a010035l.pfa +AbiSuite/fonts/b018012l.afm +AbiSuite/fonts/b018012l.pfa +AbiSuite/fonts/b018015l.afm +AbiSuite/fonts/b018015l.pfa +AbiSuite/fonts/b018032l.afm +AbiSuite/fonts/b018032l.pfa +AbiSuite/fonts/b018035l.afm +AbiSuite/fonts/b018035l.pfa +AbiSuite/fonts/bchb.afm +AbiSuite/fonts/bchb.pfa +AbiSuite/fonts/bchbi.afm +AbiSuite/fonts/bchbi.pfa +AbiSuite/fonts/bchr.afm +AbiSuite/fonts/bchr.pfa +AbiSuite/fonts/bchri.afm +AbiSuite/fonts/bchri.pfa +AbiSuite/fonts/c059013l.afm +AbiSuite/fonts/c059013l.pfa +AbiSuite/fonts/c059016l.afm +AbiSuite/fonts/c059016l.pfa +AbiSuite/fonts/c059033l.afm +AbiSuite/fonts/c059033l.pfa +AbiSuite/fonts/c059036l.afm +AbiSuite/fonts/c059036l.pfa +AbiSuite/fonts/d050000l.afm +AbiSuite/fonts/d050000l.pfa +AbiSuite/fonts/fonts.dir +AbiSuite/fonts/n019003l.afm +AbiSuite/fonts/n019003l.pfa +AbiSuite/fonts/n019004l.afm +AbiSuite/fonts/n019004l.pfa +AbiSuite/fonts/n019023l.afm +AbiSuite/fonts/n019023l.pfa +AbiSuite/fonts/n019024l.afm +AbiSuite/fonts/n019024l.pfa +AbiSuite/fonts/n019043l.afm +AbiSuite/fonts/n019043l.pfa +AbiSuite/fonts/n019044l.afm +AbiSuite/fonts/n019044l.pfa +AbiSuite/fonts/n019063l.afm +AbiSuite/fonts/n019063l.pfa +AbiSuite/fonts/n019064l.afm +AbiSuite/fonts/n019064l.pfa +AbiSuite/fonts/n021003l.afm +AbiSuite/fonts/n021003l.pfa +AbiSuite/fonts/n021004l.afm +AbiSuite/fonts/n021004l.pfa +AbiSuite/fonts/n021023l.afm +AbiSuite/fonts/n021023l.pfa +AbiSuite/fonts/n021024l.afm +AbiSuite/fonts/n021024l.pfa +AbiSuite/fonts/n022003l.afm +AbiSuite/fonts/n022003l.pfa +AbiSuite/fonts/n022004l.afm +AbiSuite/fonts/n022004l.pfa +AbiSuite/fonts/n022023l.afm +AbiSuite/fonts/n022023l.pfa +AbiSuite/fonts/n022024l.afm +AbiSuite/fonts/n022024l.pfa +AbiSuite/fonts/p052003l.afm +AbiSuite/fonts/p052003l.pfa +AbiSuite/fonts/p052004l.afm +AbiSuite/fonts/p052004l.pfa +AbiSuite/fonts/p052023l.afm +AbiSuite/fonts/p052023l.pfa +AbiSuite/fonts/p052024l.afm +AbiSuite/fonts/p052024l.pfa +AbiSuite/fonts/s050000l.afm +AbiSuite/fonts/s050000l.pfa +AbiSuite/fonts/z003034l.afm +AbiSuite/fonts/z003034l.pfa +AbiSuite/docs/AbiSource_DialogFramework.abw +AbiSuite/docs/AbiSource_Localization.abw +AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw +AbiSuite/docs/AbiWord_DocumentFormat.abw +AbiSuite/docs/AbiWord_FileImport.abw +AbiSuite/docs/AbiWord_LayoutDesign.abw +AbiSuite/docs/AbiWord_SourceOverview.abw +AbiSuite/docs/AbiWord_SpellCheck_Notes.abw +AbiSuite/docs/AbiWord_list_notes.txt +AbiSuite/docs/BUILD.TXT +AbiSuite/docs/UnixAdmin.abw +AbiSuite/docs/roadmap.html +AbiSuite/docs/Bazaar.abw +AbiSuite/docs/BillOfRights.abw +AbiSuite/docs/Gettysburg.abw +AbiSuite/docs/Interview.abw +AbiSuite/docs/Latin1.abw +AbiSuite/docs/Styles.abw +AbiSuite/docs/Unicode1.abw +AbiSuite/docs/Word97Test.doc +AbiSuite/docs/abi_memo-new.abw +AbiSuite/docs/abi_memo.abw +AbiSuite/docs/data.abw +AbiSuite/docs/footer.abw +AbiSuite/docs/rtftest.rtf +AbiSuite/docs/tabs.abw +@dirrm AbiSuite/fonts @dirrm AbiSuite/bin +@dirrm AbiSuite/docs @dirrm AbiSuite diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 25d2d9c99cfe..366918b2f2ea 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -1,42 +1,39 @@ # New ports collection makefile for: AbiWord -# Version required: 0.5.5 +# Version required: 0.7.5 # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.org> # # $FreeBSD$ # -DISTNAME= abi-0.5.5-src -PKGNAME= AbiWord-0.5.5 +DISTNAME= abi-${VERSION} +PKGNAME= AbiWord-${VERSION} CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ - unixfonts-0.5.4.tar.gz +MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \ + unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz MAINTAINER= dburr@FreeBSD.org -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord -WRKSRC= ${WRKDIR}/abi-0.5.5/src -USE_XLIB= YES -USE_GMAKE= YES - -# the build is placed in a directory name of the form -# FreeBSD_3.1-RELEASE_i386_OBJ. This variable makes it -# a bit easier to type this whenever it's needed in the -# do-install target. -OSDISTDIR= `uname -s`_`uname -r`_`uname -m`_OBJ +VERSION= 0.7.6 +WRKSRC= ${WRKDIR}/abi-${VERSION}/src +USE_XLIB= yes +USE_GMAKE= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" +OSDISTDIR= ${OPSYS}_`uname -r`_${ARCH}_OBJ .include <bsd.port.pre.mk> post-patch: - @ cd ${WRKDIR} && ${LN} -sf abi-0.5.5 abi -.if ${OSVERSION} > 310000 +.if ${OSVERSION} != 310000 @${CP} ${WRKSRC}/config/platforms/freebsd.mk \ ${WRKSRC}/config/platforms/freebsd.mk.version @${SED} -e s,3.1-RELEASE,`uname -r`,g \ @@ -44,18 +41,29 @@ post-patch: ${WRKSRC}/config/platforms/freebsd.mk .endif +pre-build: + @(cd ${WRKDIR}/wv && ./configure) + do-install: - ${MKDIR} ${PREFIX}/AbiSuite/bin - ${MKDIR} ${PREFIX}/AbiSuite/lib - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done ) - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done ) - @${CP} ${WRKDIR}/unixfonts-0.5.4/install.sh \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig + @${MKDIR} ${PREFIX}/AbiSuite/bin + @${MKDIR} ${PREFIX}/AbiSuite/docs + @(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \ + ${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \ + ${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \ + ${PREFIX}/AbiSuite/bin/ + @${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord + @${CP} ${WRKDIR}/unixfonts/install.sh \ + ${WRKDIR}/unixfonts/install.sh.orig @${SED} s,/usr/local,${PREFIX}, \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \ - ${WRKDIR}/unixfonts-0.5.4/install.sh - ( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh ) - for BIN in ${PREFIX}/AbiSuite/bin/* ; do ${LN} -sf $${BIN} ${PREFIX}/bin ; done + ${WRKDIR}/unixfonts/install.sh.orig > \ + ${WRKDIR}/unixfonts/install.sh + @(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh) @${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX}, - + @(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \ + AbiWord ${PREFIX}/AbiSuite) + .include <bsd.port.post.mk> diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo index a2d2cadf1f9f..7ae219276a27 100644 --- a/editors/AbiWord2/distinfo +++ b/editors/AbiWord2/distinfo @@ -1,3 +1,4 @@ -MD5 (AbiWord/abi-0.5.5-src.tar.gz) = b22110939863bf00d724f8aa9c26e0bd -MD5 (AbiWord/expat.tar.gz) = 9eb717e45f14995754711a5816f2c6dc -MD5 (AbiWord/unixfonts-0.5.4.tar.gz) = 44da988a7a96e1f995999a039ce33537 +MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55 +MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a +MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd +MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50 diff --git a/editors/AbiWord2/files/patch-aa b/editors/AbiWord2/files/patch-aa index ce0149fac22c..3d086340d1b6 100644 --- a/editors/AbiWord2/files/patch-aa +++ b/editors/AbiWord2/files/patch-aa @@ -1,11 +1,11 @@ ---- af/gr/unix/Makefile.orig Fri Apr 9 08:47:46 1999 -+++ af/gr/unix/Makefile Sun May 9 10:40:19 1999 -@@ -25,7 +25,7 @@ - CPPSRCS= gr_UnixGraphics.cpp \ - gr_UnixImage.cpp - --INCLUDES= -I/usr/X11R6/include -+INCLUDES= -I/usr/local/include -I/usr/X11R6/include - - TARGETS= $(OBJS) - +--- wp/impexp/xp/ie_imp_MsWord_97.h Sun Oct 31 14:05:06 1999 ++++ wp/impexp/xp/ie_imp_MsWord_97.h.new Sun Oct 31 14:05:27 1999 +@@ -24,7 +24,7 @@ + //#include <stdlib.h> + #include <stdio.h> + #include "wv.h" +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/AbiWord2/files/patch-af b/editors/AbiWord2/files/patch-af index dc6c520f1370..9d748542c247 100644 --- a/editors/AbiWord2/files/patch-af +++ b/editors/AbiWord2/files/patch-af @@ -1,10 +1,11 @@ ---- af/xap/unix/xap_UnixFont.cpp.orig Tue Apr 20 07:35:11 1999 -+++ af/xap/unix/xap_UnixFont.cpp Sun May 9 10:40:19 1999 -@@ -21,6 +21,7 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #include <sys/stat.h> +--- af/util/xp/ut_png.cpp Fri Feb 19 12:20:25 1999 ++++ af/util/xp/ut_png.cpp.new Sat Oct 30 19:10:59 1999 +@@ -17,7 +17,7 @@ + * 02111-1307, USA. + */ - #include "ut_string.h" +-#include "png.h" ++#include <png.h> + + #include "ut_assert.h" + #include "ut_bytebuf.h" diff --git a/editors/AbiWord2/files/patch-ag b/editors/AbiWord2/files/patch-ag index 1681bef3593e..6405e7d1a262 100644 --- a/editors/AbiWord2/files/patch-ag +++ b/editors/AbiWord2/files/patch-ag @@ -1,13 +1,11 @@ ---- config/abi_defs.mk.orig Thu Apr 29 10:46:27 1999 -+++ config/abi_defs.mk Sun May 9 10:40:19 1999 -@@ -230,8 +230,8 @@ - ## We should change this when get non-gtk versions on unix.... +--- wp/impexp/xp/ie_imp_AbiWord_1.h Thu Jul 22 14:29:34 1999 ++++ wp/impexp/xp/ie_imp_AbiWord_1.h.new Sat Oct 30 21:37:43 1999 +@@ -22,7 +22,7 @@ + #define IE_IMP_ABIWORD_1_H - ifeq ($(ABI_NATIVE),unix) --CFLAGS += `gtk-config --cflags` --EXTRA_LIBS += `gtk-config --libs` -+CFLAGS += `gtk12-config --cflags` -+EXTRA_LIBS += `gtk12-config --libs` - endif - - ################################################################## + #include <stdio.h> +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/AbiWord2/pkg-message b/editors/AbiWord2/pkg-message index 583418f26ac1..41799bba5851 100644 --- a/editors/AbiWord2/pkg-message +++ b/editors/AbiWord2/pkg-message @@ -1,7 +1,7 @@ -You must add the ${PREFIX}/AbiSuite/lib/fonts directory to your X server's +You must add the /usr/local/AbiSuite/fonts directory to your X server's font path. For XFree86, add the line: -FontPath "/usr/local/AbiSuite/lib/fonts/" +FontPath "/usr/local/AbiSuite/fonts/" in the "Files" section of your /etc/XF86Config file. If you use a different X server, please see its documentation on how to do diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index 31089b720a94..77eee5b0bc34 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -1,97 +1,112 @@ bin/AbiWord AbiSuite/bin/AbiWord -AbiSuite/lib/libAbiEv.a -AbiSuite/lib/libAbiFmt.a -AbiSuite/lib/libAbiGr.a -AbiSuite/lib/libAbiImpExp.a -AbiSuite/lib/libAbiPTbl.a -AbiSuite/lib/libAbiSpell.a -AbiSuite/lib/libAbiUtil.a -AbiSuite/lib/libAbiWPAp.a -AbiSuite/lib/libAbiWordVer.a -AbiSuite/lib/libAbiXAp.a -AbiSuite/lib/libAbi_expat.a -AbiSuite/lib/libMsWordView.a -AbiSuite/lib/fonts/a010013l.afm -AbiSuite/lib/fonts/a010013l.pfa -AbiSuite/lib/fonts/a010015l.afm -AbiSuite/lib/fonts/a010015l.pfa -AbiSuite/lib/fonts/a010033l.afm -AbiSuite/lib/fonts/a010033l.pfa -AbiSuite/lib/fonts/a010035l.afm -AbiSuite/lib/fonts/a010035l.pfa -AbiSuite/lib/fonts/b018012l.afm -AbiSuite/lib/fonts/b018012l.pfa -AbiSuite/lib/fonts/b018015l.afm -AbiSuite/lib/fonts/b018015l.pfa -AbiSuite/lib/fonts/b018032l.afm -AbiSuite/lib/fonts/b018032l.pfa -AbiSuite/lib/fonts/b018035l.afm -AbiSuite/lib/fonts/b018035l.pfa -AbiSuite/lib/fonts/bchb.afm -AbiSuite/lib/fonts/bchb.pfa -AbiSuite/lib/fonts/bchbi.afm -AbiSuite/lib/fonts/bchbi.pfa -AbiSuite/lib/fonts/bchr.afm -AbiSuite/lib/fonts/bchr.pfa -AbiSuite/lib/fonts/bchri.afm -AbiSuite/lib/fonts/bchri.pfa -AbiSuite/lib/fonts/c059013l.afm -AbiSuite/lib/fonts/c059013l.pfa -AbiSuite/lib/fonts/c059016l.afm -AbiSuite/lib/fonts/c059016l.pfa -AbiSuite/lib/fonts/c059033l.afm -AbiSuite/lib/fonts/c059033l.pfa -AbiSuite/lib/fonts/c059036l.afm -AbiSuite/lib/fonts/c059036l.pfa -AbiSuite/lib/fonts/d050000l.afm -AbiSuite/lib/fonts/d050000l.pfa -AbiSuite/lib/fonts/fonts.dir -AbiSuite/lib/fonts/n019003l.afm -AbiSuite/lib/fonts/n019003l.pfa -AbiSuite/lib/fonts/n019004l.afm -AbiSuite/lib/fonts/n019004l.pfa -AbiSuite/lib/fonts/n019023l.afm -AbiSuite/lib/fonts/n019023l.pfa -AbiSuite/lib/fonts/n019024l.afm -AbiSuite/lib/fonts/n019024l.pfa -AbiSuite/lib/fonts/n019043l.afm -AbiSuite/lib/fonts/n019043l.pfa -AbiSuite/lib/fonts/n019044l.afm -AbiSuite/lib/fonts/n019044l.pfa -AbiSuite/lib/fonts/n019063l.afm -AbiSuite/lib/fonts/n019063l.pfa -AbiSuite/lib/fonts/n019064l.afm -AbiSuite/lib/fonts/n019064l.pfa -AbiSuite/lib/fonts/n021003l.afm -AbiSuite/lib/fonts/n021003l.pfa -AbiSuite/lib/fonts/n021004l.afm -AbiSuite/lib/fonts/n021004l.pfa -AbiSuite/lib/fonts/n021023l.afm -AbiSuite/lib/fonts/n021023l.pfa -AbiSuite/lib/fonts/n021024l.afm -AbiSuite/lib/fonts/n021024l.pfa -AbiSuite/lib/fonts/n022003l.afm -AbiSuite/lib/fonts/n022003l.pfa -AbiSuite/lib/fonts/n022004l.afm -AbiSuite/lib/fonts/n022004l.pfa -AbiSuite/lib/fonts/n022023l.afm -AbiSuite/lib/fonts/n022023l.pfa -AbiSuite/lib/fonts/n022024l.afm -AbiSuite/lib/fonts/n022024l.pfa -AbiSuite/lib/fonts/p052003l.afm -AbiSuite/lib/fonts/p052003l.pfa -AbiSuite/lib/fonts/p052004l.afm -AbiSuite/lib/fonts/p052004l.pfa -AbiSuite/lib/fonts/p052023l.afm -AbiSuite/lib/fonts/p052023l.pfa -AbiSuite/lib/fonts/p052024l.afm -AbiSuite/lib/fonts/p052024l.pfa -AbiSuite/lib/fonts/s050000l.afm -AbiSuite/lib/fonts/s050000l.pfa -AbiSuite/lib/fonts/z003034l.afm -AbiSuite/lib/fonts/z003034l.pfa -@dirrm AbiSuite/lib/fonts -@dirrm AbiSuite/lib +AbiSuite/bin/AbiWord_s +AbiSuite/fonts/a010013l.afm +AbiSuite/fonts/a010013l.pfa +AbiSuite/fonts/a010015l.afm +AbiSuite/fonts/a010015l.pfa +AbiSuite/fonts/a010033l.afm +AbiSuite/fonts/a010033l.pfa +AbiSuite/fonts/a010035l.afm +AbiSuite/fonts/a010035l.pfa +AbiSuite/fonts/b018012l.afm +AbiSuite/fonts/b018012l.pfa +AbiSuite/fonts/b018015l.afm +AbiSuite/fonts/b018015l.pfa +AbiSuite/fonts/b018032l.afm +AbiSuite/fonts/b018032l.pfa +AbiSuite/fonts/b018035l.afm +AbiSuite/fonts/b018035l.pfa +AbiSuite/fonts/bchb.afm +AbiSuite/fonts/bchb.pfa +AbiSuite/fonts/bchbi.afm +AbiSuite/fonts/bchbi.pfa +AbiSuite/fonts/bchr.afm +AbiSuite/fonts/bchr.pfa +AbiSuite/fonts/bchri.afm +AbiSuite/fonts/bchri.pfa +AbiSuite/fonts/c059013l.afm +AbiSuite/fonts/c059013l.pfa +AbiSuite/fonts/c059016l.afm +AbiSuite/fonts/c059016l.pfa +AbiSuite/fonts/c059033l.afm +AbiSuite/fonts/c059033l.pfa +AbiSuite/fonts/c059036l.afm +AbiSuite/fonts/c059036l.pfa +AbiSuite/fonts/d050000l.afm +AbiSuite/fonts/d050000l.pfa +AbiSuite/fonts/fonts.dir +AbiSuite/fonts/n019003l.afm +AbiSuite/fonts/n019003l.pfa +AbiSuite/fonts/n019004l.afm +AbiSuite/fonts/n019004l.pfa +AbiSuite/fonts/n019023l.afm +AbiSuite/fonts/n019023l.pfa +AbiSuite/fonts/n019024l.afm +AbiSuite/fonts/n019024l.pfa +AbiSuite/fonts/n019043l.afm +AbiSuite/fonts/n019043l.pfa +AbiSuite/fonts/n019044l.afm +AbiSuite/fonts/n019044l.pfa +AbiSuite/fonts/n019063l.afm +AbiSuite/fonts/n019063l.pfa +AbiSuite/fonts/n019064l.afm +AbiSuite/fonts/n019064l.pfa +AbiSuite/fonts/n021003l.afm +AbiSuite/fonts/n021003l.pfa +AbiSuite/fonts/n021004l.afm +AbiSuite/fonts/n021004l.pfa +AbiSuite/fonts/n021023l.afm +AbiSuite/fonts/n021023l.pfa +AbiSuite/fonts/n021024l.afm +AbiSuite/fonts/n021024l.pfa +AbiSuite/fonts/n022003l.afm +AbiSuite/fonts/n022003l.pfa +AbiSuite/fonts/n022004l.afm +AbiSuite/fonts/n022004l.pfa +AbiSuite/fonts/n022023l.afm +AbiSuite/fonts/n022023l.pfa +AbiSuite/fonts/n022024l.afm +AbiSuite/fonts/n022024l.pfa +AbiSuite/fonts/p052003l.afm +AbiSuite/fonts/p052003l.pfa +AbiSuite/fonts/p052004l.afm +AbiSuite/fonts/p052004l.pfa +AbiSuite/fonts/p052023l.afm +AbiSuite/fonts/p052023l.pfa +AbiSuite/fonts/p052024l.afm +AbiSuite/fonts/p052024l.pfa +AbiSuite/fonts/s050000l.afm +AbiSuite/fonts/s050000l.pfa +AbiSuite/fonts/z003034l.afm +AbiSuite/fonts/z003034l.pfa +AbiSuite/docs/AbiSource_DialogFramework.abw +AbiSuite/docs/AbiSource_Localization.abw +AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw +AbiSuite/docs/AbiWord_DocumentFormat.abw +AbiSuite/docs/AbiWord_FileImport.abw +AbiSuite/docs/AbiWord_LayoutDesign.abw +AbiSuite/docs/AbiWord_SourceOverview.abw +AbiSuite/docs/AbiWord_SpellCheck_Notes.abw +AbiSuite/docs/AbiWord_list_notes.txt +AbiSuite/docs/BUILD.TXT +AbiSuite/docs/UnixAdmin.abw +AbiSuite/docs/roadmap.html +AbiSuite/docs/Bazaar.abw +AbiSuite/docs/BillOfRights.abw +AbiSuite/docs/Gettysburg.abw +AbiSuite/docs/Interview.abw +AbiSuite/docs/Latin1.abw +AbiSuite/docs/Styles.abw +AbiSuite/docs/Unicode1.abw +AbiSuite/docs/Word97Test.doc +AbiSuite/docs/abi_memo-new.abw +AbiSuite/docs/abi_memo.abw +AbiSuite/docs/data.abw +AbiSuite/docs/footer.abw +AbiSuite/docs/rtftest.rtf +AbiSuite/docs/tabs.abw +@dirrm AbiSuite/fonts @dirrm AbiSuite/bin +@dirrm AbiSuite/docs @dirrm AbiSuite diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 25d2d9c99cfe..366918b2f2ea 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -1,42 +1,39 @@ # New ports collection makefile for: AbiWord -# Version required: 0.5.5 +# Version required: 0.7.5 # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.org> # # $FreeBSD$ # -DISTNAME= abi-0.5.5-src -PKGNAME= AbiWord-0.5.5 +DISTNAME= abi-${VERSION} +PKGNAME= AbiWord-${VERSION} CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ - unixfonts-0.5.4.tar.gz +MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \ + unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz MAINTAINER= dburr@FreeBSD.org -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord -WRKSRC= ${WRKDIR}/abi-0.5.5/src -USE_XLIB= YES -USE_GMAKE= YES - -# the build is placed in a directory name of the form -# FreeBSD_3.1-RELEASE_i386_OBJ. This variable makes it -# a bit easier to type this whenever it's needed in the -# do-install target. -OSDISTDIR= `uname -s`_`uname -r`_`uname -m`_OBJ +VERSION= 0.7.6 +WRKSRC= ${WRKDIR}/abi-${VERSION}/src +USE_XLIB= yes +USE_GMAKE= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" +OSDISTDIR= ${OPSYS}_`uname -r`_${ARCH}_OBJ .include <bsd.port.pre.mk> post-patch: - @ cd ${WRKDIR} && ${LN} -sf abi-0.5.5 abi -.if ${OSVERSION} > 310000 +.if ${OSVERSION} != 310000 @${CP} ${WRKSRC}/config/platforms/freebsd.mk \ ${WRKSRC}/config/platforms/freebsd.mk.version @${SED} -e s,3.1-RELEASE,`uname -r`,g \ @@ -44,18 +41,29 @@ post-patch: ${WRKSRC}/config/platforms/freebsd.mk .endif +pre-build: + @(cd ${WRKDIR}/wv && ./configure) + do-install: - ${MKDIR} ${PREFIX}/AbiSuite/bin - ${MKDIR} ${PREFIX}/AbiSuite/lib - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done ) - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done ) - @${CP} ${WRKDIR}/unixfonts-0.5.4/install.sh \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig + @${MKDIR} ${PREFIX}/AbiSuite/bin + @${MKDIR} ${PREFIX}/AbiSuite/docs + @(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \ + ${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \ + ${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \ + ${PREFIX}/AbiSuite/bin/ + @${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord + @${CP} ${WRKDIR}/unixfonts/install.sh \ + ${WRKDIR}/unixfonts/install.sh.orig @${SED} s,/usr/local,${PREFIX}, \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \ - ${WRKDIR}/unixfonts-0.5.4/install.sh - ( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh ) - for BIN in ${PREFIX}/AbiSuite/bin/* ; do ${LN} -sf $${BIN} ${PREFIX}/bin ; done + ${WRKDIR}/unixfonts/install.sh.orig > \ + ${WRKDIR}/unixfonts/install.sh + @(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh) @${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX}, - + @(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \ + AbiWord ${PREFIX}/AbiSuite) + .include <bsd.port.post.mk> diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo index a2d2cadf1f9f..7ae219276a27 100644 --- a/editors/abiword-devel/distinfo +++ b/editors/abiword-devel/distinfo @@ -1,3 +1,4 @@ -MD5 (AbiWord/abi-0.5.5-src.tar.gz) = b22110939863bf00d724f8aa9c26e0bd -MD5 (AbiWord/expat.tar.gz) = 9eb717e45f14995754711a5816f2c6dc -MD5 (AbiWord/unixfonts-0.5.4.tar.gz) = 44da988a7a96e1f995999a039ce33537 +MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55 +MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a +MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd +MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50 diff --git a/editors/abiword-devel/files/patch-aa b/editors/abiword-devel/files/patch-aa index ce0149fac22c..3d086340d1b6 100644 --- a/editors/abiword-devel/files/patch-aa +++ b/editors/abiword-devel/files/patch-aa @@ -1,11 +1,11 @@ ---- af/gr/unix/Makefile.orig Fri Apr 9 08:47:46 1999 -+++ af/gr/unix/Makefile Sun May 9 10:40:19 1999 -@@ -25,7 +25,7 @@ - CPPSRCS= gr_UnixGraphics.cpp \ - gr_UnixImage.cpp - --INCLUDES= -I/usr/X11R6/include -+INCLUDES= -I/usr/local/include -I/usr/X11R6/include - - TARGETS= $(OBJS) - +--- wp/impexp/xp/ie_imp_MsWord_97.h Sun Oct 31 14:05:06 1999 ++++ wp/impexp/xp/ie_imp_MsWord_97.h.new Sun Oct 31 14:05:27 1999 +@@ -24,7 +24,7 @@ + //#include <stdlib.h> + #include <stdio.h> + #include "wv.h" +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/abiword-devel/files/patch-af b/editors/abiword-devel/files/patch-af index dc6c520f1370..9d748542c247 100644 --- a/editors/abiword-devel/files/patch-af +++ b/editors/abiword-devel/files/patch-af @@ -1,10 +1,11 @@ ---- af/xap/unix/xap_UnixFont.cpp.orig Tue Apr 20 07:35:11 1999 -+++ af/xap/unix/xap_UnixFont.cpp Sun May 9 10:40:19 1999 -@@ -21,6 +21,7 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #include <sys/stat.h> +--- af/util/xp/ut_png.cpp Fri Feb 19 12:20:25 1999 ++++ af/util/xp/ut_png.cpp.new Sat Oct 30 19:10:59 1999 +@@ -17,7 +17,7 @@ + * 02111-1307, USA. + */ - #include "ut_string.h" +-#include "png.h" ++#include <png.h> + + #include "ut_assert.h" + #include "ut_bytebuf.h" diff --git a/editors/abiword-devel/files/patch-ag b/editors/abiword-devel/files/patch-ag index 1681bef3593e..6405e7d1a262 100644 --- a/editors/abiword-devel/files/patch-ag +++ b/editors/abiword-devel/files/patch-ag @@ -1,13 +1,11 @@ ---- config/abi_defs.mk.orig Thu Apr 29 10:46:27 1999 -+++ config/abi_defs.mk Sun May 9 10:40:19 1999 -@@ -230,8 +230,8 @@ - ## We should change this when get non-gtk versions on unix.... +--- wp/impexp/xp/ie_imp_AbiWord_1.h Thu Jul 22 14:29:34 1999 ++++ wp/impexp/xp/ie_imp_AbiWord_1.h.new Sat Oct 30 21:37:43 1999 +@@ -22,7 +22,7 @@ + #define IE_IMP_ABIWORD_1_H - ifeq ($(ABI_NATIVE),unix) --CFLAGS += `gtk-config --cflags` --EXTRA_LIBS += `gtk-config --libs` -+CFLAGS += `gtk12-config --cflags` -+EXTRA_LIBS += `gtk12-config --libs` - endif - - ################################################################## + #include <stdio.h> +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/abiword-devel/pkg-message b/editors/abiword-devel/pkg-message index 583418f26ac1..41799bba5851 100644 --- a/editors/abiword-devel/pkg-message +++ b/editors/abiword-devel/pkg-message @@ -1,7 +1,7 @@ -You must add the ${PREFIX}/AbiSuite/lib/fonts directory to your X server's +You must add the /usr/local/AbiSuite/fonts directory to your X server's font path. For XFree86, add the line: -FontPath "/usr/local/AbiSuite/lib/fonts/" +FontPath "/usr/local/AbiSuite/fonts/" in the "Files" section of your /etc/XF86Config file. If you use a different X server, please see its documentation on how to do diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist index 31089b720a94..77eee5b0bc34 100644 --- a/editors/abiword-devel/pkg-plist +++ b/editors/abiword-devel/pkg-plist @@ -1,97 +1,112 @@ bin/AbiWord AbiSuite/bin/AbiWord -AbiSuite/lib/libAbiEv.a -AbiSuite/lib/libAbiFmt.a -AbiSuite/lib/libAbiGr.a -AbiSuite/lib/libAbiImpExp.a -AbiSuite/lib/libAbiPTbl.a -AbiSuite/lib/libAbiSpell.a -AbiSuite/lib/libAbiUtil.a -AbiSuite/lib/libAbiWPAp.a -AbiSuite/lib/libAbiWordVer.a -AbiSuite/lib/libAbiXAp.a -AbiSuite/lib/libAbi_expat.a -AbiSuite/lib/libMsWordView.a -AbiSuite/lib/fonts/a010013l.afm -AbiSuite/lib/fonts/a010013l.pfa -AbiSuite/lib/fonts/a010015l.afm -AbiSuite/lib/fonts/a010015l.pfa -AbiSuite/lib/fonts/a010033l.afm -AbiSuite/lib/fonts/a010033l.pfa -AbiSuite/lib/fonts/a010035l.afm -AbiSuite/lib/fonts/a010035l.pfa -AbiSuite/lib/fonts/b018012l.afm -AbiSuite/lib/fonts/b018012l.pfa -AbiSuite/lib/fonts/b018015l.afm -AbiSuite/lib/fonts/b018015l.pfa -AbiSuite/lib/fonts/b018032l.afm -AbiSuite/lib/fonts/b018032l.pfa -AbiSuite/lib/fonts/b018035l.afm -AbiSuite/lib/fonts/b018035l.pfa -AbiSuite/lib/fonts/bchb.afm -AbiSuite/lib/fonts/bchb.pfa -AbiSuite/lib/fonts/bchbi.afm -AbiSuite/lib/fonts/bchbi.pfa -AbiSuite/lib/fonts/bchr.afm -AbiSuite/lib/fonts/bchr.pfa -AbiSuite/lib/fonts/bchri.afm -AbiSuite/lib/fonts/bchri.pfa -AbiSuite/lib/fonts/c059013l.afm -AbiSuite/lib/fonts/c059013l.pfa -AbiSuite/lib/fonts/c059016l.afm -AbiSuite/lib/fonts/c059016l.pfa -AbiSuite/lib/fonts/c059033l.afm -AbiSuite/lib/fonts/c059033l.pfa -AbiSuite/lib/fonts/c059036l.afm -AbiSuite/lib/fonts/c059036l.pfa -AbiSuite/lib/fonts/d050000l.afm -AbiSuite/lib/fonts/d050000l.pfa -AbiSuite/lib/fonts/fonts.dir -AbiSuite/lib/fonts/n019003l.afm -AbiSuite/lib/fonts/n019003l.pfa -AbiSuite/lib/fonts/n019004l.afm -AbiSuite/lib/fonts/n019004l.pfa -AbiSuite/lib/fonts/n019023l.afm -AbiSuite/lib/fonts/n019023l.pfa -AbiSuite/lib/fonts/n019024l.afm -AbiSuite/lib/fonts/n019024l.pfa -AbiSuite/lib/fonts/n019043l.afm -AbiSuite/lib/fonts/n019043l.pfa -AbiSuite/lib/fonts/n019044l.afm -AbiSuite/lib/fonts/n019044l.pfa -AbiSuite/lib/fonts/n019063l.afm -AbiSuite/lib/fonts/n019063l.pfa -AbiSuite/lib/fonts/n019064l.afm -AbiSuite/lib/fonts/n019064l.pfa -AbiSuite/lib/fonts/n021003l.afm -AbiSuite/lib/fonts/n021003l.pfa -AbiSuite/lib/fonts/n021004l.afm -AbiSuite/lib/fonts/n021004l.pfa -AbiSuite/lib/fonts/n021023l.afm -AbiSuite/lib/fonts/n021023l.pfa -AbiSuite/lib/fonts/n021024l.afm -AbiSuite/lib/fonts/n021024l.pfa -AbiSuite/lib/fonts/n022003l.afm -AbiSuite/lib/fonts/n022003l.pfa -AbiSuite/lib/fonts/n022004l.afm -AbiSuite/lib/fonts/n022004l.pfa -AbiSuite/lib/fonts/n022023l.afm -AbiSuite/lib/fonts/n022023l.pfa -AbiSuite/lib/fonts/n022024l.afm -AbiSuite/lib/fonts/n022024l.pfa -AbiSuite/lib/fonts/p052003l.afm -AbiSuite/lib/fonts/p052003l.pfa -AbiSuite/lib/fonts/p052004l.afm -AbiSuite/lib/fonts/p052004l.pfa -AbiSuite/lib/fonts/p052023l.afm -AbiSuite/lib/fonts/p052023l.pfa -AbiSuite/lib/fonts/p052024l.afm -AbiSuite/lib/fonts/p052024l.pfa -AbiSuite/lib/fonts/s050000l.afm -AbiSuite/lib/fonts/s050000l.pfa -AbiSuite/lib/fonts/z003034l.afm -AbiSuite/lib/fonts/z003034l.pfa -@dirrm AbiSuite/lib/fonts -@dirrm AbiSuite/lib +AbiSuite/bin/AbiWord_s +AbiSuite/fonts/a010013l.afm +AbiSuite/fonts/a010013l.pfa +AbiSuite/fonts/a010015l.afm +AbiSuite/fonts/a010015l.pfa +AbiSuite/fonts/a010033l.afm +AbiSuite/fonts/a010033l.pfa +AbiSuite/fonts/a010035l.afm +AbiSuite/fonts/a010035l.pfa +AbiSuite/fonts/b018012l.afm +AbiSuite/fonts/b018012l.pfa +AbiSuite/fonts/b018015l.afm +AbiSuite/fonts/b018015l.pfa +AbiSuite/fonts/b018032l.afm +AbiSuite/fonts/b018032l.pfa +AbiSuite/fonts/b018035l.afm +AbiSuite/fonts/b018035l.pfa +AbiSuite/fonts/bchb.afm +AbiSuite/fonts/bchb.pfa +AbiSuite/fonts/bchbi.afm +AbiSuite/fonts/bchbi.pfa +AbiSuite/fonts/bchr.afm +AbiSuite/fonts/bchr.pfa +AbiSuite/fonts/bchri.afm +AbiSuite/fonts/bchri.pfa +AbiSuite/fonts/c059013l.afm +AbiSuite/fonts/c059013l.pfa +AbiSuite/fonts/c059016l.afm +AbiSuite/fonts/c059016l.pfa +AbiSuite/fonts/c059033l.afm +AbiSuite/fonts/c059033l.pfa +AbiSuite/fonts/c059036l.afm +AbiSuite/fonts/c059036l.pfa +AbiSuite/fonts/d050000l.afm +AbiSuite/fonts/d050000l.pfa +AbiSuite/fonts/fonts.dir +AbiSuite/fonts/n019003l.afm +AbiSuite/fonts/n019003l.pfa +AbiSuite/fonts/n019004l.afm +AbiSuite/fonts/n019004l.pfa +AbiSuite/fonts/n019023l.afm +AbiSuite/fonts/n019023l.pfa +AbiSuite/fonts/n019024l.afm +AbiSuite/fonts/n019024l.pfa +AbiSuite/fonts/n019043l.afm +AbiSuite/fonts/n019043l.pfa +AbiSuite/fonts/n019044l.afm +AbiSuite/fonts/n019044l.pfa +AbiSuite/fonts/n019063l.afm +AbiSuite/fonts/n019063l.pfa +AbiSuite/fonts/n019064l.afm +AbiSuite/fonts/n019064l.pfa +AbiSuite/fonts/n021003l.afm +AbiSuite/fonts/n021003l.pfa +AbiSuite/fonts/n021004l.afm +AbiSuite/fonts/n021004l.pfa +AbiSuite/fonts/n021023l.afm +AbiSuite/fonts/n021023l.pfa +AbiSuite/fonts/n021024l.afm +AbiSuite/fonts/n021024l.pfa +AbiSuite/fonts/n022003l.afm +AbiSuite/fonts/n022003l.pfa +AbiSuite/fonts/n022004l.afm +AbiSuite/fonts/n022004l.pfa +AbiSuite/fonts/n022023l.afm +AbiSuite/fonts/n022023l.pfa +AbiSuite/fonts/n022024l.afm +AbiSuite/fonts/n022024l.pfa +AbiSuite/fonts/p052003l.afm +AbiSuite/fonts/p052003l.pfa +AbiSuite/fonts/p052004l.afm +AbiSuite/fonts/p052004l.pfa +AbiSuite/fonts/p052023l.afm +AbiSuite/fonts/p052023l.pfa +AbiSuite/fonts/p052024l.afm +AbiSuite/fonts/p052024l.pfa +AbiSuite/fonts/s050000l.afm +AbiSuite/fonts/s050000l.pfa +AbiSuite/fonts/z003034l.afm +AbiSuite/fonts/z003034l.pfa +AbiSuite/docs/AbiSource_DialogFramework.abw +AbiSuite/docs/AbiSource_Localization.abw +AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw +AbiSuite/docs/AbiWord_DocumentFormat.abw +AbiSuite/docs/AbiWord_FileImport.abw +AbiSuite/docs/AbiWord_LayoutDesign.abw +AbiSuite/docs/AbiWord_SourceOverview.abw +AbiSuite/docs/AbiWord_SpellCheck_Notes.abw +AbiSuite/docs/AbiWord_list_notes.txt +AbiSuite/docs/BUILD.TXT +AbiSuite/docs/UnixAdmin.abw +AbiSuite/docs/roadmap.html +AbiSuite/docs/Bazaar.abw +AbiSuite/docs/BillOfRights.abw +AbiSuite/docs/Gettysburg.abw +AbiSuite/docs/Interview.abw +AbiSuite/docs/Latin1.abw +AbiSuite/docs/Styles.abw +AbiSuite/docs/Unicode1.abw +AbiSuite/docs/Word97Test.doc +AbiSuite/docs/abi_memo-new.abw +AbiSuite/docs/abi_memo.abw +AbiSuite/docs/data.abw +AbiSuite/docs/footer.abw +AbiSuite/docs/rtftest.rtf +AbiSuite/docs/tabs.abw +@dirrm AbiSuite/fonts @dirrm AbiSuite/bin +@dirrm AbiSuite/docs @dirrm AbiSuite diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 25d2d9c99cfe..366918b2f2ea 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,42 +1,39 @@ # New ports collection makefile for: AbiWord -# Version required: 0.5.5 +# Version required: 0.7.5 # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.org> # # $FreeBSD$ # -DISTNAME= abi-0.5.5-src -PKGNAME= AbiWord-0.5.5 +DISTNAME= abi-${VERSION} +PKGNAME= AbiWord-${VERSION} CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ - unixfonts-0.5.4.tar.gz +MASTER_SITES= http://www.abisource.com/downloads/Version-${VERSION}/lf/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat-${VERSION}.tar.gz \ + unixfonts-${VERSION}.tar.gz wv-${VERSION}.tar.gz MAINTAINER= dburr@FreeBSD.org -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell DIST_SUBDIR= AbiWord -WRKSRC= ${WRKDIR}/abi-0.5.5/src -USE_XLIB= YES -USE_GMAKE= YES - -# the build is placed in a directory name of the form -# FreeBSD_3.1-RELEASE_i386_OBJ. This variable makes it -# a bit easier to type this whenever it's needed in the -# do-install target. -OSDISTDIR= `uname -s`_`uname -r`_`uname -m`_OBJ +VERSION= 0.7.6 +WRKSRC= ${WRKDIR}/abi-${VERSION}/src +USE_XLIB= yes +USE_GMAKE= yes +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" +OSDISTDIR= ${OPSYS}_`uname -r`_${ARCH}_OBJ .include <bsd.port.pre.mk> post-patch: - @ cd ${WRKDIR} && ${LN} -sf abi-0.5.5 abi -.if ${OSVERSION} > 310000 +.if ${OSVERSION} != 310000 @${CP} ${WRKSRC}/config/platforms/freebsd.mk \ ${WRKSRC}/config/platforms/freebsd.mk.version @${SED} -e s,3.1-RELEASE,`uname -r`,g \ @@ -44,18 +41,29 @@ post-patch: ${WRKSRC}/config/platforms/freebsd.mk .endif +pre-build: + @(cd ${WRKDIR}/wv && ./configure) + do-install: - ${MKDIR} ${PREFIX}/AbiSuite/bin - ${MKDIR} ${PREFIX}/AbiSuite/lib - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/bin ; for BIN in *; do ${INSTALL_PROGRAM} $${BIN} ${PREFIX}/AbiSuite/bin ; done ) - ( cd ${WRKDIR}/abi-0.5.5/dist/${OSDISTDIR}/lib ; for LIB in *; do ${INSTALL_DATA} $${LIB} ${PREFIX}/AbiSuite/lib ; done ) - @${CP} ${WRKDIR}/unixfonts-0.5.4/install.sh \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig + @${MKDIR} ${PREFIX}/AbiSuite/bin + @${MKDIR} ${PREFIX}/AbiSuite/docs + @(cd ${WRKDIR}/abi-${VERSION}/docs; for DOCS in *; do \ + ${INSTALL_DATA} $${DOCS} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @(cd ${WRKDIR}/abi-${VERSION}/test/wp; for TEST in *; do \ + ${INSTALL_DATA} $${TEST} ${PREFIX}/AbiSuite/docs/ \ + ;done) + @${INSTALL_PROGRAM} ${WRKSRC}/${OSDISTDIR}/bin/AbiWord_s \ + ${PREFIX}/AbiSuite/bin/ + @${LN} -sf ${PREFIX}/AbiSuite/bin/AbiWord ${PREFIX}/bin/AbiWord + @${CP} ${WRKDIR}/unixfonts/install.sh \ + ${WRKDIR}/unixfonts/install.sh.orig @${SED} s,/usr/local,${PREFIX}, \ - ${WRKDIR}/unixfonts-0.5.4/install.sh.orig > \ - ${WRKDIR}/unixfonts-0.5.4/install.sh - ( cd ${WRKDIR}/unixfonts-0.5.4 ; yes "" | bash ./install.sh ) - for BIN in ${PREFIX}/AbiSuite/bin/* ; do ${LN} -sf $${BIN} ${PREFIX}/bin ; done + ${WRKDIR}/unixfonts/install.sh.orig > \ + ${WRKDIR}/unixfonts/install.sh + @(cd ${WRKDIR}/unixfonts; yes "" | ./install.sh) @${CAT} ${PKGDIR}/MESSAGE | ${SED} s,/usr/local,${PREFIX}, - + @(${WRKSRC}/pkg/common/unix/scripts/makewrapper.sh \ + AbiWord ${PREFIX}/AbiSuite) + .include <bsd.port.post.mk> diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index a2d2cadf1f9f..7ae219276a27 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,3 +1,4 @@ -MD5 (AbiWord/abi-0.5.5-src.tar.gz) = b22110939863bf00d724f8aa9c26e0bd -MD5 (AbiWord/expat.tar.gz) = 9eb717e45f14995754711a5816f2c6dc -MD5 (AbiWord/unixfonts-0.5.4.tar.gz) = 44da988a7a96e1f995999a039ce33537 +MD5 (AbiWord/abi-0.7.6.tar.gz) = eabfa3067ff560f7c08b62d7661bba55 +MD5 (AbiWord/expat-0.7.6.tar.gz) = 3645bf427740914d7fd5f3173f2a742a +MD5 (AbiWord/unixfonts-0.7.6.tar.gz) = 937be69cc7d43a0aa15215ec04e102dd +MD5 (AbiWord/wv-0.7.6.tar.gz) = 528c967c1d0fcb2f7b817920c6610a50 diff --git a/editors/abiword/files/patch-aa b/editors/abiword/files/patch-aa index ce0149fac22c..3d086340d1b6 100644 --- a/editors/abiword/files/patch-aa +++ b/editors/abiword/files/patch-aa @@ -1,11 +1,11 @@ ---- af/gr/unix/Makefile.orig Fri Apr 9 08:47:46 1999 -+++ af/gr/unix/Makefile Sun May 9 10:40:19 1999 -@@ -25,7 +25,7 @@ - CPPSRCS= gr_UnixGraphics.cpp \ - gr_UnixImage.cpp - --INCLUDES= -I/usr/X11R6/include -+INCLUDES= -I/usr/local/include -I/usr/X11R6/include - - TARGETS= $(OBJS) - +--- wp/impexp/xp/ie_imp_MsWord_97.h Sun Oct 31 14:05:06 1999 ++++ wp/impexp/xp/ie_imp_MsWord_97.h.new Sun Oct 31 14:05:27 1999 +@@ -24,7 +24,7 @@ + //#include <stdlib.h> + #include <stdio.h> + #include "wv.h" +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/abiword/files/patch-af b/editors/abiword/files/patch-af index dc6c520f1370..9d748542c247 100644 --- a/editors/abiword/files/patch-af +++ b/editors/abiword/files/patch-af @@ -1,10 +1,11 @@ ---- af/xap/unix/xap_UnixFont.cpp.orig Tue Apr 20 07:35:11 1999 -+++ af/xap/unix/xap_UnixFont.cpp Sun May 9 10:40:19 1999 -@@ -21,6 +21,7 @@ - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #include <sys/stat.h> +--- af/util/xp/ut_png.cpp Fri Feb 19 12:20:25 1999 ++++ af/util/xp/ut_png.cpp.new Sat Oct 30 19:10:59 1999 +@@ -17,7 +17,7 @@ + * 02111-1307, USA. + */ - #include "ut_string.h" +-#include "png.h" ++#include <png.h> + + #include "ut_assert.h" + #include "ut_bytebuf.h" diff --git a/editors/abiword/files/patch-ag b/editors/abiword/files/patch-ag index 1681bef3593e..6405e7d1a262 100644 --- a/editors/abiword/files/patch-ag +++ b/editors/abiword/files/patch-ag @@ -1,13 +1,11 @@ ---- config/abi_defs.mk.orig Thu Apr 29 10:46:27 1999 -+++ config/abi_defs.mk Sun May 9 10:40:19 1999 -@@ -230,8 +230,8 @@ - ## We should change this when get non-gtk versions on unix.... +--- wp/impexp/xp/ie_imp_AbiWord_1.h Thu Jul 22 14:29:34 1999 ++++ wp/impexp/xp/ie_imp_AbiWord_1.h.new Sat Oct 30 21:37:43 1999 +@@ -22,7 +22,7 @@ + #define IE_IMP_ABIWORD_1_H - ifeq ($(ABI_NATIVE),unix) --CFLAGS += `gtk-config --cflags` --EXTRA_LIBS += `gtk-config --libs` -+CFLAGS += `gtk12-config --cflags` -+EXTRA_LIBS += `gtk12-config --libs` - endif - - ################################################################## + #include <stdio.h> +-#include "xmlparse.h" ++#include <xmlparse.h> + #include "ut_vector.h" + #include "ut_stack.h" + #include "ie_imp.h" diff --git a/editors/abiword/pkg-message b/editors/abiword/pkg-message index 583418f26ac1..41799bba5851 100644 --- a/editors/abiword/pkg-message +++ b/editors/abiword/pkg-message @@ -1,7 +1,7 @@ -You must add the ${PREFIX}/AbiSuite/lib/fonts directory to your X server's +You must add the /usr/local/AbiSuite/fonts directory to your X server's font path. For XFree86, add the line: -FontPath "/usr/local/AbiSuite/lib/fonts/" +FontPath "/usr/local/AbiSuite/fonts/" in the "Files" section of your /etc/XF86Config file. If you use a different X server, please see its documentation on how to do diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist index 31089b720a94..77eee5b0bc34 100644 --- a/editors/abiword/pkg-plist +++ b/editors/abiword/pkg-plist @@ -1,97 +1,112 @@ bin/AbiWord AbiSuite/bin/AbiWord -AbiSuite/lib/libAbiEv.a -AbiSuite/lib/libAbiFmt.a -AbiSuite/lib/libAbiGr.a -AbiSuite/lib/libAbiImpExp.a -AbiSuite/lib/libAbiPTbl.a -AbiSuite/lib/libAbiSpell.a -AbiSuite/lib/libAbiUtil.a -AbiSuite/lib/libAbiWPAp.a -AbiSuite/lib/libAbiWordVer.a -AbiSuite/lib/libAbiXAp.a -AbiSuite/lib/libAbi_expat.a -AbiSuite/lib/libMsWordView.a -AbiSuite/lib/fonts/a010013l.afm -AbiSuite/lib/fonts/a010013l.pfa -AbiSuite/lib/fonts/a010015l.afm -AbiSuite/lib/fonts/a010015l.pfa -AbiSuite/lib/fonts/a010033l.afm -AbiSuite/lib/fonts/a010033l.pfa -AbiSuite/lib/fonts/a010035l.afm -AbiSuite/lib/fonts/a010035l.pfa -AbiSuite/lib/fonts/b018012l.afm -AbiSuite/lib/fonts/b018012l.pfa -AbiSuite/lib/fonts/b018015l.afm -AbiSuite/lib/fonts/b018015l.pfa -AbiSuite/lib/fonts/b018032l.afm -AbiSuite/lib/fonts/b018032l.pfa -AbiSuite/lib/fonts/b018035l.afm -AbiSuite/lib/fonts/b018035l.pfa -AbiSuite/lib/fonts/bchb.afm -AbiSuite/lib/fonts/bchb.pfa -AbiSuite/lib/fonts/bchbi.afm -AbiSuite/lib/fonts/bchbi.pfa -AbiSuite/lib/fonts/bchr.afm -AbiSuite/lib/fonts/bchr.pfa -AbiSuite/lib/fonts/bchri.afm -AbiSuite/lib/fonts/bchri.pfa -AbiSuite/lib/fonts/c059013l.afm -AbiSuite/lib/fonts/c059013l.pfa -AbiSuite/lib/fonts/c059016l.afm -AbiSuite/lib/fonts/c059016l.pfa -AbiSuite/lib/fonts/c059033l.afm -AbiSuite/lib/fonts/c059033l.pfa -AbiSuite/lib/fonts/c059036l.afm -AbiSuite/lib/fonts/c059036l.pfa -AbiSuite/lib/fonts/d050000l.afm -AbiSuite/lib/fonts/d050000l.pfa -AbiSuite/lib/fonts/fonts.dir -AbiSuite/lib/fonts/n019003l.afm -AbiSuite/lib/fonts/n019003l.pfa -AbiSuite/lib/fonts/n019004l.afm -AbiSuite/lib/fonts/n019004l.pfa -AbiSuite/lib/fonts/n019023l.afm -AbiSuite/lib/fonts/n019023l.pfa -AbiSuite/lib/fonts/n019024l.afm -AbiSuite/lib/fonts/n019024l.pfa -AbiSuite/lib/fonts/n019043l.afm -AbiSuite/lib/fonts/n019043l.pfa -AbiSuite/lib/fonts/n019044l.afm -AbiSuite/lib/fonts/n019044l.pfa -AbiSuite/lib/fonts/n019063l.afm -AbiSuite/lib/fonts/n019063l.pfa -AbiSuite/lib/fonts/n019064l.afm -AbiSuite/lib/fonts/n019064l.pfa -AbiSuite/lib/fonts/n021003l.afm -AbiSuite/lib/fonts/n021003l.pfa -AbiSuite/lib/fonts/n021004l.afm -AbiSuite/lib/fonts/n021004l.pfa -AbiSuite/lib/fonts/n021023l.afm -AbiSuite/lib/fonts/n021023l.pfa -AbiSuite/lib/fonts/n021024l.afm -AbiSuite/lib/fonts/n021024l.pfa -AbiSuite/lib/fonts/n022003l.afm -AbiSuite/lib/fonts/n022003l.pfa -AbiSuite/lib/fonts/n022004l.afm -AbiSuite/lib/fonts/n022004l.pfa -AbiSuite/lib/fonts/n022023l.afm -AbiSuite/lib/fonts/n022023l.pfa -AbiSuite/lib/fonts/n022024l.afm -AbiSuite/lib/fonts/n022024l.pfa -AbiSuite/lib/fonts/p052003l.afm -AbiSuite/lib/fonts/p052003l.pfa -AbiSuite/lib/fonts/p052004l.afm -AbiSuite/lib/fonts/p052004l.pfa -AbiSuite/lib/fonts/p052023l.afm -AbiSuite/lib/fonts/p052023l.pfa -AbiSuite/lib/fonts/p052024l.afm -AbiSuite/lib/fonts/p052024l.pfa -AbiSuite/lib/fonts/s050000l.afm -AbiSuite/lib/fonts/s050000l.pfa -AbiSuite/lib/fonts/z003034l.afm -AbiSuite/lib/fonts/z003034l.pfa -@dirrm AbiSuite/lib/fonts -@dirrm AbiSuite/lib +AbiSuite/bin/AbiWord_s +AbiSuite/fonts/a010013l.afm +AbiSuite/fonts/a010013l.pfa +AbiSuite/fonts/a010015l.afm +AbiSuite/fonts/a010015l.pfa +AbiSuite/fonts/a010033l.afm +AbiSuite/fonts/a010033l.pfa +AbiSuite/fonts/a010035l.afm +AbiSuite/fonts/a010035l.pfa +AbiSuite/fonts/b018012l.afm +AbiSuite/fonts/b018012l.pfa +AbiSuite/fonts/b018015l.afm +AbiSuite/fonts/b018015l.pfa +AbiSuite/fonts/b018032l.afm +AbiSuite/fonts/b018032l.pfa +AbiSuite/fonts/b018035l.afm +AbiSuite/fonts/b018035l.pfa +AbiSuite/fonts/bchb.afm +AbiSuite/fonts/bchb.pfa +AbiSuite/fonts/bchbi.afm +AbiSuite/fonts/bchbi.pfa +AbiSuite/fonts/bchr.afm +AbiSuite/fonts/bchr.pfa +AbiSuite/fonts/bchri.afm +AbiSuite/fonts/bchri.pfa +AbiSuite/fonts/c059013l.afm +AbiSuite/fonts/c059013l.pfa +AbiSuite/fonts/c059016l.afm +AbiSuite/fonts/c059016l.pfa +AbiSuite/fonts/c059033l.afm +AbiSuite/fonts/c059033l.pfa +AbiSuite/fonts/c059036l.afm +AbiSuite/fonts/c059036l.pfa +AbiSuite/fonts/d050000l.afm +AbiSuite/fonts/d050000l.pfa +AbiSuite/fonts/fonts.dir +AbiSuite/fonts/n019003l.afm +AbiSuite/fonts/n019003l.pfa +AbiSuite/fonts/n019004l.afm +AbiSuite/fonts/n019004l.pfa +AbiSuite/fonts/n019023l.afm +AbiSuite/fonts/n019023l.pfa +AbiSuite/fonts/n019024l.afm +AbiSuite/fonts/n019024l.pfa +AbiSuite/fonts/n019043l.afm +AbiSuite/fonts/n019043l.pfa +AbiSuite/fonts/n019044l.afm +AbiSuite/fonts/n019044l.pfa +AbiSuite/fonts/n019063l.afm +AbiSuite/fonts/n019063l.pfa +AbiSuite/fonts/n019064l.afm +AbiSuite/fonts/n019064l.pfa +AbiSuite/fonts/n021003l.afm +AbiSuite/fonts/n021003l.pfa +AbiSuite/fonts/n021004l.afm +AbiSuite/fonts/n021004l.pfa +AbiSuite/fonts/n021023l.afm +AbiSuite/fonts/n021023l.pfa +AbiSuite/fonts/n021024l.afm +AbiSuite/fonts/n021024l.pfa +AbiSuite/fonts/n022003l.afm +AbiSuite/fonts/n022003l.pfa +AbiSuite/fonts/n022004l.afm +AbiSuite/fonts/n022004l.pfa +AbiSuite/fonts/n022023l.afm +AbiSuite/fonts/n022023l.pfa +AbiSuite/fonts/n022024l.afm +AbiSuite/fonts/n022024l.pfa +AbiSuite/fonts/p052003l.afm +AbiSuite/fonts/p052003l.pfa +AbiSuite/fonts/p052004l.afm +AbiSuite/fonts/p052004l.pfa +AbiSuite/fonts/p052023l.afm +AbiSuite/fonts/p052023l.pfa +AbiSuite/fonts/p052024l.afm +AbiSuite/fonts/p052024l.pfa +AbiSuite/fonts/s050000l.afm +AbiSuite/fonts/s050000l.pfa +AbiSuite/fonts/z003034l.afm +AbiSuite/fonts/z003034l.pfa +AbiSuite/docs/AbiSource_DialogFramework.abw +AbiSuite/docs/AbiSource_Localization.abw +AbiSuite/docs/AbiSource_ProgrammerGuidelines.abw +AbiSuite/docs/AbiWord_DocumentFormat.abw +AbiSuite/docs/AbiWord_FileImport.abw +AbiSuite/docs/AbiWord_LayoutDesign.abw +AbiSuite/docs/AbiWord_SourceOverview.abw +AbiSuite/docs/AbiWord_SpellCheck_Notes.abw +AbiSuite/docs/AbiWord_list_notes.txt +AbiSuite/docs/BUILD.TXT +AbiSuite/docs/UnixAdmin.abw +AbiSuite/docs/roadmap.html +AbiSuite/docs/Bazaar.abw +AbiSuite/docs/BillOfRights.abw +AbiSuite/docs/Gettysburg.abw +AbiSuite/docs/Interview.abw +AbiSuite/docs/Latin1.abw +AbiSuite/docs/Styles.abw +AbiSuite/docs/Unicode1.abw +AbiSuite/docs/Word97Test.doc +AbiSuite/docs/abi_memo-new.abw +AbiSuite/docs/abi_memo.abw +AbiSuite/docs/data.abw +AbiSuite/docs/footer.abw +AbiSuite/docs/rtftest.rtf +AbiSuite/docs/tabs.abw +@dirrm AbiSuite/fonts @dirrm AbiSuite/bin +@dirrm AbiSuite/docs @dirrm AbiSuite |