Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (a4db52c4b7708260a660e0cc2a57617f931e5c0f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (a4db52c4b7708260a660e0cc2a57617f931e5c0f)
  • Date: Tue, 26 Sep 2006 10:06:04 -0500

GIT changes to master grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

devel/xxdiff/BUILD | 10 +++-------
devel/xxdiff/DEPENDS | 7 ++++---
devel/xxdiff/DETAILS | 7 +++----
devel/xxdiff/HISTORY | 7 +++++++
devel/xxdiff/INSTALL | 4 +++-
5 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit c943c4bb2372cb406cb7533cdad5f778c2db987d
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

xxdiff: updated

diff --git a/devel/xxdiff/BUILD b/devel/xxdiff/BUILD
index e158e27..4d8c012 100755
--- a/devel/xxdiff/BUILD
+++ b/devel/xxdiff/BUILD
@@ -1,9 +1,5 @@
-export TMAKEPATH=/usr/share/tmake/lib/linux-g++ &&
cd src &&
-tmake xxdiff.pro > Makefile &&
-sedit "s/-O2/$CFLAGS/" Makefile &&
-sedit 's/$(QTDIR)\/include/\/usr\/include\/qt/' Makefile &&
-sedit 's/$(QTDIR)\/lib/\/usr\/lib\/qt/' Makefile &&
-sedit 's/$(QTDIR)\/bin\/moc/\/usr\/bin\/moc/' Makefile &&
-sedit 's/$(QTDIR)\/bin\/uic/\/usr\/bin\/uic/' Makefile &&
+make -f Makefile.bootstrap makefile &&
+sedit "s/^CFLAGS\(.*\)/CFLAGS\1\ $CFLAGS/" Makefile &&
+sedit "s/^CXXFLAGS\(.*\)/CXXFLAGS\1\ $CXXFLAGS/" Makefile &&
make
diff --git a/devel/xxdiff/DEPENDS b/devel/xxdiff/DEPENDS
index b7f0bea..f63e626 100755
--- a/devel/xxdiff/DEPENDS
+++ b/devel/xxdiff/DEPENDS
@@ -1,4 +1,5 @@
-depends qt-x11 &&
-depends tmake &&
-depends flex &&
+depends qt-x11 &&
+depends flex &&
+depends python &&
+depends X11-LIBS &&
depends bison
diff --git a/devel/xxdiff/DETAILS b/devel/xxdiff/DETAILS
index 8ffefcd..7544a1f 100755
--- a/devel/xxdiff/DETAILS
+++ b/devel/xxdiff/DETAILS
@@ -1,12 +1,11 @@
SPELL=xxdiff
- VERSION=3.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=3.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2d356390d298c7f7cb9cc04ae798ffc24471f11c6ff59203d7b10f63d3b0991abff933d7dcecbbddc2bc42e4af1ea87991f73f5901a72324c21a9f25e97101b0
+
SOURCE_HASH=sha512:a656d401adf94055ec4082c73c542cd103081fd007883fc7f3aa1c63dbca962e4ecbb351620a2b1613a2d97787786fd946ad6ce9c4f2e2d2978f2d63d68c314b
WEB_SITE=http://xxdiff.sourceforge.net/
ENTERED=20020209
- UPDATED=20020209
LICENSE[0]=GPL
KEYWORDS="devel"
SHORT="Graphical file and directories comparator and merge tool"
diff --git a/devel/xxdiff/HISTORY b/devel/xxdiff/HISTORY
index 509883e..a0fb587 100644
--- a/devel/xxdiff/HISTORY
+++ b/devel/xxdiff/HISTORY
@@ -1,3 +1,10 @@
+2006-09-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version bump
+ * BUILD: removeing unnecessary sedits and switching to new build
+ system
+ * INSTALL: install py helper scripts, install to /usr/bin
+ * DEPENDS: added python and X11-LIBS as depends
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/devel/xxdiff/INSTALL b/devel/xxdiff/INSTALL
index bbe9c12..b946e36 100755
--- a/devel/xxdiff/INSTALL
+++ b/devel/xxdiff/INSTALL
@@ -1 +1,3 @@
-install -m 755 ../bin/xxdiff /usr/X11R6/bin
+install -m 755 ../bin/xxdiff $INSTALL_ROOT/usr/bin &&
+cd .. &&
+python setup.py install



  • [SM-Commit] GIT changes to master grimoire by Andra?? Levstik (a4db52c4b7708260a660e0cc2a57617f931e5c0f), Andra?? Levstik, 09/26/2006

Archive powered by MHonArc 2.6.24.

Top of Page