- Update to 0.9.6

PR:		ports/94026
Submitted by:	Babak Farrokhi <babak@farrokhi.net>
Approved by:	maintainer timeout (sobomax; 1 month)

4 files changed, 85 insertions, 87 deletions

diff --git a/net/ser/Makefile b/net/ser/Makefile
index 72dbe2590e89..66ec1f19c5a2 100644
--- a/net/ser/Makefile
+++ b/net/ser/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ser
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.berlios.de/pub/ser/${PORTVERSION}/src/
+MASTER_SITES=	http://download.berlios.de/ser/ \
+		http://download2.berlios.de/ser/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_src
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -47,7 +47,7 @@ MAKE_ENV+=	POSTGRESQL=postgres
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile completely on sparc64 or ia64"
+BROKEN=		Does not compile completely on sparc64 or ia64
 .endif
 
 post-install:
diff --git a/net/ser/distinfo b/net/ser/distinfo
index 7a734027c2d8..77badc7de730 100644
--- a/net/ser/distinfo
+++ b/net/ser/distinfo
@@ -1,3 +1,3 @@
-MD5 (ser-0.9.3_src.tar.gz) = 3ef2238e358ad349fc05b90dd87c783c
-SHA256 (ser-0.9.3_src.tar.gz) = 73f0dc9e3cd9182f5967717e93bcf6333a019f4fa01b59136e287056467b883d
-SIZE (ser-0.9.3_src.tar.gz) = 1846979
+MD5 (ser-0.9.6_src.tar.gz) = 31031225d483c0d5ac43e8eb5d0428e0
+SHA256 (ser-0.9.6_src.tar.gz) = d7870bdbb753deaa335a9ee0aae1852108fe904f74ed4ba903be9d7cd3a0b140
+SIZE (ser-0.9.6_src.tar.gz) = 1846781
diff --git a/net/ser/files/patch-Makefile.defs b/net/ser/files/patch-Makefile.defs
index 1a0c81731f29..90c41afc2616 100644
--- a/net/ser/files/patch-Makefile.defs
+++ b/net/ser/files/patch-Makefile.defs
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- Makefile.defs.orig
-+++ Makefile.defs
-@@ -151,10 +151,11 @@
+--- Makefile.defs.orig	Wed Jan 11 03:55:58 2006
++++ Makefile.defs	Thu Mar  2 19:08:17 2006
+@@ -169,10 +169,11 @@
  INSTALL-TOUCH = touch          # used to create the file first (good to 
                                 #  make solaris install work)
  INSTALL-CFG = $(INSTALL) -m 644
@@ -19,7 +16,7 @@ $FreeBSD$
  
  #set some vars from the environment (and not make builtins)
  CC   := $(shell echo "$${CC}")
-@@ -444,8 +445,8 @@
+@@ -464,8 +465,8 @@
  	found_lock_method=yes
  endif
  
@@ -30,24 +27,25 @@ $FreeBSD$
  # setting CFLAGS
  ifeq ($(mode), release)
  	#if i386
-@@ -453,14 +454,13 @@
+@@ -473,15 +474,14 @@
  		# if gcc 
  ifeq		($(CC_NAME), gcc)
  				#common stuff
 -				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE) \
-+				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
++				CFLAGS=-funroll-loops  -Wcast-align $(PROFILE) \
  					-Wall  
- 			#if gcc 3.4+
- ifeq			($(CC_SHORTVER), 3.4)
- 					CPU ?= athlon
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)
+ 					CPU ?= athlon64
  					CFLAGS+=-minline-all-stringops -malign-double \
--							-falign-loops \
+ 							-falign-loops \
+-							-ftree-vectorize \
 -							-mtune=$(CPU) 
-+							-falign-loops
++							-ftree-vectorize
  else
- 			#if gcc 3.0+
- ifeq			($(CC_SHORTVER), 3.0)
-@@ -486,7 +486,7 @@
+ 			#if gcc 3.4+
+ ifeq			($(CC_SHORTVER), 3.4)
+@@ -515,7 +515,7 @@
  
  else		# CC_NAME, gcc
  ifeq		($(CC_NAME), icc)
@@ -56,16 +54,16 @@ $FreeBSD$
  					 -tpp6 -xK  #-openmp  #optimize for PIII 
  				# -prefetch doesn't seem to work
  				#( ty to inline acroos files, unroll loops,prefetch,
-@@ -504,7 +504,7 @@
+@@ -533,7 +533,7 @@
  		# if gcc 
  ifeq		($(CC_NAME), gcc)
  				#common stuff
 -				CFLAGS=-g -O9 -funroll-loops  -Wcast-align $(PROFILE) \
 +				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
  					-Wall 
- 			#if gcc 3.4
- ifeq			($(CC_SHORTVER), 3.4)
-@@ -537,7 +537,7 @@
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)
+@@ -575,7 +575,7 @@
  
  else		# CC_NAME, gcc
  ifeq		($(CC_NAME), icc)
@@ -74,7 +72,7 @@ $FreeBSD$
  					 -tpp6 -xK  #-openmp  #optimize for PIII 
  				# -prefetch doesn't seem to work
  				#( ty to inline acroos files, unroll loops,prefetch,
-@@ -555,7 +555,7 @@
+@@ -593,7 +593,7 @@
  			#if gcc
  ifeq		($(CC_NAME), gcc)
  				#common stuff
@@ -83,34 +81,34 @@ $FreeBSD$
  					-Wall\
  					#-Wcast-align \
  					#-Wmissing-prototypes 
-@@ -620,7 +620,7 @@
+@@ -667,7 +667,7 @@
  		# if gcc 
  ifeq		($(CC_NAME), gcc)
  				#common stuff
 -				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
 +				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
  					-Wall   
- 			#if gcc 3.4+
- ifeq			($(CC_SHORTVER), 3.4)
-@@ -656,7 +656,7 @@
+ 			#if gcc 4.x+
+ ifeq			($(CC_SHORTVER), 4.x)
+@@ -709,7 +709,7 @@
  		# if gcc 
  ifeq		($(CC_NAME), gcc)
  				#common stuff
 -				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
 +				CFLAGS+=-funroll-loops  -Wcast-align $(PROFILE) \
  					-Wall 
- 			#if gcc 3.4+
- ifeq			($(CC_SHORTVER), 3.4)
-@@ -692,7 +692,7 @@
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)
+@@ -751,7 +751,7 @@
  		# if gcc 
  ifeq		($(CC_NAME), gcc)
  				#common stuff
 -				CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \
 +				CFLAGS+= -mips2 -funroll-loops $(PROFILE) \
  					-Wall 
- 			#if gcc 3.4+
- ifeq			($(CC_SHORTVER), 3.4)
-@@ -856,7 +856,7 @@
+ 			#if gcc 4.0+
+ ifeq			($(CC_SHORTVER), 4.x)
+@@ -932,7 +932,7 @@
  	# -andrei
  else	#mode,release
  ifeq	($(CC_NAME), gcc)
@@ -119,7 +117,7 @@ $FreeBSD$
  ifeq		($(ARCH), sparc64)
  			CFLAGS+= -mcpu=ultrasparc 
  endif
-@@ -871,12 +871,12 @@
+@@ -947,12 +947,12 @@
  endif
  endif
  ifeq	($(CC_NAME), icc)
@@ -134,7 +132,7 @@ $FreeBSD$
  		LDFLAGS+=-g $(PROFILE)
  		MOD_LDFLAGS=-G $(LDFLAGS)
  endif
-@@ -958,7 +958,7 @@
+@@ -1034,7 +1034,7 @@
  		found_lock_method=yes
  		LIBS= -pthread -lfl  #dlopen is in libc
  	else
diff --git a/net/ser/pkg-plist b/net/ser/pkg-plist
index 87937cb835b8..920dc8c47c2e 100644
--- a/net/ser/pkg-plist
+++ b/net/ser/pkg-plist
@@ -53,52 +53,52 @@ sbin/ser
 sbin/ser_mysql.sh
 sbin/serctl
 sbin/serunix
-share/doc/ser/AUTHORS
-share/doc/ser/INSTALL
-share/doc/ser/NEWS
-share/doc/ser/README
-share/doc/ser/README-MODULES
-share/doc/ser/README.acc
-share/doc/ser/README.auth
-share/doc/ser/README.auth_db
-share/doc/ser/README.auth_diameter
-share/doc/ser/README.auth_radius
-share/doc/ser/README.avp
-share/doc/ser/README.avp_db
-share/doc/ser/README.avpops
-share/doc/ser/README.dbtext
-share/doc/ser/README.dispatcher
-share/doc/ser/README.diversion
-share/doc/ser/README.domain
-share/doc/ser/README.enum
-share/doc/ser/README.exec
-share/doc/ser/README.ext
-share/doc/ser/README.flatstore
-share/doc/ser/README.gflags
-share/doc/ser/README.group
-share/doc/ser/README.mangler
-share/doc/ser/README.maxfwd
-share/doc/ser/README.msilo
-share/doc/ser/README.nathelper
-share/doc/ser/README.options
-share/doc/ser/README.pa
-share/doc/ser/README.pdt
-share/doc/ser/README.permissions
-share/doc/ser/README.pike
-%%POSTGRESQL%%share/doc/ser/README.postgres
-share/doc/ser/README.print
-share/doc/ser/README.registrar
-share/doc/ser/README.rr
-share/doc/ser/README.sl
-share/doc/ser/README.sms
-share/doc/ser/README.speeddial
-share/doc/ser/README.textops
-share/doc/ser/README.tm
-share/doc/ser/README.uri
-share/doc/ser/README.uri_db
-share/doc/ser/README.usrloc
-share/doc/ser/README.xlog
-@dirrm share/doc/ser
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README-MODULES
+%%DOCSDIR%%/README.acc
+%%DOCSDIR%%/README.auth
+%%DOCSDIR%%/README.auth_db
+%%DOCSDIR%%/README.auth_diameter
+%%DOCSDIR%%/README.auth_radius
+%%DOCSDIR%%/README.avp
+%%DOCSDIR%%/README.avp_db
+%%DOCSDIR%%/README.avpops
+%%DOCSDIR%%/README.dbtext
+%%DOCSDIR%%/README.dispatcher
+%%DOCSDIR%%/README.diversion
+%%DOCSDIR%%/README.domain
+%%DOCSDIR%%/README.enum
+%%DOCSDIR%%/README.exec
+%%DOCSDIR%%/README.ext
+%%DOCSDIR%%/README.flatstore
+%%DOCSDIR%%/README.gflags
+%%DOCSDIR%%/README.group
+%%DOCSDIR%%/README.mangler
+%%DOCSDIR%%/README.maxfwd
+%%DOCSDIR%%/README.msilo
+%%DOCSDIR%%/README.nathelper
+%%DOCSDIR%%/README.options
+%%DOCSDIR%%/README.pa
+%%DOCSDIR%%/README.pdt
+%%DOCSDIR%%/README.permissions
+%%DOCSDIR%%/README.pike
+%%POSTGRESQL%%%%DOCSDIR%%/README.postgres
+%%DOCSDIR%%/README.print
+%%DOCSDIR%%/README.registrar
+%%DOCSDIR%%/README.rr
+%%DOCSDIR%%/README.sl
+%%DOCSDIR%%/README.sms
+%%DOCSDIR%%/README.speeddial
+%%DOCSDIR%%/README.textops
+%%DOCSDIR%%/README.tm
+%%DOCSDIR%%/README.uri
+%%DOCSDIR%%/README.uri_db
+%%DOCSDIR%%/README.usrloc
+%%DOCSDIR%%/README.xlog
+@dirrm %%DOCSDIR%%
 @dirrm lib/ser/modules
 @dirrm lib/ser
 @dirrm etc/ser