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

Arjan Bouter scm at sourcemage.org
Thu May 10 06:06:30 EDT 2007


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

 devel/m4/DEPENDS     |    5 ++++-
 devel/m4/HISTORY     |    3 +++
 ftp/wget/DEPENDS     |   13 +++++++++----
 ftp/wget/HISTORY     |    6 ++++++
 ftp/wget/INSTALL     |    6 ++++--
 ftp/wget/POST_REMOVE |    6 ++++--
 libs/gettext/DEPENDS |    6 +++++-
 libs/gettext/HISTORY |    3 +++
 8 files changed, 38 insertions(+), 10 deletions(-)

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

    wget: added texinfo and made installind info files optional

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

    m4: made texinfo optional

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

    gettext: made texinfo optional

diff --git a/devel/m4/DEPENDS b/devel/m4/DEPENDS
index 086a830..6de8c0a 100755
--- a/devel/m4/DEPENDS
+++ b/devel/m4/DEPENDS
@@ -1,3 +1,6 @@
 depends  gnupg     &&
 depends  smgl-fhs  &&
-depends  texinfo
+optional_depends  texinfo \
+    ''                    \
+    ''                    \
+    'to build info files'
diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY
index 45cc140..b2967b1 100644
--- a/devel/m4/HISTORY
+++ b/devel/m4/HISTORY
@@ -1,3 +1,6 @@
+2007-05-08 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made texinfo optional
+
 2007-03-31 George Sherwood <george at beernabeer.com>
 	* DETAILS: updated spell to 1.4.9
 
diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS
index 4c1fb89..d04f63c 100755
--- a/ftp/wget/DEPENDS
+++ b/ftp/wget/DEPENDS
@@ -1,10 +1,15 @@
 depends  gnupg     &&
 depends  smgl-fhs  &&
 
-optional_depends  "gettext"           \
-                  "--enable-nls"      \
-                  "--disable-nls"     \
-                  "for i18n support"  &&
+optional_depends  "gettext"             \
+                  "--enable-nls"        \
+                  "--disable-nls"       \
+                  "for i18n support"    &&
+
+optional_depends  "texinfo"             \
+                  ""                    \
+                  ""                    \
+                  "to build info files" &&
 
 optional_depends  "openssl"             \
                   "--with-ssl"          \
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index 6a61d83..4857f23 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,9 @@
+2007-05-08 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: added texinfo
+	* INSTALL: made installing info file optional
+	* POST_REMOVE: only try to remove info file
+	    if it was installed in the 1st place
+
 2007-02-25 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* REPAIR^all^POST_REMOVE: added for #13495
 
diff --git a/ftp/wget/INSTALL b/ftp/wget/INSTALL
index 47159f5..8f05b26 100755
--- a/ftp/wget/INSTALL
+++ b/ftp/wget/INSTALL
@@ -1,3 +1,5 @@
 make install DESTDIR=$INSTALL_ROOT &&
-install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
- ${INSTALL_ROOT}/usr/share/info/wget.info
+if is_depends_enabled $SPELL texinfo; then
+  install-info --info-dir="${INSTALL_ROOT}/usr/share/info"\
+    ${INSTALL_ROOT}/usr/share/info/wget.info
+fi
diff --git a/ftp/wget/POST_REMOVE b/ftp/wget/POST_REMOVE
index 76b363f..da4eb9a 100755
--- a/ftp/wget/POST_REMOVE
+++ b/ftp/wget/POST_REMOVE
@@ -1,2 +1,4 @@
-install-info --remove --info-dir="${INSTALL_ROOT}/usr/share/info"\
- ${INSTALL_ROOT}/usr/share/info/wget.info
+if [[  -e "${INSTALL_ROOT}/usr/share/info/wget.info"  ]]; then
+  install-info --remove --info-dir="${INSTALL_ROOT}/usr/share/info"\
+   ${INSTALL_ROOT}/usr/share/info/wget.info
+fi
diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS
index 1e7e3c1..ca2a1ed 100755
--- a/libs/gettext/DEPENDS
+++ b/libs/gettext/DEPENDS
@@ -1,6 +1,10 @@
 depends  gnupg     &&
 depends  smgl-fhs  &&
-depends  texinfo   &&
+
+optional_depends  texinfo                  \
+                  ''                       \
+                  ''                       \
+                  'to build info files'    &&
 
 optional_depends  g++                      \
                   "--enable-libasprintf"   \
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 041cec3..90cc066 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2007-05-08 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made texinfo optional
+
 2007-02-16 Eric Sandall <sandalle at sourcemage.org>
 	* CONFIGURE: Removed tetex query, now handled by optional_depends
 	* DEPENDS: Properly optionally depend on tetex



More information about the SM-Commit mailing list