sync ./gnustep-libs/gnustep-base from stable-rc 0.4

7 files changed, 62 insertions, 45 deletions

diff --git a/gnustep-libs/gnustep-base/BUILD b/gnustep-libs/gnustep-base/BUILD
deleted file mode 100755
index 97f651d372..0000000000
--- a/gnustep-libs/gnustep-base/BUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-if [ -f /etc/profile.d/GNUstep.sh ];
-then
-    . /etc/profile.d/GNUstep.sh
-else
-    message "${ERROR_COLOR}Unable to find /etc/profile.d/GNUstep.sh"
-    message "Rebuild gnustep-make${DEFAULT_COLOR}"
-    exit 1
-fi                                                                    &&
-
-./configure                                                           \
-    $OPTS                                                             &&
-
-make
-
-if [ "$DOCU" == "y" ]; 
-then
-    PATH=$PATH:`pwd`/Tools/shared_obj                                 &&
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/Source/shared_obj          &&
-    cd Documentation                                                  &&
-    make_single                                                       &&
-    make                                                              &&
-    make_normal                                                       &&
-    cd ../
-fi
-
diff --git a/gnustep-libs/gnustep-base/CONFIGURE b/gnustep-libs/gnustep-base/CONFIGURE
index 6d3ac9bbcc..869d3e600b 100755
--- a/gnustep-libs/gnustep-base/CONFIGURE
+++ b/gnustep-libs/gnustep-base/CONFIGURE
@@ -1 +1,2 @@
-config_query  DOCU     "Build and install documentation?" y
+config_query        GNUSTEP_BUILD_DOC "Build and install documentation?" n
+config_query_option GNUSTEP_SSL       "Enable ssl support"               y "--enable-openssl"
diff --git a/gnustep-libs/gnustep-base/DEPENDS b/gnustep-libs/gnustep-base/DEPENDS
index 35075ec6aa..9b38be30d7 100755
--- a/gnustep-libs/gnustep-base/DEPENDS
+++ b/gnustep-libs/gnustep-base/DEPENDS
@@ -5,9 +5,13 @@ optional_depends libxslt        &&
 optional_depends openssl        &&
 optional_depends gmp            &&
 
-if [ "$DOCU" == "y" ]; 
+if [ "$GNUSTEP_BUILD_DOC" == "y" ] 
 then
-	depends tetex           &&
-	depends texinfo
+    depends tetex           &&
+    depends texinfo
 fi
 
+if [ "$GNUSTEP_SSL" == "y" ]
+then
+    depends openssl
+fi
diff --git a/gnustep-libs/gnustep-base/DETAILS b/gnustep-libs/gnustep-base/DETAILS
index 899d90ba6f..de64c874c5 100755
--- a/gnustep-libs/gnustep-base/DETAILS
+++ b/gnustep-libs/gnustep-base/DETAILS
@@ -1,11 +1,12 @@
            SPELL=gnustep-base
-         VERSION=1.11.0
+         VERSION=1.11.2
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$SPELL-$VERSION
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.gnustep.org/pub/gnustep/core/$SOURCE
         WEB_SITE=http://www.gnustep.org
-          MD5[0]=27d42b14ef76ead21c0e69de13467d64
-      LICENSE[0]=GPL
+     SOURCE_HASH=sha512:73753f7e3a7e51f0f33f876aec949774dd73645c72e5300a3349d941a6423162e84fbe8beca0302d4f8cf943b5a40f4d76648713de509b646a52d20af032eaef
+      LICENSE[0]=LGPL
          ENTERED=20050908
          UPDATED=20050908
        BUILD_API=2
diff --git a/gnustep-libs/gnustep-base/HISTORY b/gnustep-libs/gnustep-base/HISTORY
index 11a53d2577..5ffb074d1d 100644
--- a/gnustep-libs/gnustep-base/HISTORY
+++ b/gnustep-libs/gnustep-base/HISTORY
@@ -1,3 +1,39 @@
+2006-01-24 Maurizio Boriani <baux@sourcemage.org>
+	* DETAILS: Fix license field, close bug#10444.
+
+2005-01-13 Maurizio Boriani <baux@sourcemage.org>
+	* BUILD: Remove, use default_build.
+	* INSTALL: Likewise.
+	* UP_TRIGGERS: Fix var check.
+	* CONFIGURE: Fix build doc var and add ssl.
+	* DEPENDS: Likewise.
+	* DETAILS: Add patchlevel to force update.
+
+2005-12-30 Maurizio Boriani <baux@sourcemage.org>
+	* rebuild_gnustepworld: Renamed into UP_TRIGGERS and fixed.
+	* TRIGGERS: Removed.
+	* CONFIGURE: Remove ask for rebuild.
+
+2005-12-29 Maurizio Boriani <baux@sourcemage.org>
+	* BUILD, INSTALL: Move doc build after lib and progr installation due to
+	a linkage loop with old gnustap-base version.
+	* CONFIGURE: If installed version and 'going to install' version differs
+	ask for gnustep world rebuild.
+	* TRIGGERS: New, call if needed rebuild_gnustepworld.
+	* rebuild_gnustepworld: New, search gnustep installed spells and cast 'em.
+
+2005-12-27 Maurizio Boriani <baux@sourcemage.org>
+	* DETAILS: Bump to release 1.11.2.
+
+2005-11-29 Seth Woolley <seth@tautology.org>
+	* DETAILS: MD5 -> SHA512
+
+2005-11-23 Maurizio Boriani <baux@sourcemage.org>
+	* DETAILS: Fix source directory path.
+
+2005-10-03 Maurizio Boriani <baux@sourcemage.org>
+	* DETAILS: Bump to release 1.11.1.
+
 2005-08-31 Maurizio Boriani <baux@sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, CONFIGURE, INSTALL: created the 
 	  spell.
diff --git a/gnustep-libs/gnustep-base/INSTALL b/gnustep-libs/gnustep-base/INSTALL
deleted file mode 100755
index 85c14422af..0000000000
--- a/gnustep-libs/gnustep-base/INSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install           
-
-
-# documentation must be installed after gnustep-base due needed 
-# dependences.
-if [ "$DOCU" == "y" ]; 
-then
-    cd Documentation                                                 &&
-    make_single                                                      &&
-    make GNUSTEP_INSTALLATION_DIR=$GNUSTEP_SYSTEM_ROOT install       &&
-    make_normal
-fi
diff --git a/gnustep-libs/gnustep-base/UP_TRIGGERS b/gnustep-libs/gnustep-base/UP_TRIGGERS
new file mode 100644
index 0000000000..4c9888c030
--- /dev/null
+++ b/gnustep-libs/gnustep-base/UP_TRIGGERS
@@ -0,0 +1,12 @@
+if [ -z $(installed_version gnustep-base) ]
+then
+    return
+fi
+
+if [ $(installed_version gnustep-base) != $VERSION ]
+then
+    for  spell  in `gaze depends gnustep-base 2|cut -d":" -f1` 
+    do
+      up_trigger $spell cast_self	
+    done
+fi