[SM-Commit] GIT changes to test grimoire by David Kowis (fa0a51d7ba07336d798741b08d535f1ac65b743e)

David Kowis scm at mail.sourcemage.org
Tue May 30 14:45:05 EDT 2006


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

 mail/courier/HISTORY              |    3 +++
 mail/courier/PREPARE              |   15 ---------------
 mail/cyrus-imapd/DEPENDS          |    6 +-----
 mail/cyrus-imapd/HISTORY          |    7 +++++++
 mail/cyrus-imapd/PRE_BUILD        |    3 +++
 mail/cyrus-imapd/config.sub.patch |   12 ++++++++++++
 mail/getmail/DETAILS              |    4 ++--
 mail/getmail/HISTORY              |    3 +++
 mail/nmh/DEPENDS                  |    1 +
 mail/nmh/DETAILS                  |    4 ++--
 mail/nmh/HISTORY                  |    4 ++++
 mail/pinepgp/DEPENDS              |    4 ++--
 mail/pinepgp/HISTORY              |    3 +++
 mail/sb/BUILD                     |    9 +--------
 mail/sb/DETAILS                   |   11 ++++-------
 mail/sb/HISTORY                   |    8 ++++++++
 mail/sb/INSTALL                   |    2 ++
 mail/view-x-face/DEPENDS          |    2 +-
 mail/view-x-face/HISTORY          |    3 +++
 19 files changed, 62 insertions(+), 42 deletions(-)

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

    Updated to BUILD API2

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

    Fixed MD5 anomaly and moved to SOURCE_HASH

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

    Fixing dependency on cyrus-sasl. It's no longer optional

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

    Adding config.sub patch to fix bug 11194

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

    Fixing bug 11089

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

    Version bumping to 1.2

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

    Added dependency on db

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

    Version bump of getmail

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

    Fixed dependency on xv to point to z-rejected

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

    Added dependency on pine-client within z-rejected

diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 19215d4..2e57ad1 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2006-05-03 David Kowis <dkowis at shlrm.org>
+	* PREPARE: removed. got rid of warning
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/courier/PREPARE b/mail/courier/PREPARE
deleted file mode 100755
index 965efaf..0000000
--- a/mail/courier/PREPARE
+++ /dev/null
@@ -1,15 +0,0 @@
-message ""
-message "${PROBLEM_COLOR}If you are upgrading ${SPELL}, and depending on the version you are currently running, this could be a major upgrade which might break things."
-message ""
-message "See ${DEFAULT_COLOR}http://www.courier-mta.org/install.html#upgrade${PROBLEM_COLOR} for more information."
-message ""
-message "Please make sure you have backed up your data and configuration files, and that you have run a test install before putting this into a production environment."
-message ""
-message "Consider this to be your official warning.${DEFAULT_COLOR}"
-message ""
-
-if  !  query  "Are you comfortable with continuing the install?"  n
-then
-    return  1
-fi
-
diff --git a/mail/cyrus-imapd/DEPENDS b/mail/cyrus-imapd/DEPENDS
index 70eeef9..a8b1bfb 100755
--- a/mail/cyrus-imapd/DEPENDS
+++ b/mail/cyrus-imapd/DEPENDS
@@ -1,3 +1,4 @@
+depends cyrus-sasl &&
 optional_depends  db                             \
                   "--with-dbd"                   \
                   "--without-dbd"                \
@@ -13,11 +14,6 @@ optional_depends  openssl               
                   "--without-openssl"          \
                   "to enable openSSL support"  &&
 
-optional_depends  cyrus-sasl                      \
-                  "--with-sasl"                   \
-                  "--without-sasl"                \
-                  "to enable Cyrus-sasl support"  &&
-
 optional_depends  tcp_wrappers                 \
                   "--with-libwrap"             \
                   "--without-libwrap"          \
diff --git a/mail/cyrus-imapd/HISTORY b/mail/cyrus-imapd/HISTORY
index d145b35..a536e96 100644
--- a/mail/cyrus-imapd/HISTORY
+++ b/mail/cyrus-imapd/HISTORY
@@ -1,3 +1,10 @@
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* DEPENDS: fixed dependency on cyrus-sasl, not optional
+
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* PRE_BUILD: added config.sub patch for x86_64
+	* config.sub.patch: patch
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/cyrus-imapd/PRE_BUILD b/mail/cyrus-imapd/PRE_BUILD
new file mode 100755
index 0000000..f99cb1a
--- /dev/null
+++ b/mail/cyrus-imapd/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build       &&
+cd ${SOURCE_DIRECTORY}  &&
+patch -p0 < ${SCRIPT_DIRECTORY}/config.sub.patch
diff --git a/mail/cyrus-imapd/config.sub.patch b/mail/cyrus-imapd/config.sub.patch
new file mode 100644
index 0000000..c3569a1
--- /dev/null
+++ b/mail/cyrus-imapd/config.sub.patch
@@ -0,0 +1,12 @@
+--- config.sub.old	2000-02-02 16:53:22.000000000 -0800
++++ config.sub	2005-04-04 23:12:05.000000000 -0700
+@@ -632,6 +631,9 @@
+ 	pentiumii-* | pentium2-*)
+ 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	x86_64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
diff --git a/mail/getmail/DETAILS b/mail/getmail/DETAILS
index f44d8df..beafff4 100755
--- a/mail/getmail/DETAILS
+++ b/mail/getmail/DETAILS
@@ -1,10 +1,10 @@
            SPELL=getmail
        BUILD_API=2
-         VERSION=4.4.4
+         VERSION=4.6.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://pyropus.ca/software/getmail/old-versions/$SOURCE
-     SOURCE_HASH=sha512:5c846fc4719d8577c8e8a1f8dddc7e9ea6cb6e1f3069a920d6b6601a1342413dfd87c5aa75dbb9c21d5f1d06e4ccc92dd9b39631425d26df5aa007aea5d462bd
+     SOURCE_HASH=sha512:9b80547554e9fd54c33a250359c386145deb7e5c4c6c5074efef1fc3421cd27c445e5f433979f31437be933bc80b8f9a39f7acb3a8f36fb083c3545a99d87a7f
         WEB_SITE=http://pyropus.ca/software/getmail
          LICENSE=GPL
          ENTERED=20020716
diff --git a/mail/getmail/HISTORY b/mail/getmail/HISTORY
index da3733b..d695738 100644
--- a/mail/getmail/HISTORY
+++ b/mail/getmail/HISTORY
@@ -1,3 +1,6 @@
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* DETAILS: version bumped
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/nmh/DEPENDS b/mail/nmh/DEPENDS
new file mode 100755
index 0000000..b35df04
--- /dev/null
+++ b/mail/nmh/DEPENDS
@@ -0,0 +1 @@
+depends db
diff --git a/mail/nmh/DETAILS b/mail/nmh/DETAILS
index 944cfd4..7a03209 100755
--- a/mail/nmh/DETAILS
+++ b/mail/nmh/DETAILS
@@ -1,9 +1,9 @@
            SPELL=nmh
-         VERSION=1.1
+         VERSION=1.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://savannah.nongnu.org/download/nmh/$SOURCE
-     SOURCE_HASH=sha512:06ffd0de142d2616d4485e0ee7399541c73b6b22563da3a0194e4c99048633002a831eb5ac2e64924ae781393ad173de599612d34192d3d7f89af51ecc35f0a4
+     SOURCE_HASH=sha512:e350a75d5313b37259a134f902c763178006459ba5df022337ae6429ad8eaab8e949cebccb60cd23fb8b496a0655448d8275e312edb3e35eae698811355a359e
         WEB_SITE=http://www.nongnu.org/nmh/
          ENTERED=20040827
          UPDATED=20040827
diff --git a/mail/nmh/HISTORY b/mail/nmh/HISTORY
index 88ef79b..d6aa7bb 100644
--- a/mail/nmh/HISTORY
+++ b/mail/nmh/HISTORY
@@ -1,3 +1,7 @@
+2006-05-20 David Kowis <dkowis at shlrm.org>
+	* DEPENDS: added dependency on db
+	* DETAILS: version bumped to 1.2
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/pinepgp/DEPENDS b/mail/pinepgp/DEPENDS
index de0eb67..0bca060 100755
--- a/mail/pinepgp/DEPENDS
+++ b/mail/pinepgp/DEPENDS
@@ -1,5 +1,5 @@
-depends  pine-client                &&
-depends  gnupg        '--with-gpg'  &&
+depends  pine-client '' '' z-rejected  &&
+depends  gnupg        '--with-gpg'     &&
 
 optional_depends  mktemp                                 \
                   '--with-mktemp'                        \
diff --git a/mail/pinepgp/HISTORY b/mail/pinepgp/HISTORY
index 4c56de2..18c154d 100644
--- a/mail/pinepgp/HISTORY
+++ b/mail/pinepgp/HISTORY
@@ -1,3 +1,6 @@
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* DEPENDS: fixed pine-client depends to point to z-rejected
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/sb/BUILD b/mail/sb/BUILD
index 5985710..27ba77d 100755
--- a/mail/sb/BUILD
+++ b/mail/sb/BUILD
@@ -1,8 +1 @@
-(
-
-    prepare_install             &&
-
-    cp  -r  $SOURCE_DIRECTORY   \
-            /usr/share/sb
-
-) > $C_FIFO 2>&1
+true
diff --git a/mail/sb/DETAILS b/mail/sb/DETAILS
index 991dc6a..b4aaf43 100755
--- a/mail/sb/DETAILS
+++ b/mail/sb/DETAILS
@@ -1,20 +1,17 @@
            SPELL=sb
-         VERSION=1.5
-          SOURCE=$SPELL.tar.Z
+       BUILD_API=2
+         VERSION=2.2
+          SOURCE=$SPELL.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=ftp://ftp.spambouncer.org/$SOURCE
    SOURCE_URL[1]=ftp://download.sourcemage.org/pub/linux/distributions/sourcemage/mirror/$SOURCE
-          MD5[0]=9b78bd35bc3adc48cc7e113a08ab9dee
+     SOURCE_HASH=sha512:80133f027488e3390abdf58667bbfd3f95c1d42b230f7af00324792d6918c7b851bbf06f4399fe54c50a263a7f2f5718109e3bb98b58c6ccfeec67ed29073073
         WEB_SITE=http://www.spambouncer.org
          ENTERED=20020717
          UPDATED=20020717
-      MAINTAINER=bluebird at optushome.com.au
          LICENSE=GPL
         KEYWORDS="mail"
            SHORT="A procmail based spam filter and auto LART"
-    MENU_ITEM[0]=${SPELL}
-    MENU_EXEC[0]=${SPELL}
-    MENU_DESC[0]=${SHORT}
 cat << EOF
 
 What Does the SpamBouncer Do?
diff --git a/mail/sb/HISTORY b/mail/sb/HISTORY
index adfe5a2..0badfe9 100644
--- a/mail/sb/HISTORY
+++ b/mail/sb/HISTORY
@@ -1,3 +1,11 @@
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* INSTALL: created a BUILD_API=2 INSTALL
+	* BUILD: true'd out so it does nothing
+	* DETAILS: upgraded to BUILD_API=2
+
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* DETAILS: fixed MD5 anomaly by switching to SOURCE_HASH
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/mail/sb/INSTALL b/mail/sb/INSTALL
new file mode 100755
index 0000000..8303eaa
--- /dev/null
+++ b/mail/sb/INSTALL
@@ -0,0 +1,2 @@
+	mkdir -p /usr/share/sb     &&
+    cp  -r  $SOURCE_DIRECTORY /usr/share/sb
diff --git a/mail/view-x-face/DEPENDS b/mail/view-x-face/DEPENDS
index e489000..60bff0f 100755
--- a/mail/view-x-face/DEPENDS
+++ b/mail/view-x-face/DEPENDS
@@ -1,3 +1,3 @@
 depends compface &&
 depends netpbm   &&
-depends xv
\ No newline at end of file
+depends xv '' '' z-rejected
diff --git a/mail/view-x-face/HISTORY b/mail/view-x-face/HISTORY
index b724eed..83e6a94 100755
--- a/mail/view-x-face/HISTORY
+++ b/mail/view-x-face/HISTORY
@@ -1,3 +1,6 @@
+2006-05-30 David Kowis <dkowis at shlrm.org>
+	* DEPENDS: fixed depends on xv to point to z-rejected
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list