[csw-devel] SF.net SVN: gar:[11070] csw/mgar/pkg

[dmichelsen at users.sourceforge.net]

Revision: 11070
          http://gar.svn.sourceforge.net/gar/?rev=11070&view=rev
Author:   dmichelsen
Date:     2010-09-28 14:19:24 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
mcrypt: Rename from libmcrypt to match upstream name

Modified Paths:
--------------
    csw/mgar/pkg/mcrypt/trunk/Makefile
    csw/mgar/pkg/mcrypt/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/mcrypt/
    csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch

Removed Paths:
-------------
    csw/mgar/pkg/libmcrypt/

Modified: csw/mgar/pkg/mcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/Makefile	2009-12-07 09:20:11 UTC (rev 7572)
+++ csw/mgar/pkg/mcrypt/trunk/Makefile	2010-09-28 14:19:24 UTC (rev 11070)
@@ -1,5 +1,5 @@
-GARNAME = libmcrypt
-GARVERSION = 2.5.8
+GARNAME = mcrypt
+GARVERSION = 2.6.8
 CATEGORIES = lib
 
 DESCRIPTION = GPL replacement for Unix crypt that supports a wide range of algorithms and modes
@@ -11,14 +11,17 @@
 
 SF_PROJ = mcrypt
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES  = 0001-Do-not-use-Wall-on-Sun-Compiler.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 BUILD64 = 1
 NOISALIST = 1
 
+EXTRA_CPPFLAGS = -D__const=const
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dynamic-loading
 CONFIGURE_ARGS += --with-included-algos=cast-128,gost,rijndael-128,twofish,arcfour,cast-256,loki97,rijndael-192,saferplus,wake,blowfish-compat,des,rijndael-256,serpent,xtea,blowfish,enigma,rc2,tripledes

Modified: csw/mgar/pkg/mcrypt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/checksums	2009-12-07 09:20:11 UTC (rev 7572)
+++ csw/mgar/pkg/mcrypt/trunk/checksums	2010-09-28 14:19:24 UTC (rev 11070)
@@ -1 +1,2 @@
-c4f491dd411a09e9de3b8702ea6f73eb  libmcrypt-2.5.8.tar.bz2
+ea9996462d0eaa7fbc7a00f37e33f81b  0001-Do-not-use-Wall-on-Sun-Compiler.patch
+97639f8821b10f80943fa17da302607e  mcrypt-2.6.8.tar.gz

Added: csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch
===================================================================
--- csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch	                        (rev 0)
+++ csw/mgar/pkg/mcrypt/trunk/files/0001-Do-not-use-Wall-on-Sun-Compiler.patch	2010-09-28 14:19:24 UTC (rev 11070)
@@ -0,0 +1,39 @@
+From e79f30991cc404eb768138b163d3bb2e03240413 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 26 Dec 2009 22:27:56 +0100
+Subject: [PATCH] Do not use Wall on Sun Compiler
+
+---
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index e9109f0..9f1207b 100755
+--- a/configure
++++ b/configure
+@@ -14218,7 +14218,7 @@ fi
+ 
+ 
+ LIBS="${LIBS} ${LIBMCRYPT_LIBS}"
+-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall"
++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}"
+ 
+ 
+ { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+diff --git a/configure.in b/configure.in
+index 32512c8..d875c75 100644
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,7 @@ AM_GNU_GETTEXT([external])
+ *** in OpenPGP packets.))
+ 
+ LIBS="${LIBS} ${LIBMCRYPT_LIBS}"
+-CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS} -Wall"
++CFLAGS="${CFLAGS} ${LIBMCRYPT_CFLAGS}"
+ 
+ 
+ AC_C_CONST
+-- 
+1.6.5.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.