summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2004-06-18 04:39:14 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2004-06-18 04:39:14 +0800
commit3714b4aacdf5e4e1156cca7cd8236411c47de949 (patch)
tree05d9f41ad0a9623310a1a1611bac2cbde5105d7d /editors
parentc2e562ac62f30715c63dec6ba1296cf413c1af61 (diff)
downloadmarcuscom-ports-3714b4aacdf5e4e1156cca7cd8236411c47de949.tar.gz
marcuscom-ports-3714b4aacdf5e4e1156cca7cd8236411c47de949.tar.zst
marcuscom-ports-3714b4aacdf5e4e1156cca7cd8236411c47de949.zip
-Update to 2.1.3.
-Add a missing ${ABIVERSION}. -Switch from PREFIX to X11BASE when install icon, *.server, *.desktop and etc. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2401 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'editors')
-rw-r--r--editors/AbiWord2/Makefile13
-rw-r--r--editors/AbiWord2/distinfo4
-rw-r--r--editors/AbiWord2/files/patch-GNUmakefile.in10
-rw-r--r--editors/AbiWord2/files/patch-aq8
-rw-r--r--editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp7
-rw-r--r--editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp8
-rw-r--r--editors/AbiWord2/pkg-plist1
7 files changed, 26 insertions, 25 deletions
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 5ce5c335e..b6abe39b6 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= AbiWord2
-PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTVERSION= 2.1.3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -91,13 +90,13 @@ post-patch:
post-install:
.if defined(GNOME_ENABLED)
@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
- ${PREFIX}/share/gnome/apps/Applications/abiword.desktop
+ ${X11BASE}/share/gnome/apps/Applications/abiword.desktop
@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
- ${PREFIX}/share/gnome/pixmaps/abiword_48.png
- @${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
- ${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server
+ ${X11BASE}/share/gnome/pixmaps/abiword_48.png
+ @${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
+ ${X11BASE}/libdata/bonobo/servers/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server
@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/abi-nautilus-view-file.xml \
- ${PREFIX}/share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
+ ${X11BASE}/share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
.endif
.include <bsd.port.post.mk>
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index abacbd806..cd31de615 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.1.2.tar.bz2) = 523376956f3a5bec845c047e1989fc6e
-SIZE (AbiWord/abiword-2.1.2.tar.bz2) = 21819052
+MD5 (AbiWord/abiword-2.1.3.tar.bz2) = 991135782dc152f6df68fb4c2de2b834
+SIZE (AbiWord/abiword-2.1.3.tar.bz2) = 23422478
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.in b/editors/AbiWord2/files/patch-GNUmakefile.in
index 191db41c0..ad9a02ccf 100644
--- a/editors/AbiWord2/files/patch-GNUmakefile.in
+++ b/editors/AbiWord2/files/patch-GNUmakefile.in
@@ -1,6 +1,6 @@
---- GNUmakefile.in.orig Thu Jun 10 17:36:52 2004
-+++ GNUmakefile.in Thu Jun 10 17:39:30 2004
-@@ -156,17 +156,17 @@
+--- GNUmakefile.in.orig Thu Jun 17 14:48:13 2004
++++ GNUmakefile.in Thu Jun 17 14:49:43 2004
+@@ -149,17 +149,17 @@
SUBDIRS = src
@@ -27,7 +27,7 @@
@BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
@BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
-@@ -585,7 +585,6 @@
+@@ -550,7 +550,6 @@
# Install the datafiles. This is quick-and-dirty.
install-data-local:
@@ -35,7 +35,7 @@
if test -d $(top_srcdir)/../abidistfiles ; then \
for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -598,11 +597,7 @@
+@@ -563,11 +562,7 @@
for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
if test -f $$file ; then \
sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/AbiWord2/files/patch-aq b/editors/AbiWord2/files/patch-aq
index ed0324f28..e00bf0585 100644
--- a/editors/AbiWord2/files/patch-aq
+++ b/editors/AbiWord2/files/patch-aq
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/config/abi_defs.mk.orig Thu Jun 17 14:54:58 2004
++++ src/config/abi_defs.mk Thu Jun 17 14:55:04 2004
+@@ -217,11 +217,11 @@
## INSTALL program...
define MAKE_OBJDIR
@@ -14,7 +14,7 @@
endef
ifeq ($(OS_NAME), WIN32)
-@@ -160,7 +160,9 @@
+@@ -266,7 +266,9 @@
##################################################################
##################################################################
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
index 9af484ab2..68ffd22d8 100644
--- a/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
+++ b/editors/AbiWord2/files/patch-src::wp::ap::unix::ap_UnixApp.cpp
@@ -1,9 +1,9 @@
$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 @@
+--- src/wp/ap/unix/ap_UnixApp.cpp.orig Thu Jun 17 14:57:19 2004
++++ src/wp/ap/unix/ap_UnixApp.cpp Thu Jun 17 14:58:01 2004
+@@ -788,7 +788,7 @@
{
pluginDir = pluginList[i];
@@ -12,3 +12,4 @@ $FreeBSD$
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_util_xp_ut_string_class.cpp b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
index a82b611a7..668f9ea55 100644
--- a/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
+++ b/editors/AbiWord2/files/patch-src_af_util_xp_ut_string_class.cpp
@@ -1,5 +1,5 @@
---- src/af/util/xp/ut_string_class.cpp.orig Mon Aug 25 03:34:03 2003
-+++ src/af/util/xp/ut_string_class.cpp Mon Aug 25 03:42:00 2003
+--- src/af/util/xp/ut_string_class.cpp.orig Thu Jun 17 15:00:46 2004
++++ src/af/util/xp/ut_string_class.cpp Thu Jun 17 15:02:15 2004
@@ -28,6 +28,7 @@
#include <locale.h>
#include <ctype.h>
@@ -8,7 +8,7 @@
#include "ut_string.h"
#include "ut_string_class.h"
-@@ -340,13 +341,13 @@
+@@ -342,13 +343,13 @@
return len;
}
@@ -19,7 +19,7 @@
# define VA_COPY(ap1, ap2) (*(ap1) = *(ap2))
# elif defined (VA_COPY_AS_ARRAY)
# define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list))
--# elif defined (__GNUC__)
+-# elif defined (__GNUC__) && defined (__va_copy)
-# define VA_COPY(ap1,ap2) __va_copy((ap1),(ap2))
# else /* va_list is a pointer */
# define VA_COPY(ap1, ap2) ((ap1) = (ap2))
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 68a670b95..a36a710c8 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -68,6 +68,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/jbo.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lt-LT.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/lv-LV.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mh-MH.strings
+share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/mk-MK.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/ms-MY.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nb-NO.strings
share/AbiSuite-%%ABIVERSION%%/AbiWord/strings/nl-NL.strings
generated by cgit (git 2.34.1) at 2025-01-02 00:04:13 +0800