From bbf533f79be448324aaf63d2d4187a811b946f99 Mon Sep 17 00:00:00 2001
From: avsm <avsm@openbsd.org>
Date: Wed, 20 Oct 2004 18:28:17 +0000
Subject: [PATCH] update to mcrypt-2.6.4, now on sourceforge

---
 security/mcrypt/Makefile                       |  9 ++++-----
 security/mcrypt/distinfo                       |  6 +++---
 security/mcrypt/patches/patch-intl_Makefile.in | 12 ------------
 security/mcrypt/patches/patch-src_Makefile.am  | 10 ----------
 security/mcrypt/patches/patch-src_Makefile_in  | 12 ------------
 5 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 security/mcrypt/patches/patch-intl_Makefile.in
 delete mode 100644 security/mcrypt/patches/patch-src_Makefile.am
 delete mode 100644 security/mcrypt/patches/patch-src_Makefile_in

diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 23483efb8bd..5d94636e5c1 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2004/08/12 21:56:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2004/10/20 18:28:17 avsm Exp $
 
 COMMENT=	"extendable encryption program that supports many ciphers"
 
-DISTNAME=		mcrypt-2.6.3
+DISTNAME=		mcrypt-2.6.4
 CATEGORIES=     	security
 
-HOMEPAGE=		http://mcrypt.hellug.gr/mcrypt/
+HOMEPAGE=		http://mcrypt.sf.net/
 MAINTAINER=		Anil Madhavapeddy <avsm@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,8 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		ftp://argeas.cs-net.gr/pub/unix/mcrypt/ \
-			ftp://mcrypt.hellug.gr/pub/mcrypt/ 
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mcrypt/}
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
diff --git a/security/mcrypt/distinfo b/security/mcrypt/distinfo
index 5d1ed366d25..b3701e99d45 100644
--- a/security/mcrypt/distinfo
+++ b/security/mcrypt/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcrypt-2.6.3.tar.gz) = 3c7d6b3ca73ef12136746a8d06fc27a8
-RMD160 (mcrypt-2.6.3.tar.gz) = cd20b3390f2922e9f3eb8ee736b0cbdd8487c557
-SHA1 (mcrypt-2.6.3.tar.gz) = e0c1f87fb93293bc276decb572e8e317c29b5a0e
+MD5 (mcrypt-2.6.4.tar.gz) = 5a011846fd0f166428c8d97359aaa6b3
+RMD160 (mcrypt-2.6.4.tar.gz) = 1750f6aa7f7edea4a42e7e5a056c4d7460e30e82
+SHA1 (mcrypt-2.6.4.tar.gz) = 6541caeab47999789595ad714b741fdf98c77aca
diff --git a/security/mcrypt/patches/patch-intl_Makefile.in b/security/mcrypt/patches/patch-intl_Makefile.in
deleted file mode 100644
index d3ccc1c6336..00000000000
--- a/security/mcrypt/patches/patch-intl_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-intl_Makefile.in,v 1.2 2003/01/18 22:55:39 avsm Exp $
---- intl/Makefile.in.orig	Sat Apr 27 12:50:56 2002
-+++ intl/Makefile.in	Sat Jan 18 18:40:45 2003
-@@ -26,7 +26,7 @@ top_srcdir = @top_srcdir@
- top_builddir = ..
- VPATH = @srcdir@
- 
--prefix = @prefix@
-+prefix = ${DESTDIR}@prefix@
- exec_prefix = @exec_prefix@
- transform = @program_transform_name@
- libdir = @libdir@
diff --git a/security/mcrypt/patches/patch-src_Makefile.am b/security/mcrypt/patches/patch-src_Makefile.am
deleted file mode 100644
index 5d36a5cb238..00000000000
--- a/security/mcrypt/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.am.orig	Sat Jun 15 11:19:03 2002
-+++ src/Makefile.am	Sat Jan 18 18:40:45 2003
-@@ -13,6 +13,6 @@ mcrypt_SOURCES = extra.c mcrypt.c keys.c
- localedir = $(datadir)/locale
- mcrypt_LDADD = gaaout.o @INTLLIBS@ 
- gaaout.o: gaaout.c
--	$(CC) -o gaaout.o -c gaaout.c -g $(INCLUDES) -I. -I..
-+	$(CC) -o gaaout.o -c gaaout.c -g $(INCLUDES) -I. -I.. ${LIBMCRYPT_CFLAGS}
- gaaout.c: mcrypt.gaa
- 	gaa -o gaaout.c -i gaa.h mcrypt.gaa
diff --git a/security/mcrypt/patches/patch-src_Makefile_in b/security/mcrypt/patches/patch-src_Makefile_in
deleted file mode 100644
index ee50832732c..00000000000
--- a/security/mcrypt/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2003/01/18 22:55:39 avsm Exp $
---- src/Makefile.in.orig	Sat Jan 18 18:40:54 2003
-+++ src/Makefile.in	Sat Jan 18 18:41:15 2003
-@@ -412,7 +412,7 @@ uninstall-am: uninstall-binPROGRAMS unin
- 	uninstall-binPROGRAMS uninstall-info-am
- 
- gaaout.o: gaaout.c
--	$(CC) -o gaaout.o -c gaaout.c -g $(INCLUDES) -I. -I..
-+	$(CC) -o gaaout.o -c gaaout.c -g $(INCLUDES) -I. -I.. ${LIBMCRYPT_CFLAGS}
- gaaout.c: mcrypt.gaa
- 	gaa -o gaaout.c -i gaa.h mcrypt.gaa
- # Tell versions [3.59,3.63) of GNU make to not export all variables.