Implement WANT_GNOME.

3 files changed, 317 insertions, 278 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 8ea13df76cd9..69fd0575d9cb 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -13,30 +13,26 @@ MASTER_SITE_SUBDIR=	stable/sources/dia
 
 MAINTAINER=	saper@system.pl
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12  \
-		xml.5:${PORTSDIR}/textproc/libxml	\
-		gdk_imlib.5:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml	\
 		popt.0:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
-
-USE_X_PREFIX=   yes
-USE_LIBTOOL=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--enable-gnome
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_IMLIB=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		dia.1
 
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS=	--enable-gnome
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -48,4 +44,4 @@ post-install:
 	${SED} "s|%%PREFIX%%|${PREFIX}|g" ${FILESDIR}/dia.sh > ${WRKDIR}/dia.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/dia.sh ${PREFIX}/bin/dia
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/dia/files/patch-ab b/graphics/dia/files/patch-ab
index b35be2f31f82..b3a5bd9a1570 100644
--- a/graphics/dia/files/patch-ab
+++ b/graphics/dia/files/patch-ab
@@ -1,6 +1,10 @@
 --- Makefile.in.orig	Mon Aug  7 12:15:36 2000
 +++ Makefile.in	Mon Aug  7 12:15:39 2000
-@@ -136,7 +136,7 @@
+@@ -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
  
@@ -9,3 +13,42 @@
  Applications_DATA = dia.desktop
  
  mimedir = $(gnomedatadir)/mime-info
+ 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)
+ 
+ 
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index b3e07958de60..41cb97d5850e 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -17,251 +17,251 @@ lib/dia/libsvg_filter.so
 lib/dia/libsybase_objects.so
 lib/dia/libuml_objects.so
 lib/dia/libwpg_filter.so
-share/gnome/apps/Applications/dia.desktop
-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/hjumper.shape
-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/nmos_de.shape
-share/gnome/dia/shapes/Circuit/nmos_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/pmos_de.shape
-share/gnome/dia/shapes/Circuit/pmos_de.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/Civil/bvrest.shape
-share/gnome/dia/shapes/Civil/bvrest.xpm
-share/gnome/dia/shapes/Civil/hcompressor.shape
-share/gnome/dia/shapes/Civil/hcompressor.xpm
-share/gnome/dia/shapes/Civil/hpump.shape
-share/gnome/dia/shapes/Civil/hpump.xpm
-share/gnome/dia/shapes/Civil/hrest.shape
-share/gnome/dia/shapes/Civil/hrest.xpm
-share/gnome/dia/shapes/Civil/line.shape
-share/gnome/dia/shapes/Civil/line.xpm
-share/gnome/dia/shapes/Civil/vcompressor.shape
-share/gnome/dia/shapes/Civil/vcompressor.xpm
-share/gnome/dia/shapes/Civil/vpump.shape
-share/gnome/dia/shapes/Civil/vpump.xpm
-share/gnome/dia/shapes/Civil/vrest.shape
-share/gnome/dia/shapes/Civil/vrest.xpm
-share/gnome/dia/shapes/Civil/water_level.shape
-share/gnome/dia/shapes/Civil/water_level.xpm
-share/gnome/dia/shapes/Contact/c_if.shape
-share/gnome/dia/shapes/Contact/c_if.xpm
-share/gnome/dia/shapes/Contact/c_ifnot.shape
-share/gnome/dia/shapes/Contact/c_ifnot.xpm
-share/gnome/dia/shapes/Contact/c_lamp.shape
-share/gnome/dia/shapes/Contact/c_lamp.xpm
-share/gnome/dia/shapes/Contact/c_relay.shape
-share/gnome/dia/shapes/Contact/c_relay.xpm
-share/gnome/dia/shapes/Contact/l_if.shape
-share/gnome/dia/shapes/Contact/l_if.xpm
-share/gnome/dia/shapes/Contact/l_ifnot.shape
-share/gnome/dia/shapes/Contact/l_ifnot.xpm
-share/gnome/dia/shapes/Contact/l_out.shape
-share/gnome/dia/shapes/Contact/l_out.xpm
-share/gnome/dia/shapes/Contact/l_outj.shape
-share/gnome/dia/shapes/Contact/l_outj.xpm
-share/gnome/dia/shapes/Contact/l_outnot.shape
-share/gnome/dia/shapes/Contact/l_outnot.xpm
-share/gnome/dia/shapes/Contact/l_outr.shape
-share/gnome/dia/shapes/Contact/l_outr.xpm
-share/gnome/dia/shapes/Contact/l_outrcep.shape
-share/gnome/dia/shapes/Contact/l_outrcep.xpm
-share/gnome/dia/shapes/Contact/l_outs.shape
-share/gnome/dia/shapes/Contact/l_outs.xpm
-share/gnome/dia/shapes/Contact/l_sout.shape
-share/gnome/dia/shapes/Contact/l_sout.xpm
-share/gnome/dia/shapes/Contact/l_soutnot.shape
-share/gnome/dia/shapes/Contact/l_soutnot.xpm
-share/gnome/dia/shapes/Contact/l_soutr.shape
-share/gnome/dia/shapes/Contact/l_soutr.xpm
-share/gnome/dia/shapes/Contact/l_souts.shape
-share/gnome/dia/shapes/Contact/l_souts.xpm
-share/gnome/dia/shapes/Electric/cnx.shape
-share/gnome/dia/shapes/Electric/cnx.xpm
-share/gnome/dia/shapes/Electric/command.shape
-share/gnome/dia/shapes/Electric/command.xpm
-share/gnome/dia/shapes/Electric/contact_f.shape
-share/gnome/dia/shapes/Electric/contact_f.xpm
-share/gnome/dia/shapes/Electric/contact_o.shape
-share/gnome/dia/shapes/Electric/contact_o.xpm
-share/gnome/dia/shapes/Electric/intpos_f.shape
-share/gnome/dia/shapes/Electric/intpos_f.xpm
-share/gnome/dia/shapes/Electric/intpos_o.shape
-share/gnome/dia/shapes/Electric/intpos_o.xpm
-share/gnome/dia/shapes/Electric/lamp.shape
-share/gnome/dia/shapes/Electric/lamp.xpm
-share/gnome/dia/shapes/Electric/relay.shape
-share/gnome/dia/shapes/Electric/relay.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/shapes/Network/nwcloud.shape
-share/gnome/dia/shapes/Network/nwcloud.xpm
-share/gnome/dia/shapes/Network/router-symbol.shape
-share/gnome/dia/shapes/Network/router-symbol.xpm
-share/gnome/dia/shapes/Network/switch-atm-symbol.shape
-share/gnome/dia/shapes/Network/switch-atm-symbol.xpm
-share/gnome/dia/shapes/Network/switch-symbol.shape
-share/gnome/dia/shapes/Network/switch-symbol.xpm
-share/gnome/dia/shapes/Pneumatic/cnx.shape
-share/gnome/dia/shapes/Pneumatic/cnx.xpm
-share/gnome/dia/shapes/Pneumatic/comelec1.shape
-share/gnome/dia/shapes/Pneumatic/comelec1.xpm
-share/gnome/dia/shapes/Pneumatic/comelec2.shape
-share/gnome/dia/shapes/Pneumatic/comelec2.xpm
-share/gnome/dia/shapes/Pneumatic/commusc.shape
-share/gnome/dia/shapes/Pneumatic/commusc.xpm
-share/gnome/dia/shapes/Pneumatic/compb.shape
-share/gnome/dia/shapes/Pneumatic/compb.xpm
-share/gnome/dia/shapes/Pneumatic/compilh.shape
-share/gnome/dia/shapes/Pneumatic/compilh.xpm
-share/gnome/dia/shapes/Pneumatic/compilp.shape
-share/gnome/dia/shapes/Pneumatic/compilp.xpm
-share/gnome/dia/shapes/Pneumatic/comspr.shape
-share/gnome/dia/shapes/Pneumatic/comspr.xpm
-share/gnome/dia/shapes/Pneumatic/dejack.shape
-share/gnome/dia/shapes/Pneumatic/dejack.xpm
-share/gnome/dia/shapes/Pneumatic/dist22.shape
-share/gnome/dia/shapes/Pneumatic/dist22.xpm
-share/gnome/dia/shapes/Pneumatic/dist32.shape
-share/gnome/dia/shapes/Pneumatic/dist32.xpm
-share/gnome/dia/shapes/Pneumatic/dist42.shape
-share/gnome/dia/shapes/Pneumatic/dist42.xpm
-share/gnome/dia/shapes/Pneumatic/dist52.shape
-share/gnome/dia/shapes/Pneumatic/dist52.xpm
-share/gnome/dia/shapes/Pneumatic/drain.shape
-share/gnome/dia/shapes/Pneumatic/drain.xpm
-share/gnome/dia/shapes/Pneumatic/press.shape
-share/gnome/dia/shapes/Pneumatic/press.xpm
-share/gnome/dia/shapes/Pneumatic/presshy.shape
-share/gnome/dia/shapes/Pneumatic/presshy.xpm
-share/gnome/dia/shapes/Pneumatic/presspn.shape
-share/gnome/dia/shapes/Pneumatic/presspn.xpm
-share/gnome/dia/shapes/Pneumatic/seijack.shape
-share/gnome/dia/shapes/Pneumatic/seijack.xpm
-share/gnome/dia/shapes/Pneumatic/seojack.shape
-share/gnome/dia/shapes/Pneumatic/seojack.xpm
-share/gnome/dia/sheets/Circuit.sheet
-share/gnome/dia/sheets/Contact.sheet
-share/gnome/dia/sheets/ER.sheet
-share/gnome/dia/sheets/ER/weakentity.xpm
-share/gnome/dia/sheets/Electric.sheet
-share/gnome/dia/sheets/FS.sheet
-share/gnome/dia/sheets/Flowchart.sheet
-share/gnome/dia/sheets/GRAFCET.sheet
-share/gnome/dia/sheets/GRAFCET/etapei.xpm
-share/gnome/dia/sheets/GRAFCET/etapemc.xpm
-share/gnome/dia/sheets/GRAFCET/etapeme.xpm
-share/gnome/dia/sheets/GRAFCET/etapems.xpm
-share/gnome/dia/sheets/GRAFCET/etapesp.xpm
-share/gnome/dia/sheets/GRAFCET/vergent_and.xpm
-share/gnome/dia/sheets/Pneumatic.sheet
-share/gnome/dia/sheets/SADT.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/chronogram.sheet
-share/gnome/dia/sheets/network.sheet
-share/gnome/dia/sheets/sybase.sheet
-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
+%%GNOME:%%share/gnome/apps/Applications/dia.desktop
+%%DATADIR%%/dia/dia_logo.png
+%%DATADIR%%/dia/shapes/Circuit/ground.shape
+%%DATADIR%%/dia/shapes/Circuit/ground.xpm
+%%DATADIR%%/dia/shapes/Circuit/hcapacitor.shape
+%%DATADIR%%/dia/shapes/Circuit/hcapacitor.xpm
+%%DATADIR%%/dia/shapes/Circuit/hdiode.shape
+%%DATADIR%%/dia/shapes/Circuit/hdiode.xpm
+%%DATADIR%%/dia/shapes/Circuit/hfuse_de.shape
+%%DATADIR%%/dia/shapes/Circuit/hfuse_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/hinductor.shape
+%%DATADIR%%/dia/shapes/Circuit/hinductor.xpm
+%%DATADIR%%/dia/shapes/Circuit/hinductor_de.shape
+%%DATADIR%%/dia/shapes/Circuit/hinductor_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/hjumper.shape
+%%DATADIR%%/dia/shapes/Circuit/hled_de.shape
+%%DATADIR%%/dia/shapes/Circuit/hled_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/hpowersource_de.shape
+%%DATADIR%%/dia/shapes/Circuit/hpowersource_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/hresistor.shape
+%%DATADIR%%/dia/shapes/Circuit/hresistor.xpm
+%%DATADIR%%/dia/shapes/Circuit/hresistor_de.shape
+%%DATADIR%%/dia/shapes/Circuit/hresistor_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/hzener.shape
+%%DATADIR%%/dia/shapes/Circuit/hzener.xpm
+%%DATADIR%%/dia/shapes/Circuit/lamp_de.shape
+%%DATADIR%%/dia/shapes/Circuit/lamp_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/nmos_de.shape
+%%DATADIR%%/dia/shapes/Circuit/nmos_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/npn.shape
+%%DATADIR%%/dia/shapes/Circuit/npn.xpm
+%%DATADIR%%/dia/shapes/Circuit/opamp.shape
+%%DATADIR%%/dia/shapes/Circuit/opamp.xpm
+%%DATADIR%%/dia/shapes/Circuit/pmos_de.shape
+%%DATADIR%%/dia/shapes/Circuit/pmos_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/pnp.shape
+%%DATADIR%%/dia/shapes/Circuit/pnp.xpm
+%%DATADIR%%/dia/shapes/Circuit/speaker_de.shape
+%%DATADIR%%/dia/shapes/Circuit/speaker_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vcapacitor.shape
+%%DATADIR%%/dia/shapes/Circuit/vcapacitor.xpm
+%%DATADIR%%/dia/shapes/Circuit/vdiode.shape
+%%DATADIR%%/dia/shapes/Circuit/vdiode.xpm
+%%DATADIR%%/dia/shapes/Circuit/vfuse_de.shape
+%%DATADIR%%/dia/shapes/Circuit/vfuse_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vinductor.shape
+%%DATADIR%%/dia/shapes/Circuit/vinductor.xpm
+%%DATADIR%%/dia/shapes/Circuit/vinductor_de.shape
+%%DATADIR%%/dia/shapes/Circuit/vinductor_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vled_de.shape
+%%DATADIR%%/dia/shapes/Circuit/vled_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vpowersource_de.shape
+%%DATADIR%%/dia/shapes/Circuit/vpowersource_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vresistor.shape
+%%DATADIR%%/dia/shapes/Circuit/vresistor.xpm
+%%DATADIR%%/dia/shapes/Circuit/vresistor_de.shape
+%%DATADIR%%/dia/shapes/Circuit/vresistor_de.xpm
+%%DATADIR%%/dia/shapes/Circuit/vzener.shape
+%%DATADIR%%/dia/shapes/Circuit/vzener.xpm
+%%DATADIR%%/dia/shapes/Civil/bvrest.shape
+%%DATADIR%%/dia/shapes/Civil/bvrest.xpm
+%%DATADIR%%/dia/shapes/Civil/hcompressor.shape
+%%DATADIR%%/dia/shapes/Civil/hcompressor.xpm
+%%DATADIR%%/dia/shapes/Civil/hpump.shape
+%%DATADIR%%/dia/shapes/Civil/hpump.xpm
+%%DATADIR%%/dia/shapes/Civil/hrest.shape
+%%DATADIR%%/dia/shapes/Civil/hrest.xpm
+%%DATADIR%%/dia/shapes/Civil/line.shape
+%%DATADIR%%/dia/shapes/Civil/line.xpm
+%%DATADIR%%/dia/shapes/Civil/vcompressor.shape
+%%DATADIR%%/dia/shapes/Civil/vcompressor.xpm
+%%DATADIR%%/dia/shapes/Civil/vpump.shape
+%%DATADIR%%/dia/shapes/Civil/vpump.xpm
+%%DATADIR%%/dia/shapes/Civil/vrest.shape
+%%DATADIR%%/dia/shapes/Civil/vrest.xpm
+%%DATADIR%%/dia/shapes/Civil/water_level.shape
+%%DATADIR%%/dia/shapes/Civil/water_level.xpm
+%%DATADIR%%/dia/shapes/Contact/c_if.shape
+%%DATADIR%%/dia/shapes/Contact/c_if.xpm
+%%DATADIR%%/dia/shapes/Contact/c_ifnot.shape
+%%DATADIR%%/dia/shapes/Contact/c_ifnot.xpm
+%%DATADIR%%/dia/shapes/Contact/c_lamp.shape
+%%DATADIR%%/dia/shapes/Contact/c_lamp.xpm
+%%DATADIR%%/dia/shapes/Contact/c_relay.shape
+%%DATADIR%%/dia/shapes/Contact/c_relay.xpm
+%%DATADIR%%/dia/shapes/Contact/l_if.shape
+%%DATADIR%%/dia/shapes/Contact/l_if.xpm
+%%DATADIR%%/dia/shapes/Contact/l_ifnot.shape
+%%DATADIR%%/dia/shapes/Contact/l_ifnot.xpm
+%%DATADIR%%/dia/shapes/Contact/l_out.shape
+%%DATADIR%%/dia/shapes/Contact/l_out.xpm
+%%DATADIR%%/dia/shapes/Contact/l_outj.shape
+%%DATADIR%%/dia/shapes/Contact/l_outj.xpm
+%%DATADIR%%/dia/shapes/Contact/l_outnot.shape
+%%DATADIR%%/dia/shapes/Contact/l_outnot.xpm
+%%DATADIR%%/dia/shapes/Contact/l_outr.shape
+%%DATADIR%%/dia/shapes/Contact/l_outr.xpm
+%%DATADIR%%/dia/shapes/Contact/l_outrcep.shape
+%%DATADIR%%/dia/shapes/Contact/l_outrcep.xpm
+%%DATADIR%%/dia/shapes/Contact/l_outs.shape
+%%DATADIR%%/dia/shapes/Contact/l_outs.xpm
+%%DATADIR%%/dia/shapes/Contact/l_sout.shape
+%%DATADIR%%/dia/shapes/Contact/l_sout.xpm
+%%DATADIR%%/dia/shapes/Contact/l_soutnot.shape
+%%DATADIR%%/dia/shapes/Contact/l_soutnot.xpm
+%%DATADIR%%/dia/shapes/Contact/l_soutr.shape
+%%DATADIR%%/dia/shapes/Contact/l_soutr.xpm
+%%DATADIR%%/dia/shapes/Contact/l_souts.shape
+%%DATADIR%%/dia/shapes/Contact/l_souts.xpm
+%%DATADIR%%/dia/shapes/Electric/cnx.shape
+%%DATADIR%%/dia/shapes/Electric/cnx.xpm
+%%DATADIR%%/dia/shapes/Electric/command.shape
+%%DATADIR%%/dia/shapes/Electric/command.xpm
+%%DATADIR%%/dia/shapes/Electric/contact_f.shape
+%%DATADIR%%/dia/shapes/Electric/contact_f.xpm
+%%DATADIR%%/dia/shapes/Electric/contact_o.shape
+%%DATADIR%%/dia/shapes/Electric/contact_o.xpm
+%%DATADIR%%/dia/shapes/Electric/intpos_f.shape
+%%DATADIR%%/dia/shapes/Electric/intpos_f.xpm
+%%DATADIR%%/dia/shapes/Electric/intpos_o.shape
+%%DATADIR%%/dia/shapes/Electric/intpos_o.xpm
+%%DATADIR%%/dia/shapes/Electric/lamp.shape
+%%DATADIR%%/dia/shapes/Electric/lamp.xpm
+%%DATADIR%%/dia/shapes/Electric/relay.shape
+%%DATADIR%%/dia/shapes/Electric/relay.xpm
+%%DATADIR%%/dia/shapes/Flowchart/collate.shape
+%%DATADIR%%/dia/shapes/Flowchart/collate.xpm
+%%DATADIR%%/dia/shapes/Flowchart/delay.shape
+%%DATADIR%%/dia/shapes/Flowchart/delay.xpm
+%%DATADIR%%/dia/shapes/Flowchart/display.shape
+%%DATADIR%%/dia/shapes/Flowchart/display.xpm
+%%DATADIR%%/dia/shapes/Flowchart/document.shape
+%%DATADIR%%/dia/shapes/Flowchart/document.xpm
+%%DATADIR%%/dia/shapes/Flowchart/extract.shape
+%%DATADIR%%/dia/shapes/Flowchart/extract.xpm
+%%DATADIR%%/dia/shapes/Flowchart/intstorage.shape
+%%DATADIR%%/dia/shapes/Flowchart/intstorage.xpm
+%%DATADIR%%/dia/shapes/Flowchart/magdisk.shape
+%%DATADIR%%/dia/shapes/Flowchart/magdisk.xpm
+%%DATADIR%%/dia/shapes/Flowchart/magdrum.shape
+%%DATADIR%%/dia/shapes/Flowchart/magdrum.xpm
+%%DATADIR%%/dia/shapes/Flowchart/magtape.shape
+%%DATADIR%%/dia/shapes/Flowchart/magtape.xpm
+%%DATADIR%%/dia/shapes/Flowchart/manualinput.shape
+%%DATADIR%%/dia/shapes/Flowchart/manualinput.xpm
+%%DATADIR%%/dia/shapes/Flowchart/manualop.shape
+%%DATADIR%%/dia/shapes/Flowchart/manualop.xpm
+%%DATADIR%%/dia/shapes/Flowchart/merge.shape
+%%DATADIR%%/dia/shapes/Flowchart/merge.xpm
+%%DATADIR%%/dia/shapes/Flowchart/offlinestore.shape
+%%DATADIR%%/dia/shapes/Flowchart/offlinestore.xpm
+%%DATADIR%%/dia/shapes/Flowchart/offpageconn.shape
+%%DATADIR%%/dia/shapes/Flowchart/offpageconn.xpm
+%%DATADIR%%/dia/shapes/Flowchart/or.shape
+%%DATADIR%%/dia/shapes/Flowchart/or.xpm
+%%DATADIR%%/dia/shapes/Flowchart/predefdproc.shape
+%%DATADIR%%/dia/shapes/Flowchart/predefdproc.xpm
+%%DATADIR%%/dia/shapes/Flowchart/preparation.shape
+%%DATADIR%%/dia/shapes/Flowchart/preparation.xpm
+%%DATADIR%%/dia/shapes/Flowchart/punchedcard.shape
+%%DATADIR%%/dia/shapes/Flowchart/punchedcard.xpm
+%%DATADIR%%/dia/shapes/Flowchart/punchedtape.shape
+%%DATADIR%%/dia/shapes/Flowchart/punchedtape.xpm
+%%DATADIR%%/dia/shapes/Flowchart/sort.shape
+%%DATADIR%%/dia/shapes/Flowchart/sort.xpm
+%%DATADIR%%/dia/shapes/Flowchart/sumjunction.shape
+%%DATADIR%%/dia/shapes/Flowchart/sumjunction.xpm
+%%DATADIR%%/dia/shapes/Flowchart/terminal.shape
+%%DATADIR%%/dia/shapes/Flowchart/terminal.xpm
+%%DATADIR%%/dia/shapes/Flowchart/transaction.shape
+%%DATADIR%%/dia/shapes/Flowchart/transaction.xpm
+%%DATADIR%%/dia/shapes/Flowchart/transmittape.shape
+%%DATADIR%%/dia/shapes/Flowchart/transmittape.xpm
+%%DATADIR%%/dia/shapes/Network/nwcloud.shape
+%%DATADIR%%/dia/shapes/Network/nwcloud.xpm
+%%DATADIR%%/dia/shapes/Network/router-symbol.shape
+%%DATADIR%%/dia/shapes/Network/router-symbol.xpm
+%%DATADIR%%/dia/shapes/Network/switch-atm-symbol.shape
+%%DATADIR%%/dia/shapes/Network/switch-atm-symbol.xpm
+%%DATADIR%%/dia/shapes/Network/switch-symbol.shape
+%%DATADIR%%/dia/shapes/Network/switch-symbol.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/cnx.shape
+%%DATADIR%%/dia/shapes/Pneumatic/cnx.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/comelec1.shape
+%%DATADIR%%/dia/shapes/Pneumatic/comelec1.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/comelec2.shape
+%%DATADIR%%/dia/shapes/Pneumatic/comelec2.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/commusc.shape
+%%DATADIR%%/dia/shapes/Pneumatic/commusc.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/compb.shape
+%%DATADIR%%/dia/shapes/Pneumatic/compb.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/compilh.shape
+%%DATADIR%%/dia/shapes/Pneumatic/compilh.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/compilp.shape
+%%DATADIR%%/dia/shapes/Pneumatic/compilp.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/comspr.shape
+%%DATADIR%%/dia/shapes/Pneumatic/comspr.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/dejack.shape
+%%DATADIR%%/dia/shapes/Pneumatic/dejack.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/dist22.shape
+%%DATADIR%%/dia/shapes/Pneumatic/dist22.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/dist32.shape
+%%DATADIR%%/dia/shapes/Pneumatic/dist32.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/dist42.shape
+%%DATADIR%%/dia/shapes/Pneumatic/dist42.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/dist52.shape
+%%DATADIR%%/dia/shapes/Pneumatic/dist52.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/drain.shape
+%%DATADIR%%/dia/shapes/Pneumatic/drain.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/press.shape
+%%DATADIR%%/dia/shapes/Pneumatic/press.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/presshy.shape
+%%DATADIR%%/dia/shapes/Pneumatic/presshy.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/presspn.shape
+%%DATADIR%%/dia/shapes/Pneumatic/presspn.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/seijack.shape
+%%DATADIR%%/dia/shapes/Pneumatic/seijack.xpm
+%%DATADIR%%/dia/shapes/Pneumatic/seojack.shape
+%%DATADIR%%/dia/shapes/Pneumatic/seojack.xpm
+%%DATADIR%%/dia/sheets/Circuit.sheet
+%%DATADIR%%/dia/sheets/Contact.sheet
+%%DATADIR%%/dia/sheets/ER.sheet
+%%DATADIR%%/dia/sheets/ER/weakentity.xpm
+%%DATADIR%%/dia/sheets/Electric.sheet
+%%DATADIR%%/dia/sheets/FS.sheet
+%%DATADIR%%/dia/sheets/Flowchart.sheet
+%%DATADIR%%/dia/sheets/GRAFCET.sheet
+%%DATADIR%%/dia/sheets/GRAFCET/etapei.xpm
+%%DATADIR%%/dia/sheets/GRAFCET/etapemc.xpm
+%%DATADIR%%/dia/sheets/GRAFCET/etapeme.xpm
+%%DATADIR%%/dia/sheets/GRAFCET/etapems.xpm
+%%DATADIR%%/dia/sheets/GRAFCET/etapesp.xpm
+%%DATADIR%%/dia/sheets/GRAFCET/vergent_and.xpm
+%%DATADIR%%/dia/sheets/Pneumatic.sheet
+%%DATADIR%%/dia/sheets/SADT.sheet
+%%DATADIR%%/dia/sheets/UML.sheet
+%%DATADIR%%/dia/sheets/UML/aggregation.xpm
+%%DATADIR%%/dia/sheets/UML/umlclass_template.xpm
+%%DATADIR%%/dia/sheets/chronogram.sheet
+%%DATADIR%%/dia/sheets/network.sheet
+%%DATADIR%%/dia/sheets/sybase.sheet
+%%GNOME:%%share/gnome/mime-info/dia.keys
+%%GNOME:%%share/gnome/mime-info/dia.mime
+%%GNOME:%%share/gnome/pixmaps/dia-diagram.png
+%%GNOME:%%share/gnome/pixmaps/dia_gnome_icon.png
 share/locale/ca/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
 share/locale/de/LC_MESSAGES/dia.mo
@@ -283,17 +283,17 @@ share/locale/sv/LC_MESSAGES/dia.mo
 share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/dia.mo
-@dirrm share/gnome/dia/sheets/UML
-@dirrm share/gnome/dia/sheets/GRAFCET
-@dirrm share/gnome/dia/sheets/ER
-@dirrm share/gnome/dia/sheets
-@dirrm share/gnome/dia/shapes/Pneumatic
-@dirrm share/gnome/dia/shapes/Network
-@dirrm share/gnome/dia/shapes/Flowchart
-@dirrm share/gnome/dia/shapes/Electric
-@dirrm share/gnome/dia/shapes/Contact
-@dirrm share/gnome/dia/shapes/Civil
-@dirrm share/gnome/dia/shapes/Circuit
-@dirrm share/gnome/dia/shapes
-@dirrm share/gnome/dia
+@dirrm %%DATADIR%%/dia/sheets/UML
+@dirrm %%DATADIR%%/dia/sheets/GRAFCET
+@dirrm %%DATADIR%%/dia/sheets/ER
+@dirrm %%DATADIR%%/dia/sheets
+@dirrm %%DATADIR%%/dia/shapes/Pneumatic
+@dirrm %%DATADIR%%/dia/shapes/Network
+@dirrm %%DATADIR%%/dia/shapes/Flowchart
+@dirrm %%DATADIR%%/dia/shapes/Electric
+@dirrm %%DATADIR%%/dia/shapes/Contact
+@dirrm %%DATADIR%%/dia/shapes/Civil
+@dirrm %%DATADIR%%/dia/shapes/Circuit
+@dirrm %%DATADIR%%/dia/shapes
+@dirrm %%DATADIR%%/dia
 @dirrm lib/dia