Update to 0.86.

- gnomify and sobomaxify the port;
- provide a shell script to make dia work just OOB.

PR:		18915 (partially)
Submitted by:	Benno Rice <benno@netizen.com.au>

5 files changed, 53 insertions, 23 deletions

diff --git a/graphics/dia/files/dia.sh b/graphics/dia/files/dia.sh
new file mode 100644
index 0000000..5d9473f
--- /dev/null
+++ b/graphics/dia/files/dia.sh
@@ -0,0 +1,7 @@
+#!/bin/sh 
+DIA_LIB_PATH=$DIA_LIB_PATH:%%PREFIX%%/lib/dia
+DIA_SHAPE_PATH=%%PREFIX%%/share/gnome/dia/shapes
+DIA_SHEET_PATH=%%PREFIX%%/share/gnome/dia/sheets
+export DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH
+
+exec %%PREFIX%%/bin/dia-bin $*
diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index d37fcd2..b35be2f 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,15 +1,6 @@
---- Makefile.in.orig	Sat Feb 19 17:56:06 2000
-+++ Makefile.in	Sat Feb 19 17:57:05 2000
-@@ -111,7 +111,7 @@
- 
- SUBDIRS = lib objects plug-ins shapes intl app samples po sheets
- 
--gnomedatadir = $(datadir)
-+gnomedatadir = $(datadir)/gnome
- 
- pkgdata_DATA = dia_logo.png
- man_MANS = dia.1
-@@ -119,7 +119,7 @@
+--- Makefile.in.orig	Mon Aug  7 12:15:36 2000
++++ Makefile.in	Mon Aug  7 12:15:39 2000
+@@ -136,7 +136,7 @@
  pixmapdir = $(gnomedatadir)/pixmaps
  pixmap_DATA = dia_gnome_icon.png dia-diagram.png
  
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index 91c0004..8d00152 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,11 +1,11 @@
---- configure.orig	Sun Jan 16 21:51:51 2000
-+++ configure	Sun Jan 16 21:52:01 2000
-@@ -3770,7 +3770,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
+--- configure.orig	Mon Aug  7 11:47:15 2000
++++ configure	Mon Aug  7 11:47:51 2000
+@@ -2565,7 +2565,7 @@
+ 
+ 
+ OLDCPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$CPPFLAGS `glib-config --cflags`"
++CPPFLAGS="$CPPFLAGS `${GLIB_CONFIG} --cflags`"
+ 
+ 
+ CPPFLAGS=$OLDCPPFLAGS
diff --git a/graphics/dia/files/patch-af b/graphics/dia/files/patch-af
new file mode 100644
index 0000000..dffc53b
--- /dev/null
+++ b/graphics/dia/files/patch-af
@@ -0,0 +1,21 @@
+--- app/Makefile.in.orig	Mon Aug  7 13:13:57 2000
++++ app/Makefile.in	Mon Aug  7 13:15:10 2000
+@@ -157,7 +157,7 @@
+ @HAVE_BONOBO_TRUE@dia_oafinfo = @HAVE_BONOBO_TRUE@dia.oafinfo
+ @HAVE_BONOBO_FALSE@dia_oafinfo = 
+ 
+-bin_PROGRAMS = dia $(dia_embedd)
++bin_PROGRAMS = dia-bin $(dia_embedd)
+ 
+ gnorbadir = $(sysconfdir)/CORBA/servers
+ gnorba_DATA = $(dia_gnorba)
+@@ -488,6 +488,9 @@
+ dia: $(dia_OBJECTS) $(dia_DEPENDENCIES)
+ 	@rm -f dia
+ 	$(LINK) $(dia_LDFLAGS) $(dia_OBJECTS) $(dia_LDADD) $(LIBS)
++
++dia-bin: dia
++	cp dia dia-bin
+ 
+ dia-embedd: $(dia_embedd_OBJECTS) $(dia_embedd_DEPENDENCIES)
+ 	@rm -f dia-embedd
diff --git a/graphics/dia/files/patch-ag b/graphics/dia/files/patch-ag
new file mode 100644
index 0000000..30f6882
--- /dev/null
+++ b/graphics/dia/files/patch-ag
@@ -0,0 +1,11 @@
+--- lib/plug-ins.c.orig	Mon Aug  7 13:51:41 2000
++++ lib/plug-ins.c	Mon Aug  7 13:52:01 2000
+@@ -45,7 +45,7 @@
+ #  define PLUG_IN_EXT_LEN 4
+ #else
+ /* this one should work on any platform where libtool is used to compile dia */
+-#  define PLUG_IN_EXT ".la"
++#  define PLUG_IN_EXT ".so"
+ #  define PLUG_IN_EXT_LEN 3
+ #endif
+