Attachment 62983 Details for Bug 94026 – ser.patch

[patch] ser.patch

ser.patch (text/plain), 8.02 KB, created by babak on 2006-03-02 16:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: babak

Created: 2006-03-02 16:10:06 UTC

Size: 8.02 KB

patch

obsolete

>diff -ruN ser.orig/Makefile ser/Makefile
>--- ser.orig/Makefile	Thu Mar  2 18:35:11 2006
>+++ ser/Makefile	Thu Mar  2 18:38:35 2006
>@@ -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 @@
> .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 -ruN ser.orig/distinfo ser/distinfo
>--- ser.orig/distinfo	Thu Mar  2 18:35:11 2006
>+++ ser/distinfo	Thu Mar  2 19:05:37 2006
>@@ -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 -ruN ser.orig/files/patch-Makefile.defs ser/files/patch-Makefile.defs
>--- ser.orig/files/patch-Makefile.defs	Thu Mar  2 18:35:11 2006
>+++ ser/files/patch-Makefile.defs	Thu Mar  2 19:08:40 2006
>@@ -1,9 +1,6 @@
>-
>-$FreeBSD: ports/net/ser/files/patch-Makefile.defs,v 1.7 2005/07/08 16:15:11 sobomax Exp $
>-
>---- 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 @@
>  
>  #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 @@
>  # 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 @@
>  					 -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 @@
>  					 -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 @@
>  					-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 @@
>  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 @@
>  		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 -ruN ser.orig/pkg-plist ser/pkg-plist
>--- ser.orig/pkg-plist	Thu Mar  2 18:35:11 2006
>+++ ser/pkg-plist	Thu Mar  2 19:35:05 2006
>@@ -53,52 +53,52 @@
> 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

Actions: View | Diff

Attachments on bug 94026: 62983