Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (a0c1798481b73522c995101ff53c07612a5fd24b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (a0c1798481b73522c995101ff53c07612a5fd24b)
  • Date: Sat, 29 Mar 2008 08:24:12 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

net/pump/BUILD | 2 +-
net/pump/CONFIGURE | 3 +++
net/pump/HISTORY | 2 ++
net/pump/PRE_BUILD | 12 +++++++-----
php-pear/php/DEPENDS | 3 +--
php-pear/php/HISTORY | 3 +++
6 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit a0c1798481b73522c995101ff53c07612a5fd24b
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

net/pump: made 'extras' patch optional, fixed chaining

commit 6b90268d13e782db7ddc756257674f09623c6bf4
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

php-pear/php: C-CLIENT is no more in z-rejected

diff --git a/net/pump/BUILD b/net/pump/BUILD
index 45315f4..540ccf6 100755
--- a/net/pump/BUILD
+++ b/net/pump/BUILD
@@ -1,4 +1,4 @@
cd $SOURCE_DIRECTORY &&
make_single &&
-make DEB_CFLAGS="-fPIC ${CFLAGS}" pump
+make DEB_CFLAGS="-fPIC ${CFLAGS}" pump &&
make_normal
diff --git a/net/pump/CONFIGURE b/net/pump/CONFIGURE
new file mode 100755
index 0000000..e1af7fb
--- /dev/null
+++ b/net/pump/CONFIGURE
@@ -0,0 +1,3 @@
+config_query PUMP_FEATURES \
+ "Do you want to add extra features? (ntp.conf support, route
metric, etc)" \
+ n
diff --git a/net/pump/HISTORY b/net/pump/HISTORY
index 5e2f1bd..c2e7f7b 100644
--- a/net/pump/HISTORY
+++ b/net/pump/HISTORY
@@ -3,4 +3,6 @@
* DETAILS: patchlevel 2
* PRE_BUILD: apply Debian patches, they resolve alot of issues
* INSTALL: specific make targets
+ * CONFIGURE, PRE_BUILD: ask for extra features
+ * BUILD: fixed broken chaining

diff --git a/net/pump/PRE_BUILD b/net/pump/PRE_BUILD
index ce87e3c..fb96b1c 100755
--- a/net/pump/PRE_BUILD
+++ b/net/pump/PRE_BUILD
@@ -4,11 +4,13 @@ cd ${SOURCE_DIRECTORY} &&
# Apply Debians pump patchset - they fix things good :)
gzip -dc < ${SOURCE_CACHE}/${SOURCE2} | patch -p1 &&

-# Enable the -m (--route-metric) option to specify the default
-# metric applied to routes
-# Enable the --keep-up option to keep interfaces up when we release
-# Enable the creation of /etc/ntp.conf and the --no-ntp option
-patch -p1 < ${SPELL_DIRECTORY}/${SPELL}-${VERSION}-gentoo.patch &&
+if [[ "${PUMP_FEATURES}" == "y" ]]; then
+ # Enable the -m (--route-metric) option to specify the default
+ # metric applied to routes
+ # Enable the --keep-up option to keep interfaces up when we release
+ # Enable the creation of /etc/ntp.conf and the --no-ntp option
+ patch -p1 < ${SPELL_DIRECTORY}/${SPELL}-${VERSION}-gentoo.patch
+fi &&

# Add an if defined around the definition of foo, just like in popt.h
patch -p1 < ${SPELL_DIRECTORY}/${SPELL}-${VERSION}-redefinition.patch
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index dcbafab..e013903 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -29,8 +29,7 @@ fi &&
optional_depends C-CLIENT \
"--with-imap" \
"--without-imap" \
- "for IMAP support" \
- z-rejected &&
+ "for IMAP support" &&

optional_depends MAIL-TRANSPORT-AGENT \
"" \
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8e64fb7..cbe2428 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,6 @@
+2008-03-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: C-CLIENT is no more in z-rejected
+
2008-01-05 Elisamuel Resto <ryuji AT sourcemage.org>
* DEPENDS: added optional dependency on re2c for parser regeneration
* BUILD: added proposed change by Andrew on bug #9172



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (a0c1798481b73522c995101ff53c07612a5fd24b), Elisamuel Resto, 03/29/2008

Archive powered by MHonArc 2.6.24.

Top of Page