Merge branch '2.4' into 2.5

Conflicts:
	cdrtools/.md5sum
	cdrtools/Pkgfile
This commit is contained in:
Juergen Daubert 2008-11-10 09:03:25 +01:00
commit 80e684637c
30 changed files with 1091 additions and 817 deletions

View File

@ -1 +1 @@
92b52acf900ce4ece39edb53d4ff1c36 AdobeReader_enu-8.1.2_SU1-1.i486.tar.gz
64f704ea286b4b94c2084f9c6ea2a61c AdobeReader_enu-8.1.3-1.i486.tar.gz

View File

@ -5,9 +5,9 @@
# Depends on: gtk, libstdc++-compat
name=adobereader
version=8.1.2_SU1
version=8.1.3
release=1
source=(http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.2/enu/AdobeReader_enu-$version-1.i486.tar.gz)
source=(http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.3/enu/AdobeReader_enu-$version-1.i486.tar.gz)
PKGMK_NO_STRIP="yes"
build() {

View File

@ -1,5 +1,6 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/CenterIMLog2HTML.py
-rwxr-xr-x root/root usr/bin/centerim
-rwxr-xr-x root/root usr/bin/cimconv
drwxr-xr-x root/root usr/man/

View File

@ -1 +1 @@
9bbbdb34ab678d29387171139ae835e1 centerim-4.22.5.tar.gz
b26cb94fc5cb68fd3ca8a11ab0bb031c centerim-4.22.6.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on: ncurses
name=centerim
version=4.22.5
version=4.22.6
release=1
source=(http://www.centerim.org/download/releases/$name-$version.tar.gz)

View File

@ -6,7 +6,6 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/liberuby.a
lrwxrwxrwx root/root usr/lib/liberuby.so -> liberuby.so.1.0.5
lrwxrwxrwx root/root usr/lib/liberuby.so.1.0 -> liberuby.so.1.0.5
-rw-r--r-- root/root usr/lib/liberuby.so.1.0.5
drwxr-xr-x root/root usr/lib/ruby/
drwxr-xr-x root/root usr/lib/ruby/1.8/

View File

@ -1 +1,2 @@
4b1a5becee310f6bf03d8e2e6e868b48 eruby-1.0.5.patch
af294fe34dc6cf24228aec95167b3099 eruby-1.0.5.tar.gz

View File

@ -5,12 +5,14 @@
name=eruby
version=1.0.5
release=1
source=(http://modruby.net/archive/$name-$version.tar.gz)
release=2
source=(http://modruby.net/archive/$name-$version.tar.gz \
$name-$version.patch)
build() {
cd $name-$version
sed -i 's|/-linux/|/linux/|g' configure.rb
patch -p0 -i $SRC/$name-$version.patch
#sed -i 's|/-linux/|/linux/|g' configure.rb
./configure.rb --prefix=/usr --enable-shared
make
make DESTDIR=$PKG install

117
eruby/eruby-1.0.5.patch Normal file
View File

@ -0,0 +1,117 @@
Index: configure.rb
===================================================================
--- configure.rb (revision 140)
+++ configure.rb (working copy)
@@ -59,21 +59,24 @@
end
end
-require 'ftools'
+require 'fileutils'
def AC_OUTPUT(*files)
+ $DEFS ||= ""
if $AC_LIST_HEADER
- $DEFS = "-DHAVE_CONFIG_H"
+ $DEFS << " -DHAVE_CONFIG_H"
AC_OUTPUT_HEADER($AC_LIST_HEADER)
else
- $DEFS = $ac_confdefs.collect {|k, v| "-D#{k}=#{v}" }.join(" ")
+ $DEFS << " " + $ac_confdefs.collect {|k, v| "-D#{k}=#{v}" }.join(" ")
end
for file in files
print "creating ", file, "\n"
open(File.join($srcdir, file + ".in")) do |fin|
- File.makedirs(File.dirname(file))
+ FileUtils.mkdir_p(File.dirname(file))
open(file, "w") do |fout|
+ depend = false
while line = fin.gets
+ depend = true if /^\#\#\# depend/ =~ line
line.gsub!(/@([A-Za-z_]+)@/) do |s|
name = $1
if $ac_sed.key?(name)
@@ -82,6 +85,7 @@
s
end
end
+ line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1{$(srcdir)}\2') if depend && $nmake
fout.print(line)
end
end
@@ -153,13 +157,18 @@
file = File.join(dir, prog)
if File.file?(file); then
$ac_aux_dir = dir
- $ac_install_rb = "#{file} -c"
+ $ac_install_rb = "$(RUBY) #{file} -c"
return
end
end
end
end
+begin
+ require "continuation"
+rescue LoadError
+end
+
def AC_PROG_INSTALL
AC_MSG_CHECKING("for a BSD compatible install")
$ac_cv_path_install = callcc { |c|
@@ -291,6 +300,13 @@
$AR = CONFIG["AR"]
$LD = "$(CC)"
$RANLIB = CONFIG["RANLIB"]
+$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"]))
+$RUBY = ($nmake && !$configure_args.has_key?('--ruby')) ? $ruby.gsub(%r'/', '\\') : $ruby
+if RUBY_VERSION < "1.8.0"
+ $RM = 'rm -f'
+else
+ $RM = CONFIG["RM"] || '$(RUBY) -run -e rm -- -f'
+end
if not defined? CFLAGS
CFLAGS = CONFIG["CFLAGS"]
@@ -306,7 +322,7 @@
$LDFLAGS = "-link -incremental:no -pdb:none"
end
$LIBS = CONFIG["LIBS"]
-$XLDFLAGS = CONFIG["XLDFLAGS"]
+$XLDFLAGS = CONFIG["XLDFLAGS"].to_s
$XLDFLAGS.gsub!(/-L\./, "")
if /mswin32/ !~ RUBY_PLATFORM
$XLDFLAGS += " -L$(libdir)"
@@ -349,6 +365,14 @@
end
end
+$COMPILE_RULES = ''
+if defined?(COMPILE_RULES)
+ COMPILE_RULES.each do |rule|
+ $COMPILE_RULES << sprintf(rule, 'c', $OBJEXT)
+ $COMPILE_RULES << sprintf("\n\t%s\n\n", COMPILE_C)
+ end
+end
+
AC_SUBST("srcdir")
AC_SUBST("topdir")
AC_SUBST("hdrdir")
@@ -375,6 +399,8 @@
AC_SUBST("AR")
AC_SUBST("LD")
AC_SUBST("RANLIB")
+AC_SUBST("RUBY")
+AC_SUBST("RM")
AC_SUBST("CFLAGS")
AC_SUBST("DEFS")
@@ -388,6 +414,8 @@
AC_SUBST("EXEEXT")
AC_SUBST("DLEXT")
+AC_SUBST("COMPILE_RULES")
+
AC_SUBST("RUBY_INSTALL_NAME")
AC_SUBST("LIBRUBYARG")
AC_SUBST("LIBRUBYARG_SHARED")

View File

@ -1 +1 @@
9b8060c8d7e24e27d5007c8058dcee03 gnuplot-4.2.4.tar.gz
3cde3b9232a2d81715bbaf75e1c87ecc gnuplot-4.2.4.tar.gz

34
lm_sensors/.footprint Normal file
View File

@ -0,0 +1,34 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/sensors
-rwxr-xr-x root/root usr/bin/sensors-conf-convert
drwxr-xr-x root/root usr/etc/
-rw-r--r-- root/root usr/etc/sensors3.conf
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/sensors/
-rw-r--r-- root/root usr/include/sensors/error.h
-rw-r--r-- root/root usr/include/sensors/sensors.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libsensors.a
lrwxrwxrwx root/root usr/lib/libsensors.so -> libsensors.so.4
lrwxrwxrwx root/root usr/lib/libsensors.so.4 -> libsensors.so.4.0.2
-rwxr-xr-x root/root usr/lib/libsensors.so.4.0.2
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/sensors.1.gz
drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/libsensors.3.gz
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/sensors.conf.5.gz
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/fancontrol.8.gz
-rw-r--r-- root/root usr/man/man8/isadump.8.gz
-rw-r--r-- root/root usr/man/man8/isaset.8.gz
-rw-r--r-- root/root usr/man/man8/pwmconfig.8.gz
-rw-r--r-- root/root usr/man/man8/sensors-detect.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/fancontrol
-rwxr-xr-x root/root usr/sbin/isadump
-rwxr-xr-x root/root usr/sbin/isaset
-rwxr-xr-x root/root usr/sbin/pwmconfig
-rwxr-xr-x root/root usr/sbin/sensors-detect

1
lm_sensors/.md5sum Normal file
View File

@ -0,0 +1 @@
e88b236228ac2a50821217015b8fd0fa lm_sensors-3.0.3.tar.bz2

17
lm_sensors/Pkgfile Normal file
View File

@ -0,0 +1,17 @@
# Description: Tools for monitoring system health (temperatures, voltages, fan speed, etc)
# URL: http://www.lm-sensors.org
# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
# Depends on: perl
# Nice to have: i2c-tools
name=lm_sensors
version=3.0.3
release=1
source=(http://dl.lm-sensors.org/lm-sensors/releases/$name-$version.tar.bz2)
build () {
cd $name-$version
make install PREFIX=/usr \
ETCDIR=/usr/etc \
DESTDIR=$PKG
}

32
lm_sensors/README Normal file
View File

@ -0,0 +1,32 @@
README for lm_sensors
IMPORTANT NOTES
* The libsensors configuration file (/etc/sensors.conf) is never overwritten
by our installation process, so that you won't lose your personal settings
in that file. You still can get our latest default config file in
etc/sensors.conf.eg and manually copy it to /etc/sensors.conf if you want.
You will then want to edit it to fit your needs again.
* The format of /etc/sensors.conf changed with lm-sensors >= 3.0.0.
If you have a custom configuration file using the old format, you can convert
it using the sensors-conf-convert script. Otherwise just overwrite your old
configuration file with the new default one.
KERNEL CONFIGURATION
* Enable "I2C support" (CONFIG_I2C=y or m). On many motherboards, the sensor
chip is connected to the SMBus, which is supported by I2C in the Linux kernel
* Enable "I2C device interface" (CONFIG_I2C_CHARDEV=m). sensors-detect needs
this to probe for SMBus hardware monitoring chips.
* In I2C Hardware Bus support, enable all drivers you might need, preferably
as modules. If you're not sure, select them all.
* Enable "Hardware Monitoring support" (CONFIG_HWMON=y or m).
* Enable all hardware monitoring drivers you might need, preferably as modules

View File

@ -1 +1 @@
299d8536f36e93197f6386e35c2a02c1 mod_ruby-1.2.6.tar.gz
5aae358c3c9f1bfa2554da9242289ab7 mod_ruby-1.3.0.tar.gz

View File

@ -5,8 +5,8 @@
# Group: apache
name=mod_ruby
version=1.2.6
release=2
version=1.3.0
release=1
source=(http://modruby.net/archive/$name-$version.tar.gz)
build() {

View File

@ -1 +1 @@
8321d0e1964846090f0174cb6bb18838 subversion-1.5.2.tar.bz2
037d1ed7a313631d50defdc3cf727415 subversion-1.5.4.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: subversion apache
name=mod_svn
version=1.5.2
version=1.5.4
release=1
source=(http://subversion.tigris.org/downloads/subversion-$version.tar.bz2)

View File

@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/mpg123.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libmpg123.la
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.7.0
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.7.0
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.7.0
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.11.2
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.11.2
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.11.2
drwxr-xr-x root/root usr/lib/mpg123/
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.la
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.so

View File

@ -1 +1 @@
7bdbd62097de68728fefe04f36b1f02c mpg123-1.5.1.tar.bz2
9d350eb6d3b3ff21a5751c1adde55f0a mpg123-1.6.1.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: libtool, alsa-lib
name=mpg123
version=1.5.1
version=1.6.1
release=1
source=(http://www.mpg123.de/download/$name-$version.tar.bz2)

View File

@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/opera
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/opera/
drwxr-xr-x root/root usr/lib/opera/9.61/
-rw-r--r-- root/root usr/lib/opera/9.61/missingsyms.so
-rwxr-xr-x root/root usr/lib/opera/9.61/opera
-rwxr-xr-x root/root usr/lib/opera/9.61/operaplugincleaner
-rwxr-xr-x root/root usr/lib/opera/9.61/operapluginwrapper
-rw-r--r-- root/root usr/lib/opera/9.61/spellcheck.so
-rwxr-xr-x root/root usr/lib/opera/9.61/works
drwxr-xr-x root/root usr/lib/opera/9.62/
-rw-r--r-- root/root usr/lib/opera/9.62/missingsyms.so
-rwxr-xr-x root/root usr/lib/opera/9.62/opera
-rwxr-xr-x root/root usr/lib/opera/9.62/operaplugincleaner
-rwxr-xr-x root/root usr/lib/opera/9.62/operapluginwrapper
-rw-r--r-- root/root usr/lib/opera/9.62/spellcheck.so
-rwxr-xr-x root/root usr/lib/opera/9.62/works
drwxr-xr-x root/root usr/lib/opera/plugins/
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/

View File

@ -1 +1 @@
ef895e80f26915fdedc0c5eaee486009 opera-9.61.gcc4-qt4.i386.tar.bz2
d7018a3ddbb06e1dcad883a9c198563e opera-9.62.gcc4-qt4.i386.tar.bz2

View File

@ -5,9 +5,9 @@
# Depends on: qt4
name=opera
version=9.61
version=9.62
release=1
source=(http://ftp.ntua.gr/pub/www/Opera/linux/961/final/en/i386/opera-$version.gcc4-qt4.i386.tar.bz2)
source=(http://ftp.heanet.ie/pub/opera/linux/962/final/en/i386/opera-$version.gcc4-qt4.i386.tar.bz2)
build() {
cd $name-$version-*
@ -19,6 +19,6 @@ build() {
sed -i -e "s|$PKG||g" $PKG/usr/bin/opera
rm -rf $PKG/usr/share/doc
find "$PKG/usr/share/opera/locale/" -type d -mindepth 1 -maxdepth 1 -not -name en -exec rm -r {} \;
find "$PKG/usr/share/opera/locale/" -mindepth 1 -maxdepth 1 -type d -not -name en -exec rm -r {} \;
}

View File

@ -5,7 +5,7 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python2.5/
drwxr-xr-x root/root usr/lib/python2.5/site-packages/
-rw-r--r-- root/root usr/lib/python2.5/site-packages/rdiff_backup-1.2.1-py2.5.egg-info
-rw-r--r-- root/root usr/lib/python2.5/site-packages/rdiff_backup-1.2.2-py2.5.egg-info
drwxr-xr-x root/root usr/lib/python2.5/site-packages/rdiff_backup/
-rwxr-xr-x root/root usr/lib/python2.5/site-packages/rdiff_backup/C.so
-rw-r--r-- root/root usr/lib/python2.5/site-packages/rdiff_backup/FilenameMapping.py

View File

@ -1 +1 @@
7f71157161e510a9302abe130801c067 rdiff-backup-1.2.1.tar.gz
b9141e541c1885e858da5c41101aba78 rdiff-backup-1.2.2.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: python, rdiff, librsync
name=rdiff-backup
version=1.2.1
version=1.2.2
release=1
source=(http://savannah.nongnu.org/download/${name}/${name}-${version}.tar.gz)

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
16f399af1081ad3c303a794c9c7dc47e zsh-4.3.6.tar.bz2
0539d0a590e545ad8c40ff8c97e94538 zsh-4.3.9.tar.bz2
e545cc32832bef6431a109b7678a592e zsh-lovers.1

View File

@ -5,8 +5,8 @@
# Nice to have: libpcre
name=zsh
version=4.3.6
release=3
version=4.3.9
release=1
source=(http://www.zsh.org/pub/$name-$version.tar.bz2 \
http://www.grml.org/zsh/zsh-lovers.1)