[SM-Commit] GIT changes to master grimoire by Arjan Bouter (fdbc5e5794cd9e1f66101e444c7ef87597a664e4)

Arjan Bouter scm at sourcemage.org
Sat Jul 25 08:11:56 EDT 2009


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 dev/null                                         |binary
 doc/evince/DEPENDS                               |    6 +++++-
 doc/evince/HISTORY                               |    3 +++
 gnome2-apps/epiphany/DEPENDS                     |   19 +++++++++++++++++--
 gnome2-apps/epiphany/HISTORY                     |    4 ++++
 gnome2-apps/file-roller/DEPENDS                  |    7 ++++++-
 gnome2-apps/file-roller/HISTORY                  |    4 ++++
 net/iputils-ping/BUILD                           |    4 +++-
 net/iputils-ping/DEPENDS                         |    6 +++---
 net/iputils-ping/HISTORY                         |    3 +++
 net/iputils-ping/INSTALL                         |    6 ++++--
 net/iputils-tracepath/BUILD                      |    6 ++++--
 net/iputils-tracepath/DEPENDS                    |    3 +++
 net/iputils-tracepath/HISTORY                    |    3 +++
 net/iputils-tracepath/INSTALL                    |    5 ++++-
 windowmanagers/awesome/BUILD                     |    4 ++--
 windowmanagers/awesome/DEPENDS                   |    2 ++
 windowmanagers/awesome/DETAILS                   |    2 +-
 windowmanagers/awesome/HISTORY                   |    5 +++++
 windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig |    0 
 windowmanagers/awesome/awesome-3.3.1.tar.bz2.sig |binary
 21 files changed, 76 insertions(+), 16 deletions(-)

New commits:
commit fdbc5e5794cd9e1f66101e444c7ef87597a664e4
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    file-roller: made rarian optional and anned missing dep on gnome-doc-utils

commit 769094cdc1324c70721c91effe88be9eeecddfac
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    evince: made rarian optional

commit abbaec7a59470e792cd9f8ea9afc6f2ff67ddea1
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    iputils-tracepath: made docs and man pages generation optional

commit 16e3e6c8b6f719ad49f9e436d86aea859a3bd17a
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    iputils-ping: made docs and manpages optional

commit 615ed8b53c793d78ab97d999f6f583d6d29b4109
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    awesome: add missing deps, fixed BUILD and updated to 3.3.1

commit 049ce6d896247326975aad155c48227c63591dd0
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    epiphany: made rarian, enchant, gnome-network and libgnomeprintui optional

diff --git a/doc/evince/DEPENDS b/doc/evince/DEPENDS
index 2d0ad17..74f575e 100755
--- a/doc/evince/DEPENDS
+++ b/doc/evince/DEPENDS
@@ -10,7 +10,11 @@ depends libglade2         &&
 depends gnome-icon-theme  &&
 depends gnome-doc-utils   &&
 depends xml-parser-expat  &&
-depends rarian            &&
+
+optional_depends rarian                               \
+                 "--enable-scrollkeeper"              \
+                 "--disable-scrollkeeper"             \
+                 "Register with rarian?"              &&
 
 optional_depends  dbus-glib                           \
                   "--enable-dbus"                     \
diff --git a/doc/evince/HISTORY b/doc/evince/HISTORY
index c52ba8f..31913d4 100644
--- a/doc/evince/HISTORY
+++ b/doc/evince/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made rarian optional
+
 2009-06-19 Eric Sandall <sandalle at sourcemage.org>
 	* CONFIGURE: typo viwer -> viewer
 
diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index f61a094..6d795fc 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,7 +1,5 @@
 depends libgnomeui      &&
 depends gnome-desktop   &&
-depends libgnomeprint   &&
-depends libgnomeprintui &&
 depends iso-codes       &&
 depends dbus-glib       &&
 
@@ -15,6 +13,23 @@ optional_depends gnome-python2                          \
                  "--disable-python"                     \
                  "Enable Python support"                &&
 
+optional_depends gnome-network                           \
+                 "--enable-network-manager"              \
+                 "--disable-network-manager"             \
+                 "Integrate with gnome network manager?" &&
+
+optional_depends enchant                    \
+                 "--enable-spell-checker"   \
+                 "--disable-spell-checker"  \
+                 "Enable spelling checker?" &&
+
+optional_depends rarian                     \
+                 "--enable-scrollkeeper"    \
+                 "--disable-scrollkeeper"   \
+                 "Register with rarian?"    &&
+
+optional_depends libgnomeprintui '' '' 'Enable printing?' &&
+
 if [[ "${EPIPHANY_WEBKIT}" == "y" ]]; then
    depends webkitgtk "--with-engine=webkit"
 else
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 63124d9..8efd867 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2009-07-23 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made rarian, enchant, gnome-network
+	  and libgnomeprint(ui) optional
+
 2009-06-30 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to 2.26.3
 
diff --git a/gnome2-apps/file-roller/DEPENDS b/gnome2-apps/file-roller/DEPENDS
index 9376745..36b2e0c 100755
--- a/gnome2-apps/file-roller/DEPENDS
+++ b/gnome2-apps/file-roller/DEPENDS
@@ -3,7 +3,12 @@ depends gtk+2       &&
 depends libglade2   &&
 depends libgnome    &&
 depends libgnomeui  &&
-depends rarian      &&
+depends gnome-doc-utils  &&
+
+optional_depends rarian                        \
+                 "--enable-scrollkeeper"       \
+                 "--disable-scrollkeeper"      \
+                 "Register with scrollkeeper"  &&
 
 optional_depends nautilus2                                   \
                  "--enable-nautilus-actions"                 \
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index de7174b..94b2820 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,7 @@
+2009-07-25 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made rarian optional,
+	  added missing dep on gnome-doc-utils
+
 2009-06-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.26.2
 
diff --git a/net/iputils-ping/BUILD b/net/iputils-ping/BUILD
index e89d027..d5ccb13 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1,2 +1,4 @@
 make TARGETS="ping ping6" &&
-make -C doc man
+if is_depends_enable $SPELL opensp ; then
+  make -C doc man
+fi
diff --git a/net/iputils-ping/DEPENDS b/net/iputils-ping/DEPENDS
index 9520e12..b78b3c9 100755
--- a/net/iputils-ping/DEPENDS
+++ b/net/iputils-ping/DEPENDS
@@ -1,3 +1,3 @@
-depends opensp &&
-depends sgmlspm &&
-depends docbook-sgml-dtd
+optional_depends opensp '' '' 'for docs and manpages' &&
+optional_depends sgmlspm '' '' 'for docs and manpages' &&
+optional_depends docbook-sgml-dtd '' '' 'for docs and manpages'
diff --git a/net/iputils-ping/HISTORY b/net/iputils-ping/HISTORY
index 84a1782..fdec8f4 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS, BUILD, INSTALL: made docs and manpages optional
+
 2008-04-11 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* DEPENDS: chmod +x
 
diff --git a/net/iputils-ping/INSTALL b/net/iputils-ping/INSTALL
index b0d98ca..85547cb 100755
--- a/net/iputils-ping/INSTALL
+++ b/net/iputils-ping/INSTALL
@@ -1,3 +1,5 @@
 install  -m 4755  ping  ping6  $INSTALL_ROOT/usr/bin  &&
-install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping.8  &&
-install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping6.8
+if is_depends_enabled $SPELL opensp ; then
+  install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping.8  &&
+  install  -m 644  doc/ping.8  $INSTALL_ROOT/usr/share/man/man8/ping6.8
+fi
diff --git a/net/iputils-tracepath/BUILD b/net/iputils-tracepath/BUILD
index 82bc326..3f2a8b5 100755
--- a/net/iputils-tracepath/BUILD
+++ b/net/iputils-tracepath/BUILD
@@ -1,2 +1,4 @@
-make TARGETS="tracepath tracepath6 traceroute6"
-make -C doc man
+make TARGETS="tracepath tracepath6 traceroute6" &&
+if is_depends_enable $SPELL opensp ; then
+  make -C doc man
+fi
diff --git a/net/iputils-tracepath/DEPENDS b/net/iputils-tracepath/DEPENDS
new file mode 100755
index 0000000..b78b3c9
--- /dev/null
+++ b/net/iputils-tracepath/DEPENDS
@@ -0,0 +1,3 @@
+optional_depends opensp '' '' 'for docs and manpages' &&
+optional_depends sgmlspm '' '' 'for docs and manpages' &&
+optional_depends docbook-sgml-dtd '' '' 'for docs and manpages'
diff --git a/net/iputils-tracepath/HISTORY b/net/iputils-tracepath/HISTORY
index 3550075..a25f20f 100644
--- a/net/iputils-tracepath/HISTORY
+++ b/net/iputils-tracepath/HISTORY
@@ -1,3 +1,6 @@
+2009-07-25 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS, BUILD, INSTALL: made manpages and docs optional
+
 2008-02-01 Remko van der Vossen <wich at sourcemage.org>
         * DETAILS: 20071127-1
         * PRE_BUILD,iputils-glibc-patch.patch: remove glibc patch
diff --git a/net/iputils-tracepath/INSTALL b/net/iputils-tracepath/INSTALL
index d5418ac..94c7de4 100755
--- a/net/iputils-tracepath/INSTALL
+++ b/net/iputils-tracepath/INSTALL
@@ -1,4 +1,7 @@
-  install  tracepath  tracepath6  traceroute6  $INSTALL_ROOT/usr/bin  &&
+install  tracepath  tracepath6  traceroute6  $INSTALL_ROOT/usr/bin  &&
+if is_depends_enabled $SPELL opensp ; then
   install  doc/tracepath.8  $INSTALL_ROOT/usr/share/man/man8/tracepath.8   &&
   install  doc/tracepath.8  $INSTALL_ROOT/usr/share/man/man8/tracepath6.8  &&
   install  doc/traceroute6.8  $INSTALL_ROOT/usr/share/man/man8/traceroute6.8
+fi
+
diff --git a/windowmanagers/awesome/BUILD b/windowmanagers/awesome/BUILD
index 6d3819a..ee02cb9 100755
--- a/windowmanagers/awesome/BUILD
+++ b/windowmanagers/awesome/BUILD
@@ -1,3 +1,3 @@
-sed -i "s|-Werror||;s|-g|${CFLAGS}|" CMakeLists.txt    &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr $OPTS . &&
+cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
+      -DSYSCONFDIR=$INSTALLROOT/etc . &&
 make
diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
index 2a2d311..06a2681 100755
--- a/windowmanagers/awesome/DEPENDS
+++ b/windowmanagers/awesome/DEPENDS
@@ -12,6 +12,8 @@ depends  glib        &&
 #depends  xcb         &&
 depends  xcb-util    &&
 depends  gperf       &&
+depends  imagemagick &&
+depends  startup-notification &&
 depends  imlib2 &&
 
 optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 440385a..5954c56 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,5 +1,5 @@
            SPELL=awesome
-         VERSION=3.2.1
+         VERSION=3.3.1
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index f38e501..a0ffb7f 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,8 @@
+2009-07-25 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 3.3.1
+	* DEPENDS: added missing deps on imagemagick and startup-notification
+	* BUILD: no need to sedit anymore
+
 2009-04-19 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 3.2.1
 
diff --git a/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig b/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig
deleted file mode 100644
index a44cf2b..0000000
Binary files a/windowmanagers/awesome/awesome-3.2.1.tar.bz2.sig and /dev/null differ
diff --git a/windowmanagers/awesome/awesome-3.3.1.tar.bz2.sig b/windowmanagers/awesome/awesome-3.3.1.tar.bz2.sig
new file mode 100644
index 0000000..554cdfe
Binary files /dev/null and b/windowmanagers/awesome/awesome-3.3.1.tar.bz2.sig differ



More information about the SM-Commit mailing list