* Update to version 0.82

* Update MASTER_SITES

PR:		15613
Submitted by:	Maintainer

6 files changed, 112 insertions, 44 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 0bf67925bb0f..9065fbf108ad 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	dia
-# Version required:    0.81
-# Date created:        2 November 1999
+# Version required:    0.82
+# Date created:        21 December 1999
 # Whom:                saper@system.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dia-0.81
+DISTNAME=	dia-0.82
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.lysator.liu.se/~alla/dia/files/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/dia
 
 MAINTAINER=	saper@system.pl
 
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index c96a2b71522d..b474fbe91a35 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (dia-0.81.tar.gz) = 181d294cbe3a578476f40fd15498568d
+MD5 (dia-0.82.tar.gz) = d14e32554f62041fe5a24b13695e8573
diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index 2a07a7967d93..5cb341eca883 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,11 +1,20 @@
---- Makefile.in.orig	Tue Nov  2 13:02:50 1999
-+++ Makefile.in	Tue Nov  2 13:03:25 1999
-@@ -115,7 +115,7 @@
+--- Makefile.in.orig	Tue Dec 21 21:11:10 1999
++++ Makefile.in	Tue Dec 21 21:12:32 1999
+@@ -114,13 +114,14 @@
  pkgdata_DATA = dia_logo.png
  man_MANS = dia.1
  
 -pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datadir)/gnome/pixmaps
- pixmap_DATA = dia_gnome_icon.png
++gnomedatadir = $(datadir)/gnome
++pixmapdir = $(gnomedatadir)/pixmaps
+ pixmap_DATA = dia_gnome_icon.png dia-diagram.png
  
- Applicationsdir = $(datadir)/gnome/apps/Applications
+-Applicationsdir = $(datadir)/gnome/apps/Applications
++Applicationsdir = $(gnomedatadir)/apps/Applications
+ Applications_DATA = dia.desktop
+ 
+-mimedir = $(datadir)/mime-info
++mimedir = $(gnomedatadir)/mime-info
+ mime_DATA = dia.mime dia.keys
+ 
+ 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 diagram.dtd
diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
index 36883de6abd2..86b3e2660066 100644
--- a/graphics/dia/patches/patch-aa
+++ b/graphics/dia/patches/patch-aa
@@ -1,11 +1,24 @@
---- Makefile.am.orig	Tue Nov  2 12:37:47 1999
-+++ Makefile.am	Tue Nov  2 12:38:02 1999
-@@ -5,7 +5,7 @@
+--- Makefile.am.orig	Tue Dec 21 21:11:05 1999
++++ Makefile.am	Tue Dec 21 21:12:45 1999
+@@ -5,17 +5,18 @@
  pkgdata_DATA = dia_logo.png
  man_MANS = dia.1
  
 -pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(datadir)/gnome/pixmaps
- pixmap_DATA = dia_gnome_icon.png
++gnomedatadir = $(datadir)/gnome
++pixmapdir = $(gnomedatadir)/pixmaps
+ pixmap_DATA = dia_gnome_icon.png dia-diagram.png
  
- Applicationsdir = $(datadir)/gnome/apps/Applications
+-Applicationsdir = $(datadir)/gnome/apps/Applications
++Applicationsdir = $(gnomedatadir)/apps/Applications
+ Applications_DATA = dia.desktop
+ 
+ dia.keys: $(srcdir)/dia.keys.in Makefile
+ 	sed -e 's^\@icondir\@^$(pixmapdir)^g' $(srcdir)/dia.keys.in > dia.keys.tmp \
+ 	&& mv dia.keys.tmp dia.keys
+ 
+-mimedir = $(datadir)/mime-info
++mimedir = $(gnomedatadir)/mime-info
+ mime_DATA = dia.mime dia.keys
+ 
+ EXTRA_DIST = dia.xpm dia_gnome_icon.png dia_gnome_menu_icon.png \
diff --git a/graphics/dia/pkg-descr b/graphics/dia/pkg-descr
index eba0fa083c21..9814f9af64fb 100644
--- a/graphics/dia/pkg-descr
+++ b/graphics/dia/pkg-descr
@@ -6,6 +6,7 @@ first version there is support for UML static structure diagrams
 (class diagrams) and network diagrams. It can currently load and
 save diagrams to a custom fileformat and export to postscript.
 
+Current maintainer: James Henstridge <james@daa.com.au>
 WWW: http://www.lysator.liu.se/~alla/dia/
 
 -- 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 6490eedde58b..6f8d91613711 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -14,32 +14,10 @@ lib/locale/hu/LC_MESSAGES/dia.mo
 lib/locale/ja/LC_MESSAGES/dia.mo
 lib/locale/no/LC_MESSAGES/dia.mo
 lib/locale/pl/LC_MESSAGES/dia.mo
+lib/locale/pt/LC_MESSAGES/dia.mo
+lib/locale/ru/LC_MESSAGES/dia.mo
 lib/locale/sv/LC_MESSAGES/dia.mo
 share/dia/dia_logo.png
-share/dia/shape-internal/flowchart/collate.shape
-share/dia/shape-internal/flowchart/delay.shape
-share/dia/shape-internal/flowchart/display.shape
-share/dia/shape-internal/flowchart/document.shape
-share/dia/shape-internal/flowchart/extract.shape
-share/dia/shape-internal/flowchart/intstorage.shape
-share/dia/shape-internal/flowchart/magdisk.shape
-share/dia/shape-internal/flowchart/magdrum.shape
-share/dia/shape-internal/flowchart/magtape.shape
-share/dia/shape-internal/flowchart/manualinput.shape
-share/dia/shape-internal/flowchart/manualop.shape
-share/dia/shape-internal/flowchart/merge.shape
-share/dia/shape-internal/flowchart/offlinestore.shape
-share/dia/shape-internal/flowchart/offpageconn.shape
-share/dia/shape-internal/flowchart/or.shape
-share/dia/shape-internal/flowchart/predefdproc.shape
-share/dia/shape-internal/flowchart/preparation.shape
-share/dia/shape-internal/flowchart/punchedcard.shape
-share/dia/shape-internal/flowchart/punchedtape.shape
-share/dia/shape-internal/flowchart/sort.shape
-share/dia/shape-internal/flowchart/sumjunction.shape
-share/dia/shape-internal/flowchart/terminal.shape
-share/dia/shape-internal/flowchart/transaction.shape
-share/dia/shape-internal/flowchart/transmittape.shape
 share/dia/shapes/Circuit/ground.shape
 share/dia/shapes/Circuit/ground.xpm
 share/dia/shapes/Circuit/hcapacitor.shape
@@ -52,6 +30,8 @@ share/dia/shapes/Circuit/hinductor.shape
 share/dia/shapes/Circuit/hinductor.xpm
 share/dia/shapes/Circuit/hinductor_de.shape
 share/dia/shapes/Circuit/hinductor_de.xpm
+share/dia/shapes/Circuit/hled_de.shape
+share/dia/shapes/Circuit/hled_de.xpm
 share/dia/shapes/Circuit/hpowersource_de.shape
 share/dia/shapes/Circuit/hpowersource_de.xpm
 share/dia/shapes/Circuit/hresistor.shape
@@ -60,7 +40,6 @@ share/dia/shapes/Circuit/hresistor_de.shape
 share/dia/shapes/Circuit/hresistor_de.xpm
 share/dia/shapes/Circuit/hzener.shape
 share/dia/shapes/Circuit/hzener.xpm
-share/dia/shapes/Circuit/index.sheet
 share/dia/shapes/Circuit/lamp_de.shape
 share/dia/shapes/Circuit/lamp_de.xpm
 share/dia/shapes/Circuit/npn.shape
@@ -81,6 +60,8 @@ share/dia/shapes/Circuit/vinductor.shape
 share/dia/shapes/Circuit/vinductor.xpm
 share/dia/shapes/Circuit/vinductor_de.shape
 share/dia/shapes/Circuit/vinductor_de.xpm
+share/dia/shapes/Circuit/vled_de.shape
+share/dia/shapes/Circuit/vled_de.xpm
 share/dia/shapes/Circuit/vpowersource_de.shape
 share/dia/shapes/Circuit/vpowersource_de.xpm
 share/dia/shapes/Circuit/vresistor.shape
@@ -89,11 +70,74 @@ share/dia/shapes/Circuit/vresistor_de.shape
 share/dia/shapes/Circuit/vresistor_de.xpm
 share/dia/shapes/Circuit/vzener.shape
 share/dia/shapes/Circuit/vzener.xpm
+share/dia/shapes/Flowchart/collate.shape
+share/dia/shapes/Flowchart/collate.xpm
+share/dia/shapes/Flowchart/delay.shape
+share/dia/shapes/Flowchart/delay.xpm
+share/dia/shapes/Flowchart/display.shape
+share/dia/shapes/Flowchart/display.xpm
+share/dia/shapes/Flowchart/document.shape
+share/dia/shapes/Flowchart/document.xpm
+share/dia/shapes/Flowchart/extract.shape
+share/dia/shapes/Flowchart/extract.xpm
+share/dia/shapes/Flowchart/intstorage.shape
+share/dia/shapes/Flowchart/intstorage.xpm
+share/dia/shapes/Flowchart/magdisk.shape
+share/dia/shapes/Flowchart/magdisk.xpm
+share/dia/shapes/Flowchart/magdrum.shape
+share/dia/shapes/Flowchart/magdrum.xpm
+share/dia/shapes/Flowchart/magtape.shape
+share/dia/shapes/Flowchart/magtape.xpm
+share/dia/shapes/Flowchart/manualinput.shape
+share/dia/shapes/Flowchart/manualinput.xpm
+share/dia/shapes/Flowchart/manualop.shape
+share/dia/shapes/Flowchart/manualop.xpm
+share/dia/shapes/Flowchart/merge.shape
+share/dia/shapes/Flowchart/merge.xpm
+share/dia/shapes/Flowchart/offlinestore.shape
+share/dia/shapes/Flowchart/offlinestore.xpm
+share/dia/shapes/Flowchart/offpageconn.shape
+share/dia/shapes/Flowchart/offpageconn.xpm
+share/dia/shapes/Flowchart/or.shape
+share/dia/shapes/Flowchart/or.xpm
+share/dia/shapes/Flowchart/predefdproc.shape
+share/dia/shapes/Flowchart/predefdproc.xpm
+share/dia/shapes/Flowchart/preparation.shape
+share/dia/shapes/Flowchart/preparation.xpm
+share/dia/shapes/Flowchart/punchedcard.shape
+share/dia/shapes/Flowchart/punchedcard.xpm
+share/dia/shapes/Flowchart/punchedtape.shape
+share/dia/shapes/Flowchart/punchedtape.xpm
+share/dia/shapes/Flowchart/sort.shape
+share/dia/shapes/Flowchart/sort.xpm
+share/dia/shapes/Flowchart/sumjunction.shape
+share/dia/shapes/Flowchart/sumjunction.xpm
+share/dia/shapes/Flowchart/terminal.shape
+share/dia/shapes/Flowchart/terminal.xpm
+share/dia/shapes/Flowchart/transaction.shape
+share/dia/shapes/Flowchart/transaction.xpm
+share/dia/shapes/Flowchart/transmittape.shape
+share/dia/shapes/Flowchart/transmittape.xpm
+share/dia/sheets/Circuit.sheet
+share/dia/sheets/ER.sheet
+share/dia/sheets/ER/weakentity.xpm
+share/dia/sheets/FS.sheet
+share/dia/sheets/Flowchart.sheet
+share/dia/sheets/UML.sheet
+share/dia/sheets/UML/aggregation.xpm
+share/dia/sheets/UML/umlclass_template.xpm
+share/dia/sheets/network.sheet
+share/dia/sheets/sybase.sheet
 share/gnome/apps/Applications/dia.desktop
+share/gnome/mime-info/dia.keys
+share/gnome/mime-info/dia.mime
+share/gnome/pixmaps/dia-diagram.png
 share/gnome/pixmaps/dia_gnome_icon.png
 @dirrm lib/dia
-@dirrm share/dia/shape-internal/flowchart
-@dirrm share/dia/shape-internal
 @dirrm share/dia/shapes/Circuit
+@dirrm share/dia/shapes/Flowchart
 @dirrm share/dia/shapes
+@dirrm share/dia/sheets/ER
+@dirrm share/dia/sheets/UML
+@dirrm share/dia/sheets
 @dirrm share/dia