[maintainer update] net/OpenSER 1.2.1

	Maintainer update of port Openser to version 1.2.1

PR:		Jesus Rodriguez<jesusr@FreeBSD.org>
Submitted by:	ports/113037

4 files changed, 47 insertions, 50 deletions

diff --git a/net/openser/Makefile b/net/openser/Makefile
index 6a981b14bcc8..b796afe430d4 100644
--- a/net/openser/Makefile
+++ b/net/openser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openser
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://openser.org/pub/openser/${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-tls_src
diff --git a/net/openser/distinfo b/net/openser/distinfo
index 32ec7aedbd4d..8fbdfdda7fd0 100644
--- a/net/openser/distinfo
+++ b/net/openser/distinfo
@@ -1,3 +1,3 @@
-MD5 (openser-1.2.0-tls_src.tar.gz) = fbf929ed9d3ef1c3f41e4ebecbc4dd26
-SHA256 (openser-1.2.0-tls_src.tar.gz) = 1ecba7dc85865b85b8570618837323d6e12fe8af3eb092e74e2b9546eedcdc67
-SIZE (openser-1.2.0-tls_src.tar.gz) = 2814102
+MD5 (openser-1.2.1-tls_src.tar.gz) = 066b6ae0dd79738539a29d648428897d
+SHA256 (openser-1.2.1-tls_src.tar.gz) = 8fb86835353a552b6dca329be61f25860bbad462ec89fc4249cdd4947cdc2342
+SIZE (openser-1.2.1-tls_src.tar.gz) = 3158282
diff --git a/net/openser/files/patch-Makefile b/net/openser/files/patch-Makefile
index 0ef613ffe769..7f230ad52c51 100644
--- a/net/openser/files/patch-Makefile
+++ b/net/openser/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Apr  9 11:54:01 2007
-+++ Makefile	Mon Apr  9 13:44:55 2007
-@@ -47,13 +47,9 @@
+--- Makefile.orig	Thu May 24 11:16:04 2007
++++ Makefile	Sat May 26 19:52:17 2007
+@@ -47,10 +47,9 @@
  skip_modules?=
  
  # if not set on the cmd. line or the env, exclude this modules:
@@ -8,16 +8,13 @@
 -						avp_radius auth_radius group_radius uri_radius xmpp \
 -						presence pua pua_mi pua_usrloc \
 -						mi_xmlrpc perl snmpstats
--ifeq ($(TLS),)
--	exclude_modules+= tlsops
--endif
 +exclude_modules?= 		$(MYSQL) $(POSTGRESQL) $(SNMPSTATS) $(TLSOPS) $(UNIXODBC) \
-+						avp_radius auth_radius group_radius uri_radius \
-+						jabber osp mi_xmlrpc perl xmpp
- # always exclude the SVN dir
- override exclude_modules+= .svn $(skip_modules)
- 
-@@ -339,21 +335,9 @@
++					avp_radius auth_radius group_radius uri_radius \
++					jabber osp mi_xmlrpc perl xmpp
+ ifeq ($(TLS),)
+ 	exclude_modules+= tlsops
+ endif
+@@ -343,21 +342,9 @@
  		
  # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
  install-cfg: $(cfg-prefix)/$(cfg-dir)
@@ -34,43 +31,43 @@
 -				$(cfg-prefix)/$(cfg-dir)$(NAME).cfg; \
 -		fi
  		# radius dictionary
- 		$(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.radius
--		$(INSTALL-CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)
-+		$(INSTALL-CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)/dictionary.radius.default
+ 		$(INSTALL_TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.radius
+-		$(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)
++		$(INSTALL_CFG) etc/dictionary.radius $(cfg-prefix)/$(cfg-dir)/dictionary.radius.default
  		# openserctl config
- 		$(INSTALL-TOUCH)   $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample
- 		$(INSTALL-CFG) scripts/openserctlrc \
-@@ -389,7 +373,7 @@
+ 		$(INSTALL_TOUCH)   $(cfg-prefix)/$(cfg-dir)/openserctlrc.sample
+ 		$(INSTALL_CFG) scripts/openserctlrc \
+@@ -391,7 +378,7 @@
  		sed -e "s#/usr/local/lib/openser#$(lib-target)#g" | \
  		sed -e "s#/usr/local/etc/openser#$(cfg-target)#g"  >/tmp/openserctl
- 		$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/openserctl
--		$(INSTALL-BIN) /tmp/openserctl $(bin-prefix)/$(bin-dir)
+ 		$(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/openserctl
+-		$(INSTALL_BIN) /tmp/openserctl $(bin-prefix)/$(bin-dir)
 +		$(BSD_INSTALL_SCRIPT) /tmp/openserctl $(bin-prefix)/$(bin-dir)
  		rm -fr /tmp/openserctl
  		sed -e "s#/usr/local/sbin#$(bin-target)#g" \
  			< scripts/openserctl.base > /tmp/openserctl.base
-@@ -454,7 +438,7 @@
+@@ -456,7 +443,7 @@
  			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#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) ; \
+ 			$(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 ; \
  		fi
  		if [ "$(PGSQLON)" = "yes" ]; then \
-@@ -467,7 +451,7 @@
+@@ -469,7 +456,7 @@
  			sed -e "s#PATH:/usr/local/sbin#PATH:$(bin-target)#g" \
  				< scripts/postgresqldb.sh > /tmp/$(NAME)_postgresql.sh ; \
- 			$(INSTALL-TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh ; \
--			$(INSTALL-BIN) /tmp/$(NAME)_postgresql.sh \
+ 			$(INSTALL_TOUCH) $(bin-prefix)/$(bin-dir)/$(NAME)_postgresql.sh ; \
+-			$(INSTALL_BIN) /tmp/$(NAME)_postgresql.sh \
 +			$(BSD_INSTALL_SCRIPT) /tmp/$(NAME)_postgresql.sh \
  				$(bin-prefix)/$(bin-dir) ; \
  			rm -fr /tmp/$(NAME)_postgresql.sh ; \
  		fi
-@@ -492,8 +476,6 @@
+@@ -494,8 +481,6 @@
  			if [ -f modules/"$$r"/README ]; then \
- 				$(INSTALL-TOUCH)  $(doc-prefix)/$(doc-dir)/README ; \
- 				$(INSTALL-DOC)  modules/"$$r"/README  \
+ 				$(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" ; \
diff --git a/net/openser/files/patch-Makefile.defs b/net/openser/files/patch-Makefile.defs
index 68d2d58e6a6d..32f3114d3261 100644
--- a/net/openser/files/patch-Makefile.defs
+++ b/net/openser/files/patch-Makefile.defs
@@ -1,6 +1,6 @@
---- Makefile.defs.orig	Mon Apr  9 12:01:20 2007
-+++ Makefile.defs	Mon Apr  9 11:59:14 2007
-@@ -128,7 +128,7 @@
+--- Makefile.defs.orig	Thu May 24 11:21:19 2007
++++ Makefile.defs	Sat May 26 19:52:01 2007
+@@ -131,7 +131,7 @@
  ifeq ($(ARCH_B),64b)
  	LIBDIR ?= lib64
  else
@@ -9,28 +9,28 @@
  	# assume 32b - it is not really used further
  	ARCH_B=32b
  endif
-@@ -208,13 +208,13 @@
+@@ -211,13 +211,13 @@
  TAR ?= tar
  endif
  
--INSTALL-TOUCH = touch          # used to create the file first (good to 
+-INSTALL_TOUCH = touch          # used to create the file first (good to 
 -                               #  make solaris install work)
--INSTALL-CFG = $(INSTALL) -m 644
--INSTALL-BIN = $(INSTALL) -m 755
--INSTALL-MODULES = $(INSTALL) -m 755
--INSTALL-DOC = $(INSTALL) -m 644
--INSTALL-MAN = $(INSTALL) -m 644
-+INSTALL-TOUCH = :		# used to create the file first (good to 
+-INSTALL_CFG = $(INSTALL) -m 644
+-INSTALL_BIN = $(INSTALL) -m 755
+-INSTALL_MODULES = $(INSTALL) -m 755
+-INSTALL_DOC = $(INSTALL) -m 644
+-INSTALL_MAN = $(INSTALL) -m 644
++INSTALL_TOUCH = :	# used to create the file first (good to
 +				#  make solaris install work)
-+INSTALL-CFG = $(BSD_INSTALL_DATA)
-+INSTALL-BIN = $(BSD_INSTALL_PROGRAM)
-+INSTALL-MODULES = $(BSD_INSTALL_PROGRAM)
-+INSTALL-DOC = $(BSD_INSTALL_DATA)
-+INSTALL-MAN = $(BSD_INSTALL_MAN)
++INSTALL_CFG = $(BSD_INSTALL_DATA)
++INSTALL_BIN = $(BSD_INSTALL_PROGRAM)
++INSTALL_MODULES = $(BSD_INSTALL_PROGRAM)
++INSTALL_DOC = $(BSD_INSTALL_DATA)
++INSTALL_MAN = $(BSD_INSTALL_MAN)
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -1196,8 +1196,8 @@
+@@ -1205,8 +1205,8 @@
  
  #add libssl if needed
  ifneq ($(TLS),)