sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (5578de14cb844964ea09dbba9f4a008cc5b472f4)
- 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 (5578de14cb844964ea09dbba9f4a008cc5b472f4)
- Date: Mon, 29 Sep 2008 23:58:10 -0500
GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:
dev/null
|binary
gnome2-apps/epiphany-extensions/DETAILS |
2
gnome2-apps/epiphany-extensions/HISTORY |
3
gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig |
0
gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
|binary
gnome2-apps/epiphany/DETAILS |
2
gnome2-apps/epiphany/HISTORY |
4
gnome2-apps/epiphany/PRE_SUB_DEPENDS |
4
gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig |
0
gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig
|binary
mail/postfix/BUILD |
56 +++++-----
mail/postfix/CONFIGURE |
7 -
mail/postfix/DETAILS |
5
mail/postfix/HISTORY |
4
mail/postfix/INSTALL |
32 ++---
mail/postfix/PREPARE |
2
mail/postfix/PRE_BUILD |
10 -
net/dnsmasq/BUILD |
6 -
net/dnsmasq/DEPENDS |
11 +
net/dnsmasq/DETAILS |
3
net/dnsmasq/HISTORY |
6 -
net/dnsmasq/INSTALL |
9 +
net/dnsmasq/PRE_BUILD |
8 -
utils/ntp/BUILD |
15 +-
utils/ntp/CONFIGURE |
2
utils/ntp/DEPENDS |
25 +---
utils/ntp/DETAILS |
8 -
utils/ntp/HISTORY |
8 +
utils/ntp/INSTALL |
7 -
utils/ntp/TRIGGERS |
2
video/mplayer/DEPENDS |
7 +
video/mplayer/HISTORY |
3
32 files changed, 150 insertions(+), 101 deletions(-)
New commits:
commit 5578de14cb844964ea09dbba9f4a008cc5b472f4
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany-extensions: updated VERSION to 2.24.0
commit c5451159f8d0b285c4363db0babf1833bb15119c
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany: updated VERSION to 2.24.0.1
commit 84836343157227de66803ea6585f4462f8f55ec2
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
gnome2-apps/epiphany: fixed broken check for python dep when
gnome-python2 was requested
commit 0a07b91cd2ae1331a202bfa63ed7008a3294a698
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
utils/ntp: updated spell to 4.2.4p5
- Bormatting changes on BUILD, DEPENDS, INSTALL and TRIGGERS
- CONFIGURE added to prompt for IPv6 support
- linuxcaps configure flag moved from BUILD to DEPENDS' libcap dep
- Only use glibc's getifaddr if IPv6 support is requested and >glibc-2.4
- Removed CONFIG_PHONE sedit line, since it's not needed anymore
commit 487d2de858d3b7f155582e74b8d24a00e8806e23
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
net/dnsmasq: enabled building of I18N translations (requires gettext)
commit 34ad5c45a56f7b5353492d1a03fa15f605d85a3d
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: removed brackets (but on message prompts) and quoted paths;
DOCS had dirs, moved to DOC_DIRS
commit 4b16604f346674c765939c96e989b23e24056721
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
video/mplayer: faad2 configure switch differs on svn version
diff --git a/gnome2-apps/epiphany-extensions/DETAILS
b/gnome2-apps/epiphany-extensions/DETAILS
index 5217252..67078ae 100755
--- a/gnome2-apps/epiphany-extensions/DETAILS
+++ b/gnome2-apps/epiphany-extensions/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany-extensions
- VERSION=2.22.2
+ VERSION=2.24.0
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany-extensions/HISTORY
b/gnome2-apps/epiphany-extensions/HISTORY
index 1c575b3..8e026d7 100644
--- a/gnome2-apps/epiphany-extensions/HISTORY
+++ b/gnome2-apps/epiphany-extensions/HISTORY
@@ -1,3 +1,6 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated VERSION to 2.24.0
+
2008-08-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.2
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig
deleted file mode 100644
index 4a21475..0000000
Binary files
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.22.2.tar.bz2.sig and
/dev/null differ
diff --git
a/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
new file mode 100644
index 0000000..ceb0677
Binary files /dev/null and
b/gnome2-apps/epiphany-extensions/epiphany-extensions-2.24.0.tar.bz2.sig
differ
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 10e16ed..c640238 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -1,5 +1,5 @@
SPELL=epiphany
- VERSION=2.22.3
+ VERSION=2.24.0.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 4f8c2bd..b627eb2 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,7 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_SUB_DEPENDS: fixed broken check (gnome-python2 != python)
+ * DETAILS: updated VERSION to 2.24.0.1
+
2008-08-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.22.3
diff --git a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
b/gnome2-apps/epiphany/PRE_SUB_DEPENDS
index da18f16..d7760b5 100755
--- a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
+++ b/gnome2-apps/epiphany/PRE_SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
-gnome-python2) if is_depends_enabled $SPELL python; then return 0; fi;;
+ gnome-python2) is_depends_enabled $SPELL gnome-python2 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;;
esac
-return 1
diff --git a/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig
deleted file mode 100644
index e26f3ba..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.22.3.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig
b/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig
new file mode 100644
index 0000000..1a0006b
Binary files /dev/null and
b/gnome2-apps/epiphany/epiphany-2.24.0.1.tar.bz2.sig differ
diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 6f31aed..f4bcb82 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -2,78 +2,78 @@ create_account postfix &&
create_account postdrop &&
create_account mail &&
-mkdir -p "${INSTALL_ROOT}/var/spool/mail" &&
-chmod 1777 "${INSTALL_ROOT}/var/spool/mail" &&
-chown mail:mail "${INSTALL_ROOT}/var/spool/mail" &&
-chgrp -R mail "${INSTALL_ROOT}/var/spool/mail" &&
+mkdir -p "$INSTALL_ROOT/var/spool/mail" &&
+chmod 1777 "$INSTALL_ROOT/var/spool/mail" &&
+chown mail:mail "$INSTALL_ROOT/var/spool/mail" &&
+chgrp -R mail "$INSTALL_ROOT/var/spool/mail" &&
# We want blank vars
local AUXLIBS="" &&
local CCARGS="" &&
if is_depends_enabled $SPELL openldap; then
- AUXLIBS="${AUXLIBS} -lldap -llber" &&
- CCARGS="${CCARGS} -DHAS_LDAP" &&
+ AUXLIBS="$AUXLIBS -lldap -llber" &&
+ CCARGS="$CCARGS -DHAS_LDAP" &&
message "${MESSAGE_COLOR}OpenLDAP requested: Using
OpenLDAP${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL linux-pam; then
- AUXLIBS="${AUXLIBS} -lpam -lpam_misc" &&
- CCARGS="${CCARGS} -DHAS_PAM" &&
+ AUXLIBS="$AUXLIBS -lpam -lpam_misc" &&
+ CCARGS="$CCARGS -DHAS_PAM" &&
message "${MESSAGE_COLOR}Linux-PAM requested: Using
Linux-PAM${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL cyrus-sasl; then
- AUXLIBS="${AUXLIBS} -lsasl2" &&
- CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-I${INSTALL_ROOT}/usr/include/sasl" &&
+ AUXLIBS="$AUXLIBS -lsasl2" &&
+ CCARGS="$CCARGS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-I$INSTALL_ROOT/usr/include/sasl" &&
message "${MESSAGE_COLOR}Cyrus-SASL requested: Using
Cyrus-SASL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL mysql; then
- AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lmysqlclient -lz -lm" &&
- CCARGS="${CCARGS} -DHAS_MYSQL -I${INSTALL_ROOT}/usr/include/mysql" &&
+ AUXLIBS="$AUXLIBS -L$INSTALL_ROOT/usr/lib -lmysqlclient -lz -lm" &&
+ CCARGS="$CCARGS -DHAS_MYSQL -I$INSTALL_ROOT/usr/include/mysql" &&
message "${MESSAGE_COLOR}MySQL requested: Using MySQL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL postgresql; then
- AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lpq" &&
- CCARGS="${CCARGS} -DHAS_PGSQL -I${INSTALL_ROOT}/usr/include/pgsql" &&
+ AUXLIBS="$AUXLIBS -L$INSTALL_ROOT/usr/lib -lpq" &&
+ CCARGS="$CCARGS -DHAS_PGSQL -I$INSTALL_ROOT/usr/include/pgsql" &&
message "${MESSAGE_COLOR}PostgreSQL requested: Using
PostgresSQL${DEFAULT_COLOR}"
fi &&
if is_depends_enabled $SPELL openssl; then
- AUXLIBS="${AUXLIBS} -lssl -lcrypto" &&
- CCARGS="${CCARGS} -DHAS_SSL -DUSE_TLS
-I${INSTALL_ROOT}/usr/include/openssl" &&
+ AUXLIBS="$AUXLIBS -lssl -lcrypto" &&
+ CCARGS="$CCARGS -DHAS_SSL -DUSE_TLS -I$INSTALL_ROOT/usr/include/openssl"
&&
message "${MESSAGE_COLOR}OpenSSL requested: Using OpenSSL for
SSL/TLS${DEFAULT_COLOR}"
fi &&
# fix to get man pages to install in /usr/man
-#sedit "s:/usr/local:${INSTALL_ROOT}/usr:" src/global/mail_params.h &&
-CCARGS="${CCARGS} -DDEF_MANPAGE_DIR=\\\"${INSTALL_ROOT}/usr/share/man\\\"" &&
+#sedit "s:/usr/local:$INSTALL_ROOT/usr:" src/global/mail_params.h &&
+CCARGS="$CCARGS -DDEF_MANPAGE_DIR=\\\"$INSTALL_ROOT/usr/share/man\\\"" &&
# NPTL glibc fix
if glibc_is_nptl; then
- AUXLIBS="${AUXLIBS} -lpthread"
+ AUXLIBS="$AUXLIBS -lpthread"
fi &&
make makefiles \
"OPTS=" \
- "OPT=${CFLAGS}" \
- "AUXLIBS=${AUXLIBS}" \
- "CCARGS=${CCARGS}" &&
+ "OPT=$CFLAGS" \
+ "AUXLIBS=$AUXLIBS" \
+ "CCARGS=$CCARGS" &&
make &&
# Fix directories in the main.cf
-if [[ "${POSTFIX_PRE_EXISTING}" == "yes" ]]; then
- if [[ "${POSTFIX_FIX_MAINCF}" == "y" ]]; then
+if [[ "$POSTFIX_PRE_EXISTING" == "yes" ]]; then
+ if [[ "$POSTFIX_FIX_MAINCF" == "y" ]]; then
# repair directories in the main.cf
- local MANPAGE_DIR="$(grep manpage_directory
${INSTALL_ROOT}/etc/postfix/main.cf | cut -d"=" -f2)" &&
+ local MANPAGE_DIR="$(grep manpage_directory
$INSTALL_ROOT/etc/postfix/main.cf | cut -d"=" -f2)" &&
MANPAGE_DIR="${MANPAGE_DIR## }" &&
- if [[ "$MANPAGE_DIR" != "${INSTALL_ROOT}/usr/share/man" ]]; then
- sed -i -e "s|manpage_directory.*=.*|manpage_directory =
${INSTALL_ROOT}/usr/share/man|" \
- ${INSTALL_ROOT}/etc/postfix/main.cf
+ if [[ "$MANPAGE_DIR" != "$INSTALL_ROOT/usr/share/man" ]]; then
+ sed -i -e "s|manpage_directory.*=.*|manpage_directory =
$INSTALL_ROOT/usr/share/man|" \
+ "$INSTALL_ROOT/etc/postfix/main.cf"
fi
fi
fi
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 8312e15..9c7a1fb 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -2,7 +2,7 @@ persistent_add POSTFIX_PRE_EXISTING &&
persistent_add POSTFIX_FIX_MAINCF &&
persistent_add POSTFIX_VDA &&
-if [[ "x${POSTFIX_VDA}" == "x" ]] && spell_ok $SPELL; then
+if [[ "x$POSTFIX_VDA" == "x" ]] && spell_ok $SPELL; then
persistent_read $SPELL VDA POSTFIX_VDA
fi &&
@@ -24,12 +24,13 @@ fi &&
config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n &&
# Config file backup
-#message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. You should backup and restore configuration files
and reply y to the next two questions...${DEFAULT_COLOR}" &&
+#message "${MESSAGE_COLOR}Configuration file loss may expose your system to
SPAM relaying." &&
+#message "You should backup and restore configuration files and reply y to
the next two questions...${DEFAULT_COLOR}" &&
#config_query BACKUP "Backup config on dispel?" y &&
#config_query RESTORE "Restore config on rebuild/update?" y
# Newaliases
-#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...${DEFAULT_COLOR}" &&
+#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...$}DEFAULT_COLOR}" &&
#config_query ALIAS "Run newaliases after cast?" y &&
config_query POSTFIX_VDA "Apply Virtual Delivery Agent (VDA) patch?
(EXPERIMENTAL)" n
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index fe1bec9..a320f23 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -61,7 +61,7 @@ fi
SOURCE2_URL[20]=${SOURCE_URL[20]}.sig
# VDA patch (see: http://vda.sourceforge.net/)
-if [[ "${POSTFIX_VDA}" == "y" ]]; then
+if [[ "$POSTFIX_VDA" == "y" ]]; then
VERSION3=2.5.5-vda
SOURCE3=$SPELL-$VERSION3-ng.patch.gz
SOURCE3_URL[0]=http://vda.sourceforge.net/VDA/$SOURCE3
@@ -70,7 +70,8 @@ fi
WEB_SITE="http://www.postfix.org/";
ENTERED=20020125
- DOCS="$DOCS README_FILES RELEASE_NOTES* html examples auxiliary"
+ DOCS="$DOCS README_FILES RELEASE_NOTES*"
+ DOC_DIRS="html examples auxiliary"
LICENSE[0]=IBMPL
SHORT="Postfix is a MTA"
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 5af98e9..5469531 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,7 @@
+2008-09-27 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD, PRE_BUILD, CONFIGURE, INSTALL, PREPARE, DETAILS:
+ removed brackets and quoted paths; DOCS had dirs, moved to DOC_DIRS
+
2008-09-22 Elisamuel Resto <ryuji AT sourcemage.org>
* PREPARE: experimental version should default to 'n'
* DETAILS: VDA patch homepage URL updated; added extra mirrors
diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
index 56f03c5..69c10e8 100755
--- a/mail/postfix/INSTALL
+++ b/mail/postfix/INSTALL
@@ -1,4 +1,4 @@
-if [[ "${POSTFIX_PRE_EXISTING}" == "no" ]]; then
+if [[ "$POSTFIX_PRE_EXISTING" == "no" ]]; then
# OMG YAY fixes for stupid godamn config files!
note_config_files /etc/postfix/main.cf &&
note_config_files /etc/postfix/master.cf &&
@@ -12,35 +12,35 @@ if [[ "${POSTFIX_PRE_EXISTING}" == "no" ]]; then
# the below are the answers to the interactive install
/bin/bash postfix-install -non-interactive \
- install_root=$INSTALL_ROOT \
- tempdir=$SOURCE_DIRECTORY \
- config_directory=/etc/postfix \
- daemon_directory=/usr/libexec/postfix \
- command_directory=/usr/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=/usr/sbin/sendmail \
- newaliases_path=/usr/bin/newaliases \
- mailq_path=/usr/bin/mailq \
+ install_root="$INSTALL_ROOT" \
+ tempdir="$SOURCE_DIRECTORY" \
+ config_directory="$INSTALL_ROOT/etc/postfix" \
+ daemon_directory="$INSTALL_ROOT/usr/libexec/postfix" \
+ command_directory="$INSTALL_ROOT/usr/sbin" \
+ queue_directory="$INSTALL_ROOT/var/spool/postfix" \
+ sendmail_path="$INSTALL_ROOT/usr/sbin/sendmail" \
+ newaliases_path="$INSTALL_ROOT/usr/bin/newaliases" \
+ mailq_path="$INSTALL_ROOT/usr/bin/mailq" \
mail_owner=postfix \
setgid_group=postdrop \
html_directory=no \
- manpage_directory=/usr/share/man \
+ manpage_directory="$INSTALL_ROOT/usr/share/man" \
readme_directory=no &&
# fix the default manpage_directory
- sed -i -e "s|manpage_directory.*=.*|manpage_directory = /usr/share/man|"
/etc/postfix/main.cf
+ sed -i -e "s|manpage_directory.*=.*|manpage_directory =
$INSTALL_ROOT/usr/share/man|" /etc/postfix/main.cf
else
# preexisting install found doing the upgrade, which is unattended
make upgrade
fi &&
-ln -sf ../sbin/sendmail ${INSTALL_ROOT}/usr/lib/sendmail &&
-ln -sf postfix/aliases ${INSTALL_ROOT}/etc/aliases &&
+ln -sf ../sbin/sendmail "$INSTALL_ROOT/usr/lib/sendmail" &&
+ln -sf postfix/aliases "$INSTALL_ROOT/etc/aliases" &&
-if [[ "${POSTFIX_BENCH}" == "y" ]]; then
+if [[ "$POSTFIX_BENCH" == "y" ]]; then
local file &&
for file in qmqp-source smtp-sink smtp-source; do
- install -v -m 544 src/smtpstone/${file} ${INSTALL_ROOT}/usr/sbin
+ install -v -m 544 "src/smtpstone/$file" "$INSTALL_ROOT/usr/sbin"
done
fi
diff --git a/mail/postfix/PREPARE b/mail/postfix/PREPARE
index 5602125..94b1514 100755
--- a/mail/postfix/PREPARE
+++ b/mail/postfix/PREPARE
@@ -1,6 +1,6 @@
persistent_add POSTFIX_EXP &&
-if [[ "x${POSTFIX_EXP}" == "x" ]] && spell_ok $SPELL; then
+if [[ "x$POSTFIX_EXP" == "x" ]] && spell_ok $SPELL; then
persistent_read $SPELL PFIX_EXP POSTFIX_EXP
fi &&
diff --git a/mail/postfix/PRE_BUILD b/mail/postfix/PRE_BUILD
index 468b690..ead491e 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -1,9 +1,9 @@
-mk_source_dir "${SOURCE_DIRECTORY}" &&
+mk_source_dir "$SOURCE_DIRECTORY" &&
unpack_file &&
-if [[ "${POSTFIX_VDA}" == "y" ]] && [[ "${POSTFIX_EXP}" == "n" ]]; then
+if [[ "$POSTFIX_VDA" == "y" ]] && [[ "$POSTFIX_EXP" == "n" ]]; then
verify_file 3 &&
- cd "${SOURCE_DIRECTORY}" &&
- message "${MESSAGE_COLOR}Applying VDA Patch${DEFAULT_COLOR}" &&
- gzip -cd "${SOURCE_CACHE}/${SOURCE3}" | patch -p1
+ cd "$SOURCE_DIRECTORY" &&
+ message "${MESSAGE_COLOR}Applying VDA Patch:
${SOURCE3/.gz}${DEFAULT_COLOR}" &&
+ gzip -cd "$SOURCE_CACHE/$SOURCE3" | patch -p1
fi
diff --git a/net/dnsmasq/BUILD b/net/dnsmasq/BUILD
index fe653fc..6f28cd3 100755
--- a/net/dnsmasq/BUILD
+++ b/net/dnsmasq/BUILD
@@ -1 +1,5 @@
-make PREFIX=/usr CFLAGS="$CFLAGS"
+if is_depends_enabled $SPELL gettext; then
+ make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS" all-i18n
+else
+ make AWK=gawk PREFIX=/usr CFLAGS="$CFLAGS"
+fi
diff --git a/net/dnsmasq/DEPENDS b/net/dnsmasq/DEPENDS
index 812f805..a7314ad 100755
--- a/net/dnsmasq/DEPENDS
+++ b/net/dnsmasq/DEPENDS
@@ -1,4 +1,7 @@
-optional_depends 'dbus' \
- '--enable-dbus' \
- '--disable-dbus' \
- 'for experimental DBus configuration support'
+optional_depends gettext \
+ "" "" \
+ "for i18n support" &&
+
+optional_depends dbus \
+ "--enable-dbus" "--disable-dbus" \
+ "for experimental DBus configuration support"
diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 2d84bb5..a009c55 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,9 +1,10 @@
SPELL=dnsmasq
VERSION=2.45
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
-#
SOURCE_HASH=sha512:003c0489289ddb84f17b5d0db679054a219a6c4acd431ca215aa54239490ad235ac217a220626818c42f69b8581fc1570ed04296eb6aa26bff0ad991950c7bb9
+
#SOURCE_HASH=sha512:003c0489289ddb84f17b5d0db679054a219a6c4acd431ca215aa54239490ad235ac217a220626818c42f69b8581fc1570ed04296eb6aa26bff0ad991950c7bb9
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SECURITY_PATCH=1
LICENSE[0]=GPL
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index abc6e9a..ff545fb 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,8 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * BUILD, DEPENDS, INSTALL: depends on gettext, for translations
+ * PRE_BUILD: formatting chamges
+ * DETAILS: PATCHLEVEL=1
+
2008-07-22 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: updated to 2.45 (SECURITY_PATCH++)
@@ -127,4 +132,3 @@
2002-05-24 Insomniac <insomniac AT japh.nl>
* HISTORY: Added this History file.
-
diff --git a/net/dnsmasq/INSTALL b/net/dnsmasq/INSTALL
index 473ac45..ccd29bc 100755
--- a/net/dnsmasq/INSTALL
+++ b/net/dnsmasq/INSTALL
@@ -1,2 +1,7 @@
-make PREFIX=/usr install &&
-install -m 644 dnsmasq.conf.example /etc
+if is_depends_enabled $SPELL gettext; then
+ make AWK=gawk PREFIX=/usr install
+else
+ make AWK=gawk PREFIX=/usr install-i18n
+fi &&
+
+install_config_file dnsmasq.conf.example "$INSTALL_ROOT/etc/dnsmasq.conf"
diff --git a/net/dnsmasq/PRE_BUILD b/net/dnsmasq/PRE_BUILD
index 001e089..bc65a36 100755
--- a/net/dnsmasq/PRE_BUILD
+++ b/net/dnsmasq/PRE_BUILD
@@ -1,6 +1,6 @@
-default_pre_build &&
+default_pre_build &&
-if list_find "$OPTS" "--enable-dbus"; then
- sedit 's:.*#define HAVE_DBUS.*:#define HAVE_DBUS:' \
- $SOURCE_DIRECTORY/src/config.h
+if list_find "$OPTS" "--enable-dbus"; then
+ sedit 's:.*#define HAVE_DBUS.*:#define HAVE_DBUS:' \
+ $SOURCE_DIRECTORY/src/config.h
fi
diff --git a/utils/ntp/BUILD b/utils/ntp/BUILD
index 54a20f1..f2c781c 100755
--- a/utils/ntp/BUILD
+++ b/utils/ntp/BUILD
@@ -1,8 +1,13 @@
-create_account ntp &&
+create_account ntp &&
-for i in $(grep -rl CONFIG_PHONE .); do
- sedit "s/CONFIG_PHONE/NTP_CONFIG_PHONE/g" $i
-done &&
+local GLIBCVER=$(installed_version glibc) &&
+GLIBCVER=${GLIBCVER:0:3} &&
-OPTS="$OPTS --enable-linuxcaps" &&
+if [[ ! -z $GLIBCVER ]] && [[ ${GLIBCVER/.} > 24 ]]; then
+ if list_find "$NTP_IPV6" "--enable-ipv6"; then
+ OPTS="$OPTS --enable-getifaddrs=glibc"
+ fi
+fi &&
+
+OPTS="$OPTS $NTP_IPV6" &&
default_build
diff --git a/utils/ntp/CONFIGURE b/utils/ntp/CONFIGURE
new file mode 100755
index 0000000..1054364
--- /dev/null
+++ b/utils/ntp/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_option NTP_IPV6 "Enable support for IPv6?" n \
+ "--with-ipv6" "--without-ipv6"
diff --git a/utils/ntp/DEPENDS b/utils/ntp/DEPENDS
index 0068479..80847c1 100755
--- a/utils/ntp/DEPENDS
+++ b/utils/ntp/DEPENDS
@@ -1,17 +1,14 @@
-depends psmisc &&
-depends libcap &&
+depends psmisc &&
+depends libcap "--enable-linuxcaps" &&
-optional_depends openssl \
- "--with-crypto" \
- "--without-crypto" \
- "Enable crypto" &&
+optional_depends openssl \
+ "--with-crypto" "--without-crypto" \
+ "for crypto functions" &&
-optional_depends mdnsresponder \
- "" \
- "" \
- "For external mdsnresponder" &&
+optional_depends mdnsresponder \
+ "" "" \
+ "for external mdsnresponder" &&
-optional_depends w3c-libwww \
- "" \
- "" \
- "Enable MD5"
+optional_depends w3c-libwww \
+ "" "" \
+ "for MD5 functions"
diff --git a/utils/ntp/DETAILS b/utils/ntp/DETAILS
index 9234897..3f74af0 100755
--- a/utils/ntp/DETAILS
+++ b/utils/ntp/DETAILS
@@ -1,10 +1,10 @@
SPELL=ntp
- VERSION=4.2.4p4
-
SOURCE_HASH=sha512:c4ca7271a4abf4b8ccf8433510683722dd00115441bb1cbbf0c62f770a4fa973a49184e4a4802eaff79345544a7f2ef1588ebf0ced70d02bca8bd5440ae24239
+ VERSION=4.2.4p5
+
SOURCE_HASH=sha512:45e1fa5901c9dd1b0878138c83f469e07a1a67579611425baf38344725a3fa5fec0673996f7b64549cf6b3a2ae87441b0b5d0ad051f34f8f1433cdef7703d442
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/$SOURCE
-
SOURCE_URL[0]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/$SOURCE
+ SOURCE_URL[1]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/$SOURCE
WEB_SITE=http://www.ntp.org/
ENTERED=20011004
LICENSE[0]=PD
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index dd7b2d1..7710426 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,10 @@
+2008-09-29 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.4p5; changed both SOURCE_URL's
+ * INSTALL, TRIGGERS: formatting changes
+ * CONFIGURE, BUILD: formatting, configure added to prompt for IPv6
+ * DEPENDS: added linuxcaps flag on the depend for libcap, formatting
+ * BUILD: use glibc getifaddrs only if glibc > 24 and IPv6 was
requested
+
2008-01-14 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: added mdnsresponder
@@ -150,4 +157,3 @@
* HISTORY: Added
* DETAILS: vers. inc. from 4.1.1 to 4.1.1a
new SOURCE_URL's (thanks to Jerome Zago)
-
diff --git a/utils/ntp/INSTALL b/utils/ntp/INSTALL
index ca6756d..6a769aa 100755
--- a/utils/ntp/INSTALL
+++ b/utils/ntp/INSTALL
@@ -1,4 +1,5 @@
-default_install &&
-install -m 755 -d $INSTALL_ROOT/usr/share/doc/$SPELL &&
-cp -r html $INSTALL_ROOT/usr/share/doc/$SPELL &&
+default_install &&
+
+install -m 755 -d "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
+cp -rv html "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
mkdir -p "$INSTALL_ROOT/var/chroot/ntp"
diff --git a/utils/ntp/TRIGGERS b/utils/ntp/TRIGGERS
index 3eb1092..675cae4 100755
--- a/utils/ntp/TRIGGERS
+++ b/utils/ntp/TRIGGERS
@@ -1,3 +1,3 @@
if is_depends_enabled $SPELL openssl; then
- on_cast openssl check_self
+ on_cast openssl check_self
fi
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 722fbf5..5329730 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -22,7 +22,12 @@ else
fi &&
optional_depends libvorbis "--disable-tremor-internal" "" "to use external
libvorbis to play ogg/vorbis audio" &&
-optional_depends faad2 "--enable-faad-external" "" "to use shared faad for
AAC decoding"
+
+if [ "$MPLAYER_SVN" == "y" ]; then
+ optional_depends faad2 "--enable-faad --disable-faad-internal" "" "to use
shared faad for AAC decoding"
+else
+ optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
+fi &&
# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 54fd444..b15d6da 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2008-09-27 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DEPENDS: faad2 configure switch handling differs on svn version
+
2008-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: corrected dependencies to fit xorg-modular
- [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (5578de14cb844964ea09dbba9f4a008cc5b472f4), Elisamuel Resto, 09/30/2008
Archive powered by MHonArc 2.6.24.