Upgrade to 2.4.9.

PR:		ports/25149
Submitted by:	KATO Tsuguru

4 files changed, 59 insertions, 11 deletions

diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index abc3d8dab73d..e0c137b39e8a 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	libmcrypt
-PORTVERSION=	2.2.7
+PORTVERSION=	2.4.9
 CATEGORIES=	security
-MASTER_SITES=	ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/ \
-		ftp://argeas.cs-net.gr/pub/unix/mcrypt/old/ \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/
+MASTER_SITES=	ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
+
+LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
+
+RESTRICTED=	"yes - cryptography"
 
-INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-posix-threads
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN3=		mcrypt.3
 
-RESTRICTED=	"yes - cryptography"
-
 .include <bsd.port.mk>
diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo
index 965dc4203ad2..0fa2b2b4510c 100644
--- a/security/libmcrypt/distinfo
+++ b/security/libmcrypt/distinfo
@@ -1 +1 @@
-MD5 (libmcrypt-2.2.7.tar.gz) = c939776b7d0168f02fc82049aa6e938f
+MD5 (libmcrypt-2.4.9.tar.gz) = 9721e80b7db85133585a64e649fcd51f
diff --git a/security/libmcrypt/files/patch-aa b/security/libmcrypt/files/patch-aa
new file mode 100644
index 000000000000..d729a37d33c0
--- /dev/null
+++ b/security/libmcrypt/files/patch-aa
@@ -0,0 +1,17 @@
+--- lib/Makefile.in.orig	Thu Feb  1 21:36:23 2001
++++ lib/Makefile.in	Fri Feb 16 05:55:45 2001
+@@ -87,12 +87,12 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-DEFS = @DEFS@ -DLIBDIR=\"$(libdir)/@PACKAGE@/\" -I. -I..
++DEFS = @DEFS@ -DLIBDIR=\"$(libdir)/@PACKAGE@/\" -I. -I.. $(INCLLTDL)
+ include_HEADERS = mcrypt.h 
+ EXTRA_DIST = libdefs.h mcrypt.h bzero.h xmemory.h mcrypt_modules.h mcrypt_internal.h libmcrypt.sym win32_comp.h
+ lib_LTLIBRARIES = libmcrypt.la
+ libmcrypt_la_SOURCES = mcrypt_extra.c mcrypt.c bzero.c xmemory.c mcrypt_modules.c win32_comp.c
+-libmcrypt_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-symbols libmcrypt.sym -no-undefined
++libmcrypt_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-symbols libmcrypt.sym -no-undefined $(LIBLTDL)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/security/libmcrypt/pkg-plist b/security/libmcrypt/pkg-plist
index caaebf9265c4..4b1714dc9801 100644
--- a/security/libmcrypt/pkg-plist
+++ b/security/libmcrypt/pkg-plist
@@ -1,4 +1,34 @@
 include/mcrypt.h
 lib/libmcrypt.a
 lib/libmcrypt.so
-lib/libmcrypt.so.2
+lib/libmcrypt.so.5
+lib/libmcrypt/arcfour.so
+lib/libmcrypt/blowfish-compat.so
+lib/libmcrypt/blowfish.so
+lib/libmcrypt/cast-128.so
+lib/libmcrypt/cast-256.so
+lib/libmcrypt/cbc.so
+lib/libmcrypt/cfb.so
+lib/libmcrypt/des.so
+lib/libmcrypt/ecb.so
+lib/libmcrypt/enigma.so
+lib/libmcrypt/gost.so
+lib/libmcrypt/loki97.so
+lib/libmcrypt/nofb.so
+lib/libmcrypt/ofb.so
+lib/libmcrypt/panama.so
+lib/libmcrypt/rc2.so
+lib/libmcrypt/rijndael-128.so
+lib/libmcrypt/rijndael-192.so
+lib/libmcrypt/rijndael-256.so
+lib/libmcrypt/safer-sk128.so
+lib/libmcrypt/safer-sk64.so
+lib/libmcrypt/saferplus.so
+lib/libmcrypt/serpent.so
+lib/libmcrypt/stream.so
+lib/libmcrypt/threeway.so
+lib/libmcrypt/tripledes.so
+lib/libmcrypt/twofish.so
+lib/libmcrypt/wake.so
+lib/libmcrypt/xtea.so
+@dirrm lib/libmcrypt