From f525f112bb741d851f35f83ce25fd842d7d5c400 Mon Sep 17 00:00:00 2001 From: avsm Date: Sat, 18 Jan 2003 22:55:39 +0000 Subject: [PATCH] update to mcrypt-2.6.3 --- security/mcrypt/Makefile | 10 +++++----- security/mcrypt/distinfo | 6 +++--- security/mcrypt/patches/patch-Makefile.in | 10 +++++----- security/mcrypt/patches/patch-intl_Makefile.in | 10 +++++----- security/mcrypt/patches/patch-po_Makefile.in.in | 10 +++++----- security/mcrypt/patches/patch-src_Makefile.am | 10 ++++++++++ security/mcrypt/patches/patch-src_Makefile_in | 12 ++++++++++++ security/mcrypt/pkg/PLIST | 5 +---- 8 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 security/mcrypt/patches/patch-src_Makefile.am create mode 100644 security/mcrypt/patches/patch-src_Makefile_in diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile index c3102895981..a497341254a 100644 --- a/security/mcrypt/Makefile +++ b/security/mcrypt/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2002/12/29 20:31:40 fgsch Exp $ +# $OpenBSD: Makefile,v 1.11 2003/01/18 22:55:39 avsm Exp $ COMMENT= extendable encryption program that supports many ciphers -DISTNAME= mcrypt-2.5.7 +DISTNAME= mcrypt-2.6.3 CATEGORIES= security HOMEPAGE= http://mcrypt.hellug.gr/mcrypt/ @@ -13,8 +13,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://mcrypt.hellug.gr/pub/mcrypt/ \ - ftp://argeas.cs-net.gr/pub/unix/mcrypt +MASTER_SITES= ftp://argeas.cs-net.gr/pub/unix/mcrypt/ \ + ftp://mcrypt.hellug.gr/pub/mcrypt/ USE_LIBTOOL= Yes USE_GMAKE= Yes @@ -24,7 +24,7 @@ LIB_DEPENDS= mcrypt.6::security/libmcrypt \ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static --with-catgets +CONFIGURE_ARGS+= --enable-static --with-catgets CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl -lltdl" diff --git a/security/mcrypt/distinfo b/security/mcrypt/distinfo index f9fba6e55eb..5d1ed366d25 100644 --- a/security/mcrypt/distinfo +++ b/security/mcrypt/distinfo @@ -1,3 +1,3 @@ -MD5 (mcrypt-2.5.7.tar.gz) = 01f2e7ebc9e8992d7c5bc7cd09384a61 -RMD160 (mcrypt-2.5.7.tar.gz) = b79cc1f86a05dbb20035bc441191e4c076c83ad6 -SHA1 (mcrypt-2.5.7.tar.gz) = a676bb500ca43a61d24a9e0236b28451ebfddfc1 +MD5 (mcrypt-2.6.3.tar.gz) = 3c7d6b3ca73ef12136746a8d06fc27a8 +RMD160 (mcrypt-2.6.3.tar.gz) = cd20b3390f2922e9f3eb8ee736b0cbdd8487c557 +SHA1 (mcrypt-2.6.3.tar.gz) = e0c1f87fb93293bc276decb572e8e317c29b5a0e diff --git a/security/mcrypt/patches/patch-Makefile.in b/security/mcrypt/patches/patch-Makefile.in index f2b120dc34e..6e29385ae16 100644 --- a/security/mcrypt/patches/patch-Makefile.in +++ b/security/mcrypt/patches/patch-Makefile.in @@ -1,8 +1,8 @@ -$OpenBSD: patch-Makefile.in,v 1.1.1.1 2000/11/27 15:56:03 avsm Exp $ ---- Makefile.in.orig Mon Oct 2 16:23:35 2000 -+++ Makefile.in Mon Nov 20 15:57:31 2000 -@@ -378,8 +378,7 @@ clean-generic maintainer-clean-generic c - maintainer-clean +$OpenBSD: patch-Makefile.in,v 1.2 2003/01/18 22:55:39 avsm Exp $ +--- Makefile.in.orig Wed Oct 2 21:10:16 2002 ++++ Makefile.in Sat Jan 18 18:40:45 2003 +@@ -464,8 +464,7 @@ uninstall-info: uninstall-info-recursive + uninstall-info-recursive uninstall-local uninstall-recursive install-exec-hook: - -$(RM) -f $(bindir)/mdecrypt diff --git a/security/mcrypt/patches/patch-intl_Makefile.in b/security/mcrypt/patches/patch-intl_Makefile.in index e396a5e2ed5..d3ccc1c6336 100644 --- a/security/mcrypt/patches/patch-intl_Makefile.in +++ b/security/mcrypt/patches/patch-intl_Makefile.in @@ -1,7 +1,7 @@ -$OpenBSD: patch-intl_Makefile.in,v 1.1.1.1 2000/11/27 15:56:03 avsm Exp $ ---- intl/Makefile.in.orig Mon Nov 20 15:43:32 2000 -+++ intl/Makefile.in Mon Nov 20 15:44:07 2000 -@@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@ +$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@ @@ -9,4 +9,4 @@ $OpenBSD: patch-intl_Makefile.in,v 1.1.1.1 2000/11/27 15:56:03 avsm Exp $ +prefix = ${DESTDIR}@prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ - libdir = $(exec_prefix)/lib + libdir = @libdir@ diff --git a/security/mcrypt/patches/patch-po_Makefile.in.in b/security/mcrypt/patches/patch-po_Makefile.in.in index c517abc5930..1ad9c1ed049 100644 --- a/security/mcrypt/patches/patch-po_Makefile.in.in +++ b/security/mcrypt/patches/patch-po_Makefile.in.in @@ -1,12 +1,12 @@ -$OpenBSD: patch-po_Makefile.in.in,v 1.1.1.1 2000/11/27 15:56:03 avsm Exp $ ---- po/Makefile.in.in.orig Mon Nov 20 15:50:43 2000 -+++ po/Makefile.in.in Mon Nov 20 15:51:19 2000 -@@ -16,7 +16,7 @@ srcdir = @srcdir@ +$OpenBSD: patch-po_Makefile.in.in,v 1.2 2003/01/18 22:55:39 avsm Exp $ +--- po/Makefile.in.in.orig Sat Apr 27 12:51:00 2002 ++++ po/Makefile.in.in Sat Jan 18 18:40:45 2003 +@@ -20,7 +20,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ +prefix = ${DESTDIR}@prefix@ exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ + datadir = @datadir@ localedir = $(datadir)/locale diff --git a/security/mcrypt/patches/patch-src_Makefile.am b/security/mcrypt/patches/patch-src_Makefile.am new file mode 100644 index 00000000000..5d36a5cb238 --- /dev/null +++ b/security/mcrypt/patches/patch-src_Makefile.am @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 00000000000..ee50832732c --- /dev/null +++ b/security/mcrypt/patches/patch-src_Makefile_in @@ -0,0 +1,12 @@ +$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. diff --git a/security/mcrypt/pkg/PLIST b/security/mcrypt/pkg/PLIST index da1572e1dcb..7dd4889083d 100644 --- a/security/mcrypt/pkg/PLIST +++ b/security/mcrypt/pkg/PLIST @@ -1,7 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2001/05/10 22:21:23 avsm Exp $ +@comment $OpenBSD: PLIST,v 1.3 2003/01/18 22:55:39 avsm Exp $ bin/mcrypt bin/mdecrypt man/man1/mcrypt.1 -share/locale/cs/LC_MESSAGES/mcrypt.mo -share/locale/el/LC_MESSAGES/mcrypt.mo -share/locale/pl/LC_MESSAGES/mcrypt.mo