Update to 3.4.0 release and add support for amd64.

7 files changed, 42 insertions, 42 deletions

diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile
index 1e951b994fd3..fa53c7b7389b 100644
--- a/security/cryptlib/Makefile
+++ b/security/cryptlib/Makefile
@@ -6,18 +6,15 @@
 #
 
 PORTNAME=		cryptlib
-PORTVERSION=		3.3.1
+PORTVERSION=		3.4.0
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.franken.de/pub/crypt/cryptlib/
 DISTNAME=		cl${PORTVERSION:S/.//g}
-EXTRACT_SUFX=		.zip
 
 MAINTAINER=		ale@FreeBSD.org
 COMMENT=		A powerful security programming toolkit
 
-OPTIONS=		OPTIMIZED_CFLAGS	"Build with optimized CFLAGS" off
-
-ONLY_FOR_ARCHS=		i386
+ONLY_FOR_ARCHS=		i386 amd64
 
 USE_ZIP=		yes
 EXTRACT_BEFORE_ARGS=	-aq
@@ -27,23 +24,23 @@ MAKEFILE=		makefile
 ALL_TARGET=		default FreeBSD shared
 USE_LDCONFIG=		yes
 
+PLIST_FILES=		include/cryptlib.h \
+			lib/libcl.a lib/libcl.so \
+			lib/libcl.so.3 lib/libcl.so.${PORTVERSION}
+
 PORTDOCS=		README
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-.if defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's/%%CFLAGS%%/${CFLAGS:N-O*:N-f*} -fomit-frame-pointer -O3/' ${WRKSRC}/makefile
-.else
 	@${REINPLACE_CMD} -e 's/%%CFLAGS%%/${CFLAGS}/' ${WRKSRC}/makefile
-.endif
 	@${REINPLACE_CMD} -e 's/%%PTHREAD_CFLAGS%%/${PTHREAD_CFLAGS}/' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/' ${WRKSRC}/tools/getlibs.sh
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libcl.a ${WRKSRC}/libcl.so.3.3.0 \
+	${INSTALL_DATA} ${WRKSRC}/libcl.a ${WRKSRC}/libcl.so.${PORTVERSION} \
 		${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libcl.so.3.3.0 ${PREFIX}/lib/libcl.so.3
+	${LN} -sf ${PREFIX}/lib/libcl.so.${PORTVERSION} ${PREFIX}/lib/libcl.so.3
 	${LN} -sf ${PREFIX}/lib/libcl.so.3 ${PREFIX}/lib/libcl.so
 	${INSTALL_DATA} ${WRKSRC}/cryptlib.h ${PREFIX}/include
 
diff --git a/security/cryptlib/distinfo b/security/cryptlib/distinfo
index 88847e2375b1..1217a3e07347 100644
--- a/security/cryptlib/distinfo
+++ b/security/cryptlib/distinfo
@@ -1,3 +1,2 @@
-MD5 (cl331.zip) = 3e93e5aa0b33fb1d5b05b099f01e0afe
-SHA256 (cl331.zip) = 630ac09c4febc5c131ed2e0370a10595008a849f4cb36427dc1be06463ed4079
-SIZE (cl331.zip) = 3802344
+SHA256 (cl340.zip) = fff4cca9e70e579763882cd58bc8a5b36c52c20a7ace6c8b21c5e4e9e05fd9d5
+SIZE (cl340.zip) = 5514751
diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile
index 902731f768e8..cd8ba11a643e 100644
--- a/security/cryptlib/files/patch-makefile
+++ b/security/cryptlib/files/patch-makefile
@@ -1,11 +1,11 @@
---- makefile.orig	Sat Jan 27 22:14:40 2007
-+++ makefile	Fri Mar 30 14:40:47 2007
-@@ -1340,7 +1340,7 @@
+--- makefile.orig	2010-11-19 04:08:54.000000000 +0100
++++ makefile	2011-03-04 15:30:09.000000000 +0100
+@@ -1651,7 +1651,7 @@ FreeBSD:
  	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
  		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
  		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
--			-fomit-frame-pointer -O3 -pthread" ; \
+-			-fomit-frame-pointer -pthread" ; \
 +			%%CFLAGS%% %%PTHREAD_CFLAGS%%" ; \
  	else \
- 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
- 			-fomit-frame-pointer -O3 -pthread" ; \
+ 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
+ 	fi
diff --git a/security/cryptlib/files/patch-misc_config.h b/security/cryptlib/files/patch-misc_config.h
index 9da114d400c5..da378cfe73f0 100644
--- a/security/cryptlib/files/patch-misc_config.h
+++ b/security/cryptlib/files/patch-misc_config.h
@@ -1,6 +1,6 @@
---- misc/config.h.orig	Fri Jul 14 08:18:03 2006
-+++ misc/config.h	Fri Jul 14 08:19:19 2006
-@@ -168,6 +168,7 @@
+--- misc/config.h.orig	2010-12-21 02:29:54.000000000 +0100
++++ misc/config.h	2011-03-04 15:31:57.000000000 +0100
+@@ -287,6 +287,7 @@
  
  /* General device usage */
  
diff --git a/security/cryptlib/files/patch-misc_os_spec.h b/security/cryptlib/files/patch-misc_os_spec.h
index 8f630aeab4e2..5b604454c142 100644
--- a/security/cryptlib/files/patch-misc_os_spec.h
+++ b/security/cryptlib/files/patch-misc_os_spec.h
@@ -1,6 +1,6 @@
---- misc/os_spec.h.orig	Fri Jul 14 08:31:41 2006
-+++ misc/os_spec.h	Fri Jul 14 08:31:18 2006
-@@ -481,7 +481,7 @@
+--- misc/os_spec.h.orig	2010-10-13 23:58:52.000000000 +0200
++++ misc/os_spec.h	2011-03-04 15:31:57.000000000 +0100
+@@ -601,7 +601,7 @@ typedef unsigned char		BYTE;
  
  #if defined( __WINDOWS__ ) || \
  	( defined( __UNIX__ ) && \
diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh
index 9e438eb8b043..e1b43d127496 100644
--- a/security/cryptlib/files/patch-tools_ccopts.sh
+++ b/security/cryptlib/files/patch-tools_ccopts.sh
@@ -1,16 +1,25 @@
---- tools/ccopts.sh.orig	Fri Jul 14 08:37:59 2006
-+++ tools/ccopts.sh	Fri Jul 14 08:38:19 2006
-@@ -129,13 +129,6 @@
- # "version gcc" (we can't use just "gcc" by itself since this appears
- # elsewhere in the gcc -v output).
+--- tools/ccopts.sh.orig	2010-12-19 00:57:12.000000000 +0100
++++ tools/ccopts.sh	2011-03-04 15:33:54.000000000 +0100
+@@ -341,22 +341,6 @@ fi
+ # in situations that also use shared libs, in the case of x86-64 the use
+ # of PIC should have minimum overhead so it shouldn't be a big deal.
  
--if [ `uname -m | grep "i[3,4,5,6]86"` > /dev/null ] ; then
--	if [ `gcc --version 2>&1 | head -n 1 | tr -d '[A-Za-z]. ()' | cut -c 1` -gt 2 ] ; then
--		CCARGS="$CCARGS -march=pentium" ;
+-if [ "$ARCH" = "i586" -o "$ARCH" = "i686" -o "$ARCH" = "x86_64" ] ; then
+-	if [ "$GCC_VER" -ge 30 ] ; then
+-		case $ARCH in
+-			'x86_64')
+-				CCARGS="$CCARGS -march=opteron -fPIC" ;;
+-
+-			'i686')
+-				CCARGS="$CCARGS -march=pentiumpro" ;;
+-
+-			*)
+-				CCARGS="$CCARGS -march=pentium" ;;
+-		esac ;
 -	else
 -		CCARGS="$CCARGS -mcpu=pentium" ;
--	fi
+-	fi ;
 -fi
  
- # Check for gcc 4.x with its stupid default setting of -Wpointer-sign,
- # which leads to endless warnings about signed vs.unsigned char problems -
+ # gcc 4.x for 64-bit architectures has an optimiser bug that removes an
+ # empty-list check in cryptlib's list-management code (this has been
diff --git a/security/cryptlib/pkg-plist b/security/cryptlib/pkg-plist
deleted file mode 100644
index 7e7fc39ff0a5..000000000000
--- a/security/cryptlib/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/cryptlib.h
-lib/libcl.a
-lib/libcl.so
-lib/libcl.so.3
-lib/libcl.so.3.3.0