[SM-Commit] GIT changes to master grimoire by Andraž Levstik (40dda4d193c155ee65e6a43e802f0da869c84042)

Andraž Levstik scm at mail.sourcemage.org
Mon Mar 12 04:48:49 EDT 2007


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

 ChangeLog                     |   12 ++++----
 gnome2-libs/tracker/CONFIGURE |    9 +++---
 gnome2-libs/tracker/DEPENDS   |   60 +++++++++++++++++++++++++-----------------
 gnome2-libs/tracker/HISTORY   |    4 ++
 net/arping/DETAILS            |    1 
 net/arping/HISTORY            |    4 ++
 net/arping/PRE_BUILD          |    3 ++
 7 files changed, 59 insertions(+), 34 deletions(-)

New commits:
commit 8a6197b63c16c1505dd12fb40bfab44860807cc4
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    Merge from WIP

diff --git a/ChangeLog b/ChangeLog
index b4eb518..0c0d57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,12 @@
 2007-03-09 Arjan Bouter <abouter at sourcemage.org>
 	* http/gnash: new spell, gnu flash player
 
+2007-03-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* wm-addons/dzen2: new spell, A general purpose messaging
+	  and notification program.
+	* x11/catfish: new spell, a frontend to various search tools
+	  like beagle, tracker, locate, find etc...
+
 2007-03-08 Ladislav Hagara <hgr at vabo.cz>
 	* devel/asl: new spell
 	  Cross assembler for microprocessors and -controllers
@@ -23,12 +29,6 @@
 2007-03-06 Thomas Orgis <sobukus at sourcemage.org>
 	* science/tisean: new spell; time series analysis toolkit
 
-2007-03-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* wm-addons/dzen2: new spell, A general purpose messaging
-	  and notification program.
-	* x11/catfish: new spell, a frontend to various search tools
-	  like beagle, tracker, locate, find etc...
-
 2007-03-06 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* doc/unrtf: added, rtf -> ps,latex,html converter
 	* libs/libtextcat: added, A library for efficient, lightweight text
diff --git a/gnome2-libs/tracker/CONFIGURE b/gnome2-libs/tracker/CONFIGURE
index 72362f3..55c0d9c 100755
--- a/gnome2-libs/tracker/CONFIGURE
+++ b/gnome2-libs/tracker/CONFIGURE
@@ -1,13 +1,14 @@
 if spell_ok gstreamer; then
    config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
-                                       gstreamer xine                 
+                                       gstreamer xine external
 elif spell_ok xine-lib; then
    config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
-                                       xine gstreamer                 
+                                       xine gstreamer external
 else
    config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
-                                       gstreamer xine                 
+                                       external gstreamer xine
 fi  &&
 
 config_query_list TRACKER_MONITOR "Which file monitoring to use?"      \
-                                   inotify fam polling
+                                   inotify fam polling                 &&
+config_query TRACKER_GUI "Do you want to build the GUI(adds gnome as dependency)" y
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index 61db2e5..416f0ab 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -1,27 +1,39 @@
-depends dbus-glib                           &&
-depends bzip2                               &&
-depends zlib                                &&
-depends libpng                              &&
-depends intltool                            &&
-depends perl                                &&
-depends xml-parser-expat                    &&
-depends pango                               &&
-depends gtk+2                               &&
-depends gnome-vfs2                          &&
-depends gmime                               &&
-depends gnome-desktop                       &&
-depends poppler                             &&
-depends libexif                             &&
-depends libgsf                              &&
-depends sqlite  "--enable-external-sqlite"  &&
+depends dbus-glib                              &&
+depends bzip2                                  &&
+depends zlib                                   &&
+depends libpng                                 &&
+depends intltool                               &&
+depends perl                                   &&
+depends xml-parser-expat                       &&
+depends pango                                  &&
+depends gmime                                  &&
+depends sqlite  "--enable-external-sqlite"     &&
+optional_depends libgsf                        \
+                 "--enable-gsf"                \
+                 "--disable-gsf"               \
+                 "GSF data extractor"          &&
+optional_depends libexif                       \
+                 "--enable-exif"               \
+                 "--disable-exif"              \
+                 "exif data extractor"         &&
+optional_depends poppler                       \
+                 "--enable-pdf"                \
+                 "--disable-pdf"               \
+                 "PDF data extractor support"  &&
 
-if [ "${TRACKER_EXTRACTOR}" == "gstreamer" ]; then
-   depends gstreamer
-elif [ "${TRACKER_EXTRACTOR}" == "xine" ]; then
-   depends xine-lib
-fi  &&
+if [[ ${TRACKER_GUI} == y ]]; then
+depends gtk+2  &&
+depends gnome-vfs2 &&
+depends gnome-desktop
+fi &&
 
-if [ "${TRACKER_MONITOR}" == "fam" ]; then
-   depends FAM
-fi  
+if [[ "${TRACKER_EXTRACTOR}" == "gstreamer" ]]; then
+depends gstreamer
+elif [[ "${TRACKER_EXTRACTOR}" == "xine" ]]; then
+depends xine-lib
+fi &&
+
+if [[ "${TRACKER_MONITOR}" == "fam" ]]; then
+depends FAM
+fi
                  
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index d1714f4..3d1207e 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,7 @@
+2007-03-11 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* CONFIGURE: added query for GUI
+	* DEPENDS: move them around a bit, some are optional etc...
+
 2007-03-03 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* DEPENDS: removed gnome-utils2, added gmime
 	* inotify-fix.diff: added more fixes so the inotify support not only
diff --git a/net/arping/DETAILS b/net/arping/DETAILS
index 894ae17..a5458f8 100755
--- a/net/arping/DETAILS
+++ b/net/arping/DETAILS
@@ -5,6 +5,7 @@
      SOURCE_HASH=sha512:517e4f4b1100342e5d209fcd0549a69c00d2361dfe14790253aa040aa606061ab293018eada2e0aa4db958cf840e01df5311ab9e2830ddd1f0373c318b658810
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://www.habets.pp.se/synscan/programs.php?prog=ARPing
+      PATCHLEVEL=1
          ENTERED=20060710
       LICENSE[0]=GPL
            SHORT="A utility to see if a specific IP address is taken and what MAC address owns it"
diff --git a/net/arping/HISTORY b/net/arping/HISTORY
index 7f012d5..80bce4c 100644
--- a/net/arping/HISTORY
+++ b/net/arping/HISTORY
@@ -1,2 +1,6 @@
+2007-03-11 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* PRE_BUILD: fix man page install path
+	* DETAILS: PATCHLEVEL++
+
 2006-07-10 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* all: created spell
diff --git a/net/arping/PRE_BUILD b/net/arping/PRE_BUILD
index c08bb3d..5846b7f 100755
--- a/net/arping/PRE_BUILD
+++ b/net/arping/PRE_BUILD
@@ -1,2 +1,5 @@
 default_pre_build                                        &&
+sedit 's:/usr/local/man:/usr/local/share/man:g'          \
+      ${SOURCE_DIRECTORY}/Makefile                       &&
 sedit 's:/usr/local:/usr:g' ${SOURCE_DIRECTORY}/Makefile
+



More information about the SM-Commit mailing list