diff options
Diffstat (limited to 'sysutils/ispman/files')
-rw-r--r-- | sysutils/ispman/files/patch-Makefile | 146 | ||||
-rw-r--r-- | sysutils/ispman/files/patch-install-data-ldifs-Makefile | 11 | ||||
-rw-r--r-- | sysutils/ispman/files/patch-install-data-schema-Makefile | 13 |
3 files changed, 0 insertions, 170 deletions
diff --git a/sysutils/ispman/files/patch-Makefile b/sysutils/ispman/files/patch-Makefile deleted file mode 100644 index 323029affa0a..000000000000 --- a/sysutils/ispman/files/patch-Makefile +++ /dev/null @@ -1,146 +0,0 @@ ---- Makefile.orig 2006-06-08 00:27:06.000000000 +0400 -+++ Makefile 2007-10-08 21:39:02.000000000 +0400 -@@ -13,23 +13,23 @@ - - # generate schema files - schema: -- make -C install-data/schema all -+ $(MAKE) -C install-data/schema all - - # generate prime-ldif - ldif: -- make -C install-data/ldifs all -+ $(MAKE) -C install-data/ldifs all - - - # install schema files - install-schema: - @echo Installing LDAP schema files -- make -C install-data/schema install -+ $(MAKE) -C install-data/schema install - - - # install prime-ldif - install-ldif: - @echo Installing prime LDIF file -- make -C install-data/ldifs install -+ $(MAKE) -C install-data/ldifs install - - - # prepare ispman files -@@ -41,27 +41,32 @@ - install-base: install-base-dirs install-schema install-ldif - @echo "ISPMan Base Files" - @echo "-----------------" -- $(INSTALL) -c VERSION $(DESTDIR)$(PREFIX) -+ $(INSTALL) $(DATA_MODES) VERSION $(DESTDIR)$(PREFIX) - - @cat install-data/ispman.config install-data/ldifs/ispmanVarSort.conf \ - > install-data/ispman.conf - @echo '1;' >> install-data/ispman.conf - $(INSTALL) -m 640 install-data/ispman.conf $(DESTDIR)$(PREFIX)/conf/ispman.conf.example -- $(INSTALL) -c install-data/nls.conf $(DESTDIR)$(PREFIX)/conf -+ $(INSTALL) $(DATA_MODES) install-data/nls.conf $(DESTDIR)$(PREFIX)/conf - -- $(INSTALL) -c lib/ISPMan.pm $(DESTDIR)$(PREFIX)/lib -- $(INSTALL) -c lib/CustomerMan.pm $(DESTDIR)$(PREFIX)/lib -- $(INSTALL) -c lib/cyrusadmin.pm $(DESTDIR)$(PREFIX)/lib -- @list="`find lib/ISPMan lib/CustomerMan -name \*.pm -o -name \*.pl` lib/*.lib"; \ -+ $(INSTALL) $(DATA_MODES) lib/ISPMan.pm $(DESTDIR)$(PREFIX)/lib -+ $(INSTALL) $(DATA_MODES) lib/CustomerMan.pm $(DESTDIR)$(PREFIX)/lib -+ $(INSTALL) $(DATA_MODES) lib/cyrusadmin.pm $(DESTDIR)$(PREFIX)/lib -+ @list="`find lib/ISPMan lib/CustomerMan -name \*.pm -o -name \*.pl`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p; \ -+ done -+ -+ for p in lib/*.lib; do \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p.default"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p.default; \ - done - - @list="`find install-data/templates -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/templates"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/templates; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/templates"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/templates/$${p#install-data/templates/}.default; \ - done - - -@@ -71,8 +76,8 @@ - @echo "---------------" - @list="`find bin -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c -m 750 $$p $(DESTDIR)$(PREFIX)/$$p"; \ -- $(INSTALL) -c -m 750 $$p $(DESTDIR)$(PREFIX)/$$p; \ -+ echo "$(INSTALL) $(SCRIPT_MODES) $$p $(DESTDIR)$(PREFIX)/$$p"; \ -+ $(INSTALL) $(SCRIPT_MODES) $$p $(DESTDIR)$(PREFIX)/$$p; \ - done - - -@@ -80,11 +85,11 @@ - install-agent: install-base - @echo "ISPMan agent" - @echo "------------" -- $(INSTALL) -c -m 750 bin/ispman-agent $(DESTDIR)$(PREFIX)/bin/ispman-agent -+ $(INSTALL) $(SCRIPT_MODES) bin/ispman-agent $(DESTDIR)$(PREFIX)/bin/ispman-agent - @list="`find tasks -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p; \ - done - - -@@ -94,25 +99,25 @@ - @echo "--------------------" - @list="`find locale -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/$$p; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/$$p; \ - done - - @list="`find ispman-web/htdocs -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`; \ - done - - @list="`find ispman-web/cgi-bin -type f | grep -v CVS | grep -v '/\.'`"; \ - for p in $$list; do \ -- echo "$(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`"; \ -- $(INSTALL) -c $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`; \ -+ echo "$(INSTALL) $(SCRIPT_MODES) $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`"; \ -+ $(INSTALL) $(SCRIPT_MODES) $$p $(DESTDIR)$(PREFIX)/`echo $$p|sed 's/ispman-web\///'`; \ - done - -- $(INSTALL) -c -m 755 ispman-web/htdocs/admin/index.cgi \ -+ $(INSTALL) $(SCRIPT_MODES) ispman-web/htdocs/admin/index.cgi \ - $(DESTDIR)$(PREFIX)/htdocs/admin/index.cgi -- $(INSTALL) -c -m 755 ispman-web/htdocs/control_panel/index.cgi \ -+ $(INSTALL) $(SCRIPT_MODES) ispman-web/htdocs/control_panel/index.cgi \ - $(DESTDIR)$(PREFIX)/htdocs/control_panel/index.cgi - - # if we are doing web installation then the conf directory should be -@@ -148,9 +153,9 @@ - - # cleanup generated files - clean: -- make -C install-data/schema clean -- make -C install-data/ldifs clean -- cd contrib/perl && make clean -+ $(MAKE) -C install-data/schema clean -+ $(MAKE) -C install-data/ldifs clean -+ cd contrib/perl && $(MAKE) clean - - # remove any leftover files too - realclean: clean diff --git a/sysutils/ispman/files/patch-install-data-ldifs-Makefile b/sysutils/ispman/files/patch-install-data-ldifs-Makefile deleted file mode 100644 index c1291d6d0f97..000000000000 --- a/sysutils/ispman/files/patch-install-data-ldifs-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- install-data/ldifs/Makefile.orig 2006-06-08 00:26:52.000000000 +0400 -+++ install-data/ldifs/Makefile 2007-10-08 21:23:45.000000000 +0400 -@@ -18,7 +18,7 @@ - - - install: ispman_install.ldif -- $(INSTALL) -c ispman_install.ldif $(DESTDIR)$(PREFIX)/conf/ldif/ispman.ldif -+ $(INSTALL) $(DATA_MODES) ispman_install.ldif $(DESTDIR)$(PREFIX)/conf/ldif/ispman.ldif - - clean: - -rm ispman_install.ldif diff --git a/sysutils/ispman/files/patch-install-data-schema-Makefile b/sysutils/ispman/files/patch-install-data-schema-Makefile deleted file mode 100644 index fe9eca9591ce..000000000000 --- a/sysutils/ispman/files/patch-install-data-schema-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- install-data/schema/Makefile.orig 2006-06-08 00:26:53.000000000 +0400 -+++ install-data/schema/Makefile 2007-10-08 21:25:07.000000000 +0400 -@@ -18,8 +18,8 @@ - install: $(SCHEMAS) - @list='$(SCHEMAS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo "$(INSTALL) $$p $(INSTALL_DIR)/`echo $$p`"; \ -- $(INSTALL) -c $$p $(INSTALL_DIR)/`echo $$p`; \ -+ echo "$(INSTALL) $(DATA_MODES) $$p $(INSTALL_DIR)/`echo $$p`"; \ -+ $(INSTALL) $(DATA_MODES) $$p $(INSTALL_DIR)/`echo $$p`; \ - else :; fi; \ - done - |