[SM-Commit] GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc (2fce0a7610a5f176a5725edbe1e056a9cf77dc81)

Jaka Kranjc scm at mail.sourcemage.org
Sun Mar 4 10:24:46 EST 2007


GIT changes to stable-rc-0.8 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 chat-im/gaim/DETAILS                              |   10 ++++------
 chat-im/gaim/HISTORY                              |    3 +++
 dev/null                                          |binary
 devel/expect/DETAILS                              |    2 +-
 devel/expect/HISTORY                              |    3 +++
 devel/tcc/BUILD                                   |    5 ++---
 devel/tcc/HISTORY                                 |    3 +++
 http/firefox/HISTORY                              |    3 +++
 http/firefox/INSTALL                              |    3 ++-
 http/seamonkey/DETAILS                            |    7 ++-----
 http/seamonkey/HISTORY                            |    5 ++++-
 http/seamonkey/seamonkey-1.1.1.source.tar.bz2.sig |binary
 http/seamonkey/seamonkey-1.1.source.tar.bz2.sig   |    0 
 x11/transset/HISTORY                              |    3 +++
 x11/transset/INSTALL                              |    3 ++-
 15 files changed, 32 insertions(+), 18 deletions(-)

New commits:
commit 2fce0a7610a5f176a5725edbe1e056a9cf77dc81
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    seamonkey: Updated to version 1.1.1. SECURITY_PATCH++
    (cherry picked from commit 2df0f0986419d11da1f4ee058419539eb992cc05)
    
    Conflicts:
    
    	http/seamonkey/HISTORY

commit 9feafe1f9f6a65a96d9ce0bd0690af3d13d6e930
Author: George Sherwood <chat at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    firefox: added sedit to fix firefox-plugin.pc.  Bug 13581.
    (cherry picked from commit 292a7f9e7d77105c79938a66282c13e69f097bb0)

commit 1b6b9a029e14345322d114bf8ed2c244fd09c726
Author: George Sherwood <chat at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    gaim: Fixed svn to use http vice https for svn.  Bug 12617.
    (cherry picked from commit 0ab27b2bda7116d823ec956af7b5a67a406f0148)

commit e0be58e378c07ee2409ded4e449cb380888a1323
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    expect: fixed SOURCE_HASH [Bug 10714]
    (cherry picked from commit 0119687ba5d31c1849eb1d7567075e67a2168d1c)

commit dd94a982ce17d2f743b3d45bfc4fe75b14541789
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    tcc: fix #12251
    (cherry picked from commit eff52eda09d35021d92a80d2a98690eb1af972b1)

commit d7f79cd7a0aa06b975bb5f62ace62613dbb7adee
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    transset: handle xorg-modular too #12286
    (cherry picked from commit 3b25205f9950c29cbc37f4fd79bd32f904bb8e03)

diff --git a/chat-im/gaim/DETAILS b/chat-im/gaim/DETAILS
index 8d9bac6..043478d 100755
--- a/chat-im/gaim/DETAILS
+++ b/chat-im/gaim/DETAILS
@@ -1,12 +1,10 @@
            SPELL=gaim
 if  [  "$GAIM_CVS"  ==  "y"  ]; then
-         VERSION=svn-20061111
+         VERSION=svn
           SOURCE=$SPELL-$VERSION.tar.bz2
-#  SOURCE_URL[0]=svn_https://svn.sourceforge.net/svnroot/gaim/trunk:gaim
-   SOURCE_URL[0]=http://www.beernabeer.com/$SOURCE
-# FORCE_DOWNLOAD=1
-#  SOURCE_IGNORE=volatile
-     SOURCE_HASH=sha512:9467f77c3b73ffead71b1d6bcbb0c25557081880027db4672c990ecdbc1e9b181ebd66b6a5180a215704dc8a776f92d0093cc34f48b9e07a8f2fa23839cd4787          
+   SOURCE_URL[0]=svn_http://gaim.svn.sourceforge.net/svnroot/gaim/trunk:gaim
+  FORCE_DOWNLOAD=1
+   SOURCE_IGNORE=volatile          
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
          VERSION=2.0.0beta6
diff --git a/chat-im/gaim/HISTORY b/chat-im/gaim/HISTORY
index d6a3ca1..350bc9a 100644
--- a/chat-im/gaim/HISTORY
+++ b/chat-im/gaim/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 George Sherwood <george at beernabeer.com>
+	* DETAILS: Fixed svn to work with http vice https. Bug 12617.
+
 2007-02-10 George Sherwood <george at beernabeer.com>
 	* DEPENDS: Added depends xml-parser-exapt. Bug 13515.
 
diff --git a/devel/expect/DETAILS b/devel/expect/DETAILS
index 910f319..c78977e 100755
--- a/devel/expect/DETAILS
+++ b/devel/expect/DETAILS
@@ -10,7 +10,7 @@ SOURCE3_DIRECTORY=$BUILD_DIRECTORY/tk$VE
     SOURCE_URL[0]=http://expect.nist.gov/src/$SOURCE
    SOURCE2_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE2
    SOURCE3_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE3
-      SOURCE_HASH=sha512:0d8947113f0bf32711b450655b4ee315d1531e3256aa8c6b6ad5ba37e332663ad3241905ca1c8f91b98fde8a45a0000f390843dd591228b1745384e7d538ad4b
+      SOURCE_HASH=sha512:692ceac0eea5f2e8f75c42217fab3b2e2c202b0c460a06d5986f56a81789fbe895032a1c50b7e7fb96fb0a3d3f52f8383e706cbd0b81aa0fe03fdcc8b3ae4143
      SOURCE2_HASH=sha512:d7d669a79219bc559083974508eeddc640e1738a56b8d14a4c6d65c9672684190efc2b1ed461141a2d170376581782ed7ffc540bb2d009921a1d1a08e96c6815
      SOURCE3_HASH=sha512:561b96df5e54642323e07ba5fb521dbe144e7c217dab8572be556c92161524ea7bb2f8519d543bd0bd3af2ccac6b7c482e2927c6b63279da5bab1c5906edda88
          WEB_SITE=http://expect.nist.gov
diff --git a/devel/expect/HISTORY b/devel/expect/HISTORY
index 5dbf2b5..2efc0d6 100644
--- a/devel/expect/HISTORY
+++ b/devel/expect/HISTORY
@@ -1,3 +1,6 @@
+2007-03-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: fixed SOURCE_HASH [Bug 10714]
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/devel/tcc/BUILD b/devel/tcc/BUILD
index c77a593..5e4ea7d 100755
--- a/devel/tcc/BUILD
+++ b/devel/tcc/BUILD
@@ -1,3 +1,2 @@
-  ./configure --prefix=${INSTALL_ROOT}/usr  \
-                       $OPTS                &&
-  make
+sed -i '/cpu="unknown"/ s,,if [[ '${SMGL_COMPAT_ARCHS[1]}' == ia32 ]]; then cpu="x86"; else cpu="unknown"; fi,' configure &&
+default_build
diff --git a/devel/tcc/HISTORY b/devel/tcc/HISTORY
index 541d5e8..ed1371b 100644
--- a/devel/tcc/HISTORY
+++ b/devel/tcc/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* BUILD: fix arch detection #12251; use default_build, fixed man path
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 991fbbd..e482f2f 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 George Sherwood <george at beernabeer.com>
+	* INSTALL: Added sedit to fix firefox-plugin.pc for nspr. Bug #13581
+
 2007-02-25 George Sherwood <george at beernabeer.com>
 	* INSTALL: Added patch for firefox-config to match how we install.
 	* firefox-config.patch: Added patch to get paths correct.
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 453322b..eb9e432 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -70,4 +70,5 @@ install  -m  755  -o  root  -g  root  $S
 # make the pkgconfig files reference the nspr from the standalone nspr spell
 sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc  &&
 sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc  &&
-sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc
+sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
+sedit "s/nspr/mozilla-nspr/" ${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 93ef3f2..25c7411 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,10 +1,7 @@
            SPELL=seamonkey
-         VERSION=1.1
+         VERSION=1.1.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-
-#     SOURCE_HASH=sha512:6fcb9455fa2c08b94b4011bb2604cf13dbb3a4fa218ed5e7b0923cd5b0912b87bff983a2d351eaba19c46436b15f3d01d22f59dd7e288beca0b93c76d55722e3
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
       SOURCE_URI=seamonkey/releases/$VERSION/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
@@ -21,7 +18,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozill
   SOURCE_URL[11]=ftp://ftp.free.fr/pub/Networking/www/Mozilla/$SOURCE_URI
   SOURCE_URL[12]=ftp://ftp.eunet.ie/mirrors/ftp.mozilla.org/pub/$SOURCE_URI
         WEB_SITE=http://www.mozilla.org/
-  SECURITY_PATCH=3
+  SECURITY_PATCH=4
          ENTERED=20010922
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 681c1e5..07e2413 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,4 +1,7 @@
-2007-01-24 Eric Sandall <eric at sandall.us>
+2007-03-04 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to version 1.1.1. SECURITY_PATCH++
+
+2007-01-24 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 1.1
 	* CONFIGURE: SEAMONKEY_CALENDAR is no longer available in seamonkey
 	  Do not query for SVG renderers
diff --git a/http/seamonkey/seamonkey-1.1.1.source.tar.bz2.sig b/http/seamonkey/seamonkey-1.1.1.source.tar.bz2.sig
new file mode 100644
index 0000000..921d1a8
Binary files /dev/null and b/http/seamonkey/seamonkey-1.1.1.source.tar.bz2.sig differ
diff --git a/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig b/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig
deleted file mode 100644
index e13cbf8..0000000
Binary files a/http/seamonkey/seamonkey-1.1.source.tar.bz2.sig and /dev/null differ
diff --git a/x11/transset/HISTORY b/x11/transset/HISTORY
index f4dace6..b7cc6e4 100644
--- a/x11/transset/HISTORY
+++ b/x11/transset/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* INSTALL: handle xorg-modular too #12286
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/x11/transset/INSTALL b/x11/transset/INSTALL
index 9377da8..1132c5a 100755
--- a/x11/transset/INSTALL
+++ b/x11/transset/INSTALL
@@ -1 +1,2 @@
-install  -m  755  transset  /usr/bin/X11
+local path=$(hash X; hash -t X) &&
+install -m 755 transset $INSTALL_ROOT${path%X}



More information about the SM-Commit mailing list