diff options
Diffstat (limited to 'editors/abiword-devel/files')
| -rw-r--r-- | editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in | 14 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-..::wv::magick::Makefile.in | 14 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-af | 11 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-an | 46 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-ap | 23 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-aq | 27 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-ar | 14 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-au | 45 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-autogen.sh | 54 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-av | 11 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-configure.in | 18 | ||||
| -rw-r--r-- | editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp | 14 |
12 files changed, 0 insertions, 291 deletions
diff --git a/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in b/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in deleted file mode 100644 index c1aa9c4a9a1d..000000000000 --- a/editors/abiword-devel/files/patch-..::wv::libole2::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- ../wv/libole2/Makefile.in 2001/11/23 14:38:19 1.1 -+++ ../wv/libole2/Makefile.in 2001/11/23 14:43:32 -@@ -13,7 +13,7 @@ - HAVE_GLIB = @HAVE_GLIB@ - HAVE_GNOMEVFS= @HAVE_GNOMEVFS@ - --CFLAGS = @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -I$(srcdir)/.. -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@ -+CFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @CFLAGS@ @DEFS@ -I$(srcdir)/ -DTTFDIR=\"$(datadir)/wv/ttf\" -I$(srcdir)/../libole2 @WMF_CFLAGS@ @GLIB_CFLAGS@ - ifneq ($(HAVE_GLIB), 1) - CFLAGS += -I$(srcdir)/../glib-wv/ - endif diff --git a/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in b/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in deleted file mode 100644 index bfba3a8beb67..000000000000 --- a/editors/abiword-devel/files/patch-..::wv::magick::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- ../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/abiword-devel/files/patch-af b/editors/abiword-devel/files/patch-af deleted file mode 100644 index 502e8de76cd9..000000000000 --- a/editors/abiword-devel/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 <png.h> - - #include "ut_assert.h" - #include "ut_bytebuf.h" diff --git a/editors/abiword-devel/files/patch-an b/editors/abiword-devel/files/patch-an deleted file mode 100644 index f574d00872ed..000000000000 --- a/editors/abiword-devel/files/patch-an +++ /dev/null @@ -1,46 +0,0 @@ - -$FreeBSD$ - ---- src/Makefile.orig Sun Jul 15 10:13:26 2001 -+++ src/Makefile Wed Aug 8 13:28:42 2001 -@@ -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 *) - endif - - @$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY)) -@@ -106,10 +111,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/abiword-devel/files/patch-ap b/editors/abiword-devel/files/patch-ap deleted file mode 100644 index 76fbc4554e65..000000000000 --- a/editors/abiword-devel/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/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq deleted file mode 100644 index ed0324f287e6..000000000000 --- a/editors/abiword-devel/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/abiword-devel/files/patch-ar b/editors/abiword-devel/files/patch-ar deleted file mode 100644 index 5832a8deed5c..000000000000 --- a/editors/abiword-devel/files/patch-ar +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- 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/abiword-devel/files/patch-au b/editors/abiword-devel/files/patch-au deleted file mode 100644 index 3c726a835376..000000000000 --- a/editors/abiword-devel/files/patch-au +++ /dev/null @@ -1,45 +0,0 @@ ---- src/pkg/common/unix/scripts/makewrapper.sh.orig Wed Jan 23 09:16:52 2002 -+++ src/pkg/common/unix/scripts/makewrapper.sh Sat Feb 23 15:30:19 2002 -@@ -80,23 +80,31 @@ - if [ -z "\$locale" ] - then - locale=\$LANG -+elif [ -x \$locale ] -+then -+ locale=\$LC_CTYPE - fi - - if [ ! -z "\$locale" ] - then -- #now guess encoding -+ #now guess country/region/encoding -+ country=\`echo \$locale | sed -e 's/\(.*\)_.*\$/\1/'\` -+ region=\`echo \$locale | sed -e 's/^.*_\(.*\)\..*/\1/'\` - encoding=\`echo \$locale | sed -e 's/^.*\.\(.*\)\$/\1/'\` -- if [ ! -z "\$encoding" ] -+ if [ ! -z \$country -o ! -z \$region -o ! -z \$encoding ] - then -- addfontdir=\$ABISUITE_FONT_HOME/\$encoding -- if [ ! -z "\$addfontdir" ] -- then -- if [ -d "\$addfontdir" ] -- then -- #add directory with locale-specific fonts to font path -- ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir -- fi -- fi -+ addfontdirlst="\$ABISUITE_FONT_HOME/\$country \$ABISUITE_FONT_HOME/\${country}-\${region} \$ABISUITE_FONT_HOME/\$encoding \$ABISUITE_FONT_HOME/\${country}-\${region}.\${encoding}" -+ for addfontdir in \$addfontdirlst -+ do -+ if [ ! -z \$addfontdir ] -+ then -+ if [ -d \$addfontdir -a ! -f \$addfontdir/.already-in-fp ] -+ then -+ #add directory with locale-specific fonts to font path -+ ABISUITE_FONT_PATH=\$ABISUITE_FONT_PATH,\$addfontdir -+ fi -+ fi -+ done - fi - fi - diff --git a/editors/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh deleted file mode 100644 index 57a58a879794..000000000000 --- a/editors/abiword-devel/files/patch-autogen.sh +++ /dev/null @@ -1,54 +0,0 @@ - -$FreeBSD$ - ---- autogen.sh.orig Mon Mar 25 07:41:49 2002 -+++ autogen.sh Tue Apr 9 12:35:41 2002 -@@ -10,20 +10,20 @@ - - set -e - --automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print; if ($1 < 1.4) {exit 1;}}' -+automake14 --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`; then -+if test ! -d `aclocal14 --print-ac-dir`; 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`/$script; then -+ if test -r `aclocal14 --print-ac-dir`/$script; then - # Perhaps it was installed recently - rm -f ac-helpers/$script - else -@@ -34,13 +34,13 @@ - - # Produce aclocal.m4, so autoconf gets the automake macros it needs - echo "Creating aclocal.m4..." --aclocal -I ac-helpers -+aclocal14 -I ac-helpers - - # autoheader - - # Produce all the `GNUmakefile.in's and create neat missing things - # like `install-sh', etc. --automake --add-missing --copy --foreign -+automake14 --add-missing --copy --foreign - - # If there's a config.cache file, we may need to delete it. - # If we have an existing configure script, save a copy for comparison. -@@ -50,7 +50,7 @@ - - # Produce ./configure - echo "Creating configure..." --autoconf -+autoconf213 - - echo "" - echo "You can run ./configure now." diff --git a/editors/abiword-devel/files/patch-av b/editors/abiword-devel/files/patch-av deleted file mode 100644 index f357fa978631..000000000000 --- a/editors/abiword-devel/files/patch-av +++ /dev/null @@ -1,11 +0,0 @@ ---- src/config/platforms/freebsd.mk.orig Sun Jan 7 01:04:09 2001 -+++ src/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 diff --git a/editors/abiword-devel/files/patch-configure.in b/editors/abiword-devel/files/patch-configure.in deleted file mode 100644 index ff73266eed52..000000000000 --- a/editors/abiword-devel/files/patch-configure.in +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- configure.in.orig Thu Nov 22 01:08:37 2001 -+++ configure.in Fri Nov 23 17:17:37 2001 -@@ -317,10 +317,10 @@ - - if test "$PLATFORM" = "unix"; then - if test "$gnome" = "true"; then -- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1" -+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1" - PLATFORM_LIBS= - else -- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1" -+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS -DSUPPORTS_UT_IDLE=1" - PLATFORM_LIBS= - fi - fi diff --git a/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp b/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp deleted file mode 100644 index 9af484ab202f..000000000000 --- a/editors/abiword-devel/files/patch-src::wp::ap::unix::ap_UnixApp.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- 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) |