gnustep-gnumail: version update and some cleanup

5 files changed, 51 insertions, 58 deletions

diff --git a/gnustep-apps/gnustep-gnumail/BUILD b/gnustep-apps/gnustep-gnumail/BUILD
index 6947f2b6f7..f59001bab6 100755
--- a/gnustep-apps/gnustep-gnumail/BUILD
+++ b/gnustep-apps/gnustep-gnumail/BUILD
@@ -1,35 +1,24 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
+make_single                  &&
+default_build                &&
+if [[ "$GMEMO" == "y" ]];
 then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"  &&
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"                    &&
-    return 1
-fi                                                                    &&
+    pushd Bundles/Emoticon   &&
+    default_build            &&
+    popd
+fi                           &&
 
-make_single
-make                                                                  
-
-if [ "$GMEMO" == "y" ];
-then
-    cd Bundles/Emoticon                                               &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
-
-if [ "$GMFAC" == "y" ];
+if [[ "$GMFAC" == "y" ]];
 then
-    cd Bundles/Face                                                   &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
+    pushd Bundles/Face       &&
+    default_build            &&
+    popd
+fi                           &&
 
 
-if [ "$GMPGP" == "y" ];
+if [[ "$GMPGP" == "y" ]];
 then
-    cd Bundles/PGP                                                    &&
-    make                                                              &&
-    cd ../../
-fi                                                                    &&
-
+    pushd Bundles/PGP        &&
+    default_build            &&
+    popd
+fi                           &&
 make_normal
diff --git a/gnustep-apps/gnustep-gnumail/DEPENDS b/gnustep-apps/gnustep-gnumail/DEPENDS
index a3de05a9b9..f85e04bbf7 100755
--- a/gnustep-apps/gnustep-gnumail/DEPENDS
+++ b/gnustep-apps/gnustep-gnumail/DEPENDS
@@ -1,4 +1,8 @@
-depends          gnustep-gui                                    &&
-depends	         gnustep-pantomime                              &&
-depends          gnustep-addressbook                            &&
-optional_depends gnustep-steptalk "" "" "Add scripting support" 
+depends gnustep-gui                &&
+depends gnustep-make               &&
+depends gnustep-pantomime          &&
+depends gnustep-addressbook        &&
+optional_depends gnustep-steptalk  \
+                 ""                \
+                 ""                \
+                 "Add scripting support" 
diff --git a/gnustep-apps/gnustep-gnumail/DETAILS b/gnustep-apps/gnustep-gnumail/DETAILS
index 5b4c87c24e..ffd7a49b5a 100755
--- a/gnustep-apps/gnustep-gnumail/DETAILS
+++ b/gnustep-apps/gnustep-gnumail/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gnustep-gnumail
-         VERSION=1.2.0pre1
+         VERSION=1.2.0pre3
           SOURCE=GNUMail-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/GNUMail
    SOURCE_URL[0]=http://www.collaboration-world.com/gnumail.data/releases/Stable/$SOURCE
         WEB_SITE=http://www.collaboration-world.com
-     SOURCE_HASH=sha512:0baee1e83dbcc030f942e0ae7eba21c1999ca76ba7afd8bb5645780f75f720411e01a8a104f43160cdb8014b57d57bc81c9ff4f412fcdaba6fd039ea8db64f6e
+     SOURCE_HASH=sha512:22745bec547622106d033900ffbb16638d397ddc5286013b67d2413d9df3cc6dc71944ab1b9836ac453464db13e261dc8bd605d823aefcc8c1169004c04d0a95
       LICENSE[0]=GPL
          ENTERED=20050908
         KEYWORDS="reader gnustep mail"
diff --git a/gnustep-apps/gnustep-gnumail/HISTORY b/gnustep-apps/gnustep-gnumail/HISTORY
index 187b3cf541..4c2e33b05b 100644
--- a/gnustep-apps/gnustep-gnumail/HISTORY
+++ b/gnustep-apps/gnustep-gnumail/HISTORY
@@ -1,3 +1,10 @@
+2007-04-17 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS: minor cleanup
+	* DEPENDS: missing a dependency
+	* PRE_BUILD: added to fix some paths
+	* BUILD: cleanup
+	* INSTALL: cleanup
+
 2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnustep-apps/gnustep-gnumail/INSTALL b/gnustep-apps/gnustep-gnumail/INSTALL
index 88670bdf68..39c1279f57 100755
--- a/gnustep-apps/gnustep-gnumail/INSTALL
+++ b/gnustep-apps/gnustep-gnumail/INSTALL
@@ -1,28 +1,21 @@
-export TAR_OPTIONS="--no-same-owner"
-
-make_single                                                           &&
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install            &&
-
-if [ "$GMEMO" == "y" ];
+make_single                  &&
+default_install              &&
+if [[ "$GMEMO" == "y" ]];
 then
-    cd Bundles/Emoticon                                               &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
-    cd ../../
-fi                                                                    &&
-
-if [ "$GMFAC" == "y" ];
+    pushd Bundles/Emoticon   &&
+    default_install          &&
+    popd
+fi                           &&
+if [[ "$GMFAC" == "y" ]];
 then
-    cd Bundles/Face                                                   &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        && 
-    cd ../../
-fi                                                                    &&
-
-
-if [ "$GMPGP" == "y" ];
+    pushd Bundles/Face       &&
+    default_install          &&
+    popd
+fi                           &&
+if [[ "$GMPGP" == "y" ]];
 then
-    cd Bundles/PGP                                                    &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install        &&
-    cd ../../
-fi                                                                    &&
-
+    pushd Bundles/PGP        &&
+    default_install          &&
+    popd
+fi                           &&
 make_normal