- Update to 2.4.0, see the release note:

	http://www.abisource.com/release-notes/2.4.0.phtml
- Replace from pkg-install to plist by use '@exec /bin/mkdir -p...', it's
  easier that way.
- Correct the plist for plugins by add '@unexec /bin/rmdir....true'
- Re-enable install the .server and .xml files for bonobo/ui stuff, only
  happen if GNOME is enable (autocheck by libgnomeui).
- Add CONFLICTS with abiword(-plugins) now.

BTW: I will merging this in abiword(-plugins) this evening.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4916 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 38 insertions, 58 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index dd8842083..56972fd05 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/abiword-devel/Makefile,v 1.2 2005/09/04 05:11:25 mezz Exp $
+#   $MCom: ports/editors/abiword-devel/Makefile,v 1.3 2005/09/12 05:55:30 mezz Exp $
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.3.6
+PORTVERSION=	2.4.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -25,6 +25,8 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		wv-1.0.0:${PORTSDIR}/textproc/wv \
 		fribidi.0:${PORTSDIR}/converters/fribidi
 
+CONFLICTS=	abiword-[0-9]*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -70,7 +72,7 @@ PLIST_SUB+=		DICT:=""
 USE_GNOME+=		libgnomeui
 CONFIGURE_ARGS+=	--enable-gnome
 PKGNAMESUFFIX=		-devel-gnome
-#GNOME_ENABLED=		yes
+GNOME_ENABLED=		yes
 .endif
 
 .if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
@@ -97,25 +99,21 @@ post-patch:
 		 s|WV_INCLUDES = |#WV_INCLUDES = |g ; \
 		 s|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
 		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
-	@${REINPLACE_CMD} -e 's|(bindir)/ttfadmin.sh|(bindir)/ttfadmin24.sh|g' \
-		${WRKSRC}/src/tools/scripts/unix/GNUmakefile.in
-	@${REINPLACE_CMD} -e 's|(bindir)/ttftool|(bindir)/ttftool24|g' \
-		${WRKSRC}/src/tools/ttftool/unix/GNUmakefile.in
-	@${REINPLACE_CMD} -e 's|OTHER_LIBS =|OTHER_LIBS = $$(shell pkg-config --libs pangoxft)|g' \
-		${WRKSRC}/src/wp/main/unix/GNUmakefile.in
 
 post-install:
-	@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
+	@${MKDIR} ${X11BASE}/lib/AbiWord-${ABIVERSION}/plugins
 	@${MKDIR} ${X11BASE}/share/applications
 	@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
-		${X11BASE}/share/applications/abiword24.desktop
+		${X11BASE}/share/applications/abiword.desktop
 	@${MKDIR} ${X11BASE}/share/pixmaps
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
-		${X11BASE}/share/pixmaps/abiword24_48.png
-#	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
-#		${X11BASE}/libdata/bonobo/servers/
-#	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
-#		${X11BASE}/share/gnome/gnome-2.0/ui/
+		${X11BASE}/share/pixmaps/abiword_48.png
+.if defined(GNOME_ENABLED)
+	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
+		${X11BASE}/libdata/bonobo/servers/
+	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
+		${X11BASE}/share/gnome/gnome-2.0/ui/
+.endif
 	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 576ead80e..ab75da2c7 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.3.6.tar.bz2) = 8a1fc6a2a9cec61ed15231d2fa1b3110
-SIZE (AbiWord/abiword-2.3.6.tar.bz2) = 24175803
+MD5 (AbiWord/abiword-2.4.0.tar.bz2) = 3822923f9793fd6f59c834dc462df84e
+SIZE (AbiWord/abiword-2.4.0.tar.bz2) = 24616309
diff --git a/editors/abiword-devel/files/patch-abiword.desktop b/editors/abiword-devel/files/patch-abiword.desktop
index e90115328..a8faac36b 100644
--- a/editors/abiword-devel/files/patch-abiword.desktop
+++ b/editors/abiword-devel/files/patch-abiword.desktop
@@ -1,11 +1,7 @@
---- abiword.desktop.orig	Thu May 12 16:11:31 2005
-+++ abiword.desktop	Thu May 12 16:11:37 2005
-@@ -1,15 +1,15 @@
- [Desktop Entry]
--Exec=abiword
--Icon=abiword_48.png
-+Exec=AbiWord-2.4
-+Icon=abiword24_48.png
+--- abiword.desktop.orig	Tue Oct  4 13:22:33 2005
++++ abiword.desktop	Tue Oct  4 13:23:58 2005
+@@ -3,11 +3,11 @@
+ Icon=abiword_48.png
  Terminal=false
  Type=Application
 -Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
@@ -14,11 +10,7 @@
  Encoding=UTF-8
  X-Desktop-File-Install-Version=0.9
 -MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
--Name=Word Processor
--Comment=AbiWord Word Processor
 +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/vnd.ms-word;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
-+Name=Word Processor (2.3)
-+Comment=AbiWord Word Processor (2.3.x)
+ Name=Word Processor
+ Comment=AbiWord Word Processor
  Name[de]=Textverarbeitung
- Comment[de]=AbiWord Textverarbeitung
- Name[nb]=Tekstbehandling
diff --git a/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in b/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
deleted file mode 100644
index 4e85950f8..000000000
--- a/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wp/main/unix/GNUmakefile.in.orig	Wed Jul 20 22:27:50 2005
-+++ src/wp/main/unix/GNUmakefile.in	Wed Jul 20 22:28:01 2005
-@@ -760,8 +760,6 @@
- install-exec-local:	
- 	@if test -f $(DESTDIR)/$(bindir)/abiword; then \
- 	  echo "$(DESTDIR)/$(bindir)/abiword is a regular file - I'm not going to create a link."; \
--	else \
--	  (cd $(DESTDIR)/$(bindir) && ln -sf AbiWord-2.4 abiword); \
- 	fi
- 
- libAbiCommand.a:	$(abiword_plugins)/tools/abicommand/xp/$(ltsubdir)libAbiCommand.a
diff --git a/editors/abiword-devel/pkg-install b/editors/abiword-devel/pkg-install
deleted file mode 100644
index 79ce89789..000000000
--- a/editors/abiword-devel/pkg-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-	mkdir -p ${PKG_PREFIX}/lib/AbiWord-2.4/plugins
-fi
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 4c98f86c3..b9f5dd811 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -1,6 +1,8 @@
 bin/AbiWord-%%ABIVERSION%%
-bin/ttfadmin24.sh
-bin/ttftool24
+bin/abiword
+bin/ttfadmin.sh
+bin/ttftool
+%%GNOME:%%libdata/bonobo/servers/GNOME_AbiWord_Control_2_4.server
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Field.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
@@ -275,8 +277,9 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ur_PK
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
-share/applications/abiword24.desktop
-share/pixmaps/abiword24_48.png
+share/applications/abiword.desktop
+%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
+share/pixmaps/abiword_48.png
 @unexec rmdir %D/share/applications 2> /dev/null || true
 @dirrm share/AbiSuite-%%ABIVERSION%%/templates
 @dirrm share/AbiSuite-%%ABIVERSION%%/icons
@@ -287,7 +290,8 @@ share/pixmaps/abiword24_48.png
 @dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord/glade
 @dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
 @dirrm share/AbiSuite-%%ABIVERSION%%
-@dirrm lib/AbiWord-%%ABIVERSION%%/plugins
-@dirrm lib/AbiWord-%%ABIVERSION%%
+@exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
+@unexec /bin/rmdir %D/lib/AbiWord-%%ABIVERSION%%/plugins 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/lib/AbiWord-%%ABIVERSION%% 2>/dev/null || /usr/bin/true
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/abiword-plugins-devel/Makefile b/editors/abiword-plugins-devel/Makefile
index 4231a6f35..4b75caf1c 100644
--- a/editors/abiword-plugins-devel/Makefile
+++ b/editors/abiword-plugins-devel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					FreeBSD GNOME Team <gnome@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/editors/abiword-plugins-devel/Makefile,v 1.3 2005/09/12 05:59:06 mezz Exp $
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.3.6
+PORTVERSION=	2.4.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -17,8 +17,10 @@ DIST_SUBDIR=	AbiWord
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multi-plugins for AbiWord
 
-BUILD_DEPENDS=	AbiWord-2.4:${PORTSDIR}/editors/abiword-devel
-RUN_DEPENDS=	AbiWord-2.4:${PORTSDIR}/editors/abiword-devel
+BUILD_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword-devel
+RUN_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword-devel
+
+CONFLICTS=	abiword-plugins-[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes