Merge branch '2.2' into 2.3
This commit is contained in:
commit
a308d9cab8
@ -6,7 +6,7 @@
|
||||
|
||||
name=cyrus-sasl
|
||||
version=2.1.22
|
||||
release=1
|
||||
release=2
|
||||
source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz \
|
||||
$name-$version-crypt.patch \
|
||||
saslauthd)
|
||||
@ -37,8 +37,8 @@ build(){
|
||||
mkdir -p \
|
||||
$PKG/usr/lib/sasl2 \
|
||||
$PKG/var/sasl/saslauthd \
|
||||
$PKG/etc/rc.d \
|
||||
$PKG/usr/man/man8
|
||||
$PKG/etc/rc.d
|
||||
|
||||
install -m 644 saslauthd/saslauthd.mdoc $PKG/usr/man/man8/saslauthd.8
|
||||
install -m 755 $SRC/saslauthd $PKG/etc/rc.d
|
||||
}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch
|
||||
52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz
|
||||
0552a9b54beb4a044951b7cdbc8fc855 dbus-1.0.2.tar.gz
|
||||
0dc978461c9f75b6203f7c0cd0481b22 rc.dbus
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
# Depends on: expat
|
||||
|
||||
name=dbus
|
||||
version=1.0.1
|
||||
release=1
|
||||
version=1.0.2
|
||||
release=2
|
||||
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
|
||||
rc.dbus 30-dbus.launch)
|
||||
|
||||
@ -16,7 +16,8 @@ build() {
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--with-dbus-user=messagebus \
|
||||
--with-xml=expat
|
||||
--with-xml=expat \
|
||||
--with-system-pid-file=/var/run/$name/$name.pid
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
install -D -m 0755 $SRC/rc.dbus $PKG/etc/rc.d/dbus
|
||||
|
||||
@ -1980,6 +1980,18 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/bsd/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/builtin.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/byteswap.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/c_asm.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-atsui.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-beos.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-ft.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-glitz.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-nquartz.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-os2.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-pdf.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-ps.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-quartz.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-win32.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-xlib-xrender.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo-xlib.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cairo.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/callconv.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/cderr.h
|
||||
@ -2050,7 +2062,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/freetype/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/freetype.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftcache.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftglyph.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftoutlin.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ftoutln.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/ttnameid.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/freetype/tttables.h
|
||||
drwxr-xr-x root/root usr/include/firefox/system_wrappers/fribidi/
|
||||
@ -2091,6 +2103,9 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/gtk/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkcontainer.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkdialog.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkentry.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkfixed.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkiconfactory.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkimage.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkimmulticontext.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkinvisible.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkmain.h
|
||||
@ -2103,6 +2118,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/gtk/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkstock.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkstyle.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtktextview.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkversion.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkvscrollbar.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkwidget.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/gtk/gtkwindow.h
|
||||
@ -2274,10 +2290,12 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/photon/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/photon/PxImage.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11func.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11pqg.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11pub.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pk11sdr.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pkcs11t.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pkcs12.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/pmddim.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/png.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/poll.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/portable.h
|
||||
drwxr-xr-x root/root usr/include/firefox/system_wrappers/private/
|
||||
@ -2557,6 +2575,7 @@ drwxr-xr-x root/root usr/include/firefox/system_wrappers/wx/xrc/
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/wx/xrc/xmlres.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/xpt_struct.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/xpt_xdr.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/zlib.h
|
||||
-rw-r--r-- root/root usr/include/firefox/system_wrappers/zmouse.h
|
||||
drwxr-xr-x root/root usr/include/firefox/toolkitcomps/
|
||||
-rw-r--r-- root/root usr/include/firefox/toolkitcomps/nsICommandLine.h
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
03709c15cba0e0375ff5336d538f77e7 firefox-2.0-source.tar.bz2
|
||||
7a1fc804ed735c5b7e9b1498bac8b5db firefox-2.0.0.1-source.tar.bz2
|
||||
0eceebd5fbc394248c8c94d66fc95d66 firefox.desktop
|
||||
19ec3915f76e7eb820ad2c59730ee2be firefox.png
|
||||
a95e9f62cc3b2b0c4ad906c2a9f44bcf mozconfig
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: libidl, gtk, libpng, libjpeg, zlib
|
||||
|
||||
name=firefox
|
||||
version=2.0
|
||||
version=2.0.0.1
|
||||
release=1
|
||||
source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \
|
||||
http://crux.nu/files/$name/$name.desktop \
|
||||
|
||||
@ -87,21 +87,21 @@ drwxr-xr-x root/root usr/lib/glib-2.0/
|
||||
drwxr-xr-x root/root usr/lib/glib-2.0/include/
|
||||
-rw-r--r-- root/root usr/lib/glib-2.0/include/glibconfig.h
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1200.4
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so -> libglib-2.0.so.0.1200.5
|
||||
lrwxrwxrwx root/root usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libglib-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1200.4
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.1200.5
|
||||
lrwxrwxrwx root/root usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgmodule-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1200.4
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.1200.5
|
||||
lrwxrwxrwx root/root usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgobject-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.la
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1200.4
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1200.4
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.1200.5
|
||||
lrwxrwxrwx root/root usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.1200.5
|
||||
-rwxr-xr-x root/root usr/lib/libgthread-2.0.so.0.1200.5
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/glib-2.0.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/gmodule-2.0.pc
|
||||
|
||||
@ -1 +1 @@
|
||||
ef7b9595fa788e245a0f883bddba8a25 glib-2.12.4.tar.bz2
|
||||
08f51fd565805289879819964bb8192b glib-2.12.5.tar.bz2
|
||||
|
||||
@ -3,13 +3,14 @@
|
||||
# Maintainer: Matt Housh, jaeger at crux dot nu
|
||||
|
||||
name=glib
|
||||
version=2.12.4
|
||||
version=2.12.5
|
||||
release=1
|
||||
source=(ftp://ftp.gtk.org/pub/$name/2.12/$name-$version.tar.bz2)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-debug=no
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
@ -119,34 +119,34 @@ drwxr-xr-x root/root usr/include/libguile/
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rw-r--r-- root/root usr/lib/libguile-srfi-srfi-1-v-3.a
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-1-v-3.la
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-1-v-3.so -> libguile-srfi-srfi-1-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-1-v-3.so.3 -> libguile-srfi-srfi-1-v-3.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-1-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-1-v-3.so -> libguile-srfi-srfi-1-v-3.so.3.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-1-v-3.so.3 -> libguile-srfi-srfi-1-v-3.so.3.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-1-v-3.so.3.0.1
|
||||
-rw-r--r-- root/root usr/lib/libguile-srfi-srfi-13-14-v-3.a
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-13-14-v-3.la
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so -> libguile-srfi-srfi-13-14-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so.3 -> libguile-srfi-srfi-13-14-v-3.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so -> libguile-srfi-srfi-13-14-v-3.so.3.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so.3 -> libguile-srfi-srfi-13-14-v-3.so.3.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-13-14-v-3.so.3.0.1
|
||||
-rw-r--r-- root/root usr/lib/libguile-srfi-srfi-4-v-3.a
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-4-v-3.la
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-4-v-3.so -> libguile-srfi-srfi-4-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-4-v-3.so.3 -> libguile-srfi-srfi-4-v-3.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-4-v-3.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-4-v-3.so -> libguile-srfi-srfi-4-v-3.so.3.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-4-v-3.so.3 -> libguile-srfi-srfi-4-v-3.so.3.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-4-v-3.so.3.0.1
|
||||
-rw-r--r-- root/root usr/lib/libguile-srfi-srfi-60-v-2.a
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-60-v-2.la
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-60-v-2.so -> libguile-srfi-srfi-60-v-2.so.2.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-60-v-2.so.2 -> libguile-srfi-srfi-60-v-2.so.2.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-60-v-2.so.2.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-60-v-2.so -> libguile-srfi-srfi-60-v-2.so.2.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguile-srfi-srfi-60-v-2.so.2 -> libguile-srfi-srfi-60-v-2.so.2.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguile-srfi-srfi-60-v-2.so.2.0.1
|
||||
-rw-r--r-- root/root usr/lib/libguile.a
|
||||
-rwxr-xr-x root/root usr/lib/libguile.la
|
||||
lrwxrwxrwx root/root usr/lib/libguile.so -> libguile.so.17.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile.so.17 -> libguile.so.17.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguile.so.17.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguile.so -> libguile.so.17.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguile.so.17 -> libguile.so.17.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguile.so.17.0.1
|
||||
-rw-r--r-- root/root usr/lib/libguilereadline-v-17.a
|
||||
-rwxr-xr-x root/root usr/lib/libguilereadline-v-17.la
|
||||
lrwxrwxrwx root/root usr/lib/libguilereadline-v-17.so -> libguilereadline-v-17.so.17.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguilereadline-v-17.so.17 -> libguilereadline-v-17.so.17.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libguilereadline-v-17.so.17.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libguilereadline-v-17.so -> libguilereadline-v-17.so.17.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libguilereadline-v-17.so.17 -> libguilereadline-v-17.so.17.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libguilereadline-v-17.so.17.0.1
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/aclocal/
|
||||
-rw-r--r-- root/root usr/share/aclocal/guile.m4
|
||||
|
||||
@ -1 +1 @@
|
||||
3f47443602f93e94bf43218d9b86099d guile-1.8.0.tar.gz
|
||||
be792074780d597208a8cdfed976f559 guile-1.8.1.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: libgmp
|
||||
|
||||
name=guile
|
||||
version=1.8.0
|
||||
version=1.8.1
|
||||
release=1
|
||||
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
|
||||
|
||||
@ -16,5 +16,5 @@ build() {
|
||||
--enable-deprecation=no
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
rm -rf $PKG/usr/info
|
||||
rm -rf $PKG/usr/share/info
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
f2bb7c76fb4300d49f34a7df30642025 ImageMagick-6.3.1-0.tar.bz2
|
||||
55c64bb056b8172ef6eeaf182dccae70 ImageMagick-6.3.1-2.tar.bz2
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
# Depends on: freetype ghostscript lcms libungif libxml2
|
||||
|
||||
name=imagemagick
|
||||
version=6.3.1-0
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-$version.tar.bz2)
|
||||
version=6.3.1-2
|
||||
release=2
|
||||
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$version.tar.bz2)
|
||||
|
||||
build () {
|
||||
cd ImageMagick-${version/-*/}
|
||||
|
||||
@ -28,6 +28,7 @@ lrwxrwxrwx root/root usr/lib/libpcreposix.so.0 -> libpcreposix.so.0.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libpcreposix.so.0.0.0
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libpcre.pc
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libpcrecpp.pc
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/pcregrep.1.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
dbbec9d178ce199e67e98c9a4f994f90 pcre-6.7.tar.bz2
|
||||
b97e3bb84bd665e0fbb7a90344d65a43 pcre-7.0.tar.bz2
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Packager: Han Boetes, han at mijncomputer dot nl
|
||||
|
||||
name=libpcre
|
||||
version=6.7
|
||||
version=7.0
|
||||
release=1
|
||||
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)
|
||||
|
||||
@ -13,6 +13,7 @@ build() {
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-utf8 \
|
||||
--enable-unicode-properties
|
||||
make
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
a9c3b70ab56d65015b28c6b795491c80 gecko-sdk-i686-pc-linux-gnu-1.8b1.tar.gz
|
||||
be26b17cde385c7a34fc634d2c88c5c9 mplayerplug-in-3.31.tar.gz
|
||||
5efa01fa433ee4c7118e534c36198e72 mplayerplug-in-3.35.tar.gz
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
# URL: http://mplayerplug-in.sourceforge.net
|
||||
# Maintainer: Simon Gloßner, viper at hometux dot de
|
||||
# Packager: sten, nick dot steeves at shaw dot ca
|
||||
# Depends on: mplayer, firefox
|
||||
# Depends on: mplayer, firefox, gettext
|
||||
|
||||
name=mplayerplug-in
|
||||
version=3.31
|
||||
version=3.35
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
|
||||
http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.8b1/gecko-sdk-i686-pc-linux-gnu-1.8b1.tar.gz)
|
||||
@ -23,6 +23,6 @@ build () {
|
||||
mkdir -p $PKG/usr/lib/firefox/plugins
|
||||
mkdir -p $PKG/usr/lib/firefox/components
|
||||
|
||||
mv $SRC/$name/mplayerplug-in*.so $PKG/usr/lib/firefox/plugins
|
||||
mv $SRC/$name/mplayerplug-in*.xpt $PKG/usr/lib/firefox/components
|
||||
cp $SRC/$name/mplayerplug-in*.so $PKG/usr/lib/firefox/plugins
|
||||
cp $SRC/$name/mplayerplug-in*.xpt $PKG/usr/lib/firefox/components
|
||||
}
|
||||
|
||||
@ -11,8 +11,8 @@ REQUIREMENTS
|
||||
- faac
|
||||
- liba52
|
||||
|
||||
You should then recompile and upgrade mplayer, so that is built
|
||||
with support for these codecs.
|
||||
You should then recompile and upgrade mplayer, so that it is
|
||||
built with support for these codecs.
|
||||
|
||||
To watch videos on sites that only support IE you need to
|
||||
install the following Firefox extension:
|
||||
|
||||
@ -1 +1 @@
|
||||
bc94c201ca8ae34a01ec8de4427d04b7 mysql-ruby-2.7.2.tar.gz
|
||||
033b768396dfff8124803c849a34d216 mysql-ruby-2.7.3.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: ruby, mysql
|
||||
|
||||
name=mysql-ruby
|
||||
version=2.7.2
|
||||
version=2.7.3
|
||||
release=1
|
||||
source=(http://tmtm.org/downloads/mysql/ruby/$name-$version.tar.gz)
|
||||
|
||||
|
||||
@ -10,10 +10,6 @@ drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/ntfsinfo
|
||||
-rwxr-xr-x root/root usr/bin/ntfsls
|
||||
-rwxr-xr-x root/root usr/bin/ntfsmount
|
||||
drwxr-xr-x root/root usr/etc/
|
||||
drwxr-xr-x root/root usr/etc/gnome-vfs-2.0/
|
||||
drwxr-xr-x root/root usr/etc/gnome-vfs-2.0/modules/
|
||||
-rw-r--r-- root/root usr/etc/gnome-vfs-2.0/modules/libntfs.conf
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/ntfs/
|
||||
-rw-r--r-- root/root usr/include/ntfs/attrib.h
|
||||
@ -50,13 +46,6 @@ drwxr-xr-x root/root usr/include/ntfs/
|
||||
-rw-r--r-- root/root usr/include/ntfs/version.h
|
||||
-rw-r--r-- root/root usr/include/ntfs/volume.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/gnome-vfs-2.0/
|
||||
drwxr-xr-x root/root usr/lib/gnome-vfs-2.0/modules/
|
||||
-rw-r--r-- root/root usr/lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.a
|
||||
-rwxr-xr-x root/root usr/lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.la
|
||||
lrwxrwxrwx root/root usr/lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so -> libntfs-gnomevfs.so.1.0.0
|
||||
lrwxrwxrwx root/root usr/lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.1 -> libntfs-gnomevfs.so.1.0.0
|
||||
-rwxr-xr-x root/root usr/lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.1.0.0
|
||||
-rw-r--r-- root/root usr/lib/libntfs.a
|
||||
-rwxr-xr-x root/root usr/lib/libntfs.la
|
||||
lrwxrwxrwx root/root usr/lib/libntfs.so -> libntfs.so.9.0.0
|
||||
|
||||
@ -11,7 +11,8 @@ source=(http://dl.sourceforge.net/sourceforge/linux-ntfs/$name-$version.tar.gz)
|
||||
build() {
|
||||
cd $name-$version
|
||||
./configure --prefix=/usr \
|
||||
--enable-fuse-module
|
||||
--enable-fuse-module \
|
||||
--disable-gnome-vfs
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
||||
@ -6,11 +6,11 @@ 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.02-20060919.6/
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.02-20060919.6/missingsyms.so
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.02-20060919.6/opera
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.02-20060919.6/spellcheck.so
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.02-20060919.6/works
|
||||
drwxr-xr-x root/root usr/lib/opera/9.10-20061214.6/
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.10-20061214.6/missingsyms.so
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.10-20061214.6/opera
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.10-20061214.6/spellcheck.so
|
||||
-rwxr-xr-x root/root usr/lib/opera/9.10-20061214.6/works
|
||||
drwxr-xr-x root/root usr/lib/opera/plugins/
|
||||
-rwxr-xr-x root/root usr/lib/opera/plugins/libnpp.so
|
||||
-rwxr-xr-x root/root usr/lib/opera/plugins/operaplugincleaner
|
||||
@ -73,6 +73,9 @@ drwxr-xr-x root/root usr/share/opera/styles/images/
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/bar.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/center.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/opera.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/red_center.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/red_left.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/red_right.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/root.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/images/top.png
|
||||
-rw-r--r-- root/root usr/share/opera/styles/info.css
|
||||
@ -89,6 +92,7 @@ drwxr-xr-x root/root usr/share/opera/styles/user/
|
||||
-rw-r--r-- root/root usr/share/opera/styles/user/nostalgia.css
|
||||
-rw-r--r-- root/root usr/share/opera/styles/user/showstructure.css
|
||||
-rw-r--r-- root/root usr/share/opera/styles/user/textonly.css
|
||||
-rw-r--r-- root/root usr/share/opera/styles/warning.css
|
||||
-rw-r--r-- root/root usr/share/opera/styles/wml.css
|
||||
-rw-r--r-- root/root usr/share/opera/svg-mo.dat
|
||||
-rw-r--r-- root/root usr/share/opera/svg-mobd.dat
|
||||
|
||||
@ -1 +1 @@
|
||||
1cc0fc3a709435b05c9d53ebe7d3cbf2 opera-9.02-20060919.6-shared-qt.i386-en.tar.bz2
|
||||
f4d7007948c2841583314f321ff88e30 opera-9.10-20061214.6-shared-qt.i386-en.tar.bz2
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
# Depends on: qt3
|
||||
|
||||
name=opera
|
||||
version=9.02-20060919.6
|
||||
version=9.10-20061214.6
|
||||
release=1
|
||||
source=(http://$name.nsc.no/linux/902/final/en/i386/shared/$name-$version-shared-qt.i386-en.tar.bz2)
|
||||
source=(http://$name.nsc.no/linux/910/final/en/i386/shared/$name-$version-shared-qt.i386-en.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name-$version-shared-qt.i386-en-434
|
||||
cd $name-$version-shared-qt.i386-en-521
|
||||
|
||||
sed -i s:share/man:man: install.sh
|
||||
yes n | ./install.sh --prefix=$PKG/usr
|
||||
|
||||
@ -32,6 +32,7 @@ drwxr-xr-x root/root usr/lib/prtverify/
|
||||
-rw-r--r-- root/root usr/lib/prtverify/20_release_number.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_file_conflict.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_file_permissions.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_filesystem_collisions.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_invalid_dirs.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_junk_files.awk
|
||||
-rw-r--r-- root/root usr/lib/prtverify/30_suid_sgid.awk
|
||||
@ -49,6 +50,7 @@ drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/pkgfoster.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/pkgsize.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/portspage.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/prt-utils.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/prtcheck.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/prtcheckmissing.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/prtcreate.1.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
37762126dea675fa3df379705f9a8c87 prt-utils-0.9.0.tar.gz
|
||||
cea640356422381ddbd37fb8f931ed7c prt-utils-0.9.1.tar.gz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Depends on: prt-get
|
||||
|
||||
name=prt-utils
|
||||
version=0.9.0
|
||||
version=0.9.1
|
||||
release=1
|
||||
source=(http://crux.nu/files/tools/prt-utils/$name-$version.tar.gz)
|
||||
|
||||
|
||||
@ -3,11 +3,11 @@ drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/psc
|
||||
-rwxr-xr-x root/root usr/bin/sc
|
||||
-rwxr-xr-x root/root usr/bin/scqref
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/sc/
|
||||
drwxr-xr-x root/root usr/lib/sc/plugins/
|
||||
-rw-r--r-- root/root usr/lib/sc/tutorial.sc
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/psc.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/sc.1.gz
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/sc/
|
||||
drwxr-xr-x root/root usr/share/sc/plugins/
|
||||
-rw-r--r-- root/root usr/share/sc/tutorial.sc
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
26b011283b3fef961510b34a2ac1c334 sc-7.16.patch
|
||||
658f3174eebc6d2dad667db71304b480 sc-7.16.patch
|
||||
1db636e9b2dc7cd73c40aeece6852d47 sc-7.16.tar.gz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
name=sc
|
||||
version=7.16
|
||||
release=2
|
||||
release=3
|
||||
source=(http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/$name-$version.tar.gz \
|
||||
$name-$version.patch)
|
||||
|
||||
@ -14,7 +14,7 @@ build () {
|
||||
patch -p1 < $SRC/$name-$version.patch
|
||||
sed -i "/^CFLAGS/s/-O2 -pipe/$CFLAGS/" Makefile
|
||||
make
|
||||
mkdir -p $PKG/usr/{bin,man/man1,lib/sc}
|
||||
mkdir -p $PKG/usr/{bin,man/man1,share/sc}
|
||||
make prefix=$PKG/usr install
|
||||
sed -i "s|$PKG||g" $PKG/usr/man/man1/sc.1
|
||||
}
|
||||
|
||||
493
sc/sc-7.16.patch
493
sc/sc-7.16.patch
@ -1,7 +1,439 @@
|
||||
diff -Nru sc-7.16.orig/Makefile sc-7.16/Makefile
|
||||
--- sc-7.16.orig/Makefile 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/Makefile 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
# This is where the library file (tutorial) goes.
|
||||
#LIBDIR=/usr/local/share/$(name) # reno
|
||||
-LIBDIR=${prefix}/lib/$(name)
|
||||
+LIBDIR=${prefix}/share/$(name)
|
||||
LIBRARY=-DLIBDIR=\"${LIBDIR}\"
|
||||
|
||||
# Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up
|
||||
diff -Nru sc-7.16.orig/abbrev.c sc-7.16/abbrev.c
|
||||
--- sc-7.16.orig/abbrev.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/abbrev.c 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -19,10 +19,15 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
+#include <curses.h>
|
||||
+#include <unistd.h>
|
||||
#include "sc.h"
|
||||
|
||||
static struct abbrev *abbr_base;
|
||||
|
||||
+int are_abbrevs(void);
|
||||
+
|
||||
+
|
||||
void
|
||||
add_abbr(char *string)
|
||||
{
|
||||
@@ -87,7 +92,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if (expansion == NULL)
|
||||
+ if (expansion == NULL){
|
||||
if ((a = find_abbr(string, strlen(string), &prev))) {
|
||||
error("abbrev \"%s %s\"", a->abbr, a->exp);
|
||||
return;
|
||||
@@ -95,6 +100,7 @@
|
||||
error("abreviation \"%s\" doesn't exist", string);
|
||||
return;
|
||||
}
|
||||
+ }
|
||||
|
||||
if (find_abbr(string, strlen(string), &prev))
|
||||
del_abbr(string);
|
||||
@@ -122,7 +128,7 @@
|
||||
del_abbr(char *abbrev)
|
||||
{
|
||||
struct abbrev *a;
|
||||
- struct abbrev **prev;
|
||||
+ struct abbrev **prev=0;
|
||||
|
||||
if (!(a = find_abbr(abbrev, strlen(abbrev), prev)))
|
||||
return;
|
||||
diff -Nru sc-7.16.orig/cmds.c sc-7.16/cmds.c
|
||||
--- sc-7.16.orig/cmds.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/cmds.c 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -478,7 +478,7 @@
|
||||
int i, qtmp;
|
||||
char buf[50];
|
||||
struct frange *fr;
|
||||
- struct ent *obuf;
|
||||
+ struct ent *obuf=0;
|
||||
|
||||
if ((fr = find_frange(currow, curcol)))
|
||||
rs = fr->or_right->row - currow + 1;
|
||||
@@ -535,7 +535,7 @@
|
||||
int cs = maxcol - curcol + 1;
|
||||
int i, qtmp;
|
||||
char buf[50];
|
||||
- struct ent *obuf;
|
||||
+ struct ent *obuf=0;
|
||||
|
||||
if (cs - arg < 0) {
|
||||
cs = cs > 0 ? cs : 0;
|
||||
@@ -810,7 +810,7 @@
|
||||
|
||||
if (to_insert == 'r') {
|
||||
insertrow(numrows, 0);
|
||||
- if (fr = find_frange(currow, curcol))
|
||||
+ if ((fr = find_frange(currow, curcol)))
|
||||
deltac = fr->or_left->col - mincol;
|
||||
else {
|
||||
for (i = 0; i < numrows; i++)
|
||||
@@ -2279,7 +2279,7 @@
|
||||
ret->e.r.right.vp = lookat(newrow, newcol);
|
||||
ret->e.r.right.vf = e->e.r.right.vf;
|
||||
} else {
|
||||
- struct enode *temprange;
|
||||
+ struct enode *temprange=0;
|
||||
|
||||
if (freeenodes) {
|
||||
ret = freeenodes;
|
||||
@@ -2337,8 +2337,7 @@
|
||||
break;
|
||||
case 'f':
|
||||
case 'F':
|
||||
- if (range && ret->op == 'F' ||
|
||||
- !range && ret->op == 'f')
|
||||
+ if ((range && ret->op == 'F') || (!range && ret->op == 'f'))
|
||||
Rdelta = Cdelta = 0;
|
||||
ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta,
|
||||
r1, c1, r2, c2, transpose);
|
||||
@@ -2798,7 +2797,7 @@
|
||||
write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc)
|
||||
{
|
||||
register struct ent **pp;
|
||||
- int r, c, rs, cs, mf;
|
||||
+ int r, c, rs=0, cs=0, mf;
|
||||
char *dpointptr;
|
||||
|
||||
mf = modflg;
|
||||
@@ -2861,12 +2860,12 @@
|
||||
if ((plugin = findplugin(p+1, 'w')) != NULL) {
|
||||
if (!plugin_exists(plugin, strlen(plugin), save + 1)) {
|
||||
error("plugin not found");
|
||||
- return;
|
||||
+ return -1;
|
||||
}
|
||||
*save = '|';
|
||||
if ((strlen(save) + strlen(fname) + 20) > PATHLEN) {
|
||||
error("Path too long");
|
||||
- return;
|
||||
+ return -1;
|
||||
}
|
||||
sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0);
|
||||
sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname);
|
||||
@@ -2883,13 +2882,14 @@
|
||||
}
|
||||
#endif /* VMS */
|
||||
|
||||
- if (*fname == '\0')
|
||||
+ if (*fname == '\0'){
|
||||
if (isatty(STDOUT_FILENO) || *curfile != '\0')
|
||||
fname = curfile;
|
||||
else {
|
||||
write_fd(stdout, r0, c0, rn, cn);
|
||||
return (0);
|
||||
}
|
||||
+ }
|
||||
|
||||
#ifdef MSDOS
|
||||
namelen = 12;
|
||||
@@ -2981,12 +2981,12 @@
|
||||
if ((plugin = findplugin(p+1, 'r')) != NULL) {
|
||||
if (!(plugin_exists(plugin, strlen(plugin), save + 1))) {
|
||||
error("plugin not found");
|
||||
- return;
|
||||
+ return -1;
|
||||
}
|
||||
*save = '|';
|
||||
if ((strlen(save) + strlen(fname) + 2) > PATHLEN) {
|
||||
error("Path too long");
|
||||
- return;
|
||||
+ return -1;
|
||||
}
|
||||
sprintf(save + strlen(save), " \"%s\"", fname);
|
||||
eraseflg = 0;
|
||||
diff -Nru sc-7.16.orig/color.c sc-7.16/color.c
|
||||
--- sc-7.16.orig/color.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/color.c 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <curses.h>
|
||||
#include <ctype.h>
|
||||
+#include <unistd.h>
|
||||
#include "sc.h"
|
||||
|
||||
/* a linked list of free [struct ent]'s, uses .next as the pointer */
|
||||
diff -Nru sc-7.16.orig/frame.c sc-7.16/frame.c
|
||||
--- sc-7.16.orig/frame.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/frame.c 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -18,6 +18,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <curses.h>
|
||||
+#include <unistd.h>
|
||||
#include "sc.h"
|
||||
|
||||
static struct frange *frame_base;
|
||||
diff -Nru sc-7.16.orig/help.c sc-7.16/help.c
|
||||
--- sc-7.16.orig/help.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/help.c 2006-12-20 18:48:45.280553112 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
char *revision = "$Revision: 7.16 $";
|
||||
#else
|
||||
#include <curses.h>
|
||||
+#include <unistd.h>
|
||||
#include "sc.h"
|
||||
#endif /* QREF */
|
||||
|
||||
diff -Nru sc-7.16.orig/interp.c sc-7.16/interp.c
|
||||
--- sc-7.16.orig/interp.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/interp.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -1572,12 +1572,12 @@
|
||||
copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2)
|
||||
{
|
||||
struct ent *p;
|
||||
- struct ent *n;
|
||||
+/* struct ent *n;*/
|
||||
static int minsr = -1, minsc = -1;
|
||||
static int maxsr = -1, maxsc = -1;
|
||||
int mindr, mindc;
|
||||
int maxdr, maxdc;
|
||||
- int vr, vc;
|
||||
+/* int vr, vc;*/
|
||||
int r, c;
|
||||
int deltar, deltac;
|
||||
|
||||
@@ -2066,7 +2066,7 @@
|
||||
*line = '\0';
|
||||
}
|
||||
}
|
||||
- if (!col_hidden[c])
|
||||
+ if (!col_hidden[c]){
|
||||
if (gs.g_type == G_STR) {
|
||||
if (p && p->label
|
||||
#if defined(REGCOMP)
|
||||
@@ -2099,6 +2099,7 @@
|
||||
#endif
|
||||
#endif
|
||||
break;
|
||||
+ }
|
||||
if (r == endr && c == endc) {
|
||||
error("String not found");
|
||||
#if defined(REGCOMP)
|
||||
@@ -2471,13 +2472,11 @@
|
||||
int
|
||||
constant(register struct enode *e)
|
||||
{
|
||||
- return (
|
||||
- e == NULL
|
||||
+ return e == NULL
|
||||
|| e->op == O_CONST
|
||||
|| e->op == O_SCONST
|
||||
- || e->op == 'm' && constant(e->e.o.left)
|
||||
- || (
|
||||
- e->op != O_VAR
|
||||
+ || (e->op == 'm' && constant(e->e.o.left))
|
||||
+ || (e->op != O_VAR
|
||||
&& !(e->op & REDUCE)
|
||||
&& constant(e->e.o.left)
|
||||
&& constant(e->e.o.right)
|
||||
@@ -2491,9 +2490,7 @@
|
||||
&& e->op != LASTCOL
|
||||
&& e->op != NUMITER
|
||||
&& e->op != FILENAME
|
||||
- && optimize
|
||||
- )
|
||||
- );
|
||||
+ && optimize );
|
||||
}
|
||||
|
||||
void
|
||||
diff -Nru sc-7.16.orig/lex.c sc-7.16/lex.c
|
||||
--- sc-7.16.orig/lex.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/lex.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -34,6 +34,8 @@
|
||||
#include <signal.h>
|
||||
#include <setjmp.h>
|
||||
#include <ctype.h>
|
||||
+#include <unistd.h>
|
||||
+#include <math.h>
|
||||
#include "sc.h"
|
||||
|
||||
#ifdef NONOTIMEOUT
|
||||
@@ -107,7 +109,7 @@
|
||||
yylex()
|
||||
{
|
||||
char *p = line + linelim;
|
||||
- int ret;
|
||||
+ int ret=0;
|
||||
static int isfunc = 0;
|
||||
static bool isgoto = 0;
|
||||
static bool colstate = 0;
|
||||
@@ -326,7 +328,7 @@
|
||||
strcpy((char *)path, HomeDir);
|
||||
strcat((char *)path, "/.sc/plugins/");
|
||||
strncat((char *)path, name, len);
|
||||
- if (fp = fopen((char *)path, "r")) {
|
||||
+ if ((fp = fopen((char *)path, "r"))) {
|
||||
fclose(fp);
|
||||
return 1;
|
||||
}
|
||||
@@ -334,7 +336,7 @@
|
||||
strcpy((char *)path, LIBDIR);
|
||||
strcat((char *)path, "/plugins/");
|
||||
strncat((char *)path, name, len);
|
||||
- if (fp = fopen((char *)path, "r")) {
|
||||
+ if ((fp = fopen((char *)path, "r"))) {
|
||||
fclose(fp);
|
||||
return 1;
|
||||
}
|
||||
diff -Nru sc-7.16.orig/range.c sc-7.16/range.c
|
||||
--- sc-7.16.orig/range.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/range.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
+#include <unistd.h>
|
||||
+#include <curses.h>
|
||||
#include "sc.h"
|
||||
|
||||
static struct range *rng_base;
|
||||
diff -Nru sc-7.16.orig/sc.c sc-7.16/sc.c
|
||||
--- sc-7.16.orig/sc.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/sc.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -212,7 +212,7 @@
|
||||
|
||||
if (dbidx < 0)
|
||||
return;
|
||||
- if (p = delbuf[dbidx]) {
|
||||
+ if ((p = delbuf[dbidx])) {
|
||||
scxfree(delbuffmt[dbidx]);
|
||||
delbuffmt[dbidx] = NULL;
|
||||
}
|
||||
@@ -845,7 +845,7 @@
|
||||
break;
|
||||
case 'C':
|
||||
color = !color;
|
||||
- if (has_colors())
|
||||
+ if (has_colors()){
|
||||
if (color) {
|
||||
attron(COLOR_PAIR(1));
|
||||
bkgd(COLOR_PAIR(1) | ' ');
|
||||
@@ -853,6 +853,7 @@
|
||||
attron(COLOR_PAIR(0));
|
||||
bkgd(COLOR_PAIR(0) | ' ');
|
||||
}
|
||||
+ }
|
||||
error("Color %sabled.", color ? "en" : "dis");
|
||||
break;
|
||||
case 'N':
|
||||
diff -Nru sc-7.16.orig/sc.h sc-7.16/sc.h
|
||||
--- sc-7.16.orig/sc.h 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/sc.h 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -612,6 +612,9 @@
|
||||
extern int rowlimit;
|
||||
extern int collimit;
|
||||
|
||||
+void yankr(struct ent *v1, struct ent *v2);
|
||||
+
|
||||
+
|
||||
#if BSD42 || SYSIII
|
||||
|
||||
#ifndef cbreak
|
||||
diff -Nru sc-7.16.orig/screen.c sc-7.16/screen.c
|
||||
--- sc-7.16.orig/screen.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/screen.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -234,11 +234,12 @@
|
||||
i = stcol;
|
||||
lcols = 0;
|
||||
col = rescol + frcols;
|
||||
- if (fr && stcol >= fr->or_left->col)
|
||||
+ if (fr && stcol >= fr->or_left->col){
|
||||
if (stcol < fr->ir_left->col)
|
||||
i = fr->or_left->col;
|
||||
else
|
||||
col += flcols;
|
||||
+ }
|
||||
for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) &&
|
||||
i < maxcols; i++) {
|
||||
lcols++;
|
||||
@@ -328,11 +329,12 @@
|
||||
i = stcol;
|
||||
lcols = 0;
|
||||
col = rescol + frcols;
|
||||
- if (fr && stcol >= fr->or_left->col)
|
||||
+ if (fr && stcol >= fr->or_left->col){
|
||||
if (stcol < fr->ir_left->col)
|
||||
i = fr->or_left->col;
|
||||
else
|
||||
col += flcols;
|
||||
+ }
|
||||
for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) &&
|
||||
i < maxcols; i++) {
|
||||
lcols++;
|
||||
@@ -377,11 +379,12 @@
|
||||
i = strow;
|
||||
rows = 0;
|
||||
row = RESROW + fbrows;
|
||||
- if (fr && strow >= fr->or_left->row)
|
||||
+ if (fr && strow >= fr->or_left->row){
|
||||
if (strow < fr->ir_left->row)
|
||||
i = fr->or_left->row;
|
||||
else
|
||||
row += ftrows;
|
||||
+ }
|
||||
for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows;
|
||||
i++) {
|
||||
rows++;
|
||||
@@ -460,11 +463,12 @@
|
||||
i = strow;
|
||||
rows = 0;
|
||||
row = RESROW + fbrows;
|
||||
- if (fr && strow >= fr->or_left->row)
|
||||
+ if (fr && strow >= fr->or_left->row){
|
||||
if (strow < fr->ir_left->row)
|
||||
i = fr->or_left->row;
|
||||
else
|
||||
row += ftrows;
|
||||
+ }
|
||||
for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows;
|
||||
i++) {
|
||||
rows++;
|
||||
diff -Nru sc-7.16.orig/sort.c sc-7.16/sort.c
|
||||
--- sc-7.16.orig/sort.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/sort.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -19,6 +19,8 @@
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
+#include <unistd.h>
|
||||
+#include <curses.h>
|
||||
#include "sc.h"
|
||||
|
||||
int compare(const void *row1, const void *row2);
|
||||
diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c
|
||||
--- sc-7.16.orig/vi.c 2005-04-02 14:49:15.000000000 +0200
|
||||
+++ sc-7.16/vi.c 2005-04-02 14:55:05.000000000 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
--- sc-7.16.orig/vi.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/vi.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -17,6 +17,8 @@
|
||||
#include <curses.h>
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/wait.h>
|
||||
#include "sc.h"
|
||||
|
||||
#if defined(REGCOMP)
|
||||
@@ -40,7 +42,7 @@
|
||||
|
||||
#define istext(a) (isalnum(a) || ((a) == '_'))
|
||||
|
||||
@ -10,9 +442,60 @@ diff -Nru sc-7.16.orig/vi.c sc-7.16/vi.c
|
||||
#define true 1
|
||||
#define false 0
|
||||
|
||||
@@ -667,8 +669,10 @@
|
||||
static struct range *nextmatch;
|
||||
int len;
|
||||
|
||||
- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' ||
|
||||
- (completethis && line[linelim-1] == ' ')) {
|
||||
+ if ((linelim > 0 && isalnum(line[linelim-1])) ||
|
||||
+ line[linelim-1] == '_' ||
|
||||
+ (completethis && line[linelim-1] == ' ')) {
|
||||
+
|
||||
if (!completethis) {
|
||||
for (completethis = line + linelim - 1; isalnum(*completethis) ||
|
||||
*completethis == '_'; completethis--) /* */;
|
||||
@@ -715,7 +719,7 @@
|
||||
showdr()
|
||||
{
|
||||
int minsr, minsc, maxsr, maxsc;
|
||||
- char *p;
|
||||
+ /*char *p;*/
|
||||
char r[12];
|
||||
struct frange *fr = find_frange(currow, curcol);
|
||||
|
||||
@@ -1566,7 +1570,7 @@
|
||||
search_again(bool reverse)
|
||||
{
|
||||
int prev_match;
|
||||
- int found_it;
|
||||
+ int found_it=0;
|
||||
#if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP)
|
||||
char *look_here;
|
||||
int do_next;
|
||||
@@ -1777,7 +1781,7 @@
|
||||
static void
|
||||
match_paren()
|
||||
{
|
||||
- register int i;
|
||||
+ /*register int i;*/
|
||||
int nest = 1;
|
||||
int tmp = linelim;
|
||||
|
||||
diff -Nru sc-7.16.orig/vmtbl.c sc-7.16/vmtbl.c
|
||||
--- sc-7.16.orig/vmtbl.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/vmtbl.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
# include <curses.h>
|
||||
#endif /* PSC */
|
||||
|
||||
+#include <unistd.h>
|
||||
#include "sc.h"
|
||||
|
||||
/*
|
||||
diff -Nru sc-7.16.orig/xmalloc.c sc-7.16/xmalloc.c
|
||||
--- sc-7.16.orig/xmalloc.c 2005-04-02 14:49:15.000000000 +0200
|
||||
+++ sc-7.16/xmalloc.c 2005-04-02 14:50:06.000000000 +0200
|
||||
--- sc-7.16.orig/xmalloc.c 2006-12-20 18:43:05.630179753 +0100
|
||||
+++ sc-7.16/xmalloc.c 2006-12-20 18:48:45.290552829 +0100
|
||||
@@ -4,11 +4,12 @@
|
||||
*/
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
482b47077510dbac2bf8ce72907ff9f8 smartd
|
||||
2e424f2d35efa38a29ebca419c1dbe3c smartmontools-5.36.tar.gz
|
||||
4ab3668b7d1362ce923f64a211e0e568 smartmontools-5.37.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Packager: Jürgen Daubert, juergen dot daubert at t-online dot de
|
||||
|
||||
name=smartmontools
|
||||
version=5.36
|
||||
version=5.37
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz \
|
||||
smartd)
|
||||
@ -14,6 +14,7 @@ build () {
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--sysconfdir=/etc
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
f346e07ab1a6ecb55cc7f08fda1306ce mozconfig
|
||||
c3933149147567471000e53dbeac7429 thunderbird-1.5.0.7-source.tar.bz2
|
||||
bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: libidl, gtk, libjpeg, libpng, zlib, expat
|
||||
|
||||
name=thunderbird
|
||||
version=1.5.0.7
|
||||
version=1.5.0.9
|
||||
release=1
|
||||
source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \
|
||||
mozconfig)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user