Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (4c547259a0f5e2d510e161dc367cd6afd35eba99)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Martin Spitzbarth (4c547259a0f5e2d510e161dc367cd6afd35eba99)
  • Date: Wed, 10 Oct 2007 05:16:22 -0500

GIT changes to master grimoire by Martin Spitzbarth <m.spitzbarth AT gmx.de>:

audio-creation/audacity/BUILD | 12 ++++---
audio-creation/audacity/HISTORY | 3 +
disk/dosfstools/BUILD | 1
disk/dosfstools/DETAILS | 5 +--
disk/dosfstools/HISTORY | 6 +++
disk/dosfstools/PRE_BUILD | 4 ++
disk/dosfstools/linux-2.6.patch | 64
----------------------------------------
http/squid/BUILD | 8 +++--
http/squid/HISTORY | 4 ++
http/squid/INSTALL | 12 +++----
libs/klibc/HISTORY | 3 +
libs/klibc/PRE_BUILD | 5 +++
utils/cpufrequtils/BUILD | 4 +-
utils/cpufrequtils/HISTORY | 6 +++
utils/cpufrequtils/PRE_BUILD | 4 ++
utils/hnb/BUILD | 1
utils/hnb/HISTORY | 4 ++
utils/hnb/PRE_BUILD | 4 ++
18 files changed, 66 insertions(+), 84 deletions(-)

New commits:
commit 4c547259a0f5e2d510e161dc367cd6afd35eba99
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

audacity: added INSTALL_ROOT, fixed path for manpages

commit a0bce474481374b0be5eead886d1dd346765329b
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

squid: added INSTALL_ROOT, fixed path for manpages

commit 171a545b2a8d183cb669de6d5a7f5d7aefcd73a9
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

klibc: fixed path for manpages

commit da6a90d4c0761c657659ac81c5f528dff65a5802
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

hnb: added INSTALL_ROOT, fixed path for manpages

commit ed3849511ab19344ebd16826259e7bb4d5eb7ac1
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

cpufrequtils: added use of INSTALL_ROOT, minor changes

changed mandir to usr/share/man, using make_single

commit b5e439097183d478d88bdf35879c929d0b5d03c4
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

dosfstools: Updated to 2.11

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 06224d3..8f38679 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -8,11 +8,13 @@ fi &&

OPTS="$AUDACITY_LADSPA $AUDACITY_PORTMIXER $AUDACITY_PORTAUDIO $OPTS" &&

-./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-lib-preference=system \
- $OPTS &&
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ --with-lib-preference=system \
+ $OPTS &&

make_single &&
make &&
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 8481c8d..f87e5e3 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * BUILD: Added INSTALL_ROOT, fixed the path for manpages
+
2007-05-19 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated beta to 1.3.3

diff --git a/disk/dosfstools/BUILD b/disk/dosfstools/BUILD
index 989810e..8f58e6d 100755
--- a/disk/dosfstools/BUILD
+++ b/disk/dosfstools/BUILD
@@ -1,2 +1 @@
-patch -p1 < $SCRIPT_DIRECTORY/linux-2.6.patch &&
make
diff --git a/disk/dosfstools/DETAILS b/disk/dosfstools/DETAILS
index 285904b..ff7be5c 100755
--- a/disk/dosfstools/DETAILS
+++ b/disk/dosfstools/DETAILS
@@ -1,13 +1,12 @@
SPELL=dosfstools
- VERSION=2.10
+ VERSION=2.11
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/$SOURCE
-
SOURCE_HASH=sha512:c0e523ca6ff360a03d20215603f5326734d61eaca42b5fe5fac51f734138c04c2500a9b311a95a889954f6f7968373aa10ebf6b0a7620f88360ec0ac1365a588
+
SOURCE_HASH=sha512:eb0ee6ea11f1f3c0642722bde9f53ceec6ea085ad2ee4f3df4f4f61d6734132e0d24b8144b5a29593be8f2c40ce407ec5ac0da7749e126f4390568bd66ed28b3
WEB_SITE=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/
LICENSE[0]=GPL
ENTERED=20011217
- UPDATED=20040127
KEYWORDS="disk"
SHORT="Utilities to create and check MS-DOS filesystems under
Linux"

diff --git a/disk/dosfstools/HISTORY b/disk/dosfstools/HISTORY
index b651abf..e33ee24 100644
--- a/disk/dosfstools/HISTORY
+++ b/disk/dosfstools/HISTORY
@@ -1,3 +1,9 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created the file, honour INSTALL_ROOT,
+ fchanged MANDIR to usr/share/man
+ * BUILD, linux-2.6.patch: removed the patch
+ * DETAILS: updated spell to 2.11
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed MAINTAINER.

diff --git a/disk/dosfstools/PRE_BUILD b/disk/dosfstools/PRE_BUILD
new file mode 100755
index 0000000..2fd465e
--- /dev/null
+++ b/disk/dosfstools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:PREFIX =:PREFIX = $INSTALL_ROOT:" Makefile &&
+sedit "s:/usr/man:/usr/share/man:" Makefile
diff --git a/disk/dosfstools/linux-2.6.patch b/disk/dosfstools/linux-2.6.patch
deleted file mode 100644
index e21e94c..0000000
--- a/disk/dosfstools/linux-2.6.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nur dosfstools-2.10/dosfsck/boot.c dosfstools-2.10-fixed/dosfsck/boot.c
---- dosfstools-2.10/dosfsck/boot.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/boot.c 2004-02-11 21:15:48.000000000
+0100
-@@ -14,6 +14,9 @@
- #include "io.h"
- #include "boot.h"
-
-+#ifndef MSDOS_FAT12
-+# define MSDOS_FAT12 4084 /* taken from 2.4 linux/msdos_fs.h */
-+#endif
-
- #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0)
- /* don't divide by zero */
-diff -Nur dosfstools-2.10/dosfsck/common.h
dosfstools-2.10-fixed/dosfsck/common.h
---- dosfstools-2.10/dosfsck/common.h 1998-04-28 13:14:25.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/common.h 2004-02-11 21:15:01.000000000
+0100
-@@ -6,6 +6,9 @@
- #ifndef _COMMON_H
- #define _COMMON_H
-
-+#include <asm/types.h>
-+#include <asm/byteorder.h>
-+
- void die(char *msg,...) __attribute((noreturn));
-
- /* Displays a prinf-style message and terminates the program. */
-diff -Nur dosfstools-2.10/dosfsck/file.c dosfstools-2.10-fixed/dosfsck/file.c
---- dosfstools-2.10/dosfsck/file.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/file.c 2004-02-11 21:13:53.000000000
+0100
-@@ -15,9 +15,9 @@
- #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h>
*/
- #define _LINUX_STRING_H_ /* hack to avoid inclusion of
<linux/string.h>*/
- #define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h>
*/
-+#include "common.h"
- #include <linux/msdos_fs.h>
-
--#include "common.h"
- #include "file.h"
-
-
-diff -Nur dosfstools-2.10/dosfsck/io.c dosfstools-2.10-fixed/dosfsck/io.c
---- dosfstools-2.10/dosfsck/io.c 2003-06-14 22:03:20.000000000 +0200
-+++ dosfstools-2.10-fixed/dosfsck/io.c 2004-02-11 21:14:24.000000000 +0100
-@@ -21,8 +21,8 @@
- #include <fcntl.h>
- #include <linux/fd.h>
-
--#include "dosfsck.h"
- #include "common.h"
-+#include "dosfsck.h"
- #include "io.h"
-
-
-diff -Nur dosfstools-2.10/mkdosfs/mkdosfs.c
dosfstools-2.10-fixed/mkdosfs/mkdosfs.c
---- dosfstools-2.10/mkdosfs/mkdosfs.c 2003-06-14 22:07:08.000000000 +0200
-+++ dosfstools-2.10-fixed/mkdosfs/mkdosfs.c 2004-02-11 21:13:09.000000000
+0100
-@@ -62,6 +62,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <asm/types.h>
- #include <unistd.h>
- #include <time.h>
- #include <errno.h>
diff --git a/http/squid/BUILD b/http/squid/BUILD
index 07ba6fa..56f5adf 100755
--- a/http/squid/BUILD
+++ b/http/squid/BUILD
@@ -8,9 +8,11 @@ SQUID_AUTH_DIGEST='' &&
SQUID_AUTH_NTLM='' &&

./configure \
- --prefix=/usr \
- --sysconfdir=/etc/squid \
- --localstatedir=/var/cache/squid \
+ --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc/squid \
+ --localstatedir=${INSTALL_ROOT}/var/cache/squid \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
--enable-async-io \
--enable-snmp \
--enable-removal-policies \
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 29d5a92..c4dfc0d 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * BUILD: fixed the install path of the manpages
+ * BUILD, INSTALL: INSTALL_ROOT ified the spell
+
2007-09-06 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.6.STABLE16

diff --git a/http/squid/INSTALL b/http/squid/INSTALL
index e525f14..9c9b0d4 100755
--- a/http/squid/INSTALL
+++ b/http/squid/INSTALL
@@ -1,10 +1,10 @@
make install &&

-chown -R nobody.nogroup /var/cache/squid &&
+chown -R nobody.nogroup ${INSTALL_ROOT}/var/cache/squid &&

-if ! [ -x /var/log/squid ]; then
- mkdir -p /var/log/squid &&
- touch /var/log/squid/access.log &&
- touch /var/log/squid/cache.log &&
- touch /var/log/squid/store.log
+if ! [ -x ${INSTALL_ROOT}/var/log/squid ]; then
+ mkdir -p ${INSTALL_ROOT}/var/log/squid &&
+ touch ${INSTALL_ROOT}/var/log/squid/access.log &&
+ touch ${INSTALL_ROOT}/var/log/squid/cache.log &&
+ touch ${INSTALL_ROOT}/var/log/squid/store.log
fi
diff --git a/libs/klibc/HISTORY b/libs/klibc/HISTORY
index 1ee1a50..e7ad7db 100644
--- a/libs/klibc/HISTORY
+++ b/libs/klibc/HISTORY
@@ -1,3 +1,6 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: fixed the install path of the manpages
+
2007-04-17 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated 1.5

diff --git a/libs/klibc/PRE_BUILD b/libs/klibc/PRE_BUILD
index 2f7cda8..6b8d00c 100755
--- a/libs/klibc/PRE_BUILD
+++ b/libs/klibc/PRE_BUILD
@@ -7,6 +7,11 @@ cd $SOURCE_DIRECTORY &&
sedit "s:/usr:$INSTALL_ROOT/usr:" Makefile &&

#
+# Manpages go to usr/share/man
+#
+sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile &&
+
+#
# Needs the linux source to build against.
# Uses get_kernel_version from $GRIMOIRE/FUNCTIONS
#
diff --git a/utils/cpufrequtils/BUILD b/utils/cpufrequtils/BUILD
index 8f58e6d..89cff77 100755
--- a/utils/cpufrequtils/BUILD
+++ b/utils/cpufrequtils/BUILD
@@ -1 +1,3 @@
-make
+make_single &&
+make &&
+make_normal
diff --git a/utils/cpufrequtils/HISTORY b/utils/cpufrequtils/HISTORY
index ce72bd1..2b8593a 100644
--- a/utils/cpufrequtils/HISTORY
+++ b/utils/cpufrequtils/HISTORY
@@ -1,3 +1,9 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created the file,
+ use INSTALL_ROOT,
+ install manpages to /usr/share/man
+ * BUILD: using make_single
+
2007-02-10 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Added depends libtool.

diff --git a/utils/cpufrequtils/PRE_BUILD b/utils/cpufrequtils/PRE_BUILD
new file mode 100755
index 0000000..a8102f0
--- /dev/null
+++ b/utils/cpufrequtils/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:DESTDIR ?=:DESTDIR ?= $INSTALL_ROOT:" Makefile &&
+sedit "s:/usr/man:/usr/share/man:" Makefile
diff --git a/utils/hnb/BUILD b/utils/hnb/BUILD
index 5e1fa3a..8f58e6d 100755
--- a/utils/hnb/BUILD
+++ b/utils/hnb/BUILD
@@ -1,2 +1 @@
-sedit "s/usr\/local/usr/g" Makefile &&
make
diff --git a/utils/hnb/HISTORY b/utils/hnb/HISTORY
index 3b839fd..22ac936 100644
--- a/utils/hnb/HISTORY
+++ b/utils/hnb/HISTORY
@@ -1,3 +1,7 @@
+2007-10-10 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * PRE_BUILD: created, change paths to honour INSTALL_ROOT and the FHS
+ * BUILD: moved changes to Makefile into PRE_BUILD
+
2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/utils/hnb/PRE_BUILD b/utils/hnb/PRE_BUILD
new file mode 100755
index 0000000..2fab926
--- /dev/null
+++ b/utils/hnb/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit "s:/usr/local/bin:${INSTALL_ROOT}/usr/bin:" Makefile &&
+sedit "s:/usr/local/man:${INSTALL_ROOT}/usr/share/man:" Makefile




Archive powered by MHonArc 2.6.24.

Top of Page