Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David C. Haley (cd038b68eb5165a2825188f502f6cba211059b29)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "David C. Haley" <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David C. Haley (cd038b68eb5165a2825188f502f6cba211059b29)
  • Date: Tue, 18 Oct 2016 19:38:24 +0000

GIT changes to master grimoire by David C. Haley <khoralin AT gmail.com>:

libs/apr-util/CONFLICTS | 2 +-
libs/apr-util0/BUILD | 1 +
libs/apr-util0/DETAILS | 22 +++-------------------
libs/apr-util0/HISTORY | 4 ++++
libs/apr-util0/INSTALL | 10 +---------
libs/apr-util0/PRE_BUILD | 9 +--------
libs/apr-util0/UP_TRIGGERS | 2 ++
libs/apr/CONFLICTS | 2 +-
libs/apr0/BUILD | 2 +-
libs/apr0/DETAILS | 18 +++---------------
libs/apr0/HISTORY | 4 ++++
libs/apr0/INSTALL | 26 +-------------------------
libs/apr0/PRE_BUILD | 6 +-----
libs/apr0/UP_TRIGGERS | 2 ++
14 files changed, 26 insertions(+), 84 deletions(-)

New commits:
commit cd038b68eb5165a2825188f502f6cba211059b29
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>

apr-util0: deprecated in favor of apr-util

commit 7ac148869082d479e792cd536f1799f4cef2314b
Author: David C. Haley <khoralin AT gmail.com>
Commit: David C. Haley <khoralin AT gmail.com>

apr0: deprecated in favor of apr

diff --git a/libs/apr-util/CONFLICTS b/libs/apr-util/CONFLICTS
index 46525e7..9120fd7 100755
--- a/libs/apr-util/CONFLICTS
+++ b/libs/apr-util/CONFLICTS
@@ -1 +1 @@
-conflicts apr-util0
+conflicts apr-util0 y
diff --git a/libs/apr-util0/BUILD b/libs/apr-util0/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/libs/apr-util0/BUILD
@@ -0,0 +1 @@
+true
diff --git a/libs/apr-util0/DETAILS b/libs/apr-util0/DETAILS
index 51645da..6225afa 100755
--- a/libs/apr-util0/DETAILS
+++ b/libs/apr-util0/DETAILS
@@ -1,25 +1,9 @@
-if [ -f $DEPENDS_CONFIG/apr0.p ]; then
- source $DEPENDS_CONFIG/apr0.p
-fi
-
SPELL=apr-util0
VERSION=0.9.15
- REPOS_URI=branches/0.9.x
-if [[ "$APR_LATEST" == y ]]; then
- VERSION=${VERSION%\.*}-HEAD
- SOURCE_IGNORE=volatile
- SOURCE_HINTS=old_svn_compat
-
SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
-fi
- SOURCE=apr-util-$VERSION.tar.bz2
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-util-$VERSION
- SOURCE_URL[0]=http://archive.apache.org/dist/apr/$SOURCE
- SOURCE2_URL[0]=http://archive.apache.org/dist/apr/$SOURCE2
- SOURCE2_IGNORE=signature
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=APACHE
+ ARCHIVE=off
+ GATHER_DOCS=off
WEB_SITE=http://apr.apache.org/
KEYWORDS="libs"
ENTERED=20030302
diff --git a/libs/apr-util0/HISTORY b/libs/apr-util0/HISTORY
index 13658f6..e36b792 100644
--- a/libs/apr-util0/HISTORY
+++ b/libs/apr-util0/HISTORY
@@ -1,3 +1,7 @@
+2016-10-18 David C. Haley <khoralin AT gmail.com>
+ * ALL: spell deprecated: apr-utils0 -> apr-utils
+ Upstream vendor deprecated 0.x branch.
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* TRIGGERS: removed is_depends_enabled.function reference

diff --git a/libs/apr-util0/INSTALL b/libs/apr-util0/INSTALL
index 65bff66..27ba77d 100755
--- a/libs/apr-util0/INSTALL
+++ b/libs/apr-util0/INSTALL
@@ -1,9 +1 @@
-default_install &&
-
-# APR_BRANCH replaces APR_VERSION; remove APR_VERSION in May, 2005
-cd build &&
-cp -fv \
- find_apu.m4 \
- apu-conf.m4 \
- apu-hints.m4 \
- $INSTALL_ROOT/usr/share/apache2/build/
+true
diff --git a/libs/apr-util0/PRE_BUILD b/libs/apr-util0/PRE_BUILD
index 8626c82..27ba77d 100755
--- a/libs/apr-util0/PRE_BUILD
+++ b/libs/apr-util0/PRE_BUILD
@@ -1,8 +1 @@
-default_pre_build &&
-
-# this kicks in for non-released source checked out of Subversion repository
-# or if the APR release managers forget to run buildconf themselves :-)
-cd $SOURCE_DIRECTORY &&
-if ! [[ -x configure ]]; then
- ./buildconf --with-apr=$INSTALL_ROOT/usr/share/apache2
-fi
+true
diff --git a/libs/apr-util0/UP_TRIGGERS b/libs/apr-util0/UP_TRIGGERS
new file mode 100755
index 0000000..b31c8cb
--- /dev/null
+++ b/libs/apr-util0/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger apr-utils0 dispel_self
+up_trigger apr-utils cast_self
diff --git a/libs/apr/CONFLICTS b/libs/apr/CONFLICTS
index e480dad..0ee2a94 100755
--- a/libs/apr/CONFLICTS
+++ b/libs/apr/CONFLICTS
@@ -1 +1 @@
-conflicts apr0
+conflicts apr0 y
diff --git a/libs/apr0/BUILD b/libs/apr0/BUILD
index 405e5c9..27ba77d 100755
--- a/libs/apr0/BUILD
+++ b/libs/apr0/BUILD
@@ -1 +1 @@
-build_apr
+true
diff --git a/libs/apr0/DETAILS b/libs/apr0/DETAILS
index c22c623..6fa8421 100755
--- a/libs/apr0/DETAILS
+++ b/libs/apr0/DETAILS
@@ -1,21 +1,9 @@
SPELL=apr0
VERSION=0.9.17
- REPOS_URI=branches/0.9.x
-if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
- VERSION=${VERSION%\.*}-HEAD
- SOURCE_IGNORE=volatile
- SOURCE_HINTS=old_svn_compat
-
SOURCE_URL[0]=svn://svn.apache.org/repos/asf/apr/$SPELL/$REPOS_URI:$SPELL-$VERSION
-fi
- SOURCE=apr-$VERSION.tar.bz2
- SOURCE2=$SOURCE.asc
- SOURCE_GPG="apache.gpg:$SOURCE.asc:UPSTREAM_KEY"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/apr-$VERSION
- SOURCE_URL[0]=http://www.apache.org/dist/apr/$SOURCE
- SOURCE2_URL[0]=http://www.apache.org/dist/apr/$SOURCE2
- SOURCE2_IGNORE=signature
+ PATCHLEVEL=1
+ ARCHIVE=off
+ GATHER_DOCS=off
LICENSE[0]=APACHE
- MAKE_NJOBS=1
WEB_SITE=http://apr.apache.org/
KEYWORDS="libs"
ENTERED=20030302
diff --git a/libs/apr0/HISTORY b/libs/apr0/HISTORY
index 879315f..b3e08f4 100644
--- a/libs/apr0/HISTORY
+++ b/libs/apr0/HISTORY
@@ -1,3 +1,7 @@
+2016-10-17 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: Spell Deprecated.
+ Upstream vendor deprecated 0.x branch.
+
2007-11-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.9.17
Use upstream apache.gpg key and signatures
diff --git a/libs/apr0/INSTALL b/libs/apr0/INSTALL
index 482a956..27ba77d 100755
--- a/libs/apr0/INSTALL
+++ b/libs/apr0/INSTALL
@@ -1,25 +1 @@
-default_install &&
-
-# APR_BRANCH replaces APR_VERSION; remove APR_VERSION in May, 2005
- # fix build chain
- FIX_PATH_REGEX='s|/usr/src/apr-[^/"]*|/usr/share/apache2|' &&
- sedit $FIX_PATH_REGEX $INSTALL_ROOT/usr/bin/apr-config &&
- sedit $FIX_PATH_REGEX $INSTALL_ROOT/usr/share/apache2/build/apr_rules.mk
&&
- ln -fns build/libtool $INSTALL_ROOT/usr/share/apache2/libtool
-cd build &&
-cp -fv \
- apr_common.m4 \
- config.guess \
- config.sub \
- find_apr.m4 \
- install.sh \
- make_exports.awk \
- make_var_export.awk \
- mkdir.sh \
- PrintPath \
- $INSTALL_ROOT/usr/share/apache2/build/ &&
-
-# in APR 1.x, gen-build.py is needed to build from latest source
-if [[ -f gen-build.py ]]; then
- cp -fv gen-build.py $INSTALL_ROOT/usr/share/apache2/build/
-fi
+true
diff --git a/libs/apr0/PRE_BUILD b/libs/apr0/PRE_BUILD
index 9457b66..27ba77d 100755
--- a/libs/apr0/PRE_BUILD
+++ b/libs/apr0/PRE_BUILD
@@ -1,5 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if ! [[ -f configure ]]; then
- ./buildconf
-fi
+true
diff --git a/libs/apr0/UP_TRIGGERS b/libs/apr0/UP_TRIGGERS
new file mode 100755
index 0000000..fe0d4f0
--- /dev/null
+++ b/libs/apr0/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger apr0 dispel_self
+up_trigger apr cast_self



  • [SM-Commit] GIT changes to master grimoire by David C. Haley (cd038b68eb5165a2825188f502f6cba211059b29), David C. Haley, 10/18/2016

Archive powered by MHonArc 2.6.24.

Top of Page