diff options
Diffstat (limited to 'devel/bouml/patches/patch-aa')
| -rw-r--r-- | devel/bouml/patches/patch-aa | 39 |
1 files changed, 26 insertions, 13 deletions
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 \ |