Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (70d95a2a1b86e130ecbf4c7257d8a31482c59b4a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (70d95a2a1b86e130ecbf4c7257d8a31482c59b4a)
  • Date: Thu, 26 Oct 2006 15:35:15 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

x11-libs/wine/BUILD | 7 ++++++-
x11-libs/wine/DEPENDS | 4 ++--
x11-libs/wine/DETAILS | 24 +++++++++++-------------
x11-libs/wine/HISTORY | 8 ++++++++
x11-libs/wine/PREPARE | 16 +++++++++++++---
5 files changed, 40 insertions(+), 19 deletions(-)

New commits:
commit 2f1cdd9c2fa64cb8691b059b5e803c2f825dd7e8
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wine: Changed cvs to git, replaced spell_ok check with is_depends_enabled.

diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index ad468aa..850d8a5 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -8,6 +8,11 @@ # touch non-existant file
touch programs/winetest/tests.rc &&
default_build &&

-if spell_ok docbook-utils; then
+#
+## Remove this after is_depends_enabled is integrated to stable sorcery.
+#
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL docbook-utils; then
make -C documentation
fi
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 22b80c4..1e29b36 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -4,8 +4,8 @@ depends fontforge &&
depends jpeg &&
depends LIBGIF &&

-if [ "$WINE_CVS" == "y" ]; then
- depends CVS
+if [[ $WINE_VCS == y ]]; then
+ depends git
fi &&

optional_depends X11-LIBS \
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 6ae4c63..ac489c2 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,12 +1,12 @@
SPELL=wine
-if [ "$WINE_CVS" == "y" ]; then
- if [ "$WINE_CVS_AUTOUPDATE" == "y" ]; then
+if [[ $WINE_VCS == y ]]; then
+ if [[ $WINE_VCS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=cvs
+ VERSION=git
fi
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=cvs://:pserver:cvs:cvs AT cvs.winehq.org:/home/wine:wine
+ SOURCE_URL[0]=git://source.winehq.org/git/wine.git:wine
SOURCE_IGNORE=volatile
else
VERSION=0.9.23
@@ -26,13 +26,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
KEYWORDS="emulator x11 libs"
SHORT="Wine Is Not an Emulator"
cat << EOF
-Wine Is Not an Emulator. It is an alternative
-implementation of the Windows 3.x and Win32 APIs. Wine
-provides both a development toolkit (Winelib) for porting
-legacy Windows sources to Unix and a program loader,
-allowing unmodified Windows 3.1/95/NT binaries to run
-under Intel Unixes. Wine does not require Microsoft
-Windows, as it is a completely alternative implementation
-consisting of 100% Microsoft-Free code, but it can
-optionally use native system DLLs if they are available.
+Wine Is Not an Emulator. It is an alternative implementation of the
+Windows 3.x and Win32 APIs. Wine provides both a development toolkit
+(Winelib) for porting legacy Windows sources to Unix and a program
+loader, allowing unmodified Windows 3.1/95/NT binaries to run under
+Intel Unixes. Wine does not require Microsoft Windows, as it is a
+completely alternative implementation consisting of 100% Microsoft-Free
+code, but it can optionally use native system DLLs if they are available.
EOF
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 0e29c8e..bed3e11 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,11 @@
+2006-10-26 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Changed VERSION & SOURCE_URL to git.
+ * PREPARE: Changed WINE_CVS* vars to more generic WINE_VCS*,
+ changed prompt message to generic one.
+ * DEPENDS: Changed depends cvs to git.
+ * BUILD: Changed spell_ok docbook-utils check to more accurate
+ is_depends_enabled.
+
2006-10-13 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 0.9.23

diff --git a/x11-libs/wine/PREPARE b/x11-libs/wine/PREPARE
index 1b30619..a119ab2 100755
--- a/x11-libs/wine/PREPARE
+++ b/x11-libs/wine/PREPARE
@@ -1,6 +1,16 @@
-config_query WINE_CVS "Build CVS version?" n &&
+# Remove this variable name changing code when stable grimoire >= 0.6
+if [[ $WINE_CVS ]]; then
+ WINE_VCS=$WINE_CVS &&
+ persistent_remove WINE_CVS
+fi &&
+if [[ $WINE_CVS_AUTOUPDATE ]]; then
+ WINE_VCS_AUTOUPDATE=$WINE_CVS_AUTOUPDATE &&
+ persistent_remove WINE_CVS_AUTOUPDATE
+fi &&

-if [ "$WINE_CVS" == "y" ]; then
- config_query WINE_CVS_AUTOUPDATE \
+config_query WINE_VCS "Build latest version from development tree?" n &&
+
+if [[ $WINE_VCS == y ]]; then
+ config_query WINE_VCS_AUTOUPDATE \
"Automatically update on every system update?" n
fi




Archive powered by MHonArc 2.6.24.

Top of Page