Update bouml from ancient version 2.27 to current version 4.5. The list of

changes is incredibly long as the old version was incredibly historic, if
not archaic. Several new object types are supported, and Python code can
now be created, apparently.

4 files changed, 286 insertions, 22 deletions

diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index b58de08176d..075b9f3ec7a 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:21 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2008/09/01 12:24:54 tonnerre Exp $
 #
 
 DISTNAME=		bouml_${BOUMLVERSION}
@@ -12,7 +12,7 @@ COMMENT=		UML modeling tool, generates C++, JAVA, and IDL
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BOUMLVERSION=		2.27
+BOUMLVERSION=		4.5
 
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake pax
diff --git a/devel/bouml/PLIST b/devel/bouml/PLIST
index ff6aa4c58ca..8548449ab0e 100644
--- a/devel/bouml/PLIST
+++ b/devel/bouml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/09/01 12:24:54 tonnerre Exp $
 bin/bouml
 bin/projectControl
 bin/projectSynchro
@@ -144,6 +144,12 @@ lib/bouml/GlobalChange/142848.bodies
 lib/bouml/GlobalChange/143104.bodies
 lib/bouml/GlobalChange/143362.bodies
 lib/bouml/GlobalChange/143490.bodies
+lib/bouml/GlobalChange/144896.bodies
+lib/bouml/GlobalChange/145152.bodies
+lib/bouml/GlobalChange/145280.bodies
+lib/bouml/GlobalChange/145408.bodies
+lib/bouml/GlobalChange/145664.bodies
+lib/bouml/GlobalChange/146176.bodies
 lib/bouml/GlobalChange/1536.bodies
 lib/bouml/GlobalChange/1664.bodies
 lib/bouml/GlobalChange/1792.bodies
@@ -359,7 +365,9 @@ lib/bouml/deploy/tools
 lib/bouml/empty/1024.bodies
 lib/bouml/empty/1152.bodies
 lib/bouml/empty/1280.bodies
+lib/bouml/empty/128002
 lib/bouml/empty/128002.diagram
+lib/bouml/empty/128128
 lib/bouml/empty/128130.diagram
 lib/bouml/empty/128256.bodies
 lib/bouml/empty/128258.diagram
@@ -426,6 +434,24 @@ lib/bouml/empty/142208.bodies
 lib/bouml/empty/142592.bodies
 lib/bouml/empty/142848.bodies
 lib/bouml/empty/143104.bodies
+lib/bouml/empty/143488.bodies
+lib/bouml/empty/143744.bodies
+lib/bouml/empty/143872.bodies
+lib/bouml/empty/144768.bodies
+lib/bouml/empty/145024.bodies
+lib/bouml/empty/146560.bodies
+lib/bouml/empty/147072.bodies
+lib/bouml/empty/147200.bodies
+lib/bouml/empty/147456.bodies
+lib/bouml/empty/147712.bodies
+lib/bouml/empty/147968.bodies
+lib/bouml/empty/148224.bodies
+lib/bouml/empty/148480.bodies
+lib/bouml/empty/148864.bodies
+lib/bouml/empty/149120.bodies
+lib/bouml/empty/149376.bodies
+lib/bouml/empty/149632.bodies
+lib/bouml/empty/149888.bodies
 lib/bouml/empty/1536.bodies
 lib/bouml/empty/1664.bodies
 lib/bouml/empty/1792.bodies
@@ -468,6 +494,7 @@ lib/bouml/empty/empty.prj
 lib/bouml/empty/generation_settings
 lib/bouml/empty/idl_includes
 lib/bouml/empty/java_imports
+lib/bouml/empty/python_imports
 lib/bouml/empty/stereotypes
 lib/bouml/empty/tools
 lib/bouml/file_control
@@ -651,6 +678,13 @@ lib/bouml/html/142976.bodies
 lib/bouml/html/143106.bodies
 lib/bouml/html/143232.bodies
 lib/bouml/html/143362.bodies
+lib/bouml/html/143616.bodies
+lib/bouml/html/143746.bodies
+lib/bouml/html/143872.bodies
+lib/bouml/html/144000.bodies
+lib/bouml/html/144896.bodies
+lib/bouml/html/145152.bodies
+lib/bouml/html/146688.bodies
 lib/bouml/html/1536.bodies
 lib/bouml/html/1664.bodies
 lib/bouml/html/1792.bodies
@@ -715,6 +749,7 @@ lib/bouml/html/generation_settings
 lib/bouml/html/html.prj
 lib/bouml/html/idl_includes
 lib/bouml/html/java_imports
+lib/bouml/html/python_imports
 lib/bouml/html/stereotypes
 lib/bouml/html/tools
 lib/bouml/idl_generator
@@ -723,9 +758,12 @@ lib/bouml/ixmi2
 lib/bouml/java_catalog
 lib/bouml/java_generator
 lib/bouml/java_reverse
+lib/bouml/php_generator
+lib/bouml/php_reverse
 lib/bouml/plug_out_upgrade
 lib/bouml/projectControl
 lib/bouml/projectSynchro
+lib/bouml/python_generator
 lib/bouml/rose/1024.bodies
 lib/bouml/rose/1152.bodies
 lib/bouml/rose/1280.bodies
@@ -928,6 +966,12 @@ lib/bouml/sm_generator/142208.bodies
 lib/bouml/sm_generator/142592.bodies
 lib/bouml/sm_generator/142848.bodies
 lib/bouml/sm_generator/143104.bodies
+lib/bouml/sm_generator/144384.bodies
+lib/bouml/sm_generator/144640.bodies
+lib/bouml/sm_generator/144768.bodies
+lib/bouml/sm_generator/144896.bodies
+lib/bouml/sm_generator/145152.bodies
+lib/bouml/sm_generator/146688.bodies
 lib/bouml/sm_generator/1536.bodies
 lib/bouml/sm_generator/1664.bodies
 lib/bouml/sm_generator/1792.bodies
@@ -1109,6 +1153,152 @@ lib/bouml/sort/sort.prj
 lib/bouml/sort/stereotypes
 lib/bouml/sort/tools
 lib/bouml/stmgen
+lib/bouml/uml_proj
+lib/bouml/uml_projection/1024.bodies
+lib/bouml/uml_projection/1152.bodies
+lib/bouml/uml_projection/1280.bodies
+lib/bouml/uml_projection/128002
+lib/bouml/uml_projection/128002.diagram
+lib/bouml/uml_projection/128128
+lib/bouml/uml_projection/128130.diagram
+lib/bouml/uml_projection/128256.bodies
+lib/bouml/uml_projection/128258.diagram
+lib/bouml/uml_projection/128386.diagram
+lib/bouml/uml_projection/128512.bodies
+lib/bouml/uml_projection/128514.diagram
+lib/bouml/uml_projection/128642.diagram
+lib/bouml/uml_projection/128768.bodies
+lib/bouml/uml_projection/128770.diagram
+lib/bouml/uml_projection/128896.bodies
+lib/bouml/uml_projection/128898.diagram
+lib/bouml/uml_projection/129.diagram
+lib/bouml/uml_projection/129026.diagram
+lib/bouml/uml_projection/129152.bodies
+lib/bouml/uml_projection/129154
+lib/bouml/uml_projection/129280.bodies
+lib/bouml/uml_projection/129536.bodies
+lib/bouml/uml_projection/129920.bodies
+lib/bouml/uml_projection/130176.bodies
+lib/bouml/uml_projection/130432.bodies
+lib/bouml/uml_projection/130688.bodies
+lib/bouml/uml_projection/130944.bodies
+lib/bouml/uml_projection/131200.bodies
+lib/bouml/uml_projection/131456.bodies
+lib/bouml/uml_projection/131712.bodies
+lib/bouml/uml_projection/131968.bodies
+lib/bouml/uml_projection/132224.bodies
+lib/bouml/uml_projection/132480.bodies
+lib/bouml/uml_projection/132736.bodies
+lib/bouml/uml_projection/133120.bodies
+lib/bouml/uml_projection/133376.bodies
+lib/bouml/uml_projection/133888.bodies
+lib/bouml/uml_projection/134144.bodies
+lib/bouml/uml_projection/134272.bodies
+lib/bouml/uml_projection/134528.bodies
+lib/bouml/uml_projection/134912.bodies
+lib/bouml/uml_projection/135168.bodies
+lib/bouml/uml_projection/135424.bodies
+lib/bouml/uml_projection/135680.bodies
+lib/bouml/uml_projection/135936.bodies
+lib/bouml/uml_projection/136192.bodies
+lib/bouml/uml_projection/136448.bodies
+lib/bouml/uml_projection/136704.bodies
+lib/bouml/uml_projection/136960.bodies
+lib/bouml/uml_projection/137216.bodies
+lib/bouml/uml_projection/137472.bodies
+lib/bouml/uml_projection/137728.bodies
+lib/bouml/uml_projection/137984.bodies
+lib/bouml/uml_projection/138240.bodies
+lib/bouml/uml_projection/138496.bodies
+lib/bouml/uml_projection/138752.bodies
+lib/bouml/uml_projection/139008.bodies
+lib/bouml/uml_projection/139264.bodies
+lib/bouml/uml_projection/139776.bodies
+lib/bouml/uml_projection/140032.bodies
+lib/bouml/uml_projection/140288.bodies
+lib/bouml/uml_projection/140544.bodies
+lib/bouml/uml_projection/1408.bodies
+lib/bouml/uml_projection/140800.bodies
+lib/bouml/uml_projection/141056.bodies
+lib/bouml/uml_projection/141312.bodies
+lib/bouml/uml_projection/141568.bodies
+lib/bouml/uml_projection/141952.bodies
+lib/bouml/uml_projection/142208.bodies
+lib/bouml/uml_projection/142592.bodies
+lib/bouml/uml_projection/142848.bodies
+lib/bouml/uml_projection/143104.bodies
+lib/bouml/uml_projection/143488.bodies
+lib/bouml/uml_projection/143744.bodies
+lib/bouml/uml_projection/143872.bodies
+lib/bouml/uml_projection/144768.bodies
+lib/bouml/uml_projection/144898.bodies
+lib/bouml/uml_projection/145024.bodies
+lib/bouml/uml_projection/146560.bodies
+lib/bouml/uml_projection/147072.bodies
+lib/bouml/uml_projection/147200.bodies
+lib/bouml/uml_projection/147456.bodies
+lib/bouml/uml_projection/147712.bodies
+lib/bouml/uml_projection/147968.bodies
+lib/bouml/uml_projection/148224.bodies
+lib/bouml/uml_projection/148480.bodies
+lib/bouml/uml_projection/148864.bodies
+lib/bouml/uml_projection/149120.bodies
+lib/bouml/uml_projection/149376.bodies
+lib/bouml/uml_projection/149632.bodies
+lib/bouml/uml_projection/149888.bodies
+lib/bouml/uml_projection/150914.bodies
+lib/bouml/uml_projection/1536.bodies
+lib/bouml/uml_projection/1664.bodies
+lib/bouml/uml_projection/1792.bodies
+lib/bouml/uml_projection/1920.bodies
+lib/bouml/uml_projection/2048.bodies
+lib/bouml/uml_projection/2176.bodies
+lib/bouml/uml_projection/2304.bodies
+lib/bouml/uml_projection/2432.bodies
+lib/bouml/uml_projection/256
+lib/bouml/uml_projection/2560.bodies
+lib/bouml/uml_projection/257.diagram
+lib/bouml/uml_projection/2688.bodies
+lib/bouml/uml_projection/2944.bodies
+lib/bouml/uml_projection/3072.bodies
+lib/bouml/uml_projection/3200.bodies
+lib/bouml/uml_projection/3328.bodies
+lib/bouml/uml_projection/3456.bodies
+lib/bouml/uml_projection/3584.bodies
+lib/bouml/uml_projection/3712.bodies
+lib/bouml/uml_projection/384
+lib/bouml/uml_projection/3840.bodies
+lib/bouml/uml_projection/385.diagram
+lib/bouml/uml_projection/3968.bodies
+lib/bouml/uml_projection/4096.bodies
+lib/bouml/uml_projection/4224.bodies
+lib/bouml/uml_projection/4352.bodies
+lib/bouml/uml_projection/4736.bodies
+lib/bouml/uml_projection/4864.bodies
+lib/bouml/uml_projection/4992.bodies
+lib/bouml/uml_projection/512
+lib/bouml/uml_projection/5120.bodies
+lib/bouml/uml_projection/513.diagram
+lib/bouml/uml_projection/5248.bodies
+lib/bouml/uml_projection/641
+lib/bouml/uml_projection/6528.bodies
+lib/bouml/uml_projection/7041.bodies
+lib/bouml/uml_projection/7169.bodies
+lib/bouml/uml_projection/768.bodies
+lib/bouml/uml_projection/7681.bodies
+lib/bouml/uml_projection/8833.bodies
+lib/bouml/uml_projection/896.bodies
+lib/bouml/uml_projection/9089.bodies
+lib/bouml/uml_projection/9217.bodies
+lib/bouml/uml_projection/9345.bodies
+lib/bouml/uml_projection/cpp_includes
+lib/bouml/uml_projection/generation_settings
+lib/bouml/uml_projection/idl_includes
+lib/bouml/uml_projection/java_imports
+lib/bouml/uml_projection/python_imports
+lib/bouml/uml_projection/stereotypes
+lib/bouml/uml_projection/tools
+lib/bouml/uml_projection/uml_projection.prj
 lib/bouml/usecase_wizard/1024.bodies
 lib/bouml/usecase_wizard/1152.bodies
 lib/bouml/usecase_wizard/1280.bodies
@@ -1296,6 +1486,8 @@ lib/bouml/xmi2/128896.bodies
 lib/bouml/xmi2/129.diagram
 lib/bouml/xmi2/129026.bodies
 lib/bouml/xmi2/129152.bodies
+lib/bouml/xmi2/129154
+lib/bouml/xmi2/129280
 lib/bouml/xmi2/129280.bodies
 lib/bouml/xmi2/129410.bodies
 lib/bouml/xmi2/129536.bodies
@@ -1404,6 +1596,34 @@ lib/bouml/xmi2/143490.bodies
 lib/bouml/xmi2/143616.bodies
 lib/bouml/xmi2/143746.bodies
 lib/bouml/xmi2/143874.bodies
+lib/bouml/xmi2/144128.bodies
+lib/bouml/xmi2/144258.bodies
+lib/bouml/xmi2/144384.bodies
+lib/bouml/xmi2/144512.bodies
+lib/bouml/xmi2/145408.bodies
+lib/bouml/xmi2/145664.bodies
+lib/bouml/xmi2/147200.bodies
+lib/bouml/xmi2/147458.bodies
+lib/bouml/xmi2/147586.bodies
+lib/bouml/xmi2/147712.bodies
+lib/bouml/xmi2/147840.bodies
+lib/bouml/xmi2/148096.bodies
+lib/bouml/xmi2/148352.bodies
+lib/bouml/xmi2/148482.bodies
+lib/bouml/xmi2/148608.bodies
+lib/bouml/xmi2/148738.bodies
+lib/bouml/xmi2/148864.bodies
+lib/bouml/xmi2/148994.bodies
+lib/bouml/xmi2/149120.bodies
+lib/bouml/xmi2/149250.bodies
+lib/bouml/xmi2/149504.bodies
+lib/bouml/xmi2/149634.bodies
+lib/bouml/xmi2/149760.bodies
+lib/bouml/xmi2/150016.bodies
+lib/bouml/xmi2/150146.bodies
+lib/bouml/xmi2/150272.bodies
+lib/bouml/xmi2/150402.bodies
+lib/bouml/xmi2/150528.bodies
 lib/bouml/xmi2/1536.bodies
 lib/bouml/xmi2/1664.bodies
 lib/bouml/xmi2/1792.bodies
@@ -1446,6 +1666,7 @@ lib/bouml/xmi2/7169.bodies
 lib/bouml/xmi2/7553.bodies
 lib/bouml/xmi2/768.bodies
 lib/bouml/xmi2/7681.bodies
+lib/bouml/xmi2/7809.bodies
 lib/bouml/xmi2/8065.bodies
 lib/bouml/xmi2/8193.bodies
 lib/bouml/xmi2/8449.bodies
@@ -1456,12 +1677,15 @@ lib/bouml/xmi2/9089.bodies
 lib/bouml/xmi2/9217.bodies
 lib/bouml/xmi2/9345.bodies
 lib/bouml/xmi2/9473.bodies
+lib/bouml/xmi2/9601.bodies
 lib/bouml/xmi2/9729.bodies
+lib/bouml/xmi2/9857.bodies
 lib/bouml/xmi2/9985.bodies
 lib/bouml/xmi2/cpp_includes
 lib/bouml/xmi2/generation_settings
 lib/bouml/xmi2/idl_includes
 lib/bouml/xmi2/java_imports
+lib/bouml/xmi2/python_imports
 lib/bouml/xmi2/stereotypes
 lib/bouml/xmi2/tools
 lib/bouml/xmi2/xmi2.prj
@@ -1489,7 +1713,9 @@ lib/bouml/xmi2import/129026.diagram
 lib/bouml/xmi2import/129152.bodies
 lib/bouml/xmi2import/129154.diagram
 lib/bouml/xmi2import/129280.bodies
+lib/bouml/xmi2import/129282
 lib/bouml/xmi2import/129282.diagram
+lib/bouml/xmi2import/129408
 lib/bouml/xmi2import/129410.bodies
 lib/bouml/xmi2import/129410.diagram
 lib/bouml/xmi2import/129536.bodies
@@ -1501,6 +1727,7 @@ lib/bouml/xmi2import/129920.bodies
 lib/bouml/xmi2import/130050.bodies
 lib/bouml/xmi2import/130176.bodies
 lib/bouml/xmi2import/130432.bodies
+lib/bouml/xmi2import/130434.diagram
 lib/bouml/xmi2import/130562.bodies
 lib/bouml/xmi2import/130688.bodies
 lib/bouml/xmi2import/130944.bodies
@@ -1583,10 +1810,32 @@ lib/bouml/xmi2import/144002.bodies
 lib/bouml/xmi2import/144130.bodies
 lib/bouml/xmi2import/144258.bodies
 lib/bouml/xmi2import/144386.bodies
-lib/bouml/xmi2import/144514.bodies
 lib/bouml/xmi2import/144898.bodies
 lib/bouml/xmi2import/145026.bodies
+lib/bouml/xmi2import/146304.bodies
+lib/bouml/xmi2import/146434.bodies
+lib/bouml/xmi2import/146560.bodies
+lib/bouml/xmi2import/146688.bodies
+lib/bouml/xmi2import/146816.bodies
+lib/bouml/xmi2import/147072.bodies
+lib/bouml/xmi2import/148610.bodies
+lib/bouml/xmi2import/149762.bodies
+lib/bouml/xmi2import/149890.bodies
+lib/bouml/xmi2import/151042.bodies
+lib/bouml/xmi2import/152192.bodies
+lib/bouml/xmi2import/152704.bodies
+lib/bouml/xmi2import/152832.bodies
+lib/bouml/xmi2import/153088.bodies
+lib/bouml/xmi2import/153344.bodies
 lib/bouml/xmi2import/1536.bodies
+lib/bouml/xmi2import/153600.bodies
+lib/bouml/xmi2import/153856.bodies
+lib/bouml/xmi2import/154112.bodies
+lib/bouml/xmi2import/154496.bodies
+lib/bouml/xmi2import/154752.bodies
+lib/bouml/xmi2import/155008.bodies
+lib/bouml/xmi2import/155264.bodies
+lib/bouml/xmi2import/155520.bodies
 lib/bouml/xmi2import/1664.bodies
 lib/bouml/xmi2import/1792.bodies
 lib/bouml/xmi2import/1920.bodies
@@ -1642,6 +1891,7 @@ lib/bouml/xmi2import/cpp_includes
 lib/bouml/xmi2import/generation_settings
 lib/bouml/xmi2import/idl_includes
 lib/bouml/xmi2import/java_imports
+lib/bouml/xmi2import/python_imports
 lib/bouml/xmi2import/stereotypes
 lib/bouml/xmi2import/tools
 lib/bouml/xmi2import/xmi2import.prj
@@ -1670,6 +1920,7 @@ share/icons/hicolor/64x64/apps/projectSynchro.png
 @dirrm lib/bouml/xmi2
 @dirrm lib/bouml/xmi
 @dirrm lib/bouml/usecase_wizard
+@dirrm lib/bouml/uml_projection
 @dirrm lib/bouml/sort
 @dirrm lib/bouml/sm_generator
 @dirrm lib/bouml/singleton
diff --git a/devel/bouml/distinfo b/devel/bouml/distinfo
index 892c1feb1a0..104e2f2066e 100644
--- a/devel/bouml/distinfo
+++ b/devel/bouml/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/01/13 22:36:29 rillig Exp $
+$NetBSD: distinfo,v 1.3 2008/09/01 12:24:54 tonnerre Exp $
 
-SHA1 (bouml_2.27.tar.gz) = 88d8100e460512117477194cbf15112ca4617ec3
-RMD160 (bouml_2.27.tar.gz) = d86e9b8db713424e2bd2f3ab3f04471195cc664f
-Size (bouml_2.27.tar.gz) = 3872944 bytes
-SHA1 (patch-aa) = 91ac26ef1c8b60ca81b6dae83ed8eee0b03b2d94
+SHA1 (bouml_4.5.tar.gz) = 26f1a08b03073f29319af019b17fff37f7b85b0c
+RMD160 (bouml_4.5.tar.gz) = 0a92b9e9a31f9bfb30b327e8ff80e9bec34887e6
+Size (bouml_4.5.tar.gz) = 4637097 bytes
+SHA1 (patch-aa) = 03fa79dc89b9dcb30dcfb9b9511f7afe8e7fcdce
 SHA1 (patch-ab) = 272bf0fefc0c846b39db167731f76a3d33585523
diff --git a/devel/bouml/patches/patch-aa b/devel/bouml/patches/patch-aa
index a2a119d2912..e3ade2967bf 100644
--- a/devel/bouml/patches/patch-aa
+++ b/devel/bouml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/01 12:24:54 tonnerre Exp $
 
---- Makefile.orig	2007-04-22 10:39:42.000000000 -0500
+--- Makefile.orig	2008-04-05 10:56:34.000000000 +0200
 +++ Makefile
-@@ -1,19 +1,19 @@
+@@ -1,24 +1,24 @@
  # The directory where all the bouml files will be installed, you
  # can change it for instance because you don't have root permission
 -BOUML_LIB = /usr/lib/bouml
@@ -24,9 +24,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
 -BOUML_ICONS_PREFIX_DIR = /usr/share/icons/hicolor
 +BOUML_ICONS_PREFIX_DIR = ${PREFIX}/share/icons/hicolor
  
+ # On several Unix systems, the icons used inside the
+ # menus must be stored inside the pixmaps' directory.
+ # The copy is done if you uncomment the definition.
+-#BOUML_UNIX_PIXMAPS_DIR = /usr/share/pixmaps
++#BOUML_UNIX_PIXMAPS_DIR = ${PREFIX}/share/pixmaps
+ 
  # for packaging purpose, useless by default
  # DESTDIR = 
-@@ -21,8 +21,6 @@ BOUML_ICONS_PREFIX_DIR = /usr/share/icon
+@@ -26,8 +26,6 @@ BOUML_ICONS_PREFIX_DIR = /usr/share/icon
  # uncomment if needed
  # MAKE = make
  
@@ -35,7 +41,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
  SRC_DIRS = src \
  	src/CppGenerator \
  	src/CppReverse \
-@@ -88,19 +86,19 @@ clean:
+@@ -101,25 +99,25 @@ clean:
  	for i in $(SRC_DIRS) $(PLUGOUT_DIRS); do if [ -d $$i ]; then (cd $$i ; $(MAKE) clean; rm -f Makefile; ) || exit 1 ; fi; done
  
  install:
@@ -47,23 +53,30 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/06/05 05:56:42 rillig Exp $
  	then \
  		for i in 16 32 48 64; do \
 -			mkdir -p "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps"; \
--			cp bouml.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/bouml.png"; \
--			cp projectControl.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectControl.png"; \
--			cp projectSynchro.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectSynchro.png"; \
+-			cp -p bouml.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/bouml.png"; \
+-			cp -p projectControl.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectControl.png"; \
+-			cp -p projectSynchro.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectSynchro.png"; \
 +			${BSD_INSTALL_DATA_DIR} "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps"; \
 +			${BSD_INSTALL_DATA} bouml.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/bouml.png"; \
 +			${BSD_INSTALL_DATA} projectControl.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectControl.png"; \
 +			${BSD_INSTALL_DATA} projectSynchro.$$i.png "$(DESTDIR)$(BOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/projectSynchro.png"; \
- 		done \
+ 		done; \
+ 	fi
+ 	if test -n "$(BOUML_UNIX_PIXMAPS_DIR)"; then \
+-		mkdir -p "$(DESTDIR)$(BOUML_UNIX_PIXMAPS_DIR)"; \
++		${BSD_INSTALL_DATA_DIR} "$(DESTDIR)$(BOUML_UNIX_PIXMAPS_DIR)"; \
+ 		cp -f bouml.48.png "$(DESTDIR)$(BOUML_UNIX_PIXMAPS_DIR)/bouml.png"; \
+ 		cp -f projectControl.48.png "$(DESTDIR)$(BOUML_UNIX_PIXMAPS_DIR)/projectControl.png"; \
+ 		cp -f projectSynchro.48.png "$(DESTDIR)$(BOUML_UNIX_PIXMAPS_DIR)/projectSynchro.png"; \
  	fi
 -	for i in $(PROGS); do cp -p $$i "$(DESTDIR)$(BOUML_LIB)" ; done
--	cd plugouts ; tar cf - empty genpro html rose singleton cpp_utilities xmi xmi2 xmi2import sm_generator usecase_wizard sort FileControl deploy GlobalChange | (cd $(DESTDIR)$(BOUML_LIB); tar xf -)
+-	cd plugouts ; tar cf - empty genpro html rose singleton cpp_utilities xmi xmi2 xmi2import sm_generator usecase_wizard sort uml_projection FileControl deploy GlobalChange | (cd $(DESTDIR)$(BOUML_LIB); tar xf -)
 +	for i in $(PROGS); do ${BSD_INSTALL_PROGRAM} $$i "$(DESTDIR)$(BOUML_LIB)" ; done
-+	cd plugouts ; pax -rw -pp -pm empty genpro html rose singleton cpp_utilities xmi xmi2 xmi2import sm_generator usecase_wizard sort FileControl deploy GlobalChange $(DESTDIR)$(BOUML_LIB)
++	cd plugouts ; pax -rw -pp -pm empty genpro html rose singleton cpp_utilities xmi xmi2 xmi2import sm_generator usecase_wizard sort uml_projection FileControl deploy GlobalChange $(DESTDIR)$(BOUML_LIB)
  	echo "#!/bin/sh" >$(DESTDIR)$(BOUML_DIR)/bouml
  	echo "PATH=$(BOUML_LIB):$$"PATH >>$(DESTDIR)$(BOUML_DIR)/bouml
- 	echo "exec $(BOUML_LIB)/bouml \"$$"@"\"" >>$(DESTDIR)$(BOUML_DIR)/bouml
-@@ -109,7 +107,8 @@ install:
+ 	echo "export PATH" >>$(DESTDIR)$(BOUML_DIR)/bouml
+@@ -129,7 +127,8 @@ install:
  	cd $(DESTDIR)$(BOUML_DIR) ; rm -f projectSynchro ; ln -s $(BOUML_LIB)/projectSynchro
  	if test -n "$(BOUML_DESKTOP_DIR)" ; \
  	then \