[SM-Commit] GIT changes to master grimoire by David Kowis (696ee9f684db3bcb5f4bb2d3926cc8a9f178d079)

David Kowis scm at mail.sourcemage.org
Wed Aug 16 23:16:11 EDT 2006


GIT changes to master grimoire by David Kowis <dkowis at shlrm.org>:

 mail/amavisd-new/DETAILS |    4 ++--
 mail/amavisd-new/HISTORY |    3 +++
 mail/anubis/DETAILS      |   19 +++++++++++++------
 mail/anubis/HISTORY      |    5 +++++
 mail/anubis/PREPARE      |    7 +++++--
 mail/anubis/PRE_BUILD    |    8 +++++---
 6 files changed, 33 insertions(+), 13 deletions(-)

New commits:
commit 696ee9f684db3bcb5f4bb2d3926cc8a9f178d079
Author: David Kowis <dkowis at shlrm.org>
Commit: David Kowis <dkowis at shlrm.org>

    amavisd-new
    
    Version bumped to the latest

commit fe75b30859a73dcae4ffefda39dc45866ce8071b
Author: David Kowis <dkowis at shlrm.org>
Commit: David Kowis <dkowis at shlrm.org>

    anubis
    
    Added real version, so you don't always have to use CVS

diff --git a/mail/amavisd-new/DETAILS b/mail/amavisd-new/DETAILS
index 8a7e764..e1843d4 100755
--- a/mail/amavisd-new/DETAILS
+++ b/mail/amavisd-new/DETAILS
@@ -1,9 +1,9 @@
            SPELL=amavisd-new
-         VERSION=2.4.1
+         VERSION=2.4.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.ijs.si/software/amavisd/$SOURCE
-     SOURCE_HASH=sha512:c9429483611c39be33e145c649ea2da370e3dd2fbf5f105d6060b1810f473e934de71c340f49bb747bd049307df947bdf1c5ec85bed48c76bf5ea2f0fd107266
+     SOURCE_HASH=sha512:3a944af4c3b97ed99c377bb749ca1102535f7aa683a61f976f5aa8f804ead0b5e2fd95d987c82c3ef41e44e375ae52af49d2fac3a6f271f25fc655d26d25785f
         WEB_SITE=http://www.ijs.si/software/amavisd/
          ENTERED=20050114
          UPDATED=20050114
diff --git a/mail/amavisd-new/HISTORY b/mail/amavisd-new/HISTORY
index 97efa5b..254ac58 100644
--- a/mail/amavisd-new/HISTORY
+++ b/mail/amavisd-new/HISTORY
@@ -1,3 +1,6 @@
+2006-08-16 David Kowis <dkowis at shlrm.org>
+	* DETAILS: version bumped to 2.4.2
+
 2006-07-28 David Kowis <dkowis at shlrm.org>
 	* FINAL: created and moved the /var/amavisd dir creation here
 	* INSTALL: removed dir creation from here per bug 12688
diff --git a/mail/anubis/DETAILS b/mail/anubis/DETAILS
index 50fe21c..de09893 100755
--- a/mail/anubis/DETAILS
+++ b/mail/anubis/DETAILS
@@ -1,13 +1,20 @@
            SPELL=anubis
-if [[ "${ANUBIS_CVS_AUTOUPDATE}" == "y" ]]
-then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=cvs
-fi
+if [[ "${ANUBIS_USE_CVS}" == "y" ]]; then
+	if [[ "${ANUBIS_CVS_AUTOUPDATE}" == "y" ]]
+	then
+		 VERSION=$(date +%Y%m%d)
+	else
+		 VERSION=cvs
+	fi
           SOURCE=${SPELL}-cvs.tar.bz2
    SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.savannah.gnu.org:/sources/anubis:anubis
    SOURCE_IGNORE=volatile
+else 
+         VERSION=4.0
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=ftp://ftp.gnu.org/gnu/anubis/$SOURCE-$VERSION
+     SOURCE_HASH=sha512:b5b0698425c498f1304771e5a6ce771a9f732794afab29342d546080719c6ead78324fb87fd6a65efbf3b14b81c5f9917968136b6947da3eb72fc31038e35f45
+fi
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://www.gnu.org/software/anubis/
          ENTERED=20051231
diff --git a/mail/anubis/HISTORY b/mail/anubis/HISTORY
index 1dcd97c..df510d9 100644
--- a/mail/anubis/HISTORY
+++ b/mail/anubis/HISTORY
@@ -1,3 +1,8 @@
+2006-08-16 David Kowis <dkowis at shlrm.org>
+	* DETAILS: added the real version...
+	* PRE_BUILD: made that fancy junk optional depending on cvs
+	* PREPARE: added cvs question wrapper
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/anubis/PREPARE b/mail/anubis/PREPARE
index c6f14cd..3d2b8de 100755
--- a/mail/anubis/PREPARE
+++ b/mail/anubis/PREPARE
@@ -1,2 +1,5 @@
-config_query ANUBIS_CVS_AUTOUPDATE \
-          "Automaticaly update the spell on sorcery queue/system-update?" "n"
+config_query ANUBIS_USE_CVS "Use the CVS version?" "n"
+if [[ "$ANUBIS_USE_CVS" == "y" ]]; then
+	config_query ANUBIS_CVS_AUTOUPDATE \
+			  "Automaticaly update the spell on sorcery queue/system-update?" "n"
+fi
diff --git a/mail/anubis/PRE_BUILD b/mail/anubis/PRE_BUILD
index caaff97..f486ea4 100755
--- a/mail/anubis/PRE_BUILD
+++ b/mail/anubis/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build                   &&
-cd ${SOURCE_DIRECTORY}              &&
-sedit "s:testsuite::g" Makefile.am  &&
-NOCONFIGURE=1 ./autogen.sh
+if [[ "${ANUBIS_USE_CVS}" == "y" ]]; then
+	cd ${SOURCE_DIRECTORY}              &&
+	sedit "s:testsuite::g" Makefile.am  &&
+	NOCONFIGURE=1 ./autogen.sh
+fi



More information about the SM-Commit mailing list