diff options
| author | Pol Vinogradov | 2007-05-01 03:03:31 +0500 |
|---|---|---|
| committer | Pol Vinogradov | 2007-05-01 03:03:31 +0500 |
| commit | 1b24d7d291c3e38501be321c8616b344254a6e31 (patch) | |
| tree | 4f3acb6da6730c545986a73d4a1c28cbf4b0de08 | |
| parent | a6e094332877da0d87ab990399bebd0617d52a6e (diff) | |
| parent | 89ed2ab1e727c84aec94e7413ac09f0fce73ccb0 (diff) | |
Merge branch 'master' of git+ssh://pol@scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | gnome2-apps/gnome-power-manager/DEPENDS | 2 | ||||
| -rw-r--r-- | gnome2-apps/gnome-power-manager/HISTORY | 3 | ||||
| -rwxr-xr-x | science/yorick/BUILD | 6 | ||||
| -rwxr-xr-x | science/yorick/DETAILS | 9 | ||||
| -rw-r--r-- | science/yorick/HISTORY | 6 | ||||
| -rwxr-xr-x | science/yorick/INSTALL | 8 |
6 files changed, 25 insertions, 9 deletions
diff --git a/gnome2-apps/gnome-power-manager/DEPENDS b/gnome2-apps/gnome-power-manager/DEPENDS index edd893165a..f41e5e4211 100755 --- a/gnome2-apps/gnome-power-manager/DEPENDS +++ b/gnome2-apps/gnome-power-manager/DEPENDS @@ -3,7 +3,7 @@ depends hal && depends libglade2 && optional_depends gnome-keyring \ - "--enable-keyring" \ + "--enable-keyring" \ "--disable-keyring" \ "Enable gnome-keyring use?" && diff --git a/gnome2-apps/gnome-power-manager/HISTORY b/gnome2-apps/gnome-power-manager/HISTORY index 2472556ee2..1f9b163c42 100644 --- a/gnome2-apps/gnome-power-manager/HISTORY +++ b/gnome2-apps/gnome-power-manager/HISTORY @@ -1,3 +1,6 @@ +2007-04-30 David Brown <dmlb2000@gmail.com> + * DEPENDS: escaping a space at the end of the line didn't quite work + 2007-04-10 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 2.18.2 * DEPENDS: added gnome-keyring diff --git a/science/yorick/BUILD b/science/yorick/BUILD index 5cf07098cc..215ec89ee7 100755 --- a/science/yorick/BUILD +++ b/science/yorick/BUILD @@ -1,3 +1,5 @@ -make prefix=/usr ysite && -make config && +./configure && +mkdir -p ${INSTALL_ROOT}/usr/share/yorick && +sed -i -r "s:(Y_SITE=).*:\1/usr/share/yorick:" Make.cfg && +sed -i -r "s:(Y_HOME=).*:\1/usr/share/yorick:" Make.cfg && make diff --git a/science/yorick/DETAILS b/science/yorick/DETAILS index f2714fbc66..65c85bc345 100755 --- a/science/yorick/DETAILS +++ b/science/yorick/DETAILS @@ -1,9 +1,10 @@ SPELL=yorick - VERSION=1.6.02 + VERSION=2.1.01 SOURCE=$SPELL-$VERSION.tgz -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-1.6 - SOURCE_URL[0]=ftp://ftp-icf.llnl.gov/pub/Yorick/$SOURCE - SOURCE_HASH=sha512:82facfe29acf3b272e2c41a9c91f3d796b471f6a7e7d0a2c75eaca918af503364e7c8d49ea6e2f7d339a4a887669d7184c77395f926aeb4a38183a348c4c45b8 +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-2.1 + #SOURCE_URL[0]=ftp://ftp-icf.llnl.gov/pub/Yorick/$SOURCE + SOURCE_URL[0]=http://www.maumae.net/yorick/${SOURCE} + SOURCE_HASH=sha512:c9a40f0733462465b82fa87e52009cf3c6c133996929475bc6751f741accf6a4d96808e4af4aef9b27b12836301af5a6b0f144fb1f6c7324cc51ef4cd48acfc9 WEB_SITE[0]=http://www.maumae.net/yorick WEB_SITE[1]=ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html LICENSE[0]=ftp://ftp-icf.llnl.gov/pub/Yorick/doc/copyright.html diff --git a/science/yorick/HISTORY b/science/yorick/HISTORY index fc16ca7f54..09fcce182e 100644 --- a/science/yorick/HISTORY +++ b/science/yorick/HISTORY @@ -1,3 +1,9 @@ +2007-04-30 Mathieu Lonjaret <lejatorn@sourcemage.org> + * INSTALL: use TRACK_ROOT when ln -s + +2007-04-30 Mathieu Lonjaret <lejatorn@sourcemage.org> + * BUILD, DETAILS, INSTALL: update to 2.1.01 and some rework. + 2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org> * INSTALL: use TRACK_ROOT when linking #9163 diff --git a/science/yorick/INSTALL b/science/yorick/INSTALL index 9e0e2c0e1f..6b0603ff22 100755 --- a/science/yorick/INSTALL +++ b/science/yorick/INSTALL @@ -1,2 +1,6 @@ -default_install && -ln -s $TRACK_ROOT/usr/lib/yorick/1.6/bin/* /usr/bin +default_install && +ln -s ${TRACK_ROOT}/usr/share/yorick/bin/yorick \ +${INSTALL_ROOT}/usr/bin/yorick && +ln -s ${TRACK_ROOT}/usr/share/yorick/bin/gist \ +${INSTALL_ROOT}/usr/bin/gist + |