From 51db98e901840674ed66c0b2fa3e006731ec34b7 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 23 Feb 2003 18:43:43 +0000 Subject: Remove AbiWord2 now that it is in the FreeBSD ports tree. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@542 df743ca5-7f9a-e211-a948-0013205c9059 --- .../files/patch-..::wv::magick::Makefile.in | 14 ----- editors/AbiWord2/files/patch-af | 11 ---- editors/AbiWord2/files/patch-an | 46 -------------- editors/AbiWord2/files/patch-ap | 23 ------- editors/AbiWord2/files/patch-aq | 27 -------- editors/AbiWord2/files/patch-ar | 14 ----- editors/AbiWord2/files/patch-autogen.sh | 71 ---------------------- editors/AbiWord2/files/patch-ax | 10 --- .../files/patch-src::wp::ap::unix::ap_UnixApp.cpp | 14 ----- .../patch-src_af_xap_unix_xap_UnixFontManager.cpp | 39 ------------ .../patch-src_pkg_linux_rpm_data_abiword.desktop | 14 ----- .../files/patch-src_wp_ap_unix_ap_UnixApp.cpp | 11 ---- 12 files changed, 294 deletions(-) delete mode 100644 editors/AbiWord2/files/patch-..::wv::magick::Makefile.in delete mode 100644 editors/AbiWord2/files/patch-af delete mode 100644 editors/AbiWord2/files/patch-an delete mode 100644 editors/AbiWord2/files/patch-ap delete mode 100644 editors/AbiWord2/files/patch-aq delete mode 100644 editors/AbiWord2/files/patch-ar delete mode 100644 editors/AbiWord2/files/patch-autogen.sh delete mode 100644 editors/AbiWord2/files/patch-ax delete mode 100644 editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp delete mode 100644 editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp delete mode 100644 editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop delete mode 100644 editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixApp.cpp (limited to 'editors/AbiWord2/files') diff --git a/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in b/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in deleted file mode 100644 index 75d93c58a..000000000 --- a/editors/AbiWord2/files/patch-..::wv::magick::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/editors/AbiWord/files/patch-..::wv::magick::Makefile.in,v 1.1 2001/08/08 15:46:45 sobomax Exp $ - ---- ../wv/magick/Makefile.in 2001/08/08 11:44:02 1.1 -+++ ../wv/magick/Makefile.in 2001/08/08 11:44:13 -@@ -40,7 +40,7 @@ - all: $(MAGICKOBJECTS) - - %.$(OBJEXT): $(srcdir)/%.c -- $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+ $(CC) @CPPFLAGS@ $(CFLAGS) -c $(srcdir)/$*.c - - clean: - rm -rf *.$(OBJEXT) core a.$(OBJEXT)ut *.a diff --git a/editors/AbiWord2/files/patch-af b/editors/AbiWord2/files/patch-af deleted file mode 100644 index 502e8de76..000000000 --- a/editors/AbiWord2/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- src/af/util/xp/ut_png.cpp.orig Wed Apr 17 12:49:55 2002 -+++ src/af/util/xp/ut_png.cpp Fri Apr 19 20:40:25 2002 -@@ -24,7 +24,7 @@ - #ifdef _AIX - #define jmpbuf __jmpbuf - #endif --#include "png.h" -+#include - - #include "ut_assert.h" - #include "ut_bytebuf.h" diff --git a/editors/AbiWord2/files/patch-an b/editors/AbiWord2/files/patch-an deleted file mode 100644 index bebb944c8..000000000 --- a/editors/AbiWord2/files/patch-an +++ /dev/null @@ -1,46 +0,0 @@ - -$FreeBSD: ports/editors/AbiWord/files/patch-an,v 1.4 2002/06/05 20:05:40 marcus Exp $ - ---- src/Makefile.orig Thu May 30 17:51:53 2002 -+++ src/Makefile Wed Jun 5 15:47:41 2002 -@@ -48,6 +48,7 @@ - - ## Set the following to a list of pathnames to be copied to $(CANONDIR) - CANON_TOPLEVELFILES= $(ABI_ROOT)/COPYING $(ABI_ROOT)/user/wp/readme.txt -+CANON_TLF_NOTDIR= $(notdir $(CANON_TOPLEVELFILES)) - - ## Set the following to a list of directories (probably a subset of DIRS) - ## that have work to do. -@@ -58,6 +59,9 @@ - @for k in $(CANON_TOPLEVELFILES); do \ - $(ABICOPY) $$k $(CANONDIR); \ - done -+ @for k in $(CANON_TLF_NOTDIR); do \ -+ $(ABICHMOD) ugo=r $(CANONDIR)/$$k; \ -+ done - @for k in $(CANON_SubDirs); do \ - $(MAKE) ABI_ROOT=$(ABI_ROOT) -C $$k canonical; \ - done -@@ -72,6 +76,7 @@ - cp $$k american.hash; \ - rm $$k ; \ - done) -+ @(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *) - # We currently only ship american.hash, so the above and below aren't logical. - # For same reason, this will only copy american.hash-encoding once in place. The rest is in abispell. - @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/*.hash-encoding $(CANONDIR)/dictionary -@@ -112,10 +117,12 @@ - fi - # icons for X window manager use - @$(subst xxxx,$(CANONDIR)/icons,$(VERIFY_DIRECTORY)) -- (cd $(ABI_ROOT)/../abidistfiles/icons; cp abi* $(CANONDIR)/icons) -+ (cd $(ABI_ROOT)/../abidistfiles/icons; $(ABICOPY) abi* $(CANONDIR)/icons) -+ @(cd $(CANONDIR)/icons; $(ABICHMOD) ugo=r *_48*) - # font stuff for installation - @$(subst xxxx,$(CANONDIR)/fonts,$(VERIFY_DIRECTORY)) -- (cd $(ABI_ROOT)/../unixfonts/fonts ; cp *.* $(CANONDIR)/fonts) -+ (cd $(ABI_ROOT)/../unixfonts/fonts ; $(ABICOPY) *.* $(CANONDIR)/fonts) -+ @(cd $(CANONDIR)/fonts; $(ABICHMOD) ugo=r *.*) - endif - - ################################################################## diff --git a/editors/AbiWord2/files/patch-ap b/editors/AbiWord2/files/patch-ap deleted file mode 100644 index 76fbc4554..000000000 --- a/editors/AbiWord2/files/patch-ap +++ /dev/null @@ -1,23 +0,0 @@ ---- src/wp/Makefile.orig Sat Apr 13 07:22:38 2002 -+++ src/wp/Makefile Fri Apr 19 23:30:57 2002 -@@ -44,8 +44,18 @@ - @$(subst xxxx,$(CANON_AppDir),$(VERIFY_DIRECTORY)) - @$(subst xxxx,$(CANON_AppDir)/strings,$(VERIFY_DIRECTORY)) - @$(subst xxxx,$(CANON_AppDir)/help,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/howto,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoweb.xhtml_data,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/howto/howtoword.xhtml_data,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/info,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/interface,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/dialogreplace.xhtml_data,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/menufile.xhtml_data,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/interface/workspace.xhtml_data,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/problems,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/en-US/tutorial,$(VERIFY_DIRECTORY)) -+ @$(subst xxxx,$(CANON_AppDir)/help/images,$(VERIFY_DIRECTORY)) - @$(ABICOPY) $(USERDIR)/wp/readme.txt $(CANON_AppDir) - @$(ABICOPY) $(USERDIR)/wp/system.profile* $(CANON_AppDir) - @$(ABICOPY) $(USERDIR)/wp/strings/*.strings $(CANON_AppDir)/strings -- (cd $(USERDIR)/wp/help; tar cf - images ./*.* $(CANON_Lang)/*.* $(CANON_Lang)/*/*.*) | (cd $(CANON_AppDir)/help; tar xf -) -- @$(ABICOPY) $(ABI_ROOT)/CREDITS.TXT $(CANON_AppDir)/help/en-US/credits.txt diff --git a/editors/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq deleted file mode 100644 index ed0324f28..000000000 --- a/editors/AbiWord2/files/patch-aq +++ /dev/null @@ -1,27 +0,0 @@ ---- src/config/abi_defs.mk Fri Jun 9 15:48:49 2000 -+++ src/config/abi_defs.mk.new Thu Jun 22 16:32:03 2000 -@@ -124,11 +124,11 @@ - ## INSTALL program... - - define MAKE_OBJDIR --if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi -+if test ! -d $(@D); then rm -rf $(@D); $(ABIMKDIR) -p $(@D); fi - endef - - define VERIFY_DIRECTORY --if test ! -d xxxx; then rm -rf xxxx; mkdir -p xxxx; fi -+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi - endef - - ifeq ($(OS_NAME), WIN32) -@@ -160,7 +160,9 @@ - ################################################################## - ################################################################## - --ABICOPY=cp -+ABICOPY = cp -+ABICHMOD = chmod -+ABIMKDIR = mkdir -m u=rwx,go=rx - - ifdef ABISOURCE_LICENSED_TRADEMARKS - ABI_TMDEFS= -DABISOURCE_LICENSED_TRADEMARKS diff --git a/editors/AbiWord2/files/patch-ar b/editors/AbiWord2/files/patch-ar deleted file mode 100644 index 7277dcdb4..000000000 --- a/editors/AbiWord2/files/patch-ar +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/editors/AbiWord/files/patch-ar,v 1.2 2001/08/08 15:46:45 sobomax Exp $ - ---- src/pkg/common/unix/scripts/install.sh.orig Sat Apr 7 10:59:52 2001 -+++ src/pkg/common/unix/scripts/install.sh Wed Aug 8 13:31:57 2001 -@@ -80,7 +80,7 @@ - - echo "Installing program binaries to [$LIBEXECDIR]..." - # Setup bins --(cd $SRCDIR/bin; tar cf - *) | (cd $LIBEXECDIR; tar xf -) -+(cd $SRCDIR/bin; cp Abi* $LIBEXECDIR) - - ######################################################################## - # If we're on Solaris, run makepsres on the font path diff --git a/editors/AbiWord2/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh deleted file mode 100644 index 84fe028e6..000000000 --- a/editors/AbiWord2/files/patch-autogen.sh +++ /dev/null @@ -1,71 +0,0 @@ ---- autogen.sh.orig Thu Oct 17 08:19:31 2002 -+++ autogen.sh Fri Feb 21 23:47:48 2003 -@@ -10,20 +10,20 @@ - - rm -f autogen.err - --automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' -+%%AUTOMAKE%% --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' - - if [ $? -ne 0 ]; then - echo "Error: you need automake 1.4 or later. Please upgrade." - exit 1 - fi - --if test ! -d `aclocal --print-ac-dir 2>> autogen.err`; then -- echo "Bad aclocal (automake) installation" -+if test ! -d `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`; then -+ echo "Bad %%ACLOCAL%% (automake) installation" - exit 1 - fi - - for script in `cd ac-helpers/fallback; echo *.m4`; do -- if test -r `aclocal --print-ac-dir 2>> autogen.err`/$script; then -+ if test -r `%%ACLOCAL%% --print-ac-dir 2>> autogen.err`/$script; then - # Perhaps it was installed recently - rm -f ac-helpers/$script - else -@@ -34,17 +34,17 @@ - - # Produce aclocal.m4, so autoconf gets the automake macros it needs - # --echo "Creating aclocal.m4: aclocal -I ac-helpers $ACLOCAL_FLAGS" -+echo "Creating aclocal.m4: %%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS" - --aclocal -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err -+%%ACLOCAL%% -I ac-helpers $ACLOCAL_FLAGS 2>> autogen.err - - echo "Checking for PKG_CHECK_MODULES..." - - pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN` - if test "x$pkgcheckdef" = "x"; then -- echo "Running aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS" -- (aclocal -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || { -- echo "aclocal failed! Unable to continue." -+ echo "Running %%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS" -+ (%%ACLOCAL%% -I ac-helpers -I ac-helpers/pkg-config $ACLOCAL_FLAGS 2>> autogen.err) || { -+ echo "%%ACLOCAL%% failed! Unable to continue." - exit 1 - } - pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN` -@@ -66,9 +66,9 @@ - # Produce all the `GNUmakefile.in's and create neat missing things - # like `install-sh', etc. - # --echo "automake --add-missing --copy --foreign" -+echo "%%AUTOMAKE%% --add-missing --copy --foreign" - --automake --add-missing --copy --foreign 2>> autogen.err || { -+%%AUTOMAKE%% --add-missing --copy --foreign 2>> autogen.err || { - echo "" - echo "* * * warning: possible errors while running automake - check autogen.err" - echo "" -@@ -84,7 +84,7 @@ - # - echo "Creating configure..." - --autoconf 2>> autogen.err || { -+%%AUTOCONF%% 2>> autogen.err || { - echo "" - echo "* * * warning: possible errors while running automake - check autogen.err" - echo "" diff --git a/editors/AbiWord2/files/patch-ax b/editors/AbiWord2/files/patch-ax deleted file mode 100644 index 91ab01775..000000000 --- a/editors/AbiWord2/files/patch-ax +++ /dev/null @@ -1,10 +0,0 @@ ---- ../wv/libole2/ms-ole.h Sun Oct 6 20:18:41 2002 -+++ ../wv/libole2/ms-ole.h.new Sun Oct 6 20:18:48 2002 -@@ -20,6 +20,7 @@ - #if defined(__QNXNTO__) - # include - #endif -+# include - # include /* for mode_t */ - #else - # include diff --git a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp deleted file mode 100644 index 90d66846b..000000000 --- a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/editors/AbiWord/files/patch-src::wp::ap::unix::ap_UnixApp.cpp,v 1.2 2001/12/17 12:54:07 sobomax Exp $ - ---- src/wp/ap/unix/ap_UnixApp.cpp.orig Thu Dec 6 09:00:14 2001 -+++ src/wp/ap/unix/ap_UnixApp.cpp Mon Dec 17 13:49:48 2001 -@@ -612,7 +612,7 @@ - { - pluginDir = pluginList[i]; - -- n = scandir(pluginDir.c_str(), &namelist, so_only, alphasort); -+ n = scandir(pluginDir.c_str(), &namelist, (int (*)(dirent *))so_only, alphasort); - UT_DEBUGMSG(("DOM: found %d plugins in %s\n", n, pluginDir.c_str())); - - if (n > 0) diff --git a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp deleted file mode 100644 index f30c23b08..000000000 --- a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixFontManager.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- src/af/xap/unix/xap_UnixFontManager.cpp.orig Sat Feb 22 01:00:28 2003 -+++ src/af/xap/unix/xap_UnixFontManager.cpp Sat Feb 22 01:00:57 2003 -@@ -808,30 +808,30 @@ - switch (f) - { - case GR_Font::FF_Roman: -- m_f[f].setFont(searchFont("Times-12")); -+ m_f[f].setFont(searchFont("Times 12")); - break; - - case GR_Font::FF_Swiss: -- m_f[f].setFont(searchFont("Helvetica-12")); -+ m_f[f].setFont(searchFont("Helvetica 12")); - break; - - case GR_Font::FF_Modern: -- m_f[f].setFont(searchFont("Courier-12")); -+ m_f[f].setFont(searchFont("Courier 12")); - break; - - case GR_Font::FF_Script: -- m_f[f].setFont(searchFont("Cursive-12")); -+ m_f[f].setFont(searchFont("Cursive 12")); - break; - - case GR_Font::FF_Decorative: -- m_f[f].setFont(searchFont("Old English-12")); -+ m_f[f].setFont(searchFont("Old English 12")); - break; - - // ugh!? BiDi is not a font family, what is it doing here? - // And what's that "Technical" thing? - case GR_Font::FF_Technical: - case GR_Font::FF_BiDi: -- m_f[f].setFont(searchFont("Arial-12")); -+ m_f[f].setFont(searchFont("Arial 12")); - break; - - default: diff --git a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop b/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop deleted file mode 100644 index b875f7db7..000000000 --- a/editors/AbiWord2/files/patch-src_pkg_linux_rpm_data_abiword.desktop +++ /dev/null @@ -1,14 +0,0 @@ ---- src/pkg/linux/rpm/data/abiword.desktop.orig Sun Dec 8 19:56:43 2002 -+++ src/pkg/linux/rpm/data/abiword.desktop Sat Feb 22 00:25:22 2003 -@@ -8,9 +8,9 @@ - Comment[fr]=Traitement de texte AbiWord - Comment[pt]=Processador de Texto Abiword - Comment[sv]=Ordbehandlaren Abiword --Exec=abiword-2.0 -+Exec=AbiWord-2.0 - Icon=abiword_48.png - Terminal=0 - Type=Application --Categories=Application;Office;WordProcessor;X-Red-Hat-Base; -+Categories=Application;Office;WordProcessor; - StartupNotify=true diff --git a/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixApp.cpp b/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixApp.cpp deleted file mode 100644 index 69aae909a..000000000 --- a/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixApp.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wp/ap/unix/ap_UnixApp.cpp.orig Sat Feb 22 01:21:20 2003 -+++ src/wp/ap/unix/ap_UnixApp.cpp Sat Feb 22 01:21:31 2003 -@@ -1241,7 +1241,7 @@ - pMyUnixApp->shutdown(); - delete pMyUnixApp; - -- poptFreeContext (Args.poptcon); -+ //poptFreeContext (Args.poptcon); - return 0; - } - -- cgit v1.2.3