5 files changed, 72 insertions, 81 deletions

diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index b3a5bd9a1570..bdf4e05a4547 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,54 +1,21 @@
---- Makefile.in.orig	Mon Aug  7 12:15:36 2000
-+++ Makefile.in	Mon Aug  7 12:15:39 2000
-@@ -120,14 +120,16 @@
- pkgdata_DATA = dia_logo.png
- man_MANS = dia.1
- 
-+ifdef HAVE_GNOME
- pixmapdir = $(gnomedatadir)/pixmaps
- pixmap_DATA = dia_gnome_icon.png dia-diagram.png
+--- Makefile.in.orig	Fri May 11 05:04:49 2001
++++ Makefile.in	Thu May 17 14:28:56 2001
+@@ -154,3 +154,4 @@
  
 -Applicationsdir = $(gnomedatadir)/gnome/apps/Applications
++ifdef HAVE_GNOME
 +Applicationsdir = $(gnomedatadir)/apps/Applications
- Applications_DATA = dia.desktop
- 
- mimedir = $(gnomedatadir)/mime-info
+ Applications_DATA = dia.desktop 
+@@ -159,2 +160,3 @@
  mime_DATA = dia.mime dia.keys
 +endif
  
- EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png 	dia.desktop dia.spec KNOWN_BUGS $(pkgdata_DATA) $(man_MANS) 	dia-diagram.png dia.mime dia.keys.in 	doc/diagram.dtd doc/sheet.dtd doc/custom-shapes
- 
-@@ -237,7 +239,6 @@
- 
- install-ApplicationsDATA: $(Applications_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
- 	@list='$(Applications_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Applicationsdir)/$$p"; \
-@@ -256,7 +257,6 @@
- 
- install-mimeDATA: $(mime_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(mimedir)
- 	@list='$(mime_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(mimedir)/$$p"; \
-@@ -275,7 +275,6 @@
- 
- install-pixmapDATA: $(pixmap_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
- 	@list='$(pixmap_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
-@@ -490,8 +489,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Applicationsdir) \
--		$(DESTDIR)$(mimedir) $(DESTDIR)$(pixmapdir) \
-+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 \
- 		$(DESTDIR)$(pkgdatadir)
+@@ -556,4 +558,8 @@
  
++ifdef HAVE_GNOME
+ install-data-am: install-ApplicationsDATA install-man install-mimeDATA \
+ 	install-pixmapDATA install-pkgdataDATA
++else
++install-data-am: install-man install-pkgdataDATA
++endif
  
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index 8d00152d61ed..5dbe20742fc4 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,11 +1,37 @@
---- configure.orig	Mon Aug  7 11:47:15 2000
-+++ configure	Mon Aug  7 11:47:51 2000
-@@ -2565,7 +2565,7 @@
+--- configure.orig	Fri May 11 04:08:46 2001
++++ configure	Thu May 17 15:59:22 2001
+@@ -5296,4 +5296,19 @@
  
+-
+-
++# Actually configure libtool.  ac_aux_dir is where install-sh is found.
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
++${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
++|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++# Reload cache, that may have been modified by ltconfig
++if test -r "$cache_file"; then
++  echo "loading cache $cache_file"
++  . $cache_file
++else
++  echo "creating cache $cache_file"
++  > $cache_file
++fi
  
+@@ -5306,4 +5321,5 @@
+ 
+-# Prevent multiple expansion
+-
++# Redirect the config.log output again, so that the ltconfig log is not
++# clobbered by the next message.
++exec 5>>./config.log
+ 
+@@ -6197,3 +6213,3 @@
  OLDCPPFLAGS=$CPPFLAGS
 -CPPFLAGS="$CPPFLAGS `glib-config --cflags`"
-+CPPFLAGS="$CPPFLAGS `${GLIB_CONFIG} --cflags`"
- 
++CPPFLAGS="$CPPFLAGS `$GLIB_CONFIG --cflags`"
  
- CPPFLAGS=$OLDCPPFLAGS
diff --git a/graphics/dia/files/patch-ae b/graphics/dia/files/patch-ae
index 8f16e74f66eb..aca97ced24ad 100644
--- a/graphics/dia/files/patch-ae
+++ b/graphics/dia/files/patch-ae
@@ -1,20 +1,12 @@
---- app/main.c.org	Wed Apr 19 20:56:49 2000
-+++ app/main.c	Wed Apr 19 20:57:43 2000
-@@ -15,6 +15,8 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
+--- app/main.c.orig	Sun Mar 25 19:05:16 2001
++++ app/main.c	Thu May 17 14:09:02 2001
+@@ -19,2 +19,4 @@
+ 
 +#include <ieeefp.h>
 +
  #include "geometry.h"
- #include "diagram.h"
- #include "display.h"
-@@ -25,6 +27,8 @@
-      
- int main(int argc, char *argv[])
+@@ -35,2 +37,4 @@
  {
 +  fpsetmask(0);
 +
    app_init(argc, argv);
- 
-   gtk_main ();
diff --git a/graphics/dia/files/patch-af b/graphics/dia/files/patch-af
index dffc53b222b0..4368d300a9d9 100644
--- a/graphics/dia/files/patch-af
+++ b/graphics/dia/files/patch-af
@@ -1,21 +1,20 @@
---- 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 = 
+--- app/Makefile.in.orig	Fri May 11 05:04:49 2001
++++ app/Makefile.in	Thu May 17 16:18:20 2001
+@@ -177,4 +177,2 @@
  
 -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
+-
+ oafinfodir = $(datadir)/oaf
+@@ -336,4 +334,4 @@
+ CONFIG_CLEAN_FILES =
+-@HAVE_BONOBO_TRUE@bin_PROGRAMS = dia$(EXEEXT) dia-embedd$(EXEEXT)
+-@HAVE_BONOBO_FALSE@bin_PROGRAMS = dia$(EXEEXT)
++@HAVE_BONOBO_TRUE@bin_PROGRAMS = dia-bin$(EXEEXT) dia-embedd$(EXEEXT)
++@HAVE_BONOBO_FALSE@bin_PROGRAMS = dia-bin$(EXEEXT)
+ noinst_PROGRAMS = run_dia.sh
+@@ -552,2 +550,5 @@
  	$(LINK) $(dia_LDFLAGS) $(dia_OBJECTS) $(dia_LDADD) $(LIBS)
 +
-+dia-bin: dia
-+	cp dia dia-bin
++dia-bin$(EXEEXT): dia$(EXEEXT)
++	cp dia$(EXEEXT) dia-bin$(EXEEXT)
  
- dia-embedd: $(dia_embedd_OBJECTS) $(dia_embedd_DEPENDENCIES)
- 	@rm -f dia-embedd
diff --git a/graphics/dia/files/patch-po::Makefile.in.in b/graphics/dia/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..da394213d95f
--- /dev/null
+++ b/graphics/dia/files/patch-po::Makefile.in.in
@@ -0,0 +1,7 @@
+--- po/Makefile.in.in.orig	Thu May 17 14:51:15 2001
++++ po/Makefile.in.in	Thu May 17 14:52:27 2001
+@@ -55,3 +55,3 @@
+ CATOBJEXT = @CATOBJEXT@
+-INSTOBJEXT = @INSTOBJEXT@
++INSTOBJEXT = .mo
+