summaryrefslogtreecommitdiffstats
path: root/editors/abiword/files
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-24 12:51:50 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-24 12:51:50 +0800
commit03ad249fa1d9294261092e4152db4975b6ddcd9d (patch)
tree35b46083ed1e063b989b8a559485cbb419eb6f76 /editors/abiword/files
parent02f6f5857ebefb11898bf4ba6d8afef1c8d78bb0 (diff)
downloadmarcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar.gz
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar.bz2
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar.lz
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar.xz
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.tar.zst
marcuscom-ports-03ad249fa1d9294261092e4152db4975b6ddcd9d.zip
share/gnome/ -> share/.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9245 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'editors/abiword/files')
-rw-r--r--editors/abiword/files/patch-GNUmakefile.in47
-rw-r--r--editors/abiword/files/patch-abiword.desktop16
-rw-r--r--editors/abiword/files/patch-an38
-rw-r--r--editors/abiword/files/patch-aq27
-rw-r--r--editors/abiword/files/patch-ar11
-rw-r--r--editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp11
-rw-r--r--editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp12
7 files changed, 162 insertions, 0 deletions
diff --git a/editors/abiword/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in
new file mode 100644
index 000000000..6385aea4d
--- /dev/null
+++ b/editors/abiword/files/patch-GNUmakefile.in
@@ -0,0 +1,47 @@
+--- GNUmakefile.in.orig Wed Jul 20 22:21:46 2005
++++ GNUmakefile.in Wed Jul 20 22:23:12 2005
+@@ -337,15 +337,15 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = src
+-expat_peerdir = $(top_builddir)/../expat
+-wv_peerdir = $(top_builddir)/../wv
+-libiconv_peerdir = $(top_builddir)/../libiconv
+-libpng_peerdir = @LIBPNG_PEERDIR@
+-libpopt_peerdir = $(top_builddir)/../popt
+-desktop_DATA = abiword.desktop
+-desktopdir = $(datadir)/applications
+-icon_DATA = abiword_48.png
+-icondir = $(datadir)/icons
++#expat_peerdir = $(top_builddir)/../expat
++#wv_peerdir = $(top_builddir)/../wv
++#libiconv_peerdir = $(top_builddir)/../libiconv
++#libpng_peerdir = @LIBPNG_PEERDIR@
++#libpopt_peerdir = $(top_builddir)/../popt
++#desktop_DATA = abiword.desktop
++#desktopdir = $(datadir)/applications
++#icon_DATA = abiword_48.png
++#icondir = $(datadir)/icons
+ @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
+ @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
+ @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
+@@ -844,7 +844,6 @@
+
+ # Install the datafiles. This is quick-and-dirty.
+ install-data-local:
+- @$(mkinstalldirs) $(DESTDIR)$(bonobodir)
+ if test -d $(top_srcdir)/../abidistfiles ; then \
+ for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
+@@ -857,11 +856,7 @@
+ for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
+ if test -f $$file ; then \
+ sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
+- if test "$$sfile.server" = $$file; then \
+- $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
+- else \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
+- fi; \
+ fi; \
+ done; \
+ fi; \
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
new file mode 100644
index 000000000..7eff00d9c
--- /dev/null
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -0,0 +1,16 @@
+--- abiword.desktop.orig Fri Apr 14 12:43:24 2006
++++ abiword.desktop Fri Apr 14 12:45:03 2006
+@@ -3,11 +3,11 @@
+ Icon=abiword_48.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
++Categories=Application;Office;WordProcessor;GNOME;GTK;
+ StartupNotify=true
+ Encoding=UTF-8
+ X-Desktop-File-Install-Version=0.9
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+ Name=AbiWord
+ GenericName=Word Processor
+ Comment=AbiWord Word Processor
diff --git a/editors/abiword/files/patch-an b/editors/abiword/files/patch-an
new file mode 100644
index 000000000..54d3de78e
--- /dev/null
+++ b/editors/abiword/files/patch-an
@@ -0,0 +1,38 @@
+--- src/Makefile.orig Mon Dec 22 13:06:12 2003
++++ src/Makefile Sun Mar 28 15:29:40 2004
+@@ -52,6 +52,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.
+@@ -62,6 +63,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
+@@ -83,6 +87,7 @@
+ ifeq ($(ABI_OPT_PSPELL),1)
+ echo "Using Pspell build, not installing ispell hash files"
+ else
++ @(cd $(CANONDIR)/dictionary; $(ABICHMOD) ugo=r *)
+ # We currently only ship american.hash
+ @$(subst xxxx,$(CANONDIR)/dictionary,$(VERIFY_DIRECTORY))
+ @$(ABICOPY) $(ABI_ROOT)/../abidistfiles/dictionary/$(OS_ENDIAN).american.hash $(CANONDIR)/dictionary/american.hash
+@@ -92,7 +97,8 @@
+ ifeq ($(ABI_NATIVE),unix)
+ # 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 abi*)
+ endif
+
+ @$(subst xxxx,$(CANONDIR)/clipart,$(VERIFY_DIRECTORY))
diff --git a/editors/abiword/files/patch-aq b/editors/abiword/files/patch-aq
new file mode 100644
index 000000000..98ce28093
--- /dev/null
+++ b/editors/abiword/files/patch-aq
@@ -0,0 +1,27 @@
+--- src/config/abi_defs.mk.orig Sun Jun 12 16:07:25 2005
++++ src/config/abi_defs.mk Sun Jun 12 16:08:49 2005
+@@ -202,11 +202,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)
+@@ -251,7 +251,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/files/patch-ar b/editors/abiword/files/patch-ar
new file mode 100644
index 000000000..7e5c85d3d
--- /dev/null
+++ b/editors/abiword/files/patch-ar
@@ -0,0 +1,11 @@
+--- 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/files/patch-src_af_util_xp_ut_iconv.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
new file mode 100644
index 000000000..9e95194c1
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_iconv.cpp
@@ -0,0 +1,11 @@
+--- src/af/util/xp/ut_iconv.cpp.orig Tue Jan 10 00:18:13 2006
++++ src/af/util/xp/ut_iconv.cpp Tue Jan 10 00:18:31 2006
+@@ -67,7 +67,7 @@
+ #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) || \
+ (defined (__MACH__) && defined (__APPLE__)) || \
+ (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
+-defined (__AIX__) || defined(__OpenBSD__) || \
++defined (__AIX__) || defined(__OpenBSD__) || defined (__FreeBSD__) || \
+ (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1))
+
+ #define ICONV_CONST const
diff --git a/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
new file mode 100644
index 000000000..97fad9259
--- /dev/null
+++ b/editors/abiword/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -0,0 +1,12 @@
+--- src/af/util/xp/ut_string_class.cpp.orig Mon Jan 17 14:38:20 2005
++++ src/af/util/xp/ut_string_class.cpp Mon Jan 17 14:38:43 2005
+@@ -352,9 +352,6 @@
+ # else /* va_list is a pointer */
+ # define VA_COPY(ap1, ap2) ((ap1) = (ap2))
+ # endif /* va_list is a pointer */
+-# if defined (__GNUC__)
+-# define VA_COPY(ap1,ap2) __va_copy((ap1),(ap2))
+-# endif
+ #endif /* !VA_COPY */
+
+ UT_String& UT_String_vprintf (UT_String & inStr, const char *format,