Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1471465aeb17b23b335c5d60ec248e02fef6f80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1471465aeb17b23b335c5d60ec248e02fef6f80)
  • Date: Thu, 1 Dec 2011 06:17:13 -0600

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

utils/metalog/DETAILS | 6 +++---
utils/metalog/HISTORY | 5 +++++
utils/metalog/PRE_BUILD | 7 -------
utils/metalog/config.patch | 25 -------------------------
utils/metalog/configs | 1 +
utils/metalog/volatiles | 1 +
6 files changed, 10 insertions(+), 35 deletions(-)

New commits:
commit a1471465aeb17b23b335c5d60ec248e02fef6f80
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

metalog: version 2 and let sorcery handle the config file instead of a
patch

diff --git a/utils/metalog/DETAILS b/utils/metalog/DETAILS
index 92a6618..ab50faa 100755
--- a/utils/metalog/DETAILS
+++ b/utils/metalog/DETAILS
@@ -1,9 +1,9 @@
SPELL=metalog
- VERSION=1
- SOURCE=$SPELL-$VERSION.tar.lzma
+ VERSION=2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:f5aa1f10440e01ccf76fb50eba7612a18df93a9821cc5c97302647dbd7be6bb7382e08193063d9d37b1760b52ba7dc82d9b1612c287159d84f9326a351063ea1
+
SOURCE_HASH=sha512:194d9ca0c5bc8addd1970362cfa7bf1a368f50a9aa7370e2c4d63eb9d9819df08df001a3a85595a74e7b16fdd78c94ffde3cd9a63962ebc9f6ed71b1a574d7cf
WEB_SITE=http://metalog.sourceforge.net/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/metalog/HISTORY b/utils/metalog/HISTORY
index 5f668dd..1a67962 100644
--- a/utils/metalog/HISTORY
+++ b/utils/metalog/HISTORY
@@ -1,3 +1,8 @@
+2011-12-01 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 2
+ * PRE_BUILD, config.patch: sorcery handles config files, no need for
a patch
+ * configs, volatiles: added, let sorcery handle metalog.conf
+
2009-03-26 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: don't trash current config by applying the patch
* config.patch: added
diff --git a/utils/metalog/PRE_BUILD b/utils/metalog/PRE_BUILD
deleted file mode 100755
index dcad1ee..0000000
--- a/utils/metalog/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-
-7z x -so "$SOURCE_CACHE/$SOURCE" 2> /dev/null | tar x -C "$BUILD_DIRECTORY"
&&
-
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/config.patch"
diff --git a/utils/metalog/config.patch b/utils/metalog/config.patch
deleted file mode 100644
index 54ed239..0000000
--- a/utils/metalog/config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig 2009-03-15 13:57:01.000000000 +0300
-+++ Makefile.in 2009-03-26 02:45:56.593257418 +0300
-@@ -732,12 +732,16 @@
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-- done
-+ @if [ ! -f $(DESTDIR)$(sysconfdir)/metalog.conf ]; then \
-+ @list='$(sysconf_DATA)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ f=$(am__strip_dir) \
-+ echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
-+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+ done \
-+ else \
-+ echo "$(DESTDIR)$(sysconfdir)/metalog.conf already exists,
install will not overwrite"; \
-+ fi
-
- uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
diff --git a/utils/metalog/configs b/utils/metalog/configs
new file mode 100755
index 0000000..9b22861
--- /dev/null
+++ b/utils/metalog/configs
@@ -0,0 +1 @@
+^/etc/metalog.conf$
diff --git a/utils/metalog/volatiles b/utils/metalog/volatiles
new file mode 100755
index 0000000..9b22861
--- /dev/null
+++ b/utils/metalog/volatiles
@@ -0,0 +1 @@
+^/etc/metalog.conf$



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (a1471465aeb17b23b335c5d60ec248e02fef6f80), Arjan Bouter, 12/01/2011

Archive powered by MHonArc 2.6.24.

Top of Page