4 files changed, 22 insertions, 88 deletions

diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 0b40b08d9309..dead627fb22c 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -6,41 +6,26 @@
 #
 
 PORTNAME=	libmcrypt
-PORTVERSION=	2.5.3
+PORTVERSION=	2.5.4
 CATEGORIES=	security
 MASTER_SITES=	ftp://mcrypt.hellug.gr/pub/mcrypt/libmcrypt/ \
 		ftp://ftp.ntua.gr/pub/security/mcrypt/libmcrypt/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
-LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
-
 RESTRICTED=	"yes - cryptography"
 
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-static
 INSTALLS_SHLIB=	yes
 
 MAN3=		mcrypt.3
 
-post-extract:
-# so we need not audit the configure scripts
-	${FIND} ${WRKSRC} -name configure -exec ${RM} -f \{\} \;
-
-pre-patch:
-	@${FIND} ${WRKSRC}/modules -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
-		's|#ifdef USE_LTDL|#if defined(USE_LTDL) && !defined(__FreeBSD__)|g'
-
 post-patch:
-	@cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf
-
-pre-configure:
-# because we removed the configure scripts
-	cd ${WRKSRC} && autoconf
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|: install-pkglibLTLIBRARIES|:|g'
 
 .include <bsd.port.mk>
diff --git a/security/libmcrypt/distinfo b/security/libmcrypt/distinfo
index b0a45bb1e9da..ed0c8805807a 100644
--- a/security/libmcrypt/distinfo
+++ b/security/libmcrypt/distinfo
@@ -1 +1 @@
-MD5 (libmcrypt-2.5.3.tar.gz) = 9ee42ac7c7b6c0b418746604c1f06c30
+MD5 (libmcrypt-2.5.4.tar.gz) = 1536fa470cb2c590c924a1249344ef6a
diff --git a/security/libmcrypt/files/patch-ltmain.sh b/security/libmcrypt/files/patch-ltmain.sh
index 45d13f31fc1b..0c9089ac359a 100644
--- a/security/libmcrypt/files/patch-ltmain.sh
+++ b/security/libmcrypt/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Fri Feb  1 20:23:29 2002
-+++ ltmain.sh	Sat Mar  2 15:26:31 2002
-@@ -958,6 +958,7 @@
+--- ltmain.sh.orig	Wed Dec 18 06:19:10 2002
++++ ltmain.sh	Sat Dec 21 02:44:34 2002
+@@ -973,6 +973,7 @@
  	;;
  
        -avoid-version)
@@ -8,3 +8,16 @@
  	avoid_version=yes
  	continue
  	;;
+@@ -4325,10 +4326,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/libmcrypt/pkg-plist b/security/libmcrypt/pkg-plist
index 49f9f39fd0ca..ef43a5e94d38 100644
--- a/security/libmcrypt/pkg-plist
+++ b/security/libmcrypt/pkg-plist
@@ -1,70 +1,6 @@
 bin/libmcrypt-config
 include/mcrypt.h
 lib/libmcrypt.a
-lib/libmcrypt.la
 lib/libmcrypt.so
-lib/libmcrypt.so.7
-lib/libmcrypt/arcfour.la
-lib/libmcrypt/arcfour.so
-lib/libmcrypt/blowfish-compat.la
-lib/libmcrypt/blowfish-compat.so
-lib/libmcrypt/blowfish.la
-lib/libmcrypt/blowfish.so
-lib/libmcrypt/cast-128.la
-lib/libmcrypt/cast-128.so
-lib/libmcrypt/cast-256.la
-lib/libmcrypt/cast-256.so
-lib/libmcrypt/cbc.la
-lib/libmcrypt/cbc.so
-lib/libmcrypt/cfb.la
-lib/libmcrypt/cfb.so
-lib/libmcrypt/ctr.la
-lib/libmcrypt/ctr.so
-lib/libmcrypt/des.la
-lib/libmcrypt/des.so
-lib/libmcrypt/ecb.la
-lib/libmcrypt/ecb.so
-lib/libmcrypt/enigma.la
-lib/libmcrypt/enigma.so
-lib/libmcrypt/gost.la
-lib/libmcrypt/gost.so
-lib/libmcrypt/loki97.la
-lib/libmcrypt/loki97.so
-lib/libmcrypt/ncfb.la
-lib/libmcrypt/ncfb.so
-lib/libmcrypt/nofb.la
-lib/libmcrypt/nofb.so
-lib/libmcrypt/ofb.la
-lib/libmcrypt/ofb.so
-lib/libmcrypt/panama.la
-lib/libmcrypt/panama.so
-lib/libmcrypt/rc2.la
-lib/libmcrypt/rc2.so
-lib/libmcrypt/rijndael-128.la
-lib/libmcrypt/rijndael-128.so
-lib/libmcrypt/rijndael-192.la
-lib/libmcrypt/rijndael-192.so
-lib/libmcrypt/rijndael-256.la
-lib/libmcrypt/rijndael-256.so
-lib/libmcrypt/safer-sk128.la
-lib/libmcrypt/safer-sk128.so
-lib/libmcrypt/safer-sk64.la
-lib/libmcrypt/safer-sk64.so
-lib/libmcrypt/saferplus.la
-lib/libmcrypt/saferplus.so
-lib/libmcrypt/serpent.la
-lib/libmcrypt/serpent.so
-lib/libmcrypt/stream.la
-lib/libmcrypt/stream.so
-lib/libmcrypt/threeway.la
-lib/libmcrypt/threeway.so
-lib/libmcrypt/tripledes.la
-lib/libmcrypt/tripledes.so
-lib/libmcrypt/twofish.la
-lib/libmcrypt/twofish.so
-lib/libmcrypt/wake.la
-lib/libmcrypt/wake.so
-lib/libmcrypt/xtea.la
-lib/libmcrypt/xtea.so
+lib/libmcrypt.so.8
 share/aclocal/libmcrypt.m4
-@dirrm lib/libmcrypt