* Update to 2.0.7

* Do not install GNOME files into the wrong location
* Protect more files behind GNOME_ENABLED that rely on the GNOME
  heirarchy

12 files changed, 78 insertions, 36 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 813682454e9..ab4bb8f538e 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -97,11 +97,11 @@ pre-configure:
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
+.if defined(GNOME_ENABLED)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.if defined(GNOME_ENABLED)
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
 		${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index 5cca74d1185..7fb4d8a10cd 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
-SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
+MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
+SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687
diff --git a/editors/AbiWord2/files/patch-GNUmakefile.am b/editors/AbiWord2/files/patch-GNUmakefile.am
index 3e4cc389dd5..5aa14570ff3 100644
--- a/editors/AbiWord2/files/patch-GNUmakefile.am
+++ b/editors/AbiWord2/files/patch-GNUmakefile.am
@@ -1,6 +1,22 @@
---- GNUmakefile.am.orig	Mon Aug 18 09:45:27 2003
-+++ GNUmakefile.am	Mon Aug 25 04:25:53 2003
-@@ -76,7 +76,6 @@
+--- GNUmakefile.am.orig	Fri Sep 12 09:18:10 2003
++++ GNUmakefile.am	Thu May 20 01:35:58 2004
+@@ -7,11 +7,11 @@
+ libpng_peerdir=@LIBPNG_PEERDIR@
+ libpopt_peerdir=$(top_builddir)/../popt
+ 
+-desktop_DATA = abiword.desktop
+-desktopdir = $(datadir)/applications
++#desktop_DATA = abiword.desktop
++#desktopdir = $(datadir)/applications
+ 
+-icon_DATA = abiword_48.png
+-icondir= $(datadir)/icons
++#icon_DATA = abiword_48.png
++#icondir= $(datadir)/icons
+ 
+ # Hack: make sure that the PEERS stuff is build first
+ # We can not use the all target, because on parallel builds there is no
+@@ -82,7 +82,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -8,7 +24,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 ;\
-@@ -89,11 +88,7 @@
+@@ -95,11 +94,7 @@
  	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 1eafe31a256..10cf0ceeb05 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
 share/AbiSuite-2.0/templates/normal.awt-yi
 share/AbiSuite-2.0/templates/normal.awt-zh_CN
 share/AbiSuite-2.0/templates/normal.awt-zh_TW
-share/applications/abiword.desktop
-share/icons/abiword_48.png
-share/gnome/apps/Applications/abiword.desktop
+%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
-share/gnome/pixmaps/abiword_48.png
+%%GNOME:%%share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/templates
 @dirrm share/AbiSuite-2.0/icons
 @dirrm share/AbiSuite-2.0/dictionary
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 813682454e9..ab4bb8f538e 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -97,11 +97,11 @@ pre-configure:
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
+.if defined(GNOME_ENABLED)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.if defined(GNOME_ENABLED)
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
 		${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 5cca74d1185..7fb4d8a10cd 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
-SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
+MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
+SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.am b/editors/abiword-devel/files/patch-GNUmakefile.am
index 3e4cc389dd5..5aa14570ff3 100644
--- a/editors/abiword-devel/files/patch-GNUmakefile.am
+++ b/editors/abiword-devel/files/patch-GNUmakefile.am
@@ -1,6 +1,22 @@
---- GNUmakefile.am.orig	Mon Aug 18 09:45:27 2003
-+++ GNUmakefile.am	Mon Aug 25 04:25:53 2003
-@@ -76,7 +76,6 @@
+--- GNUmakefile.am.orig	Fri Sep 12 09:18:10 2003
++++ GNUmakefile.am	Thu May 20 01:35:58 2004
+@@ -7,11 +7,11 @@
+ libpng_peerdir=@LIBPNG_PEERDIR@
+ libpopt_peerdir=$(top_builddir)/../popt
+ 
+-desktop_DATA = abiword.desktop
+-desktopdir = $(datadir)/applications
++#desktop_DATA = abiword.desktop
++#desktopdir = $(datadir)/applications
+ 
+-icon_DATA = abiword_48.png
+-icondir= $(datadir)/icons
++#icon_DATA = abiword_48.png
++#icondir= $(datadir)/icons
+ 
+ # Hack: make sure that the PEERS stuff is build first
+ # We can not use the all target, because on parallel builds there is no
+@@ -82,7 +82,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -8,7 +24,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 ;\
-@@ -89,11 +88,7 @@
+@@ -95,11 +94,7 @@
  	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 1eafe31a256..10cf0ceeb05 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
 share/AbiSuite-2.0/templates/normal.awt-yi
 share/AbiSuite-2.0/templates/normal.awt-zh_CN
 share/AbiSuite-2.0/templates/normal.awt-zh_TW
-share/applications/abiword.desktop
-share/icons/abiword_48.png
-share/gnome/apps/Applications/abiword.desktop
+%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
-share/gnome/pixmaps/abiword_48.png
+%%GNOME:%%share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/templates
 @dirrm share/AbiSuite-2.0/icons
 @dirrm share/AbiSuite-2.0/dictionary
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 813682454e9..ab4bb8f538e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -97,11 +97,11 @@ pre-configure:
 		 s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 post-install:
+.if defined(GNOME_ENABLED)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.if defined(GNOME_ENABLED)
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/GNOME_AbiWord_Control_2_0.server\
 		${PREFIX}/libdata/bonobo/servers/GNOME_AbiWord_Control_2_0.server
 	@${LN} -sf ${PREFIX}/share/AbiSuite-2.0/abi-nautilus-view-file.xml \
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 5cca74d1185..7fb4d8a10cd 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.0.6.tar.bz2) = 80379d6a61ec0faad0665e9b83f47e62
-SIZE (AbiWord/abiword-2.0.6.tar.bz2) = 21994261
+MD5 (AbiWord/abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025
+SIZE (AbiWord/abiword-2.0.7.tar.bz2) = 22012687
diff --git a/editors/abiword/files/patch-GNUmakefile.am b/editors/abiword/files/patch-GNUmakefile.am
index 3e4cc389dd5..5aa14570ff3 100644
--- a/editors/abiword/files/patch-GNUmakefile.am
+++ b/editors/abiword/files/patch-GNUmakefile.am
@@ -1,6 +1,22 @@
---- GNUmakefile.am.orig	Mon Aug 18 09:45:27 2003
-+++ GNUmakefile.am	Mon Aug 25 04:25:53 2003
-@@ -76,7 +76,6 @@
+--- GNUmakefile.am.orig	Fri Sep 12 09:18:10 2003
++++ GNUmakefile.am	Thu May 20 01:35:58 2004
+@@ -7,11 +7,11 @@
+ libpng_peerdir=@LIBPNG_PEERDIR@
+ libpopt_peerdir=$(top_builddir)/../popt
+ 
+-desktop_DATA = abiword.desktop
+-desktopdir = $(datadir)/applications
++#desktop_DATA = abiword.desktop
++#desktopdir = $(datadir)/applications
+ 
+-icon_DATA = abiword_48.png
+-icondir= $(datadir)/icons
++#icon_DATA = abiword_48.png
++#icondir= $(datadir)/icons
+ 
+ # Hack: make sure that the PEERS stuff is build first
+ # We can not use the all target, because on parallel builds there is no
+@@ -82,7 +82,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -8,7 +24,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 ;\
-@@ -89,11 +88,7 @@
+@@ -95,11 +94,7 @@
  	      for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 1eafe31a256..10cf0ceeb05 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -253,11 +253,9 @@ share/AbiSuite-2.0/templates/normal.awt-ur_PK
 share/AbiSuite-2.0/templates/normal.awt-yi
 share/AbiSuite-2.0/templates/normal.awt-zh_CN
 share/AbiSuite-2.0/templates/normal.awt-zh_TW
-share/applications/abiword.desktop
-share/icons/abiword_48.png
-share/gnome/apps/Applications/abiword.desktop
+%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
-share/gnome/pixmaps/abiword_48.png
+%%GNOME:%%share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-2.0/templates
 @dirrm share/AbiSuite-2.0/icons
 @dirrm share/AbiSuite-2.0/dictionary