Update to 0.83

5 files changed, 130 insertions, 161 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 9065fbf108ad..583eefb84fab 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dia
-# Version required:    0.82
+# Version required:    0.83
 # Date created:        21 December 1999
 # Whom:                saper@system.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dia-0.82
+DISTNAME=	dia-0.83
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/dia
@@ -23,7 +23,8 @@ USE_X_PREFIX=   yes
 USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
-
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index b474fbe91a35..531b5dff5ce9 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1 +1 @@
-MD5 (dia-0.82.tar.gz) = d14e32554f62041fe5a24b13695e8573
+MD5 (dia-0.83.tar.gz) = 84c6e12dd4c072948e9c52077f246525
diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index 5cb341eca883..85aeac2e7b7f 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,20 +1,11 @@
---- 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
-+gnomedatadir = $(datadir)/gnome
-+pixmapdir = $(gnomedatadir)/pixmaps
+--- Makefile.in.orig	Sat Feb 12 23:33:35 2000
++++ Makefile.in	Sat Feb 12 23:33:53 2000
+@@ -119,7 +119,7 @@
+ pixmapdir = $(gnomedatadir)/pixmaps
  pixmap_DATA = dia_gnome_icon.png dia-diagram.png
  
--Applicationsdir = $(datadir)/gnome/apps/Applications
+-Applicationsdir = $(gnomedatadir)/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
+ mimedir = $(gnomedatadir)/mime-info
diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa
deleted file mode 100644
index 86b3e2660066..000000000000
--- a/graphics/dia/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
-+gnomedatadir = $(datadir)/gnome
-+pixmapdir = $(gnomedatadir)/pixmaps
- pixmap_DATA = dia_gnome_icon.png dia-diagram.png
- 
--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-plist b/graphics/dia/pkg-plist
index c3bc2a8fc0b6..562d1602495a 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,4 +1,5 @@
 bin/dia
+lib/dia/libcgm_filter.so
 lib/dia/liber_objects.so
 lib/dia/libflowchart_objects.so
 lib/dia/libfs_objects.so
@@ -6,117 +7,117 @@ lib/dia/libnetwork_objects.so
 lib/dia/libstandard_objects.so
 lib/dia/libsybase_objects.so
 lib/dia/libuml_objects.so
-share/dia/dia_logo.png
-share/dia/shapes/Circuit/ground.shape
-share/dia/shapes/Circuit/ground.xpm
-share/dia/shapes/Circuit/hcapacitor.shape
-share/dia/shapes/Circuit/hcapacitor.xpm
-share/dia/shapes/Circuit/hdiode.shape
-share/dia/shapes/Circuit/hdiode.xpm
-share/dia/shapes/Circuit/hfuse_de.shape
-share/dia/shapes/Circuit/hfuse_de.xpm
-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
-share/dia/shapes/Circuit/hresistor.xpm
-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/lamp_de.shape
-share/dia/shapes/Circuit/lamp_de.xpm
-share/dia/shapes/Circuit/npn.shape
-share/dia/shapes/Circuit/npn.xpm
-share/dia/shapes/Circuit/opamp.shape
-share/dia/shapes/Circuit/opamp.xpm
-share/dia/shapes/Circuit/pnp.shape
-share/dia/shapes/Circuit/pnp.xpm
-share/dia/shapes/Circuit/speaker_de.shape
-share/dia/shapes/Circuit/speaker_de.xpm
-share/dia/shapes/Circuit/vcapacitor.shape
-share/dia/shapes/Circuit/vcapacitor.xpm
-share/dia/shapes/Circuit/vdiode.shape
-share/dia/shapes/Circuit/vdiode.xpm
-share/dia/shapes/Circuit/vfuse_de.shape
-share/dia/shapes/Circuit/vfuse_de.xpm
-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
-share/dia/shapes/Circuit/vresistor.xpm
-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/dia/dia_logo.png
+share/gnome/dia/shapes/Circuit/ground.shape
+share/gnome/dia/shapes/Circuit/ground.xpm
+share/gnome/dia/shapes/Circuit/hcapacitor.shape
+share/gnome/dia/shapes/Circuit/hcapacitor.xpm
+share/gnome/dia/shapes/Circuit/hdiode.shape
+share/gnome/dia/shapes/Circuit/hdiode.xpm
+share/gnome/dia/shapes/Circuit/hfuse_de.shape
+share/gnome/dia/shapes/Circuit/hfuse_de.xpm
+share/gnome/dia/shapes/Circuit/hinductor.shape
+share/gnome/dia/shapes/Circuit/hinductor.xpm
+share/gnome/dia/shapes/Circuit/hinductor_de.shape
+share/gnome/dia/shapes/Circuit/hinductor_de.xpm
+share/gnome/dia/shapes/Circuit/hled_de.shape
+share/gnome/dia/shapes/Circuit/hled_de.xpm
+share/gnome/dia/shapes/Circuit/hpowersource_de.shape
+share/gnome/dia/shapes/Circuit/hpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/hresistor.shape
+share/gnome/dia/shapes/Circuit/hresistor.xpm
+share/gnome/dia/shapes/Circuit/hresistor_de.shape
+share/gnome/dia/shapes/Circuit/hresistor_de.xpm
+share/gnome/dia/shapes/Circuit/hzener.shape
+share/gnome/dia/shapes/Circuit/hzener.xpm
+share/gnome/dia/shapes/Circuit/lamp_de.shape
+share/gnome/dia/shapes/Circuit/lamp_de.xpm
+share/gnome/dia/shapes/Circuit/npn.shape
+share/gnome/dia/shapes/Circuit/npn.xpm
+share/gnome/dia/shapes/Circuit/opamp.shape
+share/gnome/dia/shapes/Circuit/opamp.xpm
+share/gnome/dia/shapes/Circuit/pnp.shape
+share/gnome/dia/shapes/Circuit/pnp.xpm
+share/gnome/dia/shapes/Circuit/speaker_de.shape
+share/gnome/dia/shapes/Circuit/speaker_de.xpm
+share/gnome/dia/shapes/Circuit/vcapacitor.shape
+share/gnome/dia/shapes/Circuit/vcapacitor.xpm
+share/gnome/dia/shapes/Circuit/vdiode.shape
+share/gnome/dia/shapes/Circuit/vdiode.xpm
+share/gnome/dia/shapes/Circuit/vfuse_de.shape
+share/gnome/dia/shapes/Circuit/vfuse_de.xpm
+share/gnome/dia/shapes/Circuit/vinductor.shape
+share/gnome/dia/shapes/Circuit/vinductor.xpm
+share/gnome/dia/shapes/Circuit/vinductor_de.shape
+share/gnome/dia/shapes/Circuit/vinductor_de.xpm
+share/gnome/dia/shapes/Circuit/vled_de.shape
+share/gnome/dia/shapes/Circuit/vled_de.xpm
+share/gnome/dia/shapes/Circuit/vpowersource_de.shape
+share/gnome/dia/shapes/Circuit/vpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/vresistor.shape
+share/gnome/dia/shapes/Circuit/vresistor.xpm
+share/gnome/dia/shapes/Circuit/vresistor_de.shape
+share/gnome/dia/shapes/Circuit/vresistor_de.xpm
+share/gnome/dia/shapes/Circuit/vzener.shape
+share/gnome/dia/shapes/Circuit/vzener.xpm
+share/gnome/dia/shapes/Flowchart/collate.shape
+share/gnome/dia/shapes/Flowchart/collate.xpm
+share/gnome/dia/shapes/Flowchart/delay.shape
+share/gnome/dia/shapes/Flowchart/delay.xpm
+share/gnome/dia/shapes/Flowchart/display.shape
+share/gnome/dia/shapes/Flowchart/display.xpm
+share/gnome/dia/shapes/Flowchart/document.shape
+share/gnome/dia/shapes/Flowchart/document.xpm
+share/gnome/dia/shapes/Flowchart/extract.shape
+share/gnome/dia/shapes/Flowchart/extract.xpm
+share/gnome/dia/shapes/Flowchart/intstorage.shape
+share/gnome/dia/shapes/Flowchart/intstorage.xpm
+share/gnome/dia/shapes/Flowchart/magdisk.shape
+share/gnome/dia/shapes/Flowchart/magdisk.xpm
+share/gnome/dia/shapes/Flowchart/magdrum.shape
+share/gnome/dia/shapes/Flowchart/magdrum.xpm
+share/gnome/dia/shapes/Flowchart/magtape.shape
+share/gnome/dia/shapes/Flowchart/magtape.xpm
+share/gnome/dia/shapes/Flowchart/manualinput.shape
+share/gnome/dia/shapes/Flowchart/manualinput.xpm
+share/gnome/dia/shapes/Flowchart/manualop.shape
+share/gnome/dia/shapes/Flowchart/manualop.xpm
+share/gnome/dia/shapes/Flowchart/merge.shape
+share/gnome/dia/shapes/Flowchart/merge.xpm
+share/gnome/dia/shapes/Flowchart/offlinestore.shape
+share/gnome/dia/shapes/Flowchart/offlinestore.xpm
+share/gnome/dia/shapes/Flowchart/offpageconn.shape
+share/gnome/dia/shapes/Flowchart/offpageconn.xpm
+share/gnome/dia/shapes/Flowchart/or.shape
+share/gnome/dia/shapes/Flowchart/or.xpm
+share/gnome/dia/shapes/Flowchart/predefdproc.shape
+share/gnome/dia/shapes/Flowchart/predefdproc.xpm
+share/gnome/dia/shapes/Flowchart/preparation.shape
+share/gnome/dia/shapes/Flowchart/preparation.xpm
+share/gnome/dia/shapes/Flowchart/punchedcard.shape
+share/gnome/dia/shapes/Flowchart/punchedcard.xpm
+share/gnome/dia/shapes/Flowchart/punchedtape.shape
+share/gnome/dia/shapes/Flowchart/punchedtape.xpm
+share/gnome/dia/shapes/Flowchart/sort.shape
+share/gnome/dia/shapes/Flowchart/sort.xpm
+share/gnome/dia/shapes/Flowchart/sumjunction.shape
+share/gnome/dia/shapes/Flowchart/sumjunction.xpm
+share/gnome/dia/shapes/Flowchart/terminal.shape
+share/gnome/dia/shapes/Flowchart/terminal.xpm
+share/gnome/dia/shapes/Flowchart/transaction.shape
+share/gnome/dia/shapes/Flowchart/transaction.xpm
+share/gnome/dia/shapes/Flowchart/transmittape.shape
+share/gnome/dia/shapes/Flowchart/transmittape.xpm
+share/gnome/dia/sheets/Circuit.sheet
+share/gnome/dia/sheets/ER.sheet
+share/gnome/dia/sheets/ER/weakentity.xpm
+share/gnome/dia/sheets/FS.sheet
+share/gnome/dia/sheets/Flowchart.sheet
+share/gnome/dia/sheets/UML.sheet
+share/gnome/dia/sheets/UML/aggregation.xpm
+share/gnome/dia/sheets/UML/umlclass_template.xpm
+share/gnome/dia/sheets/network.sheet
+share/gnome/dia/sheets/sybase.sheet
 share/gnome/apps/Applications/dia.desktop
 share/gnome/mime-info/dia.keys
 share/gnome/mime-info/dia.mime
@@ -134,10 +135,10 @@ share/locale/pt/LC_MESSAGES/dia.mo
 share/locale/ru/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
 @dirrm lib/dia
-@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
+@dirrm share/gnome/dia/shapes/Circuit
+@dirrm share/gnome/dia/shapes/Flowchart
+@dirrm share/gnome/dia/shapes
+@dirrm share/gnome/dia/sheets/ER
+@dirrm share/gnome/dia/sheets/UML
+@dirrm share/gnome/dia/sheets
+@dirrm share/gnome/dia