diff options
| author | Johan van Selst <johans@FreeBSD.org> | 2006-06-22 14:08:48 +0000 |
|---|---|---|
| committer | Johan van Selst <johans@FreeBSD.org> | 2006-06-22 14:08:48 +0000 |
| commit | 8a942f389f57d775d4afa8e157aa11b03e9b1dea (patch) | |
| tree | 3a35ee2076a9421e896122f0ff08b9ff81a974bd /net/openser/files/patch-Makefile | |
| parent | - Update to version 1.2.2 (diff) | |
- Update to version 1.0.1
- Respect CFLAGS
PR: 94108
Submitted by: jesusr (maintainer)
Approved by: flz (mentor)
Notes
Notes:
svn path=/head/; revision=166034
Diffstat (limited to 'net/openser/files/patch-Makefile')
| -rw-r--r-- | net/openser/files/patch-Makefile | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile index 4cf5432f9d59..c65f092559d8 100644 --- a/net/openser/files/patch-Makefile +++ b/net/openser/files/patch-Makefile @@ -1,20 +1,24 @@ ---- Makefile.orig Fri Oct 28 23:27:18 2005 -+++ Makefile Sun Oct 30 22:14:24 2005 +--- Makefile.orig Sun Mar 5 19:40:19 2006 ++++ Makefile Sun Mar 5 20:40:04 2006 @@ -46,7 +46,7 @@ skip_modules?= # if not set on the cmd. line or the env, exclude this modules: -exclude_modules?= jabber cpl-c pa postgres mysql \ -+exclude_modules?= jabber $(POSTGRESQL) $(MYSQL) \ ++exclude_modules?= jabber $(POSTGRESQL) $(MYSQL) \ avp_radius auth_radius group_radius uri_radius # always exclude the CVS dir override exclude_modules+= CVS $(skip_modules) -@@ -320,17 +320,9 @@ +@@ -320,21 +320,9 @@ # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work install-cfg: $(cfg-prefix)/$(cfg-dir) - sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules-target)#g" \ -- < etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample +- < etc/$(NAME).cfg > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 +- sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg-prefix)/$(cfg-dir)tls/#g" \ +- < $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 \ +- > $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample +- rm -fr $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample0 - chmod 644 $(cfg-prefix)/$(cfg-dir)$(NAME).cfg.sample - if [ -z "${skip_cfg_install}" -a \ - ! -f $(cfg-prefix)/$(cfg-dir)$(NAME).cfg ]; then \ @@ -28,9 +32,9 @@ #$(INSTALL-CFG) etc/$(NAME).cfg $(cfg-prefix)/$(cfg-dir) if [ -z $(TLS) ]; then \ echo "No TLS scripts installed" ; \ -@@ -341,36 +333,16 @@ - mkdir $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \ - mkdir $(cfg-prefix)/$(cfg-dir)/tls/user ; \ +@@ -345,25 +333,7 @@ + mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private ; \ + mkdir -p $(cfg-prefix)/$(cfg-dir)/tls/user ; \ $(INSTALL-TOUCH) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \ - $(INSTALL) etc/tls/README $(cfg-prefix)/$(cfg-dir)/tls/; \ - $(INSTALL-TOUCH) etc/tls/rootCA/index.txt $(cfg-prefix)/$(cfg-dir)/tls/rootCA/; \ @@ -45,7 +49,7 @@ - $(INSTALL) etc/tls/rootCA/private/cakey.pem $(cfg-prefix)/$(cfg-dir)/tls/rootCA/private/; \ - $(INSTALL-TOUCH) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ - $(INSTALL) etc/tls/user/user-calist.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ -- $(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/users/; \ +- $(INSTALL-TOUCH) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ - $(INSTALL) etc/tls/user/user-cert.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ - $(INSTALL-TOUCH) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ - $(INSTALL) etc/tls/user/user-privkey.pem $(cfg-prefix)/$(cfg-dir)/tls/user/; \ @@ -55,27 +59,35 @@ fi install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/$(NAME)unix/$(NAME)unix - $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME) - $(INSTALL-BIN) $(NAME) $(bin-prefix)/$(bin-dir) - $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/sc -- $(INSTALL-BIN) scripts/sc $(bin-prefix)/$(bin-dir) -- mv -f $(bin-prefix)/$(bin-dir)/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl -+ $(BSD_INSTALL_SCRIPT) scripts/sc $(bin-prefix)/$(bin-dir)/$(NAME)ctl - $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/mysqldb.sh -- $(INSTALL-BIN) scripts/mysqldb.sh $(bin-prefix)/$(bin-dir) -- mv -f $(bin-prefix)/$(bin-dir)/mysqldb.sh $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh -+ $(BSD_INSTALL_SCRIPT) scripts/mysqldb.sh $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh +@@ -372,17 +342,17 @@ + sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \ + < scripts/sc > /tmp/$(NAME)ctl + $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)ctl +- $(INSTALL-BIN) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir) ++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)ctl $(bin-prefix)/$(bin-dir) + rm -fr /tmp/$(NAME)ctl + sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \ + < scripts/mysqldb.sh > /tmp/$(NAME)_mysql.sh + $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_mysql.sh +- $(INSTALL-BIN) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir) ++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_mysql.sh $(bin-prefix)/$(bin-dir) + rm -fr /tmp/$(NAME)_mysql.sh + sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-prefix)/$(bin-dir)#g" \ + < scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh + $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh +- $(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir) ++ $(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh $(bin-prefix)/$(bin-dir) + rm -fr /tmp/$(NAME)_postgresql.sh $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1 $(INSTALL-BIN) utils/gen_ha1/gen_ha1 $(bin-prefix)/$(bin-dir)/$(NAME)_gen_ha1 - $(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)unix -@@ -418,9 +390,7 @@ +@@ -431,9 +401,7 @@ if [ -f modules/"$$r"/README ]; then \ $(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README ; \ $(INSTALL-DOC) modules/"$$r"/README \ - $(doc-prefix)/$(doc-dir)/README ; \ - mv -f $(doc-prefix)/$(doc-dir)/README \ - $(doc-prefix)/$(doc-dir)/README."$$r" ; \ -+ $(doc-prefix)/$(doc-dir)/README."$$r" ; \ ++ $(doc-prefix)/$(doc-dir)/README."$$r" ; \ fi ; \ fi ; \ done |