diff --git a/extra/3ddesktop/3ddesktop-0.2.9-gcc4.patch b/extra/3ddesktop/3ddesktop-0.2.9-gcc4.patch new file mode 100644 index 000000000..95404894c --- /dev/null +++ b/extra/3ddesktop/3ddesktop-0.2.9-gcc4.patch @@ -0,0 +1,13 @@ +diff -urNad 3ddesktop-0.2.9/event.hpp /tmp/dpep.QstFBy/3ddesktop-0.2.9/event.hpp +--- 3ddesktop-0.2.9/event.hpp 2004-12-06 03:57:32.000000000 +0100 ++++ /tmp/dpep.QstFBy/3ddesktop-0.2.9/event.hpp 2005-07-06 21:50:00.000000000 +0200 +@@ -74,7 +74,7 @@ + list::iterator k; + for (k = events.begin(); k != events.end(); ++k) { + Event *e = *k; +- printf(":: Event %d 0x%x\n", e->type, (unsigned int)(e->function)); ++ printf(":: Event %d %p\n", e->type, e->function); + } + } + + diff --git a/extra/3ddesktop/3ddesktop-0.2.9-missing-include.patch b/extra/3ddesktop/3ddesktop-0.2.9-missing-include.patch new file mode 100644 index 000000000..cc30fda09 --- /dev/null +++ b/extra/3ddesktop/3ddesktop-0.2.9-missing-include.patch @@ -0,0 +1,11 @@ +diff -u -r a/config.hpp b/config.hpp +--- a/config.hpp 2005-06-20 13:28:29.000000000 +0200 ++++ b/config.hpp 2008-12-17 19:40:05.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + + #include + #include diff --git a/extra/3ddesktop/PKGBUILD b/extra/3ddesktop/PKGBUILD new file mode 100644 index 000000000..81afda14c --- /dev/null +++ b/extra/3ddesktop/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 31368 2009-03-26 05:01:13Z eric $ +# Maintainer: damir +# Contributor: Ben + +pkgname=3ddesktop +pkgver=0.2.9 +pkgrel=3 +pkgdesc="a 3d virtual desktop switcher (opengl/mesa)" +arch=('i686' 'x86_64') +url="http://desk3d.sourceforge.net" +license=('GPL') +depends=('freetype2' 'libxi' 'libxmu' 'imlib2' 'glut') +backup=('etc/3ddesktop/3ddesktop.conf') +source=(http://downloads.sourceforge.net/sourceforge/desk3d/$pkgname-$pkgver.tar.gz 3ddesktop-0.2.9-gcc4.patch 3ddesktop-0.2.9-missing-include.patch) +md5sums=('da1e8b0d2c210a441676bbf663e694ee' '9aac53edbd737f827651470da4e5a7b2'\ + 'ae911ed543329f63fe50cfbb9021deeb') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../3ddesktop-0.2.9-gcc4.patch || return 1 + patch -Np1 -i ../3ddesktop-0.2.9-missing-include.patch || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/3ddesktop || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/a2ps/ChangeLog b/extra/a2ps/ChangeLog new file mode 100644 index 000000000..fda664602 --- /dev/null +++ b/extra/a2ps/ChangeLog @@ -0,0 +1,10 @@ +2009-03-22 Eric Belanger + + * a2ps 4.14-1 + * Upstream update + * Added/Removed patches + * Updated license + * Added backup array + * Added gperf makedepends + * Added install scriptlet to handle info pages + * Added ChangeLog diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD new file mode 100644 index 000000000..d52f90cea --- /dev/null +++ b/extra/a2ps/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 31037 2009-03-24 05:49:45Z eric $ +# Maintainer: Eric Belanger +# Contributor: Sarah Hay + +pkgname=a2ps +pkgver=4.14 +pkgrel=1 +pkgdesc="a2ps is an Any to PostScript filter" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/a2ps/" +license=('GPL3') +depends=('ghostscript' 'psutils' 'imagemagick' 'perl') +makedepends=('gperf') +replaces=('a2ps-lprng') +provides=('a2ps-lprng') +backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') +options=('!libtool') +install=a2ps.install +source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \ + a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \ + a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch) +md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' '93011b58e9f20a7fafa31287a51884a4'\ + '2e493d0bc00d71eb3e8a9b6febc52b69' '09cc5ed4d3d8ff1b2103e519191e8286'\ + '42aa39b74f6da8cf6e94185c4fc3e601' '066f9327fee6b6eca3a57d657d1097d1') +sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65'\ + '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce'\ + '6aed29c1399e79f3914b408059610f9e7c0fc38e' '58fa90134f1027e3f05aeb08212cbcc10f420738') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch || return 1 + patch -p1 < ../a2ps-4.13c-emacs.patch || return 1 + patch -p1 < ../a2ps-4.13-manpage-chmod.patch || return 1 + patch -p1 < ../a2ps-4.14-check-mempcpy.patch || return 1 + patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch || return 1 + libtoolize --force --copy || return 1 + autoreconf -I m4 || return 1 + ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ + --includedir=/usr/include --enable-nls || return 1 + export LANG=C + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + sed -i "s:^countdictstack: \0:" ${pkgdir}/usr/bin/psset || return 1 + rm ${pkgdir}/usr/share/info/dir + gzip ${pkgdir}/usr/share/info/* +} diff --git a/extra/a2ps/a2ps-4.13-manpage-chmod.patch b/extra/a2ps/a2ps-4.13-manpage-chmod.patch new file mode 100644 index 000000000..e0c61124e --- /dev/null +++ b/extra/a2ps/a2ps-4.13-manpage-chmod.patch @@ -0,0 +1,12 @@ +diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint +--- a2ps-4.13.orig/man/Makefile.maint 2002-03-04 20:46:26.000000000 +0200 ++++ a2ps-4.13/man/Makefile.maint 2007-02-19 21:50:29.000000000 +0200 +@@ -20,7 +20,7 @@ + --include=$(basename $@).x \ + --include=common.x \ + $(executable) > $@-t || exit 1; \ +- chmod -w $@-t || exit 1; \ ++ chmod a-w $@-t || exit 1; \ + rm -f $@ || exit 1; \ + mv $@-t $@ || exit 1; \ + else \ diff --git a/extra/a2ps/a2ps-4.13c-emacs.patch b/extra/a2ps/a2ps-4.13c-emacs.patch new file mode 100644 index 000000000..f1cd5d9eb --- /dev/null +++ b/extra/a2ps/a2ps-4.13c-emacs.patch @@ -0,0 +1,10 @@ +--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig 2005-12-05 08:03:48.000000000 +0100 ++++ a2ps-4.13/contrib/emacs/a2ps-print.el 2005-12-06 16:38:14.000000000 +0100 +@@ -93,6 +93,7 @@ + (concat "--center-title=" name) + (concat "--footer=" (concat name " Emacs buffer")) + (concat "--pretty-print=" filetype) ++ (concat "-d") + ;Uncommenting the following gives a print preview (only): + ; (concat "--output=/tmp/foo.ps") + ) diff --git a/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch b/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch new file mode 100644 index 000000000..c49ab78c9 --- /dev/null +++ b/extra/a2ps/a2ps-4.13c-fnmatch-replacement.patch @@ -0,0 +1,43 @@ +diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c +--- a2ps-4.13.orig/lib/fnmatch.c 2002-03-04 12:46:25 -0600 ++++ a2ps-4.13/lib/fnmatch.c 2006-05-27 11:41:15 -0500 +@@ -27,18 +27,6 @@ + #include + #include + +- +-/* Comment out all this code if we are using the GNU C Library, and are not +- actually compiling the library itself. This code is part of the GNU C +- Library, but also included in many other GNU distributions. Compiling +- and linking in this code is a waste when using the GNU C library +- (especially if it is a shared library). Rather than having every GNU +- program understand `configure --with-gnu-libc' and omit the object files, +- it is simpler to just do this in the source for each such file. */ +- +-#if defined _LIBC || !defined __GNU_LIBRARY__ +- +- + # if defined STDC_HEADERS || !defined isascii + # define ISASCII(c) 1 + # else +@@ -52,10 +40,13 @@ + extern int errno; + # endif + ++/* fnmatch replacement taken from the GNU C Library for systems that ++ provide a broken implementation. */ ++ + /* Match STRING against the filename pattern PATTERN, returning zero if + it matches, nonzero if not. */ + int +-fnmatch (const char *pattern, const char *string, int flags) ++rpl_fnmatch (const char *pattern, const char *string, int flags) + { + register const char *p = pattern, *n = string; + register char c; +@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char + + # undef FOLD + } +- +-#endif /* _LIBC or not __GNU_LIBRARY__. */ diff --git a/extra/a2ps/a2ps-4.14-check-mempcpy.patch b/extra/a2ps/a2ps-4.14-check-mempcpy.patch new file mode 100644 index 000000000..7b820cead --- /dev/null +++ b/extra/a2ps/a2ps-4.14-check-mempcpy.patch @@ -0,0 +1,12 @@ +--- a2ps-4.14-orig/configure.in 2008-04-16 08:36:03.000000000 +0200 ++++ a2ps-4.14/configure.in 2008-04-16 08:36:29.000000000 +0200 +@@ -137,7 +137,8 @@ + ad_REPLACE_FUNC_STRCASECMP + ad_REPLACE_FUNC_STRNCASECMP + ad_REPLACE_FUNC_RENAME +-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale) ++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \ ++ tempnam strsignal psignal setlocale mempcpy) + ad_FUNC_SYSTEMPAPERNAME + ad_FUNC_ATEXIT + ad_FUNC_STRFTIME diff --git a/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch b/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch new file mode 100644 index 000000000..7c3c69076 --- /dev/null +++ b/extra/a2ps/a2ps-4.14-fix-stpcpy-proto.patch @@ -0,0 +1,17 @@ +=== modified file 'lib/xstrrpl.c' +--- lib/xstrrpl.c 2008-04-14 18:04:50 +0000 ++++ lib/xstrrpl.c 2008-04-14 18:20:20 +0000 +@@ -20,12 +20,10 @@ + + #include "system.h" + #include + #include "xstrrpl.h" + +-extern char * stpcpy(); +- + /* Perform subsitutions in string. Result is malloc'd + E.g., result = xstrrrpl ("1234", subst) gives result = "112333" + where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}} + */ + char * + diff --git a/extra/a2ps/a2ps.install b/extra/a2ps/a2ps.install new file mode 100644 index 000000000..30f12c285 --- /dev/null +++ b/extra/a2ps/a2ps.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(a2ps.info.gz ogonkify.info.gz regex.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD new file mode 100644 index 000000000..cba41ae49 --- /dev/null +++ b/extra/a52dec/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 5601 2008-07-18 22:06:17Z jgc $ +# Maintainer: Thomas Baechler +# contributor: Sarah Hay + +pkgname=a52dec +pkgver=0.7.4 +pkgrel=4 +pkgdesc="liba52 is a free library for decoding ATSC A/52 streams." +arch=('i686' 'x86_64') +license=('GPL2') +depends=('glibc') +options=(!libtool) +source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz + a52dec-0.7.4-build.patch) +url="http://liba52.sourceforge.net/" +md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/a52dec-0.7.4-build.patch || return 1 + ./bootstrap || return 1 + ./configure --prefix=/usr --enable-shared || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + install -m644 liba52/a52_internal.h $startdir/pkg/usr/include/a52dec/ || return 1 +} diff --git a/extra/a52dec/a52dec-0.7.4-build.patch b/extra/a52dec/a52dec-0.7.4-build.patch new file mode 100644 index 000000000..f3a29f303 --- /dev/null +++ b/extra/a52dec/a52dec-0.7.4-build.patch @@ -0,0 +1,27 @@ +diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am +--- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800 ++++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800 +@@ -1,4 +1,3 @@ +-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ + + lib_LTLIBRARIES = liba52.la + +diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl +--- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800 ++++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800 +@@ -2,7 +2,6 @@ + AC_SUBST([LIBA52_LIBS]) + + dnl avoid -fPIC when possible +-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" + + AC_ARG_ENABLE([double], + [ --enable-double use double-precision samples]) +diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am +--- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700 ++++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800 +@@ -1,4 +1,3 @@ +-CFLAGS = @A52DEC_CFLAGS@ + + bin_PROGRAMS = a52dec extract_a52 + a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD new file mode 100644 index 000000000..0ae5b056d --- /dev/null +++ b/extra/aalib/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 9082 2008-08-17 03:29:36Z allan $ +# Maintainer: arjan +# Contributor: Tom Newsom +# +pkgname=aalib +pkgver=1.4rc5 +pkgrel=6 +pkgdesc="AAlib is a portable ASCII art GFX library" +arch=('i686' 'x86_64') +url="http://aa-project.sourceforge.net/aalib/" +license=('LGPL') +depends=('glibc' 'ncurses' 'gpm>=1.20.4' 'libx11') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/aa-project/$pkgname-$pkgver.tar.gz + aclocal-fixes.patch) +md5sums=('9801095c42bba12edebd1902bcf0a990' '863a96a6689aa7ee073ca448bc2f133d') + +build() { + cd $startdir/src/$pkgname-1.4.0 + patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make || return 1 + make DESTDIR=$startdir/pkg install + rm ${pkgdir}/usr/share/info/dir +} diff --git a/extra/aalib/aclocal-fixes.patch b/extra/aalib/aclocal-fixes.patch new file mode 100644 index 000000000..3f1919a22 --- /dev/null +++ b/extra/aalib/aclocal-fixes.patch @@ -0,0 +1,11 @@ +--- aalib.m4.orig 2006-03-05 13:58:21.000000000 +0000 ++++ aalib.m4 2006-03-05 13:58:32.000000000 +0000 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl diff --git a/extra/abcde/PKGBUILD b/extra/abcde/PKGBUILD new file mode 100644 index 000000000..684c9869f --- /dev/null +++ b/extra/abcde/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 47848 2009-07-28 09:26:47Z giovanni $ +# Contributor: Jochem Kossen +# Maintainer: Kevin Piche + +pkgname=abcde +pkgver=2.3.99.7 +pkgrel=2 +pkgdesc="A frontend command-line utility that grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them, all in one go." +depends=('bash' 'cd-discid' 'cdparanoia' 'lame' 'vorbis-tools' 'wget' 'id3' 'id3v2') +backup=(etc/$pkgname.conf) +arch=('i686' 'x86_64') +url="http://code.google.com/p/abcde" +license=('GPL') +source=() +md5sums=() +makedepends=('subversion') + +build() { + # Retrieve source from subversion. + svn export http://$pkgname.googlecode.com/svn/tags/$pkgver $pkgname + cd $startdir/src/$pkgname + + sed -e "s:normalize-audio:normalize:g" -i $pkgname + sed -e "s:/usr/bin/less:/bin/less:g" -i $pkgname + install -Dm 0755 $pkgname $startdir/pkg/usr/bin/$pkgname + install -Dm 0755 cddb-tool $startdir/pkg/usr/bin/cddb-tool + install -Dm 0644 cddb-tool.1 $startdir/pkg/usr/share/man/man1/cddb-tool.1 + install -Dm 0644 $pkgname.1 $startdir/pkg/usr/share/man/man1/$pkgname.1 + install -Dm 0644 $pkgname.conf $startdir/pkg/etc/$pkgname.conf +} diff --git a/extra/abiword-plugins/AbiCommand.patch b/extra/abiword-plugins/AbiCommand.patch new file mode 100644 index 000000000..3bb90d91f --- /dev/null +++ b/extra/abiword-plugins/AbiCommand.patch @@ -0,0 +1,11 @@ +--- a/tools/abicommand/xp/AbiCommand.cpp 2007-10-11 13:05:55.000000000 -0700 ++++ b/tools/abicommand/xp/AbiCommand.cpp 2009-05-29 12:36:40.000000000 -0700 +@@ -551,7 +551,7 @@ + UT_UTF8String *pCom1 = + const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1))); + printf(" Filename %s \n",pCom1->utf8_str()); +- char *suffix = rindex (pCom1->utf8_str (), '.'); ++ const char *suffix = rindex (pCom1->utf8_str (), '.'); + + if (suffix != NULL) + { diff --git a/extra/abiword-plugins/PKGBUILD b/extra/abiword-plugins/PKGBUILD new file mode 100644 index 000000000..3fe440117 --- /dev/null +++ b/extra/abiword-plugins/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 44524 2009-07-02 15:54:40Z giovanni $ +# Maintainer: Giovanni Scafora + +pkgname=abiword-plugins +pkgver=2.6.8 +pkgrel=7 +pkgdesc="Various plugins for Abiword" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.abisource.com" +options=('!libtool' '!makeflags') +makedepends=('libxml2') +depends=("abiword>=${pkgver}" 'aiksaurus>=1.2.1' 'gtkmathview>=0.7.7' + 'link-grammar>=4.2.4' 'libwmf>=0.2.8.4' 'librsvg>=2.18.1' + 'libwpd>=0.8.7' 'psiconv>=0.9.8' 'boost') +source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-plugins-${pkgver}.tar.gz + http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.gz + AbiCommand.patch) +md5sums=('421c49723e209c971ddb0798c1b313a9' + 'fab04d8ef999c303f720197adf261310' + '7bd4ad7802216d43422063b86ee1bc9a') + +build() { + cd "${srcdir}/abiword-plugins-${pkgver}" + patch -Np1 -i ${srcdir}/AbiCommand.patch || return 1 + ./configure --prefix=/usr \ + --without-gda \ + --disable-gda \ + --with-abiword="${srcdir}/abiword-${pkgver}/" + make || return 1 + make DESTDIR="${pkgdir}/" install +} diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD new file mode 100644 index 000000000..7ea43d61e --- /dev/null +++ b/extra/abiword/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 40670 2009-05-29 16:09:22Z giovanni $ +# Maintainer: Giovanni Scafora + +pkgname=abiword +pkgver=2.6.8 +pkgrel=2 +pkgdesc="A fully-featured word processor" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.abisource.com" +depends=('fribidi>=0.10.9' 'enchant>=1.3.0' 'libgnomeprintui' + 'wv>=1.2.4' 'libgnomeui>=2.22.01' 'libgsf-gnome>=1.14.8') +makedepends=('pkgconfig') +options=('!makeflags' 'force') +source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/${pkgname}-${pkgver}.tar.gz) +md5sums=('fab04d8ef999c303f720197adf261310') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --with-libxml2 \ + --disable-gucharmap + make || return 1 + make DESTDIR=${startdir}/pkg install + rm -rf ${pkgdir}/usr/lib + mv ${pkgdir}/usr/share/icons ${pkgdir}/usr/share/pixmaps +} diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD new file mode 100644 index 000000000..204602fa4 --- /dev/null +++ b/extra/abook/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 42696 2009-06-18 16:23:53Z aaron $ +# Contributor: damir +# Maintainer: Thayer Williams + +pkgname=abook +pkgver=0.6.0pre2 +pkgrel=2 +pkgdesc="A text-based addressbook designed for use with mutt" +arch=('i686' 'x86_64') +url="http://abook.sourceforge.net" +license=('GPL2') +depends=('readline') +source=(http://abook.sourceforge.net/devel/abook-$pkgver.tar.gz) +md5sums=('1e4a7210b3507db7b3d47ee7a2457934') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make prefix=${pkgdir}/usr install || return 1 + install -d ${pkgdir}/usr/share || return 1 + mv ${pkgdir}/usr/man ${pkgdir}/usr/share || return 1 +} + diff --git a/extra/abs/ChangeLog b/extra/abs/ChangeLog new file mode 100644 index 000000000..d65f7ebb0 --- /dev/null +++ b/extra/abs/ChangeLog @@ -0,0 +1,64 @@ +2009-07-31 Allan McRae + + * 2.3.3-1 + Upstream update + - add arch=('any') support + +2009-03-31 Allan McRae + + * 2.3.2-2 + Improve install script handling of non-existent directories in ABS tree + +2009-03-31 Allan McRae + + * 2.3.2-1 + Fix potential permission issues in the ABS tree + +2009-03-13 Allan McRae + + * 2.3.1-1 + Upstream update + - various prototype updates + Removed install file + +2008-10-28 Allan McRae + + * 2.3-1 + Upstream update + - add ability to download files using tarballs on pacman mirror + +2008-08-10 Allan McRae + + * 2.2-1 + Upstream update + - adds ability to select which repos/packages + sync on commandline + - additional PKGBUILD and install script prototypes + +2008-04-19 Travis Willard + + * 2.1-1 + Upstream update - re-adds support for community + +2008-04-19 Travis Willard + + * 2.0-4 + Added install warning about /var/abs + +2008-04-15 Travis Willard + + * 2.0-3 + Added install message + Moved abs.conf to /etc instead of /etc/abs + +2008-04-13 Travis Willard + + * 2.0-2 + Moved rsyncd.conf.abs to /usr/share/abs + Made rsync server configurable + +2008-04-10 Travis Willard + + * 2.0-1 + Added ChangeLog + New rsync-based release diff --git a/extra/abs/PKGBUILD b/extra/abs/PKGBUILD new file mode 100644 index 000000000..9c66a1b5c --- /dev/null +++ b/extra/abs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 48089 2009-07-30 16:57:14Z allan $ +# Maintainer: Allan McRae + +pkgname=abs +pkgver=2.3.3 +pkgrel=1 +pkgdesc="Utilities to download and work with the Arch Build System (ABS)" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/git/?p=abs.git" +license=('GPL') +depends=('bash' 'rsync') +backup=(etc/abs.conf) +install=abs.install +source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz) +md5sums=('a65e55d96118532e1138ff107ac7f489') + +build() { + cd ${srcdir}/${pkgname} + + make CONFDIR=/etc/ || return 1 + make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1 + + # Add readme file, and make base /var/abs path + install -dm0755 ${pkgdir}/var/abs/local/ + install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README + + # change ABS tags for x86_64 to correct values + if [ "$CARCH" = "x86_64" ]; then + sed -i 's|"i686"|"x86_64"|g' ${pkgdir}/etc/abs.conf + fi +} diff --git a/extra/abs/abs.install b/extra/abs/abs.install new file mode 100644 index 000000000..c16a8d736 --- /dev/null +++ b/extra/abs/abs.install @@ -0,0 +1,12 @@ +pre_upgrade() { + if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then + echo "==> Fixing potential ABS tree permission issues (this may take a while...)" + + for dir in core extra community testing; do + if [ -d /var/abs/$dir ]; then + find /var/abs/$dir -type d -exec chown root:root {} \; + find /var/abs/$dir -type d -exec chmod 755 {} \; + fi + done + fi +} diff --git a/extra/abuse/PKGBUILD b/extra/abuse/PKGBUILD new file mode 100644 index 000000000..abbb608fd --- /dev/null +++ b/extra/abuse/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 8619 2008-08-14 04:02:03Z kevin $ +# Committer: jlvsimoes +# Maintainer: kevin + +pkgname=abuse +pkgver=0.7.1 +pkgrel=1 +pkgdesc="A side-scroller action game that pits you against ruthless alien killers" +url="http://abuse.zoy.org/" +depends=('gcc-libs' 'libgl' 'sdl') +# abuse-data below is the original commercial levels and sound effects. +# abuse-frabs contains community created levels. +# abuse-lib is the original demo levels. +# abuse-sfx is the original sound effects, included in abuse-data. +source=(http://abuse.zoy.org/raw/Downloads/abuse-${pkgver}.tar.gz +http://abuse.zoy.org/raw/Downloads/abuse-data-2.00.tar.gz +http://abuse.zoy.org/raw/Downloads/abuse-frabs-2.11.tar.gz +abuse.patch) +noextract=(abuse-data-2.00.tar.gz) +license=('GPL' 'custom') +arch=('i686' 'x86_64') +install=abuse.install +md5sums=('439b607f291560a8f9698a2f09cffa63' '2b857668849b2dc7cd29cdd84a33c19e' + '0686f951289fe514846903bab36a2079' '86b5256f066e994db9d57dbe1ec2a58e') + +build() { + cd ${srcdir}/abuse-${pkgver} + patch -p1 -i ${srcdir}/abuse.patch + ./configure --prefix=/usr --datadir=/usr/share/abuse/orig --with-x + make || return 1 + make DESTDIR=${pkgdir} install + + mkdir -p ${pkgdir}/usr/share/abuse/{frabs,orig} + mkdir -p ${pkgdir}/usr/share/licenses/abuse + + # original code license. sdlport is gpl. + sed -n '1,/^$/ p' src/view.cpp > \ + ${pkgdir}/usr/share/licenses/abuse/orig.code.license + + # original game data. + cd ${pkgdir}/usr/share/abuse/orig + tar -xzf ${srcdir}/abuse-data-2.00.tar.gz + mv README.datafiles ${pkgdir}/usr/share/licenses/abuse/orig.data.license + + # frabs data, link to sound in orignal game data. + cd ${pkgdir}/usr/share/abuse/frabs + mv ${srcdir}/abuse-frabs-2.11/* . + rm -f abuse.exe setup.exe art/dos4gw.exe art/spaint.exe + ln -s ../orig/sfx sfx + cp docs/index.html ${pkgdir}/usr/share/licenses/abuse/frabs.license + + chown -R root:root ${pkgdir}/usr/share +} diff --git a/extra/abuse/abuse.install b/extra/abuse/abuse.install new file mode 100644 index 000000000..4d28ebacd --- /dev/null +++ b/extra/abuse/abuse.install @@ -0,0 +1,13 @@ +# arg 1: the new package version +post_install() { +# echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse" + echo "Abuse uses the original game levels by default. To use the frabs levels" + echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install +} + diff --git a/extra/abuse/abuse.patch b/extra/abuse/abuse.patch new file mode 100644 index 000000000..e06896cef --- /dev/null +++ b/extra/abuse/abuse.patch @@ -0,0 +1,36 @@ +diff -Naur abuse-0.7.1.orig/Makefile.in abuse-0.7.1/Makefile.in +--- abuse-0.7.1.orig/Makefile.in 2008-03-02 15:25:05.000000000 -0500 ++++ abuse-0.7.1/Makefile.in 2008-08-11 23:34:21.000000000 -0400 +@@ -201,7 +201,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = src + man_MANS = abuse.6 +-datafiledir = $(datadir)/games/abuse ++datafiledir = $(datadir) + datafile_DATA = abuse.bmp abuse.lsp abuse.png + EXTRA_DIST = bootstrap abuse.6 abuse.bmp abuse.lsp abuse.png + all: config.h +diff -Naur abuse-0.7.1.orig/configure abuse-0.7.1/configure +--- abuse-0.7.1.orig/configure 2008-03-02 15:25:03.000000000 -0500 ++++ abuse-0.7.1/configure 2008-08-11 23:33:49.000000000 -0400 +@@ -21887,7 +21887,7 @@ + + X_LIBS=-L$x_libraries + +-EXPDATADIR="-DEXPDATADIR=\\\"$datadir/games/abuse\\\"" ++EXPDATADIR="-DEXPDATADIR=\\\"$datadir\\\"" + + + { echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5 +diff -Naur abuse-0.7.1.orig/src/sdlport/setup.cpp abuse-0.7.1/src/sdlport/setup.cpp +--- abuse-0.7.1.orig/src/sdlport/setup.cpp 2008-03-02 14:42:24.000000000 -0500 ++++ abuse-0.7.1/src/sdlport/setup.cpp 2008-08-11 23:33:49.000000000 -0400 +@@ -89,7 +89,7 @@ + if( (fd = fopen( rcfile, "w" )) != NULL ) + { + fputs( "; Abuse-SDL Configuration file\n\n", fd ); +- fputs( "; Location of the datafiles\ndatadir=/var/games/abuse\n\n", fd ); ++ fputs( "; Location of the datafiles\ndatadir=/usr/share/abuse/orig\n\n", fd ); + fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd ); + fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd ); + fputs( "; Use mono audio only\nmono=0\n\n", fd ); diff --git a/extra/acct/PKGBUILD b/extra/acct/PKGBUILD new file mode 100644 index 000000000..b528396b5 --- /dev/null +++ b/extra/acct/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 31369 2009-03-26 05:11:36Z eric $ +# Maintainer: damir +# Contributor: phrakture + +pkgname=acct +pkgver=6.3.2 +pkgrel=2 +pkgdesc="A set of utilities which reports and summarizes data about user connect times and process execution statistics" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/acct/" +license=('GPL') +depends=('glibc') +install=acct.install +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('da0055b254f7da8b8920db83ef1ebba1') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 + make || return 1 + make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man infodir=$pkgdir/usr/share/info install || return 1 + rm $pkgdir/usr/share/info/dir + gzip $pkgdir/usr/share/info/* + + # sysvinit already provides "last": + rm $pkgdir/usr/{bin/last,share/man/man1/last.1} +} + + + diff --git a/extra/acct/acct.install b/extra/acct/acct.install new file mode 100644 index 000000000..7007f0f76 --- /dev/null +++ b/extra/acct/acct.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(accounting.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/acidrip/PKGBUILD b/extra/acidrip/PKGBUILD new file mode 100644 index 000000000..b856e3b88 --- /dev/null +++ b/extra/acidrip/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 26878 2009-02-14 06:18:41Z eric $ +# Maintainer: Aaron Griffin + +pkgname=acidrip +pkgver=0.14 +pkgrel=6 +pkgdesc="A Gtk2::Perl application for ripping and encoding DVD's" +license=('GPL') +arch=(i686 x86_64) +url="http://untrepid.com/acidrip/" +depends=('mplayer' 'lsdvd' 'lame' 'libdvdcss' 'gtk2-perl' 'perl>=5.10.0') +source=(ftp://ftp.archlinux.org/other/acidrip/$pkgname-$pkgver.tar.gz + http://untrepid.com/acidrip/acidrip-icon4bit.png + acidrip.desktop crop-fixes.patch) +md5sums=('c1c27bbf658e5c30f43e067a8ae283de' '7498602e2a3838cf35b94af85d9954d3'\ + 'f6896612df224a325d66c5f8fa8553e7' '1a8470702e2e0eda8ecbc473141aa08f') +options=(!emptydirs) + +build() +{ + cd $startdir/src/$pkgname-$pkgver + patch -up1 < ../crop-fixes.patch || return 1 + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make install DESTDIR=${startdir}/pkg || return 1 + + install -D -m644 ${startdir}/src/acidrip-icon4bit.png \ + ${startdir}/pkg/usr/share/pixmaps/acidrip.png + install -D -m644 ${startdir}/src/acidrip.desktop \ + ${startdir}/pkg/usr/share/applications/acidrip.desktop + + # remove perllocal.pod and .packlist + find ${startdir}/pkg -name perllocal.pod -delete + find ${startdir}/pkg -name .packlist -delete +} diff --git a/extra/acidrip/acidrip.desktop b/extra/acidrip/acidrip.desktop new file mode 100644 index 000000000..189941b51 --- /dev/null +++ b/extra/acidrip/acidrip.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=AcidRip DVD Ripper +GenericName=DVD Ripper +Comment=DVD Ripper +Exec=acidrip +Icon=acidrip.png +Type=Application +Categories=AudioVideo; diff --git a/extra/acidrip/crop-fixes.patch b/extra/acidrip/crop-fixes.patch new file mode 100644 index 000000000..4a856180f --- /dev/null +++ b/extra/acidrip/crop-fixes.patch @@ -0,0 +1,21 @@ +diff -ur acidrip-0.14/AcidRip/acidrip.pm acidrip-0.14-cropfixes/AcidRip/acidrip.pm +--- acidrip-0.14/AcidRip/acidrip.pm 2004-07-25 09:03:09.000000000 -0500 ++++ acidrip-0.14-cropfixes/AcidRip/acidrip.pm 2007-02-12 15:05:36.000000000 -0600 +@@ -680,7 +680,7 @@ + message( "Running " . get_command("cropdetect") ); + open( CROP, get_command("cropdetect") . " 2>&1 |" ); + while () { +- if ( $_ =~ /crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ } ++ if ( $_ =~ /[cC]rop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ } + $crop_output .= $_; + gui_check($_); + } +@@ -863,7 +863,7 @@ + if ( $::settings->{'mencoder_pid'} = open( MENCODER, "$menc 2>&1 |" ) ) { + $/ = "\r"; + while () { +- if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) { ++ if (/^Pos:\s*(\d+)\.\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+([\d.]+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) { + if ( $1 ne $sec ) { $sec = $1; $::widgets->{'menc_seconds'}->set_text( hhmmss($1) ) } + if ( $4 ne $fps ) { $fps = $4; $::widgets->{'menc_fps'}->set_text($4) } + if ( $6 ne $size ) { $size = $6; $::widgets->{'menc_filesize'}->set_text($6) } diff --git a/extra/acpi/PKGBUILD b/extra/acpi/PKGBUILD new file mode 100644 index 000000000..c739a6c29 --- /dev/null +++ b/extra/acpi/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 32278 2009-03-30 00:09:20Z thayer $ +# Contributor: Judd Vinet +# Maintainer: Thayer Williams + +pkgname=acpi +pkgver=1.4 +pkgrel=2 +pkgdesc="Linux ACPI client providing battery, AC power, and thermal readings" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/acpiclient" +depends=('glibc') +source=(http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz) +license=('GPL2') +md5sums=('ea2a285957a36bad2ec099413bd330a5') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} + diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD new file mode 100644 index 000000000..fab6c72fb --- /dev/null +++ b/extra/acpid/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 36515 2009-04-24 04:32:29Z thayer $ +# Contributor: Manolis Tzanidakis +# Contributor: Judd Vinet +# Maintainer: Thayer Williams + +pkgname=acpid +pkgver=1.0.10 +pkgrel=1 +pkgdesc="A daemon for delivering ACPI power management events" +arch=('i686' 'x86_64') +url="http://acpid.sourceforge.net" +license=('GPL') +depends=(glibc) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + acpid + anything + handler.sh) +backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything') +md5sums=('61156ef32015c56dc0f2e3317f4ae09e' + '15903690f1bae4b3b0625b369de65521' + '2d37b98d6e74bab815604b8b48c6cfd4' + '0e8dd13793b1baa79a745f4034888367') + +build() { + cd $srcdir/$pkgname-$pkgver + /usr/bin/make || return 1 + /bin/install -d -m0755 $pkgdir/usr/bin || return 1 + /usr/bin/make INSTPREFIX=$pkgdir \ + MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1 + + # install our supplementary scripts + /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1 + /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1 + /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1 + + # set world readable bit on the acpid binary + /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1 +} + diff --git a/extra/acpid/acpid b/extra/acpid/acpid new file mode 100644 index 000000000..585944f7d --- /dev/null +++ b/extra/acpid/acpid @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/acpid` +case "$1" in + start) + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon acpid + stat_done + fi + ;; + stop) + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon acpid + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/acpid/anything b/extra/acpid/anything new file mode 100644 index 000000000..d1828989b --- /dev/null +++ b/extra/acpid/anything @@ -0,0 +1,3 @@ +# Pass all events to our one handler script +event=.* +action=/etc/acpi/handler.sh %e diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh new file mode 100644 index 000000000..ad31d1aa9 --- /dev/null +++ b/extra/acpid/handler.sh @@ -0,0 +1,65 @@ +#!/bin/sh +# Default acpi script that takes an entry for all actions + +# NOTE: This is a 2.6-centric script. If you use 2.4.x, you'll have to +# modify it to not use /sys + +minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` +maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` +setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" + +set $* + +case "$1" in + button/power) + #echo "PowerButton pressed!">/dev/tty5 + case "$2" in + PWRF) logger "PowerButton pressed: $2" ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/sleep) + case "$2" in + SLPB) echo -n mem >/sys/power/state ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + ac_adapter) + case "$2" in + AC) + case "$4" in + 00000000) + echo -n $minspeed >$setspeed + #/etc/laptop-mode/laptop-mode start + ;; + 00000001) + echo -n $maxspeed >$setspeed + #/etc/laptop-mode/laptop-mode stop + ;; + esac + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + battery) + case "$2" in + BAT0) + case "$4" in + 00000000) #echo "offline" >/dev/tty5 + ;; + 00000001) #echo "online" >/dev/tty5 + ;; + esac + ;; + CPU0) + ;; + *) logger "ACPI action undefined: $2" ;; + esac + ;; + button/lid) + #echo "LID switched!">/dev/tty5 + ;; + *) + logger "ACPI group/action undefined: $1 / $2" + ;; +esac diff --git a/extra/afterstep/PKGBUILD b/extra/afterstep/PKGBUILD new file mode 100644 index 000000000..4bfc6584d --- /dev/null +++ b/extra/afterstep/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 44299 2009-07-01 13:46:43Z allan $ +# Maintainer: Alexander Baldeck +# Contributor: DaNiMoTh +pkgname=afterstep +pkgver=2.2.8 +pkgrel=4 +pkgdesc="A Window Manager based on NextStep Interface" +arch=(i686 x86_64) +url="http://www.afterstep.org" +license=('GPL') +depends=('gtk2' 'libpng' 'libtiff>=3.8.2-5' 'readline' 'freetype2' 'libsm' \ + 'librsvg') +makedepends=('pkgconfig' 'libxt') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/afterstep/AfterStep-${pkgver}.tar.bz2) + +build() { + cd $startdir/src/AfterStep-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make || return 1 + make DESTDIR=$startdir/pkg install + install -D -m644 AfterStep.desktop $startdir/pkg/etc/X11/sessions/AfterStep.desktop +} +md5sums=('8734622c9cb549f5baa8b3262312db70') diff --git a/extra/agg/PKGBUILD b/extra/agg/PKGBUILD new file mode 100644 index 000000000..96041cc31 --- /dev/null +++ b/extra/agg/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 50029 2009-08-18 14:59:15Z jgc $ +# Maintainer: + +pkgname=agg +pkgver=2.5 +pkgrel=3 +pkgdesc="A High Quality Rendering Engine for C++" +arch=('i686' 'x86_64') +url="http://www.antigrain.com/" +license=('GPL') +depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9') +makedepends=('automake') +provides=('antigrain') +replaces=('antigrain') +options=('!libtool' '!makeflags') +source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz + agg-2.4-depends.patch + agg-2.5-pkgconfig.patch) +md5sums=('0229a488bc47be10a2fee6cf0b2febd6' + '22f8e48c137d25038181c86d5e40b110' + '43a19a7b1564c591e56c8d09a0fd8da5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1 + patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1 + sh ./autogen.sh || return 1 + ./configure --prefix=/usr --disable-static || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/agg/agg-2.4-depends.patch b/extra/agg/agg-2.4-depends.patch new file mode 100644 index 000000000..9d4f6e309 --- /dev/null +++ b/extra/agg/agg-2.4-depends.patch @@ -0,0 +1,48 @@ +--- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100 ++++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -4,8 +4,9 @@ + agginclude_HEADERS = agg_font_freetype.h + lib_LTLIBRARIES = libaggfontfreetype.la + +-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@ ++libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp + libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@ ++libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@ + endif + +--- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100 ++++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100 +@@ -5,6 +5,6 @@ + libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ + libaggplatformsdl_la_SOURCES = agg_platform_support.cpp + libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@ +-libaggplatformsdl_la_LIBADD = @SDL_LIBS@ ++libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@ + endif + +--- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100 ++++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000 +@@ -122,7 +122,8 @@ + fi + AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes]) + AC_SUBST(x_includes) +-AC_SUBST(x_libraries) ++test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries" ++AC_SUBST(X_LDFLAGS) + dnl ############################################### + + dnl Settung up library version +--- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000 ++++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000 +@@ -1,8 +1,8 @@ + if ENABLE_X11 + lib_LTLIBRARIES = libaggplatformX11.la + +-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@ ++libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@ + libaggplatformX11_la_SOURCES = agg_platform_support.cpp + libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@ +-libaggplatformX11_la_LIBADD = -lX11 ++libaggplatformX11_la_LIBADD = ../../libagg.la -lX11 + endif diff --git a/extra/agg/agg-2.5-pkgconfig.patch b/extra/agg/agg-2.5-pkgconfig.patch new file mode 100644 index 000000000..a303bfb90 --- /dev/null +++ b/extra/agg/agg-2.5-pkgconfig.patch @@ -0,0 +1,10 @@ +--- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000 ++++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000 +@@ -6,5 +6,6 @@ + Name: libagg + Description: Anti Grain Geometry - A High Quality Rendering Engine for C++ + Version: @VERSION@ +-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg ++Requires.private: freetype2 ++Libs: -L${libdir} -lagg + Cflags: -I${includedir} diff --git a/extra/aif/PKGBUILD b/extra/aif/PKGBUILD new file mode 100644 index 000000000..d6ce2bfe7 --- /dev/null +++ b/extra/aif/PKGBUILD @@ -0,0 +1,25 @@ +# $Id$ +# Maintainer: Dieter Plaetinck + +pkgname=aif +pkgver=2009.08.07 +pkgrel=1 +pkgdesc="The ArchLinux Installation Framework" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/?p=aif.git;a=summary" +license=('GPL3') +depends=('bash' 'pacman') +optdepends=('markdown: to generate the html installation guide') +source=(http://ftp.archlinux.org/other/aif/aif-$pkgver.tar.gz) +md5sums=('b8d76716f85a4f7ec56dc0c195833ce5') + +build() { + + cd $srcdir/aif-$pkgver/ + + make DESTDIR="$pkgdir/" install + +} + +# vim:set ts=2 sw=2 et: + diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD new file mode 100644 index 000000000..2adb47b0d --- /dev/null +++ b/extra/aiksaurus/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 45576 2009-07-12 17:54:50Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Jan de Groot + +pkgname=aiksaurus +pkgver=1.2.1 +pkgrel=2 +pkgdesc="A cross-platform, open-source thesaurus" +url="http://aiksaurus.sourceforge.net/" +license=('GPL') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('gtk2') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + 'aiksaurus-gcc44.patch') +md5sums=('3eae03b7c49843ccc9262e52846ea6b4' + '7f94749172116b1529fc21b718ee7636') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # gcc44 build patch + patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch || return 1 + + ./configure --prefix=/usr --with-gtk + make || return 1 + make DESTDIR=${pkgdir} install +} diff --git a/extra/aiksaurus/aiksaurus-gcc44.patch b/extra/aiksaurus/aiksaurus-gcc44.patch new file mode 100644 index 000000000..7146d5307 --- /dev/null +++ b/extra/aiksaurus/aiksaurus-gcc44.patch @@ -0,0 +1,31 @@ +--- base/aiksaurus.t.cpp~ 2003-06-26 21:44:38.000000000 -0400 ++++ base/aiksaurus.t.cpp 2009-05-31 20:02:29.172988678 -0400 +@@ -22,6 +22,7 @@ + #include "Aiksaurus.h" + #include "AsciiCompare.h" + #include "config.h" ++#include + #include + #include + using namespace std; + +--- ./gtk/src/Display.cpp~ 2003-05-27 19:56:54.000000000 -0400 ++++ ./gtk/src/Display.cpp 2009-06-02 18:09:36.198627551 -0400 +@@ -22,6 +22,7 @@ + #include "Meaning.h" + #include "DialogMediator.h" + #include "Exception.h" ++#include + using namespace std; + + namespace AiksaurusGTK_impl +--- ./gtk/src/gtkAiksaur.t.cpp~ 2002-01-11 21:02:12.000000000 -0500 ++++ ./gtk/src/gtkAiksaur.t.cpp 2009-06-02 18:12:06.815277325 -0400 +@@ -21,6 +21,7 @@ + #include + #include "config.h" + #include ++#include + #include + #include + using namespace std; diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD new file mode 100644 index 000000000..7378077ee --- /dev/null +++ b/extra/akonadi/PKGBUILD @@ -0,0 +1,29 @@ +# $ Id: $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=akonadi +pkgver=1.2.1 +pkgrel=1 +pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" +arch=('i686' 'x86_64') +url='http://www.akonadi-project.org' +license=('LGPL') +depends=('shared-mime-info' 'boost' 'mysql' 'soprano') +makedepends=('pkgconfig' 'cmake' 'automoc4') +install='akonadi.install' +source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2") +md5sums=('f9c1d000844f31c67360078ddf60bec2') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' + make + make DESTDIR=$pkgdir install +} diff --git a/extra/akonadi/akonadi.install b/extra/akonadi/akonadi.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/extra/akonadi/akonadi.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/alacarte/PKGBUILD b/extra/alacarte/PKGBUILD new file mode 100644 index 000000000..129c99710 --- /dev/null +++ b/extra/alacarte/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 38660 2009-05-09 23:35:08Z jgc $ +# Maintainer: Jan de Groot +# Contributor: pressh + +pkgname=alacarte +pkgver=0.12.1 +pkgrel=1 +pkgdesc="Menu editor for gnome" +arch=(i686 x86_64) +license=('LGPL') +url="http://www.realistanew.com/projects/alacarte/" +depends=('gnome-menus>=2.26.1' 'gnome-python>=2.26.0') +makedepends=('pkgconfig' 'intltool') +install=alacarte.install +options=('!libtool') +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.bz2) +md5sums=('c6d77f7e5ee6129532e4bb1a35a07194') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/alacarte/alacarte.install b/extra/alacarte/alacarte.install new file mode 100644 index 000000000..cdf5fd481 --- /dev/null +++ b/extra/alacarte/alacarte.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/allegro/LICENSE b/extra/allegro/LICENSE new file mode 100644 index 000000000..497c56a8f --- /dev/null +++ b/extra/allegro/LICENSE @@ -0,0 +1,26 @@ +=================================== +============ Copyright ============ +=================================== + + Allegro is gift-ware. It was created by a number of people working in + cooperation, and is given to you freely as a gift. You may use, modify, + redistribute, and generally hack it about in any way you like, and you do + not have to give us anything in return. However, if you like this product + you are encouraged to thank us by making a return gift to the Allegro + community. This could be by writing an add-on package, providing a useful + bug report, making an improvement to the library, or perhaps just + releasing the sources of your program so that other people can learn from + them. If you redistribute parts of this code or make a game using it, it + would be nice if you mentioned Allegro somewhere in the credits, but you + are not required to do this. We trust you not to abuse our generosity. + + Disclaimer: + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD new file mode 100644 index 000000000..1a3f265c1 --- /dev/null +++ b/extra/allegro/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 52058 2009-09-14 21:52:23Z giovanni $ +# Maintainer: +# Contributor: Tom Newsom +# Contributor: arjan + +pkgname=allegro +pkgver=4.2.2 +pkgrel=3 +pkgdesc="Portable library mainly aimed at video game and multimedia programming" +arch=(i686 x86_64) +url="http://alleg.sourceforge.net/" +license=('custom') +depends=('jack-audio-connection-kit' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor') +options=('!makeflags') +source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz + LICENSE) +md5sums=('87ffb1def034e0ec29a9ad4a595cda7e' + 'cd97e2992e8e66b9e6a449d832dc9c7a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-artsdigi=no \ + --enable-esddigi=no \ + --disable-asm \ + --disable-mmx \ + --disable-sse || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +} diff --git a/extra/alltray/PKGBUILD b/extra/alltray/PKGBUILD new file mode 100644 index 000000000..af7e27017 --- /dev/null +++ b/extra/alltray/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer : James Rayner +# Contributor: Roberto Salas + +pkgname=alltray +pkgver=0.70 +pkgrel=1 +pkgdesc="Drop's any app in the tray." +license=("GPL") +arch=(i686 x86_64) +url="http://alltray.sourceforge.net" +depends=('gconf') +source=(http://optusnet.dl.sourceforge.net/sourceforge/alltray/$pkgname-$pkgver.tar.gz) + +build() +{ + cd $startdir/src/$pkgname-$pkgver + + #Arch64 fix + if [ "$CARCH" = "x86_64" ]; then + ./configure --prefix=/usr --disable-gconf + else ./configure --prefix=/usr + fi + + make || return 1 + make DESTDIR=$startdir/pkg install + + find $startdir/pkg -name *.la -exec rm {} + +} + + +md5sums=('675a0a60f22fae04da787095ef0bd7d9') diff --git a/extra/alpine/2.00-lpam.patch b/extra/alpine/2.00-lpam.patch new file mode 100644 index 000000000..69e66d7ef --- /dev/null +++ b/extra/alpine/2.00-lpam.patch @@ -0,0 +1,13 @@ +--- alpine-2.00.orig/alpine/Makefile.in ++++ alpine-2.00/alpine/Makefile.in +@@ -169,7 +169,7 @@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lpam + LIBTOOL = @LIBTOOL@ + LN = @LN@ + LN_S = @LN_S@ + LTLIBICONV = @LTLIBICONV@ + LTLIBINTL = @LTLIBINTL@ diff --git a/extra/alpine/CVE-2008-5514.patch b/extra/alpine/CVE-2008-5514.patch new file mode 100644 index 000000000..594bea0b2 --- /dev/null +++ b/extra/alpine/CVE-2008-5514.patch @@ -0,0 +1,20 @@ +--- alpine-2.00/imap/src/c-client/rfc822.c ++++ alpine-2.00/imap/src/c-client/rfc822.c +@@ -1351,6 +1351,7 @@ + + static long rfc822_output_char (RFC822BUFFER *buf,int c) + { ++ if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL; + *buf->cur++ = c; /* add character, soutr buffer if full */ + return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT; + } +@@ -1374,7 +1375,8 @@ + len -= i; + } + /* soutr buffer now if full */ +- if (len && !rfc822_output_flush (buf)) return NIL; ++ if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf)) ++ return NIL; + } + return LONGT; + } diff --git a/extra/alpine/ChangeLog b/extra/alpine/ChangeLog new file mode 100644 index 000000000..afa533b91 --- /dev/null +++ b/extra/alpine/ChangeLog @@ -0,0 +1,38 @@ +2009-09-18 Eric Belanger + + * alpine 2.00-6 + * libldap-2.4 rebuild + +2009-09-18 Eric Belanger + + * alpine 2.00-5 + * Updated patchset to level 52 + * Security fix + +2009-09-17 Allan McRae + + * alpine 2.00-4 + * libldap-2.4 rebuild + +2009-02-07 Eric Belanger + + * alpine 2.00-3 + * Updated patchset to level 20 + +2008-12-05 Eric Belanger + + * alpine 2.00-2 + * Rebuilt against heimdal 1.2.1 + * Placed copy of all.patch.gz patch on local ftp (close FS#11964) + +2008-09-04 Eric Belanger + + * alpine 2.00-1 + * Upstream update + * Replaced install scriptlet with optdepends + +2008-03-26 Eric Belanger + + * alpine 1.10-1 + * Upstream update + * Added ChangeLog diff --git a/extra/alpine/PKGBUILD b/extra/alpine/PKGBUILD new file mode 100644 index 000000000..cdccd0612 --- /dev/null +++ b/extra/alpine/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 52374 2009-09-19 01:47:33Z eric $ +# Maintainer: Eric Belanger +# Contributor: Fabio Scotoni + +pkgname=alpine +pkgver=2.00 +pkgrel=6 +_patchlevel=52 +pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)" +arch=('i686' 'x86_64') +url="http://www.washington.edu/alpine/" +license=('APACHE') +depends=('libldap>=2.4.18' 'heimdal>=1.2.1' 'gettext') +optdepends=('aspell: for spell-checking support') +provides=('pine') +conflicts=('pine') +replaces=('pine') +options=('!makeflags') +source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \ + http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \ + 2.00-lpam.patch CVE-2008-5514.patch) +md5sums=('84e44cbf71ed674800a5d57eed9c1c52' '33d9fa000f896fce23cc58b56068428f'\ + 'cd3911c16fc6a072e853c0ccfc35857c' '1b52a54a656979116c09fb1d948a4325') +sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' '1d952e652e8ccf11867af12fe6de70180e58acb1'\ + '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../all_${_patchlevel}.patch || return 1 + patch -p1 < ../2.00-lpam.patch || return 1 + patch -p1 < ../CVE-2008-5514.patch || return 1 + ./configure --prefix=/usr --without-passfile --without-tcl \ + --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \ + --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/alsa-firmware/PKGBUILD b/extra/alsa-firmware/PKGBUILD new file mode 100644 index 000000000..83f3e6f59 --- /dev/null +++ b/extra/alsa-firmware/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 51333 2009-09-07 16:10:25Z tpowa $ +# Contributor: Jochen Immendörfer +# Package Maintainer: Tobias Powalowski +pkgname=alsa-firmware +pkgver=1.0.20 +pkgrel=1 +pkgdesc="ALSA firmware package" +arch=('i686' 'x86_64') +url="http://alsa-project.org/" +license=('GPL') +source=(ftp://ftp.alsa-project.org/pub/firmware/$pkgname-$pkgver.tar.bz2) +md5sums=('75fe079c35c091cac49f3a60876bc26a') +options=(!strip) + + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$startdir/pkg install || return 1 +} + diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD new file mode 100644 index 000000000..66f703007 --- /dev/null +++ b/extra/alsa-oss/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 13736 2008-09-28 09:04:09Z tpowa $ +# Maintainer: judd +pkgname=alsa-oss +pkgver=1.0.17 +pkgrel=1 +pkgdesc="OSS compatibility library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.alsa-project.org" +options=(!libtool) +depends=('glibc' 'alsa-lib>=1.0.17a') +source=(ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$startdir/pkg install +} +md5sums=('1b1850c2fc91476a73d50f537cbd402f') diff --git a/extra/alsaplayer/ChangeLog b/extra/alsaplayer/ChangeLog new file mode 100644 index 000000000..c0406aa07 --- /dev/null +++ b/extra/alsaplayer/ChangeLog @@ -0,0 +1,6 @@ +2009-02-23 Eric Belanger + + * alsaplayer 0.99.80-2 + * Added gtk2 GUI (close FS#13372) + * Moved depends to optdepends + * Added ChangeLog diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD new file mode 100644 index 000000000..f27b3758e --- /dev/null +++ b/extra/alsaplayer/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 27628 2009-02-24 01:38:37Z eric $ +# Maintainer: Eric Belanger +# Contributor: Jochem Kossen + +pkgname=alsaplayer +pkgver=0.99.80 +pkgrel=2 +pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit." +arch=('i686' 'x86_64') +url="http://www.alsaplayer.org/" +license=('GPL') +depends=('gcc-libs') +makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack-audio-connection-kit' 'esound') +optdepends=('gtk2: for the gtk2 GUI interface' \ + 'esound: for ESD audio server output support' \ + 'jack-audio-connection-kit: for JACK audio server output support' \ + 'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \ + 'libid3tag and flac: for flac support' 'libmad: for MPEG support' \ + 'libsndfile: for sndfile support' 'libvorbis: for ogg vorbis support' \ + 'libmikmod: for mod, s3m, it and xm formats supports') +options=('!libtool') +source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2 gcc.diff) +md5sums=('04f8c2321a37d15f40f9ee21251c6202' '0c1790e4744d9b085208436f5442efe0') +sha1sums=('883d590b01371840024b5a8bf0fe95b464a2ccd1' '684ac4ea9f58e63da7f4c9518196128714575066') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 < ../gcc.diff || return 1 + ./configure --prefix=/usr --enable-esd \ + --disable-opengl --disable-gtk --enable-jack \ + --enable-gtk2 --enable-audiofile || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/extra/alsaplayer/gcc.diff b/extra/alsaplayer/gcc.diff new file mode 100644 index 000000000..a27290fd9 --- /dev/null +++ b/extra/alsaplayer/gcc.diff @@ -0,0 +1,10 @@ +--- app/ControlSocket.cpp.orig 2008-07-04 22:34:38.000000000 +0200 ++++ app/ControlSocket.cpp 2008-07-04 22:35:53.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "control.h" + #include "message.h" + #include "Playlist.h" diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD new file mode 100644 index 000000000..80d52c54f --- /dev/null +++ b/extra/amarok/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 53517 2009-10-01 22:05:09Z andrea $ +# Contributor: Andrea Scarpino +# Contributor: damir + +pkgname=amarok +replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') +pkgver=2.2.0 +pkgrel=1 +pkgdesc="A media player for KDE" +arch=("i686" "x86_64") +url="http://amarok.kde.org" +license=('GPL2' 'LGPL2' 'FDL') +depends=('mysql>=5.1.37' 'kdebase-runtime>=4.3' 'libmtp>=0.3.7' 'libgpod>=0.7.2' + 'libmp4v2' 'qtscriptgenerator>=0.1.0' 'taglib-extras>=1.0.1' + 'liblastfm>=0.3.0' 'loudmouth>=1.4.3') +makedepends=('pkgconfig' 'automoc4' 'cmake') +install=amarok.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('5a0188c5eb7d343109b82964942d8eb5') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \ + -DCMAKE_INSTALL_PREFIX=/usr + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/extra/amarok/amarok.install b/extra/amarok/amarok.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/extra/amarok/amarok.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD new file mode 100644 index 000000000..595c9df0a --- /dev/null +++ b/extra/amule/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 52339 2009-09-17 12:57:32Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Henrik Ronellenfitsch + +pkgname=amule +pkgver=2.2.6 +pkgrel=1 +pkgdesc="An eMule-like client for ed2k p2p network" +arch=('i686' 'x86_64') +url="http://www.amule.org" +license=('GPL') +depends=('wxgtk>=2.8.10.1' 'gd>=2.0.35' 'geoip') +makedepends=('crypto++') +source=(http://downloads.sourceforge.net/project/${pkgname}/aMule/${pkgver}/aMule-${pkgver}.tar.bz2) +md5sums=('530d9b48187e36f78fc21bb19e94326d') + +build() { + cd ${srcdir}/aMule-${pkgver} + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-cas \ + --enable-wxcas \ + --enable-amule-daemon \ + --enable-amulecmd \ + --enable-amule-gui \ + --enable-alc \ + --enable-alcc \ + --enable-webserver \ + --disable-debug \ + --enable-optimize \ + --enable-ccache \ + --enable-geoip + + make || return 1 + make DESTDIR=${pkgdir}/ install || return 1 +} diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD new file mode 100644 index 000000000..6ab39bde3 --- /dev/null +++ b/extra/anjuta/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 44674 2009-07-03 17:43:31Z jgc $ +# Mantainer: Andreas Radke +# Contributor: Harley Laue + +pkgname=anjuta +pkgver=2.26.2.2 +pkgrel=1 +pkgdesc="Anjuta Integrated Development Environment (IDE)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('autogen>=5.9.5' 'devhelp>=0.23' 'gnome-build>=2.24.1' 'vte>=0.20.5' 'graphviz>=2.22.2' 'subversion>=1.6.1' 'gtksourceview2>=2.6.2' 'glade>=3.6.7' 'libglade>=2.6.4' 'libxslt>=1.1.24' 'libunique>=1.0.8' 'libgda>=4.0.2' 'gdl>=2.26.2' 'libgnomeui>=2.24.1' 'desktop-file-utils' 'ctags') +makedepends=('gnome-doc-utils>=0.16.1' 'intltool>=0.40.6' 'valgrind>=3.4.1') +optdepends=('valgrind: for the valgrind debugger plugin') +url="http://anjuta.sourceforge.net/" +install=anjuta.install +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('8b05a4ee536b8057e38434efeaf468ff') + +build() { + cd "${srcdir}/anjuta-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-plugin-subversion --enable-plugin-glade \ + --enable-plugin-valgrind \ + --enable-plugin-sourceview --disable-gtk-doc \ + --enable-debug --disable-scrollkeeper || return 1 + make || return 1 + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain anjuta ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + #exists already in gnome-build + rm -f "${pkgdir}/usr/bin/gbf-am-parse" + rm -f "${pkgdir}/usr/bin/gbf-mkfile-parse" +} diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install new file mode 100644 index 000000000..cf4e13c33 --- /dev/null +++ b/extra/anjuta/anjuta.install @@ -0,0 +1,22 @@ +pkgname=anjuta + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q +} diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD new file mode 100644 index 000000000..368d351ea --- /dev/null +++ b/extra/anthy/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 28115 2009-02-27 23:59:50Z eric $ +# Maintainer: damir + +pkgname=anthy +pkgver=9100h +_filecode=37536 +pkgrel=1 +pkgdesc="Hiragana text to Kana Kanji mixed text Japanese input method" +arch=("i686" "x86_64") +url="http://sourceforge.jp/projects/anthy/" +license=('LGPL' 'GPL') +depends=('glibc') +options=('!libtool' 'force') +source=("http://downloads.sourceforge.jp/anthy/${_filecode}/$pkgname-$pkgver.tar.gz") +md5sums=('1f558ff7ed296787b55bb1c6cf131108') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make EMACS=emacs sysconfdir=/etc || return 1 + make EMACS=emacs DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/antiword/PKGBUILD b/extra/antiword/PKGBUILD new file mode 100644 index 000000000..9103de17c --- /dev/null +++ b/extra/antiword/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer : Aaron, phrakture, Griffin +# Contributor: Gustav Munkby + +pkgname=antiword +pkgver=0.37 +pkgrel=2 +pkgdesc="Antiword is a free MS Word reader for Linux and RISC OS" +arch=('i686' 'x86_64') +url="http://www.winfield.demon.nl/" +license="GPL" +depends=('glibc') +install=antiword.install +source=(http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz \ + antiword-helper) +md5sums=('f868e2a269edcbc06bf77e89a55898d1' '01a988376cfd4bb268120ab597c9abe3') + +build() +{ + cd $srcdir/$pkgname-$pkgver + sed -i "s|CFLAGS =.*|CFLAGS = $CFLAGS -DNDEBUG|g; \ + s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \ + Makefile.Linux + make DESTDIR=$pkgdir global_install + install -m755 $srcdir/antiword-helper $pkgdir/usr/bin/ + install -Dm644 Docs/antiword.1 $pkgdir/usr/share/man/man1/antiword.1 +} diff --git a/extra/antiword/antiword-helper b/extra/antiword/antiword-helper new file mode 100644 index 000000000..ee9fea627 --- /dev/null +++ b/extra/antiword/antiword-helper @@ -0,0 +1,13 @@ +#!/bin/bash + +[ $# -eq 2 ] || exit 1 + +tmpfile=/tmp/aw$$.txt +editor=${EDITOR:-`which vi`} +terminal="$2" + +antiword "$1" > $tmpfile +chmod -w $tmpfile +$terminal -e $editor $tmpfile +chmod +w $tmpfile +rm $tmpfile diff --git a/extra/antiword/antiword.install b/extra/antiword/antiword.install new file mode 100644 index 000000000..58aaccde7 --- /dev/null +++ b/extra/antiword/antiword.install @@ -0,0 +1,26 @@ +post_install() +{ + cat << EOF +NOTES On Antiword Integration: + +* If you use mozplugger, make sure to configure the + msword section like so (replacing with your + terminal of choice): + application/msword: doc, dot: Microsoft Word Document + ignore_errors exits: antiword-helper "$file" + +* To properly use antiword in your mailcap settings: + application/msword; antiword %s; copiousoutput + +* To enable drag-and-drop support in KDE, use the kantiword script +EOF +} + +post_upgrade() +{ + post_install $1 +} + +op=$1 +shift +$op $* diff --git a/extra/apache-ant/PKGBUILD b/extra/apache-ant/PKGBUILD new file mode 100644 index 000000000..9ddf63c92 --- /dev/null +++ b/extra/apache-ant/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 44514 2009-07-02 11:40:47Z paul $ +# Contributor: Andrew Wright +# Maintainer: Paul Mattal + +pkgname=apache-ant +pkgver=1.7.1 +pkgrel=3 +pkgdesc="A java-based build tool." +arch=('i686' 'x86_64') +license=('APACHE') +url="http://ant.apache.org/" +depends=('java-runtime') +optdepends=('junit: to jave junit on the classpath in javac tasks') +source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2 + ${pkgname}.sh) +md5sums=('9330447f3763b87570dd1118c49a8efd' + '593ee6ebd9b8ec321534a028e686880f') + +build() { + # install profile.d script + install -dm755 ${pkgdir}/etc/profile.d || return 1 + install -m755 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/ || return 1 + + # Get the ANT_HOME env var + source ${srcdir}/${pkgname}.sh || return 1 + + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/${ANT_HOME}/{bin,lib} || return 1 + + install -m644 ./lib/*.jar ${pkgdir}/${ANT_HOME}/lib || return 1 + cp -Rp ./etc ${pkgdir}/${ANT_HOME} || return 1 + + # Do not copy Windows .bat/.cmd files + find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -m755 {} ${pkgdir}/${ANT_HOME}/bin \; || return 1 + + # symlink to junit so it's on the javac build path for ant + # matches behavior on ubuntu 9 and makes sense for compatibility + # http://bugs.archlinux.org/task/15229 + cd $startdir/pkg/usr/share/java/apache-ant/lib || return 1 + ln -s ../../junit.jar . || return 1 + cd - || return 1 + + # The license says the NOTICE file should be redistributed for derivative + # works, so lets supply it. + install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} || return 1 + install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname} || return 1 +} + diff --git a/extra/apache-ant/apache-ant.sh b/extra/apache-ant/apache-ant.sh new file mode 100644 index 000000000..ab602fb28 --- /dev/null +++ b/extra/apache-ant/apache-ant.sh @@ -0,0 +1,3 @@ +export ANT_HOME=/usr/share/java/apache-ant +export PATH=$PATH:$ANT_HOME/bin + diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD new file mode 100644 index 000000000..f0e3b562b --- /dev/null +++ b/extra/apache/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 53936 2009-10-04 02:15:01Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=apache +pkgver=2.2.14 +pkgrel=1 +pkgdesc='A high performance Unix-based HTTP server' +arch=('i686' 'x86_64') +options=('!libtool') +url='http://www.apache.org/dist/httpd' +license=('APACHE') +backup=(etc/httpd/conf/httpd.conf + etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf + etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf + etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf + etc/logrotate.d/httpd) +depends=('openssl' 'zlib' 'apr-util' 'pcre') +optdepends=('lynx: apachectl status') +source=("http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2" + 'httpd.logrotate' 'httpd' 'arch.layout') +md5sums=('a5226203aaf97e5b941c41a71c112704' + 'f4d627c64024c1b7b95efb5ffbaa625e' + 'bddd84dafa770d74df1dc1f96bd71823' + '3d659d41276ba3bfcb20c231eb254e0c') + +build() { + cd ${srcdir}/httpd-${pkgver} + + # set default user + sed -e 's#User daemon#User http#' \ + -e 's#Group daemon#Group http#' \ + -i docs/conf/httpd.conf.in + + cat ${srcdir}/arch.layout >> config.layout + ./configure --enable-layout=Arch \ + --enable-modules=all \ + --enable-mods-shared=all \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=http \ + --with-suexec-docroot=/srv/http \ + --with-suexec-logfile=/var/log/httpd/suexec.log \ + --with-suexec-bin=/usr/sbin/suexec \ + --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ + --enable-ldap --enable-authnz-ldap \ + --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ + --enable-ssl --with-ssl \ + --enable-deflate --enable-cgid \ + --enable-proxy --enable-proxy-connect \ + --enable-proxy-http --enable-proxy-ftp \ + --enable-dbd \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr + + make || return 1 + + make DESTDIR=${pkgdir} install + install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd + install -D -m644 ${srcdir}/httpd.logrotate ${pkgdir}/etc/logrotate.d/httpd + + # symlinks for /etc/httpd + ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs + ln -fs /var/run/httpd ${pkgdir}/etc/httpd/run + ln -fs /usr/lib/httpd/modules ${pkgdir}/etc/httpd/modules + ln -fs /usr/lib/httpd/build ${pkgdir}/etc/httpd/build + + # set sane defaults + sed -e 's#/usr/lib/httpd/modules/#modules/#' \ + -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ + -i ${pkgdir}/etc/httpd/conf/httpd.conf + + # cleanup + rm -rf ${pkgdir}/usr/share/httpd/manual + rm -rf ${pkgdir}/etc/httpd/conf/original + rm -rf ${pkgdir}/srv/http + rmdir ${pkgdir}/usr/bin +} diff --git a/extra/apache/arch.layout b/extra/apache/arch.layout new file mode 100644 index 000000000..ab59db84b --- /dev/null +++ b/extra/apache/arch.layout @@ -0,0 +1,22 @@ + + prefix: /etc/httpd + exec_prefix: /usr + bindir: /usr/bin + sbindir: /usr/sbin + libdir: /usr/lib/httpd + libexecdir: /usr/lib/httpd/modules + mandir: /usr/share/man + sysconfdir: /etc/httpd/conf + datadir: /usr/share/httpd + installbuilddir: /usr/lib/httpd/build + errordir: /usr/share/httpd/error + iconsdir: /usr/share/httpd/icons + htdocsdir: /srv/http + manualdir: /usr/share/httpd/manual + cgidir: /srv/http/cgi-bin + includedir: /usr/include/httpd + localstatedir: /var + runtimedir: /var/run/httpd + logfiledir: /var/log/httpd + proxycachedir: /var/cache/httpd + \ No newline at end of file diff --git a/extra/apache/httpd b/extra/apache/httpd new file mode 100755 index 000000000..fa84eff9b --- /dev/null +++ b/extra/apache/httpd @@ -0,0 +1,71 @@ +#!/bin/bash + +daemon_name=httpd + +. /etc/rc.conf +. /etc/rc.d/functions + + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + # RUN + /usr/sbin/apachectl start &>/dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon $daemon_name + stat_done + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + # KILL + /usr/sbin/apachectl stop &>/dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm_daemon $daemon_name + stat_done + fi + ;; + + reload) + stat_busy "Reloading $daemon_name daemon" + /usr/sbin/apachectl graceful &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon $daemon_name + stat_done + fi + ;; + + restart) + stat_busy "Restarting $daemon_name daemon" + /usr/sbin/apachectl restart &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon $daemon_name + stat_done + fi + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|reload|restart|status}" +esac + +exit 0 diff --git a/extra/apache/httpd.logrotate b/extra/apache/httpd.logrotate new file mode 100644 index 000000000..3f9298cd2 --- /dev/null +++ b/extra/apache/httpd.logrotate @@ -0,0 +1,5 @@ +/var/log/httpd/*log { + postrotate + /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/extra/apollon/PKGBUILD b/extra/apollon/PKGBUILD new file mode 100644 index 000000000..c7694fd44 --- /dev/null +++ b/extra/apollon/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 6638 2008-07-26 01:22:07Z eric $ +# Maintainer: damir +# Contributor: Damir Perisa + +pkgname=apollon +pkgver=1.0.2.1 +pkgrel=4 +pkgdesc="Apollon is a KDE-based client for the giFT." +arch=('i686' 'x86_64') +url="http://apollon.sourceforge.net/" +license=('GPL2') +depends=('kdelibs3' 'gift') +options=('libtool') #Don't slay .la files, this is a KDE app! +source=(http://dl.sourceforge.net/sourceforge/apollon/$pkgname-$pkgver.tar.gz) +md5sums=('d9624419e8fe3e1b274639063ea31dd0') + +build() { + cd $startdir/src/$pkgname-$pkgver + . /etc/profile.d/kde3.sh + ./configure --prefix=/opt/kde --without-arts + make || return 1 + make DESTDIR=$startdir/pkg install +} diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD new file mode 100644 index 000000000..840b89398 --- /dev/null +++ b/extra/apricots/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 27264 2009-02-18 03:07:20Z eric $ +# Contributor: Damir Perisa + +pkgname=apricots +pkgver=0.2.6 +pkgrel=3 +pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers" +arch=("i686" "x86_64") +license=('GPL') +url="http://www.fishies.org.uk/apricots.html" +depends=('gcc-libs' 'openal>=1.6.372' 'sdl' 'freealut>=1.1.0') +source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" \ + "apricots-0.2.6-freealut.patch") +md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch || return 1 + ./configure --prefix=/usr || return 1 + make || return 1 + make prefix=$pkgdir/usr install || return 1 +} diff --git a/extra/apricots/apricots-0.2.6-freealut.patch b/extra/apricots/apricots-0.2.6-freealut.patch new file mode 100644 index 000000000..4f6630713 --- /dev/null +++ b/extra/apricots/apricots-0.2.6-freealut.patch @@ -0,0 +1,65 @@ +--- apricots/apricots.cpp ++++ apricots/apricots.cpp +@@ -16,6 +16,7 @@ + int main(int, char**){ + #endif + ++atexit(SDL_Quit); + // Initialize data + gamedata g; + init_data(g); + +--- apricots/sampleio.cpp ++++ apricots/sampleio.cpp +@@ -74,12 +74,9 @@ + alListenerfv(AL_ORIENTATION, front ); + + // Load in samples +- ALvoid* data = malloc(5 * (512 * 3) * 1024); + alGenBuffers(numsamples, samples); + + for (int i = 0; i < numsamples; i++){ +- ALsizei freq; +- ALboolean fileok; + // Evil OpenAL portability fix done here + #ifdef _WIN32 + ALenum format; +@@ -87,15 +84,12 @@ + alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash); + fileok = (alGetError() == AL_NO_ERROR); + #else +- ALsizei format; +- ALsizei trash; +- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq); ++ samples[i] = alutCreateBufferFromFile(filenames[i]); + #endif +- if (!fileok){ ++ if (samples[i] == AL_NONE){ + cerr << "sampleio: could not open " << filenames[i] << endl; + exit(1); + } +- alBufferData(samples[i], format, data, filelen, freq); + } + + // Generate Sources +@@ -107,7 +101,6 @@ + alSourcefv(sources[j], AL_ORIENTATION, back ); + } + +- free(data); + + } + + +--- configure.in ++++ configure.in +@@ -100,7 +100,8 @@ + + dnl Check for OpenAL + AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"]) +-AC_CHECK_LIB( openal, alutInit) ++AC_CHECK_LIB( openal, alGetError) ++AC_CHECK_LIB( alut, alutInit) + + KDE_CHECK_EXTRA_LIBS + all_libraries="$all_libraries $USER_LDFLAGS" diff --git a/extra/arch/PKGBUILD b/extra/arch/PKGBUILD new file mode 100644 index 000000000..539cea42a --- /dev/null +++ b/extra/arch/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 20637 2008-12-06 04:18:52Z allan $ +# Maintainer: Judd Vinet +pkgname=arch +pkgver=1.3.5 +pkgrel=5 +pkgdesc="a modern and remarkable revision control system" +arch=(i686 x86_64) +license=('GPL') +url="http://regexps.srparish.net/www/#Gnu-arch" +depends=('zlib' 'expat' 'heimdal>=1.2') +source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) +md5sums=('db31ee89bc4788eef1eba1cee6c176ef') +options=('!makeflags') + +build() { + cd $startdir/src/tla-$pkgver/src + mkdir =build + cd =build + ../configure --prefix /usr + make || return 1 + make prefix=$startdir/pkg/usr install +} diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD new file mode 100644 index 000000000..a75f85717 --- /dev/null +++ b/extra/archboot/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 52118 2009-09-16 07:06:50Z tpowa $ +# Maintainer : Tobias Powalowski + +pkgname=archboot +pkgver=2009.09 +pkgrel=1 +pkgdesc="Advanced, modular arch boot/install image creation utility" +arch=(i686 x86_64) +license=('GPL') +url="http://www.archlinux.org/" +depends=('mkinitcpio>=0.5.26-1' 'mksyslinux>=2008.12-1' 'mkpxelinux>=2009.09-1' 'mkisolinux>=2008.12-1' 'initscripts>=2009.08-1' 'subversion>=1.6.5-3' 'wget>=1.11.4-2' 'bash>=4.0.028-1' 'coreutils>=7.5-2' 'cryptsetup>=1.0.7-1' 'dialog>=1.1_20080819-2' 'e2fsprogs>=1.41.8-2' 'findutils>=4.4.2-1' 'gawk>=3.1.7-1' 'grep>=2.5.4-3' 'iputils>=20071127-2' 'jfsutils>=1.1.14-1' 'less>=436-1' 'lvm2>=2.02.48-1' 'mdadm>=2.6.9-1' 'module-init-tools>=3.10-1' 'nano>=2.0.9-2' 'ncurses>=5.7-2' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2.0.0-4' 'pcmciautils>=015-2' 'procps>=3.2.8-1' 'psmisc>=22.8-1' 'reiserfsprogs>=3.6.21-2' 'sed>=4.2.1-1' 'snarf>=7.0-3' 'syslog-ng>=3.0.4-1' 'sysvinit>=2.86-5' 'tar>=1.22-1' 'util-linux-ng>=2.16-1' 'which>=2.20-1' 'kbd>=1.15-2' 'wireless_tools>=29-3' 'xfsprogs>=3.0.1-2' 'dnsutils>=9.6.1-2' 'hdparm>=9.27-1' 'memtest86+>=2.11-1' 'grub>=0.97-16' 'inetutils>=1.6-4' 'openssh>=5.2p1-1' 'hwdetect>=2009.09-5' 'shadow>=4.1.4.2-1' 'bridge-utils>=1.4-2' 'ifenslave>=1.1.0-4' 'cpufrequtils>=005-2' 'links>=2.2-2' 'tcp_wrappers>=7.6-10' 'dosfstools>=3.0.5-1' 'glibc>=2.10.1-4' 'kernel-headers>=2.6.30.5-1' 'kernel26>=2.6.30.6-1' 'kernel26-firmware>=2.6.30-1' 'xinetd>=2.3.14-5' 'kexec-tools>=2.0.0-1' 'ppp>=2.4.4-9' 'rp-pppoe>=3.10-1' 'lilo>=22.8-3' 'iptables>=1.4.4-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-5' 'ntfs-3g>=2009.4.4-1' 'pciutils>=3.1.4-1' 'usbutils>=0.86-2' 'vpnc>=0.5.3-1' 'openvpn>=2.1_rc19-2' 'b43-fwcutter>=012-1' 'wpa_supplicant>=0.6.9-2' 'rsync>=3.0.6-1' 'gzip>=1.3.12-6' 'libdownload>=1.3-3' 'libarchive>=2.7.1-1' 'device-mapper>=1.02.33-1' 'screen>=4.0.3-8' 'libelf>=0.8.12-1' 'pam>=1.0.4-1' 'cracklib>=2.8.13-2' 'nfs-utils>=1.2.0-3' 'nfsidmap>=0.21-2' 'readline>=6.0.004-1' 'acl>=2.2.47-2' 'attr>=2.4.43-1' 'pcre>=7.9-1' 'cpio>=2.10-1' 'fuse>=2.8.0-1' 'klibc>=1.5.15-3' 'libusb>=0.1.12-3' 'vim>=7.2.245-1' 'lzo2>=2.03-1' 'libsasl>=2.1.23-1' 'libldap>=2.3.43-3' 'gpm>=1.20.6-1' 'libevent>=1.4.11-1' 'gcc-libs>=4.4.1-1' 'sdparm>=1.03-2' 'licenses>=2.5-1' 'pptpclient>=1.7.2-2' 'rt2x00-rt61-fw>=1.2-3' 'rt2x00-rt71w-fw>=1.8-3' 'ndiswrapper>=1.55-1' 'ndiswrapper-utils>=1.55-1' 'zd1211-firmware>=1.4-2' 'wlan-ng26-utils>=0.2.9-1' 'ipw2100-fw>=1.3-3' 'ipw2200-fw>=3.1-1' 'iwlwifi-3945-ucode>=15.32.2.9-1' 'iwlwifi-4965-ucode>=228.61.2.24-1' 'iwlwifi-5000-ucode>=8.24.2.12-1' 'smbclient>=3.3.7-1' 'tdb>=3.3.7-1' 'bittorrent>=5.2.2-1' 'dhcpcd>=5.1.0-1' 'openssl>=0.9.8k-4' 'git>=1.6.4.3-1' 'dmraid>=1.0.0.rc15-8' 'linux-atm>=2.5.0-1' 'netcfg>=2.2.1-1' 'tiacx>=20080210-10' 'tiacx-firmware>=2-1' 'parted>=1.8.8-3' 'tzdata>=2009l-1' 'ntp>=4.2.4p7-3' 'libgcrypt>=1.4.4-2' 'iw>=0.9.15-1' 'crda>=1.1.0-1' 'libnl>=1.1-1' 'iproute2>=2.6.29-1' 'wireless-regdb>=2009.08.05-1' 'v86d>=0.1.9-7' 'dhclient>=3.1.2p1-3' 'syslinux>=3.82-1' 'mtools>=4.0.10-5' 'fsarchiver>=0.5.9-1' 'iwlwifi-5150-ucode>=8.24.2.2-1' 'xz-utils>=4.999.9beta-1' 'libtirpc>=0.2.0-1' 'librpcsecgss>=0.18-1' 'rpcbind>=0.2.0-1' 'testdisk>=6.11-1' 'wipe>=2.2.0-2' 'clamav>=0.95.2-1' 'ddrescue>=1.11-1' 'udev>=146-2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) +backup=('etc/archboot/archbootcd.conf' 'etc/archboot/archbootcd-lowmem.conf' 'etc/archboot/archpxelinux.conf' \ +'etc/archboot/archsyslinux.conf' 'etc/archboot/install.conf' 'etc/archboot/install-lowmem.conf') +backup=('etc/archboot/allinone.conf' + 'etc/archboot/allinone-lowmem.conf' + 'etc/archboot/default.conf' + 'etc/archboot/default-ftp.conf' + 'etc/archboot/default-pxelinux.conf' + 'etc/archboot/default-ftp-pxelinux.conf' + 'etc/archboot/lowmem.conf' + 'etc/archboot/allinone.conf' + 'etc/archboot/presets/allinone' + 'etc/archboot/presets/allinone-lowmem' + 'etc/archboot/presets/isolinux' + 'etc/archboot/presets/isolinux-lowmem' + 'etc/archboot/presets/isolinux-ftp' + 'etc/archboot/presets/syslinux' + 'etc/archboot/presets/syslinux-lowmem' + 'etc/archboot/presets/syslinux-ftp' + 'etc/archboot/presets/pxelinux' + 'etc/archboot/presets/pxelinux-ftp' +) +install=archboot.install + +### to bump the depends list use this: +#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done + +build() +{ + cd $srcdir/$pkgname-$pkgver-$pkgrel + mv * $pkgdir/ + # vmware-detect + cd $startdir/src + gcc -o vmware-detect vmware-detect.c + install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect +} +md5sums=('d62203bd88ed9ea64f75ce847bc8bbd2' + '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install new file mode 100644 index 000000000..25d9c88d4 --- /dev/null +++ b/extra/archboot/archboot.install @@ -0,0 +1,24 @@ +# This is a default template for a post-install scriptlet. You can +# remove any functions you don't need (and this header). + +# arg 1: the new package version +post_install() { + cat << EOF +ARCHBOOT usage: +--------------- +--> Main config files were installed to '/etc/archboot/'. + Preset files were installed to '/etc/archboot/presets'. + Modify them to your needs. +--> Use the preset files as config file of your build tool: + mkisolinux, mksyslinux or mkpxelinux +--> For Allinone ISOs use archboot-allinone.sh +EOF +} + +post_upgrade() { + post_install $1 +} + +op=$1 +shift +$op $* diff --git a/extra/archboot/vmware-detect.c b/extra/archboot/vmware-detect.c new file mode 100644 index 000000000..d242a388d --- /dev/null +++ b/extra/archboot/vmware-detect.c @@ -0,0 +1,13 @@ +#include +int main() { + unsigned char idtr[6]; + asm("sidt %0" : "=m" (idtr)); + if(0xff==idtr[5]) + { + return 0; + } + else + { + return 1; + } +} diff --git a/extra/archiso/PKGBUILD b/extra/archiso/PKGBUILD new file mode 100644 index 000000000..1ac343351 --- /dev/null +++ b/extra/archiso/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 27219 2009-02-17 04:14:42Z eric $ + +pkgname=archiso +pkgver=0.1 +pkgrel=1 +pkgdesc="ArchLinux livecd generation scripts" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/?p=archiso.git" +license=('GPL') +depends=('mkinitcpio' 'cdrkit' 'squashfs-tools' 'devtools') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('84c39d8f423fd60646a1013837c68167') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/archlinux-artwork/PKGBUILD b/extra/archlinux-artwork/PKGBUILD new file mode 100644 index 000000000..1e9328aec --- /dev/null +++ b/extra/archlinux-artwork/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 53942 2009-10-04 05:50:03Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-artwork +pkgver=1.5 +pkgrel=2 +pkgdesc="Official logos, icons, CD labels and other artwork for Arch Linux" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:cc-by-nc-sa' 'custom:TRADEMARKS') +install=archlinux-artwork.install +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('7169db016b5084090c7011745b6446c0') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos,web} + + install -m644 FONTS $pkgdir/usr/share/archlinux/docs/ + install -m644 TRADEMARKS $pkgdir/usr/share/archlinux/docs/ + install -m644 cd-labels/* $pkgdir/usr/share/archlinux/cd-labels/ + install -m644 icons/* $pkgdir/usr/share/archlinux/icons/ + install -m644 logos/* $pkgdir/usr/share/archlinux/logos/ + install -m644 wmlogos/* $pkgdir/usr/share/archlinux/wmlogos/ + install -m644 web/* $pkgdir/usr/share/archlinux/web/ + + # add the custom license + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + install -m644 TRADEMARKS $pkgdir/usr/share/licenses/$pkgname/ +} + diff --git a/extra/archlinux-artwork/archlinux-artwork.install b/extra/archlinux-artwork/archlinux-artwork.install new file mode 100644 index 000000000..ef4541741 --- /dev/null +++ b/extra/archlinux-artwork/archlinux-artwork.install @@ -0,0 +1,4 @@ +post_install() { + echo "==> Artwork has been installed to /usr/share/archlinux" +} + diff --git a/extra/archlinux-installer/PKGBUILD b/extra/archlinux-installer/PKGBUILD new file mode 100644 index 000000000..9f1ad37ed --- /dev/null +++ b/extra/archlinux-installer/PKGBUILD @@ -0,0 +1,23 @@ +# $Id$ +# Maintainer: Aaron Griffin + +pkgname=archlinux-installer +pkgver=2009.02 +pkgrel=2 +pkgdesc="The ArchLinux install scripts and docs" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/?p=installer.git" +license=('GPL') +depends=('bash' 'dialog' 'util-linux-ng' 'grep' 'sed') +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.gz") +md5sums=('93bc355046775819baa9402ff0744bd3') + +build() { + cd $srcdir/$pkgname-$pkgver-$pkgrel + install -D -m755 setup $pkgdir/arch/setup + install -D -m755 quickinst $pkgdir/arch/quickinst + install -D -m644 arch-linux-official-guide.txt \ + $pkgdir/arch/arch-linux-official-guide.txt +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/archlinux-menus/Arch-AUR.desktop b/extra/archlinux-menus/Arch-AUR.desktop new file mode 100644 index 000000000..1cc598cf7 --- /dev/null +++ b/extra/archlinux-menus/Arch-AUR.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux AUR +Exec=xdg-open http://aur.archlinux.org +Icon=arch-logo.png +Name=AUR +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Bugs.desktop b/extra/archlinux-menus/Arch-Bugs.desktop new file mode 100644 index 000000000..4bf5340dc --- /dev/null +++ b/extra/archlinux-menus/Arch-Bugs.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux Bugtracker +Exec=xdg-open http://bugs.archlinux.org +Icon=arch-logo.png +Name=Bugs +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Developers.desktop b/extra/archlinux-menus/Arch-Developers.desktop new file mode 100644 index 000000000..dce798246 --- /dev/null +++ b/extra/archlinux-menus/Arch-Developers.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux development team +Exec=xdg-open http://www.archlinux.org/developers/ +Icon=arch-logo.png +Name=Developers +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Documentation.desktop b/extra/archlinux-menus/Arch-Documentation.desktop new file mode 100644 index 000000000..45e291de6 --- /dev/null +++ b/extra/archlinux-menus/Arch-Documentation.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux Documentation +Exec=xdg-open http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide +Icon=arch-logo.png +Name=Documentation +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Donate.desktop b/extra/archlinux-menus/Arch-Donate.desktop new file mode 100644 index 000000000..55f6a9056 --- /dev/null +++ b/extra/archlinux-menus/Arch-Donate.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux Donations +Exec=xdg-open http://www.archlinux.org/donate/ +Icon=arch-logo.png +Name=Donate +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Forum.desktop b/extra/archlinux-menus/Arch-Forum.desktop new file mode 100644 index 000000000..2598ebe5f --- /dev/null +++ b/extra/archlinux-menus/Arch-Forum.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux Forum +Exec=xdg-open http://bbs.archlinux.org +Icon=arch-logo.png +Name=Forum +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Homepage.desktop b/extra/archlinux-menus/Arch-Homepage.desktop new file mode 100644 index 000000000..dde25c344 --- /dev/null +++ b/extra/archlinux-menus/Arch-Homepage.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux homepage +Exec=xdg-open http://www.archlinux.org +Icon=arch-logo.png +Name=Homepage +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-SVN.desktop b/extra/archlinux-menus/Arch-SVN.desktop new file mode 100644 index 000000000..1916c05a9 --- /dev/null +++ b/extra/archlinux-menus/Arch-SVN.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux SVN +Exec=xdg-open http://repos.archlinux.org/viewvc.cgi/ +Icon=arch-logo.png +Name=SVN +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Schwag.desktop b/extra/archlinux-menus/Arch-Schwag.desktop new file mode 100644 index 000000000..3f30c83d2 --- /dev/null +++ b/extra/archlinux-menus/Arch-Schwag.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux goodie shopping +Exec=xdg-open http://www.zazzle.com/archlinux/ +Icon=arch-logo.png +Name=Schwag +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Arch-Wiki.desktop b/extra/archlinux-menus/Arch-Wiki.desktop new file mode 100644 index 000000000..28e3d9152 --- /dev/null +++ b/extra/archlinux-menus/Arch-Wiki.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Comment=Archlinux Wiki +Exec=xdg-open http://wiki.archlinux.org +Icon=arch-logo.png +Name=Wiki +StartupNotify=true +Terminal=false +Type=Application +Categories=Archlinux; diff --git a/extra/archlinux-menus/Archlinux.directory b/extra/archlinux-menus/Archlinux.directory new file mode 100644 index 000000000..eba24e382 --- /dev/null +++ b/extra/archlinux-menus/Archlinux.directory @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Archlinux +Icon=arch-logo.png +Type=Directory diff --git a/extra/archlinux-menus/PKGBUILD b/extra/archlinux-menus/PKGBUILD new file mode 100644 index 000000000..98eaee2ff --- /dev/null +++ b/extra/archlinux-menus/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 49716 2009-08-15 13:10:40Z jgc $ +# Contributor: Jan de Groot +# Maintainer: Thayer Williams + +pkgname=archlinux-menus +pkgver=2.2 +pkgrel=2 +pkgdesc="Arch Linux specific XDG-compliant menu" +arch=('any') +url="http://www.archlinux.org/" +license=('GPL') +depends=('xdg-utils') +source=(Arch-AUR.desktop + Arch-Bugs.desktop + Arch-Developers.desktop + Arch-Documentation.desktop + Arch-Donate.desktop + Arch-Forum.desktop + Arch-Homepage.desktop + Arch-Schwag.desktop + Arch-SVN.desktop + Arch-Wiki.desktop + arch-logo.png + Archlinux.directory) +md5sums=('748a4baa222de82f03ac17feb9523d15' + '7662f444e999f8f4d0fc0f8e3e35ff51' + 'dcc6c6d7aa37ab64ce7d57838e4587e4' + '82f85d3408d69a0d0a977fdd8b3a82c3' + 'b8b31b2f7a72c561566fc215e8f78b8d' + '73a94f31dd4f9332daa70c2075c8978e' + 'aa8557e757c07e79789818161d95cad2' + '96a351c0eff7337d02f3bf0f1f051f45' + '45a55abfe8f6a9a9591ab7008ce02549' + '6aeccfb3ebd3d4b923199e4870c4c184' + '7ca3b587c44b8fdbff2074b753fb76f7' + '8320ad4adc71dc837bad64e8ea944338') + +build() { + cd ${srcdir} + install -m755 -d ${pkgdir}/usr/share/desktop-directories + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/pixmaps + + install -m644 *.desktop ${pkgdir}/usr/share/applications/ + install -m644 arch-logo.png ${pkgdir}/usr/share/pixmaps/ + install -m644 Archlinux.directory ${pkgdir}/usr/share/desktop-directories/ +} diff --git a/extra/archlinux-menus/arch-logo.png b/extra/archlinux-menus/arch-logo.png new file mode 100644 index 000000000..3ba50b213 Binary files /dev/null and b/extra/archlinux-menus/arch-logo.png differ diff --git a/extra/archlinux-themes-gdm/PKGBUILD b/extra/archlinux-themes-gdm/PKGBUILD new file mode 100644 index 000000000..6bd268c68 --- /dev/null +++ b/extra/archlinux-themes-gdm/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 19468 2008-11-24 03:16:21Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-themes-gdm +pkgver=1.4 +pkgrel=1 +pkgdesc="Arch Linux greeter themes for the GNOME login manager" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:cc-by-sa') +depends=('gdm') +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('bce4170608ed6f982f92277b7279ab98') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/gdm/themes + mv archlinux-*/ $pkgdir/usr/share/gdm/themes +} + diff --git a/extra/archlinux-themes-kde/PKGBUILD b/extra/archlinux-themes-kde/PKGBUILD new file mode 100644 index 000000000..36c9fc0a3 --- /dev/null +++ b/extra/archlinux-themes-kde/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 19471 2008-11-24 03:26:21Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-themes-kde +pkgver=1.5 +pkgrel=1 +pkgdesc="Arch Linux artwork and themes for KDE 4" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:cc-by-sa') +install=archlinux-themes-kde.install +depends=('archlinux-artwork' 'archlinux-wallpaper' 'archlinux-themes-kdm') +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('d0b01beb50e36737044353cd0fdfe9c8') + +build() { + cd $srcdir/$pkgname-$pkgver + + # documentation + mkdir -p $pkgdir/usr/share/archlinux/docs + cp archlinux-themes-kde.txt $pkgdir/usr/share/archlinux/docs/ + + # login pic + mkdir -p $pkgdir/usr/share/apps/kdm/pics/users + cp Arch-kdm.png $pkgdir/usr/share/apps/kdm/pics/users/ + + # link arch wallpapers to KDE's default wallpaper dir + mkdir -p $pkgdir/usr/share/wallpapers + ln -sf /usr/share/archlinux/wallpaper/*.* \ + $pkgdir/usr/share/wallpapers/ + + # kmenu icons + mkdir -p $pkgdir/usr/share/icons + mv archlinux-iconset/ $pkgdir/usr/share/icons/archlinux-kde/ +} + diff --git a/extra/archlinux-themes-kde/archlinux-themes-kde.install b/extra/archlinux-themes-kde/archlinux-themes-kde.install new file mode 100644 index 000000000..e239f9855 --- /dev/null +++ b/extra/archlinux-themes-kde/archlinux-themes-kde.install @@ -0,0 +1,6 @@ +post_install() { + echo "==> Archlinux KDE theme files can be enabled via systemsettings" + echo "==> See /usr/share/archlinux/docs/archlinux-themes-kde.txt for details" + } + +# vim:set ts=2 sw=2 et: diff --git a/extra/archlinux-themes-kdm/PKGBUILD b/extra/archlinux-themes-kdm/PKGBUILD new file mode 100644 index 000000000..33f2cb64e --- /dev/null +++ b/extra/archlinux-themes-kdm/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 2115 2008-05-25 19:25:26Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-themes-kdm +pkgver=1.4 +pkgrel=1 +pkgdesc="Arch Linux KDM greeter themes for KDE4" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:cc-by-sa') +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('7469d94881c323fb0535deef5ca64e83') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/apps/kdm/themes + mv archlinux-*/ $pkgdir/usr/share/apps/kdm/themes +} + diff --git a/extra/archlinux-themes-slim/PKGBUILD b/extra/archlinux-themes-slim/PKGBUILD new file mode 100644 index 000000000..e05372b31 --- /dev/null +++ b/extra/archlinux-themes-slim/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 19476 2008-11-24 03:41:21Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-themes-slim +pkgver=1.2 +pkgrel=1 +pkgdesc="Arch Linux themes for the SLiM login manager" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:cc-by-sa') +depends=('slim') +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('f9b7c231ec26c93fc89ecadfa2d0e250') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/slim/themes + mv archlinux-*/ $pkgdir/usr/share/slim/themes +} + diff --git a/extra/archlinux-wallpaper/PKGBUILD b/extra/archlinux-wallpaper/PKGBUILD new file mode 100644 index 000000000..b73d83ea4 --- /dev/null +++ b/extra/archlinux-wallpaper/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 19480 2008-11-24 03:49:33Z thayer $ +# Contributor: Thayer Williams +# Maintainer: Thayer Williams + +pkgname=archlinux-wallpaper +pkgver=1.3 +pkgrel=1 +pkgdesc="A variety of wallpapers for Arch Linux" +arch=(i686 x86_64) +url="http://www.archlinux.org/" +license=('CCPL:by-nc-sa') +install=archlinux-wallpaper.install +source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz) +md5sums=('0bd3088b8be479f88a7523700dc52d07') + +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/archlinux/wallpaper + + install -m644 AUTHORS $pkgdir/usr/share/archlinux/wallpaper/ + install -m644 *.jpg $pkgdir/usr/share/archlinux/wallpaper/ + install -m644 *.png $pkgdir/usr/share/archlinux/wallpaper/ +} + diff --git a/extra/archlinux-wallpaper/archlinux-wallpaper.install b/extra/archlinux-wallpaper/archlinux-wallpaper.install new file mode 100644 index 000000000..45f063372 --- /dev/null +++ b/extra/archlinux-wallpaper/archlinux-wallpaper.install @@ -0,0 +1,4 @@ +post_install() { + echo "==> Wallpapers have been installed to /usr/share/archlinux/wallpaper" +} + diff --git a/extra/ardour/100_syslibs.patch b/extra/ardour/100_syslibs.patch new file mode 100644 index 000000000..c89dbf0bb --- /dev/null +++ b/extra/ardour/100_syslibs.patch @@ -0,0 +1,53 @@ + +diff --git a/SConstruct b/SConstruct +index e7df3c7..3b3cb35 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -504,8 +504,8 @@ libraries = { } + + libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') + +-#libraries['sndfile'] = LibraryInfo() +-#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') ++libraries['sndfile-ardour'] = LibraryInfo() ++libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile') + + libraries['lrdf'] = LibraryInfo() + libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') +@@ -1089,10 +1088,6 @@ if env['SYSLIBS']: + # cannot use system one for the time being + # + +- libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', +- LIBPATH='#libs/libsndfile', +- CPPPATH=['#libs/libsndfile/src']) +- + # libraries['libglademm'] = LibraryInfo() + # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') + +@@ -1112,7 +1107,6 @@ if env['SYSLIBS']: + ] + + subdirs = [ +- 'libs/libsndfile', + 'libs/pbd', + 'libs/midi++2', + 'libs/ardour', +@@ -1165,9 +1158,6 @@ else: + libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', + LIBPATH='#libs/soundtouch', + CPPPATH=['#libs', '#libs/soundtouch']) +- libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', +- LIBPATH='#libs/libsndfile', +- CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', + # LIBPATH='#libs/libglademm', + # CPPPATH='#libs/libglademm') +@@ -1182,7 +1172,6 @@ else: + + subdirs = [ + 'libs/sigc++2', +- 'libs/libsndfile', + 'libs/pbd', + 'libs/midi++2', + 'libs/ardour', diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD new file mode 100644 index 000000000..fcef35c48 --- /dev/null +++ b/extra/ardour/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 37533 2009-05-02 20:24:10Z jgc $ +# Maintainer: tobias +# Contributor: ... let's say it was teamwork ... + +# ardour, liblrdf and raptor are heavily dependent on each other. Updating of +# one package mostly will require an update of all the other packages. I vote +# for fixed dependencies speaking in terms of versions + +pkgname=ardour +pkgver=2.8 +pkgrel=1 +pkgdesc="A multichannel hard disk recorder and digital audio workstation" +arch=(i686 x86_64) +license=('GPL2') +url="http://ardour.org" +depends=('liblrdf>=0.4.0-5' + 'ladspa>=1.13' 'libgnomecanvasmm>=2.26.0' + 'liblo>=0.25' 'libusb>=0.1.12' 'aubio>=0.3.2' 'libsndfile>=1.0.19') +makedepends=('scons' 'boost' 'soundtouch') +install=${pkgname}.install +source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop + 100_syslibs.patch) +md5sums=('24bd768dbe08f1f2724dc97704ee0518' + '8aeaf433ebf781733db48e5a16b0c4da' + '98b6f1d56af73b18f126b200456ce312') + +build() { + # start building ardour now + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/100_syslibs.patch" || return 1 + sed -i -e "s@/configure@& --prefix=/usr@g" libs/libsndfile/SConscript || return 1 + sed -i -e "s/lib64/lib/g" SConstruct || return 1 + sed -i "s/_protocol.h>/\0\n#include /g" libs/surfaces/tranzport/screen.cc || return 1 + + # force -O2 from the CFLAGS in makepkg.conf + sed -i '/-O3/d' SConstruct || return 1 + scons ARCH="${CFLAGS}" \ + PREFIX="/usr" \ + NLS=yes \ + FREEDESKTOP=no \ + NJOBS="${MAKEFLAGS}" \ + SYSLIBS=yes \ + VST=0 \ + DESTDIR="${pkgdir}" || return 1 + scons PREFIX="/usr" \ + NLS=yes \ + FREEDESKTOP=no \ + SYSLIBS=yes \ + VST=0 \ + DESTDIR="${pkgdir}" install || return 1 + # install some freedesktop.org compatibility + install -m755 -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/" || return 1 +} diff --git a/extra/ardour/ardour.desktop b/extra/ardour/ardour.desktop new file mode 100644 index 000000000..b50f6c952 --- /dev/null +++ b/extra/ardour/ardour.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Ardour +Comment=Multitrack hard disk recorder +Exec=ardour2 +Icon=/usr/share/ardour2/icons/ardour_icon_48px.png +Terminal=false +Type=Application +X-MultipleArgs=false +Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install new file mode 100644 index 000000000..3ae477947 --- /dev/null +++ b/extra/ardour/ardour.install @@ -0,0 +1,17 @@ +# arg 1: the new package version +post_install() { + cat << EOM + +--> You need to have jack running before you start ardour. There are two ways +--> to have ardour and jack running: +--> - as root with realtime capabilities +--> - as oridinary user without realtime capabilities +--> You have to make sure, that ardour and jack run as the same user - mixing +--> up fails. +--> RUNNING AS ROOT IS ALWAYS A RISK FOR THE SECURITY! +--> Also consider to use qjackctl to control jack. Note, that also qjackctl +--> has to run as the same user as ardour. Don't forget to check out +--> qjackctl's patchbay and read the docs from http://ardour.org ! + +EOM +} diff --git a/extra/aria2/ChangeLog b/extra/aria2/ChangeLog new file mode 100644 index 000000000..f112d9112 --- /dev/null +++ b/extra/aria2/ChangeLog @@ -0,0 +1,26 @@ +2009-04-02 Alexander Fehr + + * aria2-1.3.0-1: + New upstream release. + +2008-12-30 Alexander Fehr + + * aria2-1.1.2-1: + New upstream release. + Added dependency on c-ares. + Added dependency on ca-certificates. + Enabled --with-ca-bundle configure option. + +2008-11-26 Alexander Fehr + + * aria2-1.0.1-1: + New upstream release. + Added dependency on sqlite3. + +2008-09-16 Alexander Fehr + + * aria2-0.15.3-1: + New upstream release. + New maintainer. + Removed sha1sums. + Added ChangeLog. diff --git a/extra/aria2/PKGBUILD b/extra/aria2/PKGBUILD new file mode 100644 index 000000000..298a17644 --- /dev/null +++ b/extra/aria2/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 52897 2009-09-23 05:35:34Z eric $ +# Maintainer: Alexander Fehr + +pkgname=aria2 +pkgver=1.5.2 +pkgrel=1 +pkgdesc="Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink" +arch=('i686' 'x86_64') +url="http://aria2.sourceforge.net/" +license=('GPL') +depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') +source=( http://downloads.sourceforge.net/project/aria2/stable/archives/aria2-${pkgver}/aria2-${pkgver}.tar.bz2) +md5sums=('13ffefebdc4df4956721801fe74e01df') + +build() { + cd "$srcdir/aria2-$pkgver" + + ./configure --prefix=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/arj/001_arches_align.patch b/extra/arj/001_arches_align.patch new file mode 100644 index 000000000..c55d17ec4 --- /dev/null +++ b/extra/arj/001_arches_align.patch @@ -0,0 +1,34 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.19.orig/arj_proc.c arj-3.10.19/arj_proc.c +--- arj-3.10.19.orig/arj_proc.c 2004-02-20 14:18:52.000000000 +0100 ++++ arj-3.10.22/arj_proc.c 2004-04-08 14:06:58.000000000 +0200 +@@ -2898,7 +2898,7 @@ + } + #endif + +-#if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) ++#if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) + /* Model-independent routine to get 2 bytes from far RAM */ + + unsigned int mget_word(char FAR *p) +diff -Naur arj-3.10.19.orig/arj_proc.h arj-3.10.19/arj_proc.h +--- arj-3.10.19.orig/arj_proc.h 2004-01-25 01:40:00.000000000 +0100 ++++ arj-3.10.22/arj_proc.h 2004-04-08 14:07:18.000000000 +0200 +@@ -12,7 +12,7 @@ + + #define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) + #define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) +-#ifndef WORDS_BIGENDIAN ++#if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) + #define mget_word(p) (*(unsigned short *)(p)&0xFFFF) + #define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) + #define mget_dword(p) (*(unsigned long *)(p)) +@@ -60,7 +60,7 @@ + void unpack_mem(struct mempack *mempack); + void strip_lf(char *str); + char *ltrim(char *str); +-#ifdef WORDS_BIGENDIAN ++#if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) + unsigned int mget_word(char FAR *p); + unsigned long mget_dword(char FAR *p); + void mput_word(unsigned int w, char FAR *p); diff --git a/extra/arj/002_no_remove_static_const.patch b/extra/arj/002_no_remove_static_const.patch new file mode 100644 index 000000000..3656ba504 --- /dev/null +++ b/extra/arj/002_no_remove_static_const.patch @@ -0,0 +1,20 @@ +#DPATCHLEVEL=1 +diff -Naur arj-3.10.22.orig/gnu/makefile.in arj-3.10.22/gnu/makefile.in +--- arj-3.10.22.orig/gnu/makefile.in 2004-04-17 14:28:06.000000000 +0300 ++++ arj-3.10.22/gnu/makefile.in 2005-08-04 21:50:24.000000000 +0300 +@@ -192,6 +192,15 @@ + dispose: + + # ++# XXX: Do not use -O2, it removes the static const variable with gcc 4.x ++# ++ ++INTEGR_DIRS = $(ARJ_DIR) $(REARJ_DIR) $(ARJCRYPT_DIR) $(REGISTER_DIR) ++ ++$(patsubst %,%/integr.o, $(INTEGR_DIRS)): $(SRC_DIR)/integr.c ++ $(CC) -Wall -g -c -o$@ $< ++ ++# + # The tools + # + diff --git a/extra/arj/003_64_bit_clean.patch b/extra/arj/003_64_bit_clean.patch new file mode 100644 index 000000000..7cd602ea5 --- /dev/null +++ b/extra/arj/003_64_bit_clean.patch @@ -0,0 +1,194 @@ +#DPATCHLEVEL=1 +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_arcv.c arj-3.10.22/arj_arcv.c +--- arj-3.10.22.orig/arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 ++++ arj-3.10.22/arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 +@@ -59,27 +59,27 @@ + #define setup_hput(ptr) (tmp_hptr=(ptr)) + + #define hget_byte() (*(tmp_hptr++)&0xFF) +-#define hput_byte(c) (*(tmp_hptr++)=(char) (c)) ++#define hput_byte(c) (*(tmp_hptr++)=(uint8_t) (c)) + + /* Reads two bytes from the header, incrementing the pointer */ + +-static unsigned int hget_word() ++static uint16_t hget_word() + { +- unsigned int result; ++ uint16_t result; + + result=mget_word(tmp_hptr); +- tmp_hptr+=sizeof(short); ++ tmp_hptr+=sizeof(uint16_t); + return result; + } + + /* Reads four bytes from the header, incrementing the pointer */ + +-static unsigned long hget_longword() ++static uint32_t hget_longword() + { +- unsigned long result; ++ uint32_t result; + + result=mget_dword(tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + return result; + } + +@@ -87,18 +87,18 @@ + + /* Writes two bytes to the header, incrementing the pointer */ + +-static void hput_word(unsigned int w) ++static void hput_word(uint16_t w) + { + mput_word(w,tmp_hptr); +- tmp_hptr+=sizeof(unsigned short); ++ tmp_hptr+=sizeof(uint16_t); + } + + /* Writes four bytes to the header, incrementing the pointer */ + +-static void hput_longword(unsigned long l) ++static void hput_longword(uint32_t l) + { + mput_dword(l,tmp_hptr); +- tmp_hptr+=sizeof(unsigned long); ++ tmp_hptr+=sizeof(uint32_t); + } + + /* Calculates and stores the basic header size */ +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c +--- arj-3.10.22.orig/arj_proc.c 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.c 2005-11-24 02:50:31.000000000 +0200 +@@ -585,7 +585,7 @@ + /* Returns the exact amount of data that could be safely written to the + destination volume */ + +-unsigned long get_volfree(unsigned int increment) ++unsigned long get_volfree(unsigned long increment) + { + unsigned long pvol; + unsigned int arjsec_overhead; +@@ -605,7 +605,7 @@ + remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- + (long)out_bytes-(long)cpos-(long)ext_voldata- + MULTIVOLUME_RESERVE-t_volume_offset; +- return((unsigned long)min(remain, (unsigned long)increment)); ++ return((unsigned long)min(remain, increment)); + } + + /* Performs various checks when multivolume data is packed to predict an +@@ -2466,14 +2466,14 @@ + *tsptr='\0'; + endptr=tsptr; + tsptr=sptr; +- while((unsigned int)tsptr<(unsigned int)endptr&&patterns>8 , p+1); +@@ -2931,7 +2931,7 @@ + + /* Model-independent routine to store 4 bytes in far RAM */ + +-void mput_dword(unsigned long d, char FAR *p) ++void mput_dword(uint32_t d, char FAR *p) + { + mput_word(d&0xFFFF, p); + mput_word(d>>16 , p+2); +diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.h arj-3.10.22/arj_proc.h +--- arj-3.10.22.orig/arj_proc.h 2005-11-24 02:50:19.000000000 +0200 ++++ arj-3.10.22/arj_proc.h 2005-11-24 03:17:25.000000000 +0200 +@@ -8,15 +8,17 @@ + #ifndef ARJ_PROC_INCLUDED + #define ARJ_PROC_INCLUDED + ++#include ++ + /* Helper macros */ + +-#define mget_byte(p) (*(unsigned char FAR *)(p)&0xFF) +-#define mput_byte(c, p) *(unsigned char FAR *)(p)=(unsigned char)(c) ++#define mget_byte(p) (*(uint8_t FAR *)(p)&0xFF) ++#define mput_byte(c, p) *(uint8_t FAR *)(p)=(uint8_t)(c) + #if !defined(ALIGN_POINTERS) && !defined(WORDS_BIGENDIAN) +-#define mget_word(p) (*(unsigned short *)(p)&0xFFFF) +-#define mput_word(w,p) (*(unsigned short *)(p)=(unsigned short)(w)) +-#define mget_dword(p) (*(unsigned long *)(p)) +-#define mput_dword(w,p) (*(unsigned long *)(p)=(unsigned long)(w)) ++#define mget_word(p) (*(uint16_t *)(p)&0xFFFF) ++#define mput_word(w,p) (*(uint16_t *)(p)=(uint16_t)(w)) ++#define mget_dword(p) (*(uint32_t *)(p)) ++#define mput_dword(w,p) (*(uint32_t *)(p)=(uint32_t)(w)) + #endif + + /* Prototypes */ +@@ -31,7 +33,7 @@ + int translate_path(char *name); + void restart_proc(char *dest); + int search_for_extension(char *name, char *ext_list); +-unsigned long get_volfree(unsigned int increment); ++unsigned long get_volfree(unsigned long increment); + unsigned int check_multivolume(unsigned int increment); + void store(); + void hollow_encode(); +@@ -61,10 +63,10 @@ + void strip_lf(char *str); + char *ltrim(char *str); + #if defined(ALIGN_POINTERS) || defined(WORDS_BIGENDIAN) +-unsigned int mget_word(char FAR *p); +-unsigned long mget_dword(char FAR *p); +-void mput_word(unsigned int w, char FAR *p); +-void mput_dword(unsigned long d, char FAR *p); ++uint16_t mget_word(char FAR *p); ++uint32_t mget_dword(char FAR *p); ++void mput_word(uint16_t w, char FAR *p); ++void mput_dword(uint32_t d, char FAR *p); + #endif + + #endif diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD new file mode 100644 index 000000000..b1ba961e5 --- /dev/null +++ b/extra/arj/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 49935 2009-08-16 22:10:36Z jgc $ +# Maintainer: Travis Willard +# Contributor: Gergely Tamas + +pkgname=arj +pkgver=3.10.22 +pkgrel=5 +pkgdesc="Free and portable clone of the ARJ archiver" +url="http://arj.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +makedepends=('autoconf') +options=(!makeflags) +source=(http://downloads.sourceforge.net/sourceforge/arj/$pkgname-$pkgver.tar.gz + 001_arches_align.patch + 002_no_remove_static_const.patch + 003_64_bit_clean.patch + arj-3.10.22-custom-printf.patch) +md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' + '550bc972d825036f17f202a2b11b35c2' + '395dfa8cc500ffae648777f8f241be88' + '56b3cf96ec485b0d824761457417fcc0' + '4630a7254dfc6c8d8c7e696aa4a58f4a') +sha1sums=('e8470f480e9eee14906e5485a8898e5c24738c8b' + '7f8904f8c89bacbbeec8c431d627efbb8da2f259' + '919a3c02a1e039803502c21175d69f7703d13026' + 'd506338e34b40ef5cac6ec14c858fd651a354aaf' + '4c9481a4b196c4f56fb44fcd3b9362222d6cbe58') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Add gentoo patches + patch -Np1 -i "${srcdir}/001_arches_align.patch" || return 1 + patch -Np1 -i "${srcdir}/002_no_remove_static_const.patch" || return 1 + patch -Np1 -i "${srcdir}/003_64_bit_clean.patch" || return 1 + patch -Np1 -i "${srcdir}/arj-3.10.22-custom-printf.patch" || return 1 + + # Build! + cd gnu + aclocal || return 1 + autoconf || return 1 + rm -f config.{guess,sub} + _autover=$(automake --version | head -n1 | awk '{ print $4 }') + cp /usr/share/automake-${_autover}/config.{guess,sub} . || return 1 + ./configure --prefix=/usr || return 1 + cd .. + make prepare || return 1 + make || return 1 + + # Install! + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/arj/arj-3.10.22-custom-printf.patch b/extra/arj/arj-3.10.22-custom-printf.patch new file mode 100644 index 000000000..b789dd5c7 --- /dev/null +++ b/extra/arj/arj-3.10.22-custom-printf.patch @@ -0,0 +1,15 @@ +Patch by Lubomir Rintel for arj >= 3.10.22, which disables +the custom printf to avoid conflicting strnlen definition with the glibc +headers. By using custom printf (as in the past), we're completely loosing +all the _FORTIFY_SOURCE printf protections. + +--- arj-3.10.22/fardata.c 2004-04-17 13:39:42.000000000 +0200 ++++ arj-3.10.22/fardata.c.printf 2009-04-18 16:23:52.000000000 +0200 +@@ -13,7 +13,6 @@ + /* ASR fix 02/05/2003: need that regardless of COLOR_OUTPUT to support -jp + correctly */ + #if SFX_LEVEL>=ARJ +- #define CUSTOM_PRINTF + #define CHUNK_SIZE 512 /* Size of the output block */ + #define CHUNK_THRESHOLD (CHUNK_SIZE-256) /* Safety bound */ + #endif diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD new file mode 100644 index 000000000..1801705f2 --- /dev/null +++ b/extra/arora/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 54006 2009-10-05 17:22:14Z pierre $ +# Maintainer: Pierre Schmitz + +pkgname=arora +pkgver=0.10.1 +pkgrel=1 +pkgdesc='A cross platform web browser built using Qt and WebKit' +url='http://www.arora-browser.org' +license=('GPL') +arch=('i686' 'x86_64') +depends=('qt' 'openssl' 'xdg-utils') +install='arora.install' +source=("http://arora.googlecode.com/files/arora-${pkgver}.tar.gz") +md5sums=('ac38282a2d9134687d9c30dbb73c0fbc') + +build() { + cd $srcdir/$pkgname-$pkgver + qmake PREFIX="/usr" "CONFIG-=debug" -r + make + make INSTALL_ROOT=$pkgdir install +} diff --git a/extra/arora/arora.install b/extra/arora/arora.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/extra/arora/arora.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD new file mode 100644 index 000000000..38a26d2d2 --- /dev/null +++ b/extra/aspell-de/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 33739 2009-04-04 18:57:19Z eric $ +# Maintainer: Simo Leone +# Contributor: Tobias Kieslich + +pkgname=aspell-de +pkgver=20030222 +pkgrel=2 +pkgdesc="German dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL2') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$pkgver-1.tar.bz2) +md5sums=('5950c5c8a36fc93d4d7616591bace6a6') + +build() { + cd $srcdir/aspell6-de-$pkgver-1 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-el/PKGBUILD b/extra/aspell-el/PKGBUILD new file mode 100644 index 000000000..6704b674d --- /dev/null +++ b/extra/aspell-el/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 32298 2009-03-30 03:13:49Z eric $ +# Maintainer: Simo Leone + +pkgname=aspell-el +pkgver=0.50 +pkgrel=4 +pkgdesc="Greek dictionary for aspell." +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/el/$pkgname-0.50-3.tar.bz2) +md5sums=('0ea2c42ceb9b91f7f5de2c017234ad37') + +build() { + cd $srcdir/$pkgname-0.50-3 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-en/PKGBUILD b/extra/aspell-en/PKGBUILD new file mode 100644 index 000000000..2435958f4 --- /dev/null +++ b/extra/aspell-en/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 32299 2009-03-30 03:19:45Z eric $ +# Maintainer: Simo Leone +# Contributor: Sarah Hay + +pkgname=aspell-en +pkgver=6.0 +pkgrel=2 +pkgdesc="English dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('custom') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$pkgver-0.tar.bz2) +md5sums=('16449e0a266e1ecc526b2f3cd39d4bc2') + +build() { + cd $srcdir/aspell6-en-$pkgver-0 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 Copyright $pkgdir/usr/share/licenses/$pkgname/LICENSE || return 1 +} diff --git a/extra/aspell-es/PKGBUILD b/extra/aspell-es/PKGBUILD new file mode 100644 index 000000000..80f378b12 --- /dev/null +++ b/extra/aspell-es/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 33712 2009-04-04 18:20:48Z eric $ +# Maintainer: Simo Leone +# Contributor: Juan Pablo León + +pkgname=aspell-es +pkgver=1.9a +pkgrel=1 +pkgdesc="Spanish dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$pkgver-1.tar.bz2) +md5sums=('473c980181e1930d075c6111a7a68e49') + +build() { + cd $srcdir/aspell6-es-$pkgver-1 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-fi/PKGBUILD b/extra/aspell-fi/PKGBUILD new file mode 100644 index 000000000..7eebdaf4b --- /dev/null +++ b/extra/aspell-fi/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 47984 2009-07-30 02:32:25Z eric $ +#Maintainer: Simo Leone +#Contributor: Simo Leone +pkgname=aspell-fi +pkgver=0.7 +pkgrel=2 +pkgdesc="Finnish dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net" +license=('GPL2') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$pkgver-0.tar.bz2) +md5sums=('6d1032116982c0efab1af8fce83259c0') +sha1sums=('10235c88220f7b914a1d8af7b4d4e8e26b5d7c76') + +build() { + cd "$srcdir/aspell6-fi-$pkgver-0" + ./configure || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/aspell-fr/PKGBUILD b/extra/aspell-fr/PKGBUILD new file mode 100644 index 000000000..3dddc60a6 --- /dev/null +++ b/extra/aspell-fr/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 32300 2009-03-30 03:24:12Z eric $ +# Maintainer: Simo Leone +# Contributor: Eric Johnson + +pkgname=aspell-fr +pkgver=0.50.3 +pkgrel=3 +pkgdesc="French dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/fr/$pkgname-0.50-3.tar.bz2) +md5sums=('53a2d05c4e8f7fabd3cefe24db977be7') + +build() { + cd $srcdir/$pkgname-0.50-3 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-it/PKGBUILD b/extra/aspell-it/PKGBUILD new file mode 100644 index 000000000..6d7d4bb95 --- /dev/null +++ b/extra/aspell-it/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 33716 2009-04-04 18:22:42Z eric $ +# Maintainer: Simo Leone +# Contributor: Eric Johnson + +pkgname=aspell-it +pkgver=2.2_20050523 +pkgrel=1 +pkgdesc="Italian dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('GPL2') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-$pkgver-0.tar.bz2) +md5sums=('b1217299a0b67d1e121494d7ec18a88d') + +build() { + cd $srcdir/aspell6-it-$pkgver-0 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-nl/PKGBUILD b/extra/aspell-nl/PKGBUILD new file mode 100644 index 000000000..7b4b376a2 --- /dev/null +++ b/extra/aspell-nl/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 33744 2009-04-04 19:05:46Z eric $ +# Maintainer: Simo Leone +# Contributor: Tobias Kieslich + +pkgname=aspell-nl +pkgver=0.50 +pkgrel=4 +pkgdesc="Dutch dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('custom') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/nl/$pkgname-0.50-2.tar.bz2) +md5sums=('c3ef9fd7dc4c47d816eee9ef5149c76a') + +build() { + cd $srcdir/$pkgname-0.50-2 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 Copyright $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD new file mode 100644 index 000000000..94bd733b4 --- /dev/null +++ b/extra/aspell-pt/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 33724 2009-04-04 18:31:29Z eric $ +# Maintainer: Simo Leone +# Contributor: jlvsimoes + +pkgname=aspell-pt +pkgver=20080707 +pkgrel=1 +pkgdesc="Portuguese dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('LGPL' 'GPL') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-20080707-0.tar.bz2 \ + ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2) +md5sums=('0c99d5c143fc15a951a1bc234230590c' 'a54267ce8f91de6e6a1baf1e8048cba0') + +build() { + cd $srcdir/aspell6-pt_BR-20080707-0 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + + cd $srcdir/aspell6-pt_PT-20070510-0 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/aspell-ru/PKGBUILD b/extra/aspell-ru/PKGBUILD new file mode 100644 index 000000000..dcc194cbd --- /dev/null +++ b/extra/aspell-ru/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 33809 2009-04-04 20:26:03Z eric $ +# Maintainer: Simo Leone +# Contributor: Rouslan Solomakhin + +pkgname=aspell-ru +pkgver=0.99f7 +pkgrel=2 +pkgdesc="Russian dictionary for aspell" +arch=('i686' 'x86_64') +url="http://aspell.net/" +license=('custom') +depends=('aspell') +source=(ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-$pkgver-1.tar.bz2) +md5sums=('c4c98eaa5e77ad3adccbc5c96cb57cb3') + +build() { + cd $srcdir/aspell6-ru-$pkgver-1 + ./configure || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 Copyright $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD new file mode 100644 index 000000000..8d584b9d0 --- /dev/null +++ b/extra/aspell/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 19099 2008-11-14 21:50:10Z thayer $ +# Contributor: Jochem Kossen +# Contributor: dorphell +# Maintainer: Thayer Williams + +pkgname=aspell +pkgver=0.60.6 +_pkgmajorver=0.60 +pkgrel=4 +pkgdesc="A spell checker designed to eventually replace Ispell" +url="http://aspell.net/" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gcc-libs' 'ncurses>=5.6-7') +optdepends=('perl: to import old dictionaries') +options=(!libtool) +install=aspell.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('bc80f0198773d5c05086522be67334eb') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + ln -s ${pkgname}-${_pkgmajorver} ${pkgdir}/usr/lib/${pkgname} || return 1 + + # cleanup info files + rm ${pkgdir}/usr/share/info/dir || return 1 + gzip ${pkgdir}/usr/share/info/* || return 1 +} diff --git a/extra/aspell/aspell.install b/extra/aspell/aspell.install new file mode 100644 index 000000000..2747f021e --- /dev/null +++ b/extra/aspell/aspell.install @@ -0,0 +1,23 @@ +infodir=/usr/share/info +filelist=(aspell.info aspell-dev.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done + echo "==> aspell comes with no default dictionary" +} + +post_upgrade() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD new file mode 100644 index 000000000..02a470b49 --- /dev/null +++ b/extra/asymptote/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Firmicus +# Contributor: bender02 at gmx dot com +pkgname=asymptote +pkgver=1.86 +pkgrel=1 +pkgdesc="A vector graphics language (like metapost)" +arch=('i686' 'x86_64') +url="http://asymptote.sourceforge.net/" +license=("GPL3") +depends=('texlive-core' 'gc' 'freeglut' 'gsl' 'fftw') +optdepends=('python: for the xasy GUI' + 'pil: "' + 'tix: "') +source=(http://downloads.sourceforge.net/sourceforge/asymptote/$pkgname-$pkgver.src.tgz) +install="texlive.install" + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --enable-gc=/usr --prefix=/usr \ + --with-latex=/usr/share/texmf/tex/latex \ + --with-context=/usr/share/texmf/tex/context || return 1 + make asy || return 1 + make DESTDIR=$pkgdir install-asy || return 1 +} +md5sums=('0dc9c827a5e6f3577b5bc5966cb90ca8') diff --git a/extra/asymptote/texlive.install b/extra/asymptote/texlive.install new file mode 100644 index 000000000..78877da3c --- /dev/null +++ b/extra/asymptote/texlive.install @@ -0,0 +1,13 @@ +post_install() { + echo ">>> texlive: updating the filename database..." + mktexlsr --quiet /usr/share/texmf +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD new file mode 100644 index 000000000..552caadb5 --- /dev/null +++ b/extra/at-spi/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 30226 2009-03-17 18:24:30Z jgc $ +# Maintainer: Jan de Groot + +pkgname=at-spi +pkgver=1.26.0 +pkgrel=1 +pkgdesc="Assistive Technology Service Provider Interface" +arch=(i686 x86_64) +license=('GPL') +depends=('libbonobo>=2.24.1' 'libxtst' 'gtk2>=2.16.0') +makedepends=('pkgconfig' 'python' 'intltool') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3f2f7d29b45eff08adf56af0d31d3984') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/at-spi || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD new file mode 100644 index 000000000..ec7e3e179 --- /dev/null +++ b/extra/at/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 31370 2009-03-26 05:24:56Z eric $ +# Maintainer: Judd Vinet +# Contributor: Todd Musall +pkgname=at +pkgver=3.1.10.2 +pkgrel=1 +pkgdesc="AT and batch delayed command scheduling utility and daemon." +arch=('i686' 'x86_64') +url="http://www.debian.org" +license=('GPL') +depends=('pam') +makedepends=('ssmtp') +backup=('etc/at.deny') +source=(http://ftp.debian.org/debian/pool/main/a/at/at_$pkgver.tar.gz atd) +md5sums=('485688690a0aae53224c4150867da334' '35574e34829e7df07a3269d4ab646a29') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man \ + --with-jobdir=/var/spool/atd \ + --with-atspool=/var/spool/atd || return 1 + make || return 1 + make IROOT=$pkgdir docdir=/usr/share/doc install || return 1 + install -D -m755 ../atd $pkgdir/etc/rc.d/atd || return 1 +} diff --git a/extra/at/atd b/extra/at/atd new file mode 100644 index 000000000..d10a46a3b --- /dev/null +++ b/extra/at/atd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/atd` +case "$1" in + start) + stat_busy "Starting ATD Daemon" + [ -z "$PID" ] && /usr/sbin/atd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon atd + stat_done + fi + ;; + stop) + stat_busy "Stopping ATD Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon atd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/aterm/ChangeLog b/extra/aterm/ChangeLog new file mode 100644 index 000000000..f099aa027 --- /dev/null +++ b/extra/aterm/ChangeLog @@ -0,0 +1,6 @@ +2009-07-28 Eric Belanger + + * aterm 1.0.1-2 + * FHS man pages + * Added libxt makedepends + * Added ChangeLog diff --git a/extra/aterm/PKGBUILD b/extra/aterm/PKGBUILD new file mode 100644 index 000000000..c9c901d3a --- /dev/null +++ b/extra/aterm/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 47933 2009-07-29 18:40:02Z eric $ +# Maintainer: Eric Belanger +# Contributor: Tom Newsom + +pkgname=aterm +pkgver=1.0.1 +pkgrel=2 +pkgdesc="An xterm replacement with transparency support" +arch=('i686' 'x86_64') +url="http://aterm.sourceforge.net/" +license=('GPL') +depends=('libxext' 'libsm') +makedepends=('libxt') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('c2eede028e1011e0ec7035cf319c9b5a') +sha1sums=('a975753b415306a0734efc3773de8a86129bb54b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-transparency=yes \ + --enable-background-image --enable-fading --enable-menubar \ + --enable-graphics || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD new file mode 100644 index 000000000..2d0aba8df --- /dev/null +++ b/extra/aubio/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD,v 1.1 2008/03/15 17:43:46 BaSh Exp $ +# Maintainer: Tobias Kieslich tobias [funnychar] archlinux org +# AUR-Maintainer: Andrea Scarpino +# Contributor: Peter Baldwin +# Contributor: Shinlun Hsieh + +pkgname=aubio +pkgver=0.3.2 +pkgrel=3 +pkgdesc="A library for audio labelling" +arch=('i686' 'x86_64') +url="http://aubio.piem.org/" +license=('GPL') +depends=('libsamplerate' 'fftw' 'jack-audio-connection-kit') +options=('!libtool') +source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz) +md5sums=('ffc3e5e4880fec67064f043252263a44') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${startdir}/pkg install +} diff --git a/extra/audacious-plugins/ChangeLog b/extra/audacious-plugins/ChangeLog new file mode 100644 index 000000000..4d44471af --- /dev/null +++ b/extra/audacious-plugins/ChangeLog @@ -0,0 +1,47 @@ +2009-07-12 Eric Belanger + + * audacious-plugins 2.1-1 + New upstream release. + Changed audacious depends to makedepends (close FS#14655) + Removed old patches + +2009-02-17 Eric Belanger + + * audacious-plugins-1.5.1-3: + Rebuilt against libmtp 0.3.7-1 + libcdio 0.81-2 + added patch for new libmtp from Fedora + +2009-02-17 Eric Belanger + + * audacious-plugins-1.5.1-2: + Rebuilt against projectm 1.2.0 + +2008-08-30 Alexander Fehr + + * audacious-plugins-1.5.1-1: + New upstream release. + New maintainer. + Changed license to GPL. + Cleaned up dependencies and made more of them optional. + Removed !libtool option. + Built MTP upload, RootVis and MMS plugins. + Enabled SSE2 for x86_64. + Added audacious-plugins-amidi.patch to fix AMIDI-Plug plugin. + Removed install file. + +2008-03-15 Travis Willard + + * audacious-plugins-1.5.0-1: + New upstream release. + Changed dependency on 'audacious-player' to 'audacious'. + +2008-03-08 Travis Willard + + * audacious-plugins-1.4.5-2: + Switched to optdepends usage for optional dependencies. + +2008-02-16 Travis Willard + + * audacious-plugins-1.4.5-1: + New upstream release. + Added ChangeLog. diff --git a/extra/audacious-plugins/PKGBUILD b/extra/audacious-plugins/PKGBUILD new file mode 100644 index 000000000..4e8279ff1 --- /dev/null +++ b/extra/audacious-plugins/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 45594 2009-07-13 01:10:18Z eric $ +# Maintainer: Alexander Fehr +# Contributor: William Rea + +pkgname=audacious-plugins +pkgver=2.1 +pkgrel=1 +pkgdesc="Plugins for Audacious" +arch=('i686' 'x86_64') +url="http://audacious-media-player.org/" +license=('GPL') +depends=('libmad' 'libvorbis') +makedepends=('jack-audio-connection-kit' 'lame' 'fluidsynth' 'libcdio>=0.81-2' 'libsidplay' 'wavpack' + 'libmpcdec' 'taglib' 'lirc-utils' 'curl' 'libmtp>=0.3.7-1' 'sdl' 'projectm' 'imlib2' + 'neon' 'libmms' 'gtkglext' "audacious>=${pkgver}") +optdepends=('jack-audio-connection-kit: JACK output plugin' + 'lame: FileWriter output plugin' + 'fluidsynth: FluidSynth backend for AMIDI-Plug input plugin' + 'libcdio: CD Audio input plugin' + 'libsidplay: SID input plugin' + 'wavpack: WavPack input plugin' + 'libmpcdec: Musepack input plugin' + 'taglib: Musepack input plugin' + 'lirc-utils: LIRC plugin' + 'curl: Audioscrobbler plugin' + 'libmtp: MTP upload plugin' + 'sdl: Paranormal and projectM visualization plugins' + 'projectm: projectM visualization plugin' + 'imlib2: RootVis visualization plugin' + 'neon: HTTP transport plugin' + 'libmms: MMS transport plugin') +source=(http://distfiles.atheme.org/audacious-plugins-$pkgver.tgz) +md5sums=('087fcb1f6fb8429b267f18ed3e3acb7a') + + +build() { + cd "$srcdir/audacious-plugins-$pkgver" + + if [[ $CARCH = "i686" ]]; then + ./configure --prefix=/usr --disable-esd --disable-arts --disable-pulse \ + --enable-amidiplug --disable-timidity --disable-adplug \ + --enable-chardet --disable-sse2 || return 1 + elif [[ $CARCH = "x86_64" ]]; then + ./configure --prefix=/usr --disable-esd --disable-arts --disable-pulse \ + --enable-amidiplug --disable-timidity --disable-adplug \ + --enable-chardet || return 1 + fi + + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD new file mode 100644 index 000000000..7a3a49ae2 --- /dev/null +++ b/extra/audacious/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 53850 2009-10-03 14:55:08Z andrea $ +# Contributor: Alexander Fehr +# Contributor: William Rea + +pkgname=audacious +pkgver=2.1 +pkgrel=2 +pkgdesc="Media player based on BMP" +arch=('i686' 'x86_64') +url="http://audacious-media-player.org/" +license=('GPL3') +depends=('gtk2' 'libmcs' 'dbus-glib' 'libsamplerate' 'libxml2' 'desktop-file-utils' + 'audacious-plugins') +optdepends=('unzip: Zipped skins support') +provides=('audacious-player') +replaces=('audacious-player') +install=audacious.install +source=(http://distfiles.atheme.org/$pkgname-$pkgver.tgz + 'remove_libudet.patch') +md5sums=('03ab6a062e5909214841f90f767f1147' + 'd194f9f187c415b60165dd584ae3bad1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i ${srcdir}/remove_libudet.patch || return 1 + + if [[ $CARCH == "i686" ]]; then + ./configure --prefix=/usr \ + --enable-samplerate \ + --disable-sse2 || return 1 + elif [[ $CARCH == "x86_64" ]]; then + ./configure --prefix=/usr \ + --enable-samplerate || return 1 + fi + + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/audacious/audacious.install b/extra/audacious/audacious.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/audacious/audacious.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/audacity/ChangeLog b/extra/audacity/ChangeLog new file mode 100644 index 000000000..b58834dca --- /dev/null +++ b/extra/audacity/ChangeLog @@ -0,0 +1,25 @@ +2009-09-02 Eric Belanger + + * audacity 1.3.9-1 + * Upstream update + * Fixed icon location + +2009-07-17 Eric Belanger + + * audacity 1.3.8-1 + * Upstream update + * Updated source url + * Improved description + +2009-01-30 Eric Belanger + + * audacity 1.3.7-1 + * Upstream update + * Updated source url + +2008-12-07 Eric Belanger + + * audacity 1.3.6-2 + * Added install scriptlet to update mime database (close FS#11398) + * Added soundtouch support (close FS#9056) + * Added ChangeLog diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD new file mode 100644 index 000000000..0cecf1993 --- /dev/null +++ b/extra/audacity/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 50915 2009-09-03 02:47:27Z eric $ +# Maintainer: Eric Belanger +# Contributor: Tom Newsom +# Contributor: dorphell + +pkgname=audacity +pkgver=1.3.9 +pkgrel=1 +pkgdesc="A program that lets you manipulate digital audio waveforms" +arch=('i686' 'x86_64') +url="http://audacity.sourceforge.net/" +license=('GPL') +depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' \ + 'lame' 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack-audio-connection-kit') +makedepends=('zip' 'python' 'pkgconfig' 'soundtouch') +options=('!makeflags') +install=audacity.install +source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.bz2) +md5sums=('0f2bc8971c6e2c4d39457c28aea16b5c') +sha1sums=('77330b3bb70070001262f6e3c7d74a1d94c93c5e') + +build() { + cd "${srcdir}/${pkgname}-src-${pkgver}" + + WX_CONFIG=/usr/bin/wx-config \ + ./configure --prefix=/usr \ + --with-portaudio=v19 --with-libsamplerate=system \ + --without-libresample --with-libmad=system \ + --with-id3tag=system --with-flac=system \ + --with-vorbis=system --with-libexpat=system \ + --with-libsndfile=system --with-soundtouch \ + --enable-unicode --without-taglib || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + + install -d "${pkgdir}/usr/share/pixmaps" + ln -s /usr/share/audacity/audacity.xpm "${pkgdir}/usr/share/pixmaps/audacity.xpm" || return 1 +} diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install new file mode 100644 index 000000000..41f09f887 --- /dev/null +++ b/extra/audacity/audacity.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/audiofile/aclocal-fixes.patch b/extra/audiofile/aclocal-fixes.patch new file mode 100644 index 000000000..ef4d25831 --- /dev/null +++ b/extra/audiofile/aclocal-fixes.patch @@ -0,0 +1,11 @@ +--- audiofile.m4.orig 2006-03-05 13:06:01.000000000 +0000 ++++ audiofile.m4 2006-03-05 13:06:17.000000000 +0000 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. + dnl +-AC_DEFUN(AM_PATH_AUDIOFILE, ++AC_DEFUN([AM_PATH_AUDIOFILE], + [dnl + dnl Get compiler flags and libraries from the audiofile-config script. + dnl diff --git a/extra/autofs/PKGBUILD b/extra/autofs/PKGBUILD new file mode 100644 index 000000000..64e058fda --- /dev/null +++ b/extra/autofs/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 52252 2009-09-17 04:41:53Z allan $ +# Maintainer: Andrea Scarpino +# Contributor: Dale Blount +# Contributor: Manolis Tzanidakis + +pkgname=autofs +pkgver=5.0.5 +pkgrel=1 +pkgdesc="A kernel-based automounter for Linux." +arch=('i686' 'x86_64') +url="http://wiki.autofs.net/FrontPage" +license=('GPL2') +depends=('libldap>=2.4.18' 'libxml2' 'heimdal') +backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs) +install=autofs.install +source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" + 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' + 'heimdal.patch') +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' + 'e307bf6d2638e46eeb916cf42fe029b2' + '47f597c870410055e0fdb66103daf928' + 'a6cefb591e77b31b79dbb7243646c96b' + 'd8a15ec9186c5c0b36e5cea1e2739e8a' + '1ee4825e26ad72bfe86acec3d3da5d2a') + +build() { + export MAKEFLAGS="-j1" + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" Makefile.rules + patch -Np1 -i ${srcdir}/heimdal.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc/autofs \ + --with-mapdir=/etc/autofs \ + --without-hesiod + make || return 1 + make INSTALLROOT=${pkgdir} install + + local conf_file + for conf_file in auto.{master,misc}; do + install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file + done + + sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5 + install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs + install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/autofs/auto.master b/extra/autofs/auto.master new file mode 100644 index 000000000..be4ea73ae --- /dev/null +++ b/extra/autofs/auto.master @@ -0,0 +1,6 @@ +# Sample auto.master file +# Format of this file: +# mountpoint map options +# For details of the format look at autofs(5). + +#/media /etc/autofs/auto.media diff --git a/extra/autofs/auto.misc b/extra/autofs/auto.misc new file mode 100644 index 000000000..569156626 --- /dev/null +++ b/extra/autofs/auto.misc @@ -0,0 +1,7 @@ +# This is an automounter map and it has the following format +# key [ -mount-options-separated-by-comma ] location +# Details may be found in the autofs(5) manpage + +cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom +floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl +usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 diff --git a/extra/autofs/autofs b/extra/autofs/autofs new file mode 100644 index 000000000..08bd3e133 --- /dev/null +++ b/extra/autofs/autofs @@ -0,0 +1,50 @@ +#!/bin/bash + +daemon_name=autofs + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs + +if [ ! -z "$TIMEOUT" ]; then + daemonoptions="--timeout=$TIMEOUT $daemonoptions" +fi + +PID=`cat /var/run/autofs-running 2> /dev/null` +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon_name + stat_done + fi + ;; + stop) + stat_busy "Stopping $daemon_name daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon_name + stat_done + fi + ;; + restart) + stat_busy "Restarting $daemon_name daemon" + $0 stop + sleep 1 + $0 start + ;; + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac +exit 0 diff --git a/extra/autofs/autofs.conf.d b/extra/autofs/autofs.conf.d new file mode 100644 index 000000000..bc82491e7 --- /dev/null +++ b/extra/autofs/autofs.conf.d @@ -0,0 +1,4 @@ +#localoptions='rsize=8192,wsize=8192' + +# e.g. --timeout=60 +daemonoptions='' diff --git a/extra/autofs/autofs.install b/extra/autofs/autofs.install new file mode 100644 index 000000000..7806efa7f --- /dev/null +++ b/extra/autofs/autofs.install @@ -0,0 +1,5 @@ +post_install(){ + echo "#########################################################" + echo "In autofs5 --ghost option isn't valid. In order to start autofs" + echo "you must remove that option from your /etc/conf.d/autofs. " +} diff --git a/extra/autofs/heimdal.patch b/extra/autofs/heimdal.patch new file mode 100644 index 000000000..c49b1fd3b --- /dev/null +++ b/extra/autofs/heimdal.patch @@ -0,0 +1,34 @@ +--- autofs-5.0.4/modules/cyrus-sasl.c~ 2009-01-11 17:18:55.000000000 +0100 ++++ autofs-5.0.4/modules/cyrus-sasl.c 2009-01-11 17:18:55.000000000 +0100 +@@ -66,6 +66,15 @@ + #endif + #endif + ++/** ++ * The type of a principal is different for MIT Krb5 and Heimdal. ++ * These macros are provided by Heimdal, and introduced here for MIT. ++ */ ++#ifndef krb5_realm_length ++#define krb5_realm_length(r) ((r).length) ++#define krb5_realm_data(r) ((r).data) ++#endif ++ + /* + * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME + * environment variable so that the library knows where to find it. +@@ -451,11 +460,11 @@ + + /* setup a principal for the ticket granting service */ + ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), + strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, +- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, ++ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), ++ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)), + 0); + if (ret) { + error(logopt, diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD new file mode 100644 index 000000000..711dcf5c4 --- /dev/null +++ b/extra/autogen/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 33835 2009-04-04 20:53:28Z jgc $ +# Maintainer: Arjan Timmerman +# Contributer: Tor Krill +pkgname=autogen +pkgver=5.9.7 +pkgrel=1 +pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text." +arch=(i686 x86_64) +url="http://autogen.sourceforge.net/" +license=('GPL3') +depends=('guile>=1.8.6' 'libxml2>=2.7.3' 'libtool>=2.2.6a') +options=('!libtool' '!makeflags') +install=autogen.install +source=(http://downloads.sourceforge.net/autogen/${pkgname}-${pkgver}.tar.bz2) +md5sums=('71ed6e1104803b99cb962c0dca357014') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + rm -f ${pkgdir}/usr/share/info/dir +} diff --git a/extra/autogen/autogen.install b/extra/autogen/autogen.install new file mode 100644 index 000000000..eae969dcb --- /dev/null +++ b/extra/autogen/autogen.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(autogen.info autogen.info-1 autogen.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD new file mode 100644 index 000000000..f62279efd --- /dev/null +++ b/extra/automoc4/PKGBUILD @@ -0,0 +1,28 @@ +# $ Id: $ +# Maintainer: Pierre Schmitz + +pkgname=automoc4 +pkgver=0.9.88 +pkgrel=1 +pkgdesc="KDE automoc4" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('custom') +depends=('qt>=4.4') +makedepends=('pkgconfig' 'cmake') +source=("ftp://ftp.archlinux.org/other/automoc4/automoc4-${pkgver}.tar.bz2") +md5sums=('adffb45ea2b550f284b1e3455f525176') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make + make DESTDIR=$pkgdir install + + grep -A 21 '^ Copyright' ${srcdir}/${pkgname}-${pkgver}/kde4automoc.cpp > license.txt + install -D license.txt ${pkgdir}/usr/share/licenses/automoc4/license.txt +} diff --git a/extra/autopano-sift-c/PKGBUILD b/extra/autopano-sift-c/PKGBUILD new file mode 100644 index 000000000..11f12f6b0 --- /dev/null +++ b/extra/autopano-sift-c/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 44469 2009-07-02 06:51:12Z allan $ +# Contributor: Lukas Jirkovsky +pkgname=autopano-sift-c +pkgver=2.5.0 +pkgrel=3 +pkgdesc="Identify key feature points within arbitrary images" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL2') +depends=('libxml2' 'libpano13>=2.9.12-2' 'gcc-libs') +makedepends=('cmake') +provides=('autopano-sift') +conflicts=('autopano-sift') +replaces=('autopano-sift') +source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz) +md5sums=('d4e6bfab53fe227a36eec4c94c0bbfe6') + +build() { + cd ${srcdir}/autopano-sift-C-${pkgver} + + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/autotrace/PKGBUILD b/extra/autotrace/PKGBUILD new file mode 100644 index 000000000..73746675e --- /dev/null +++ b/extra/autotrace/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 43965 2009-06-30 08:12:05Z allan $ +# Maintainer: damir +# Contributor: forest76 +# Thanx to: neri for the IM-detection fix + +pkgname=autotrace +pkgver=0.31.1 +pkgrel=9 +pkgdesc="autotrace is a utility to trace bitmaps: convert bitmaps to vector graphics" +arch=('i686' 'x86_64') +url='http://autotrace.sourceforge.net/' +license=('GPL' 'LGPL') +depends=('pstoedit' 'imagemagick>=6.5.3.10') +options=('!libtool') +source=(http://downloads.sourceforge.net/autotrace/$pkgname-$pkgver.tar.gz + aclocal-fixes.patch) +md5sums=('54eabbb38d2076ded6d271e1ee4d0783' '94b82727bb1749fc252ddba43ad586f2') + +build() { + cd $startdir/src/$pkgname-$pkgver + patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1 + + # Fix IM detection for 6.x.y: + sed -i 's|\\>= 2|\\>= 0|' configure + chmod 755 configure + + ./configure --prefix=/usr --mandir=/usr/share/man --with-pstoedit --disable-pstoedittest PSTOEDIT_CONFIG=/bin/true + make LIBPSTOEDIT_LIBS+=-lpstoedit || return 1 + make DESTDIR=$startdir/pkg install +} diff --git a/extra/autotrace/aclocal-fixes.patch b/extra/autotrace/aclocal-fixes.patch new file mode 100644 index 000000000..3aac8bb0b --- /dev/null +++ b/extra/autotrace/aclocal-fixes.patch @@ -0,0 +1,11 @@ +--- autotrace.m4.orig 2006-03-05 13:53:23.000000000 +0000 ++++ autotrace.m4 2006-03-05 13:53:35.000000000 +0000 +@@ -4,7 +4,7 @@ + dnl AM_PATH_AUTOTRACE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl Test to see if libautotrace is installed, and define AUTOTRACE_CFLAGS, LIBS + dnl +-AC_DEFUN(AM_PATH_AUTOTRACE, ++AC_DEFUN([AM_PATH_AUTOTRACE], + [dnl + dnl Get the cflags and libraries from the autotrace-config script + dnl diff --git a/extra/avahi/ChangeLog b/extra/avahi/ChangeLog new file mode 100644 index 000000000..57984a3b2 --- /dev/null +++ b/extra/avahi/ChangeLog @@ -0,0 +1,17 @@ + +2009-04-23 Douglas Soares de Andrade + + * Updated for i686: 0.6.25 + +2009-03-21 Eric Belanger + + * Added optdepends for avahi-discover (close FS#11250) + +2009-01-04 Douglas Soares de Andrade + + * Updated for i686: 0.6.24 + +2008-07-22 Douglas Soares de Andrade + + * Updated for i686: 0.6.23 + diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD new file mode 100644 index 000000000..5636b04bb --- /dev/null +++ b/extra/avahi/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 36472 2009-04-23 07:27:59Z douglas $ +# Maintainer: Douglas Soares de Andrade + +pkgname=avahi +pkgver=0.6.25 +pkgrel=1 +pkgdesc="A multicast/unicast DNS-SD framework" +arch=('i686' 'x86_64') +url="http://www.avahi.org/" +license=('LGPL') +depends=('dbus>=1.1.20-1' 'libcap>=2.16' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat') +optdepends=('qt3: Qt3 UI support' 'libglade: avahi-discover-standalone' + 'nss-mdns: NSS support for mDNS' 'pygtk and dbus-python: avahi-discover') +makedepends=('mono' 'pygtk' 'gtk-sharp-2' 'dbus-python' 'qt3' 'libglade' 'intltool') +backup=(etc/avahi/avahi-daemon.conf) +install=avahi.install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png) + +build() { + [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh + export MONO_SHARED_DIR=${startdir}/src/.wabi + mkdir -p ${MONO_SHARED_DIR} + + cd ${startdir}/src/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-qt4 \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --enable-autoipd \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi + + make || return 1 + make DESTDIR=${startdir}/pkg install + + rm -rf ${MONO_SHARED_DIR} + + #fix capability + sed -i -e 's|$DAEMON -D |modprobe capability > /dev/null 2>\&1 ; $DAEMON -D |' ${startdir}/pkg/etc/rc.d/avahi-daemon + + sed -i -e 's/netdev/network/g' ${startdir}/pkg/etc/dbus-1/system.d/avahi-dbus.conf + + # howl and mdnsresponder compatability + cd ${startdir}/pkg/usr/include + ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h + ln -s avahi-compat-howl howl + cd ${startdir}/pkg/usr/lib/pkgconfig + ln -s avahi-compat-howl.pc howl.pc + mkdir -p ${startdir}/pkg/usr/share/pixmaps + install -m 644 ${startdir}/src/gnome-nettool.png ${startdir}/pkg/usr/share/pixmaps/gnome-nettool.png +} +md5sums=('a83155a6e29e3988f07e5eea3287b21e' + '42c2905307c7a5dc6ac4b75f4c3d65a3') diff --git a/extra/avahi/avahi.install b/extra/avahi/avahi.install new file mode 100644 index 000000000..f0beca8cd --- /dev/null +++ b/extra/avahi/avahi.install @@ -0,0 +1,42 @@ +post_install() { + echo -n "adding avahi system group... " + groupadd -g 84 avahi && echo "done." + echo -n "adding avahi system user... " + useradd -c "Avahi daemon" -u 84 -d / -g avahi -s /bin/false avahi \ + && echo "done." + passwd -l avahi &>/dev/null + + post_upgrade + cat << 'EOM' +==> The following daemons may be added to DAEMONS in /etc/rc.conf: + -> avahi-daemon - the mdns responder, you probably want this. + dbus needs to be running when you start it. + -> avahi-dnsconfd - daemon used for peer-to-peer automatic dns + configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. + -> In addition, pygtk is required for the graphical ones and + twisted-web for avahi-bookmarks. + +EOM +} + +post_upgrade() { + true +} + +pre_remove() { + # pre_remove gets called whenever post_remove is defined. + true +} + +post_remove() { + # post_remove doesn't start at a newline like the other post_* functions, + # so we'll have to make one for ourselves. + echo -n -e "\nremoving avahi system user... " + userdel avahi && echo "done." +} + +op=$1 +shift +$op $* diff --git a/extra/avahi/gnome-nettool.png b/extra/avahi/gnome-nettool.png new file mode 100644 index 000000000..227d0678a Binary files /dev/null and b/extra/avahi/gnome-nettool.png differ diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD new file mode 100644 index 000000000..021263b3e --- /dev/null +++ b/extra/avfs/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 49934 2009-08-16 21:58:34Z jgc $ +# Maintainer: Kevin Piche +# Contributor: K. Piche + +pkgname=avfs +pkgver=0.9.8 +pkgrel=2 +pkgdesc="A virtual filesystem which enables programs to look inside archived or compressed files, or access remote files" +arch=(i686 x86_64) +license=('GPL') +url="http://avf.sourceforge.net/" +source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2) +options=(!emptydirs !libtool) +depends=('fuse' 'sh') +md5sums=('5281b990251c8c3a15366ad40e4818db') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-library --enable-fuse --disable-static || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/avidemux/ChangeLog b/extra/avidemux/ChangeLog new file mode 100644 index 000000000..cce0397a9 --- /dev/null +++ b/extra/avidemux/ChangeLog @@ -0,0 +1,48 @@ +2009-08-17 Eric Belanger + + * avidemux 2.5.1-1 + * Upstream update + * Removed libdca optdepends + * Enabled SMP build + +2009-08-05 Eric Belanger + + * avidemux 2.5.0-2 + * Switched to a svn snapshot (close FS#15751) + * Added library symlinks + +2009-07-17 Eric Belanger + + * avidemux 2.5.0-1 + * Upstream update + * Added optdepends for plugins + * Updated patches + +2009-06-12 Eric Belanger + + * Added patches to build with cmake 2.6.4 and gcc 4.4 (close FS#15082) + +2009-04-18 Eric Belanger + + * avidemux 2.4.4-3 + * Rebuilt against x264 20090416 + +2009-02-20 Eric Belanger + + * avidemux 2.4.4-2 + * Rebuilt against x264 20090216 + * Rebuilt against faad2 2.7 + +2009-02-09 Eric Belanger + + * avidemux 2.4.4-1 + * Upstream update + +2009-01-10 Eric Belanger + + * avidemux 2.4.3-2 + * Rebuilt against x264 20090108 + * Added QT4 GUI + * Added libxslt makedepends + * Added man page + * Added ChangeLog diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD new file mode 100644 index 000000000..8df463644 --- /dev/null +++ b/extra/avidemux/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 49966 2009-08-18 00:50:20Z eric $ +# Maintainer: Eric Belanger +# Contributor: damir + +pkgname=avidemux +pkgver=2.5.1 +pkgrel=1 +pkgdesc="A graphical tool to edit video (filter/re-encode/split)" +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +depends=('libxv' 'libxml2' 'sdl') +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack-audio-connection-kit' 'esound' 'libvorbis' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate') +optdepends=('gtk2: for using the GTK GUI' \ + 'qt: for using the QT4 GUI' \ + 'lame, faac: for the corresponding audio encoder plugin' \ + 'faad2 : for the corresponding audio decoder plugin' \ + 'esound, jack-audio-connection-kit: for the corresponding audio device plugin' \ + 'x264, xvidcore: for the corresponding video encoder plugin') +source=(http://downloads.sourceforge.net/avidemux/avidemux_2.5.1.tar.gz avidemux-2.5-i18n.patch) +md5sums=('081db3af87f1f93c7b4e5d5975e07e40' '0adb7cee81e06bfc454baf1d8fbcdd64') +sha1sums=('50fe78548e0ebf0611d23aa4755f332056520392' 'd510ca55cd1b9c162b4c3bcd224a80b6a18421ef') + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + patch -p1 < ../avidemux-2.5-i18n.patch || return 1 + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . || return 1 + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \ + -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \ + -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build -D CMAKE_BUILD_TYPE=Release .. || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" || return 1 + install -D -m644 ../../avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1 + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" || return 1 +} diff --git a/extra/avidemux/avidemux-2.5-i18n.patch b/extra/avidemux/avidemux-2.5-i18n.patch new file mode 100644 index 000000000..b36d484fc --- /dev/null +++ b/extra/avidemux/avidemux-2.5-i18n.patch @@ -0,0 +1,40 @@ +diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp +--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:12:49.000000000 -0400 ++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:14:03.000000000 -0400 +@@ -73,7 +73,7 @@ + #ifdef __APPLE__ + QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/"; + #else +- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/"; ++ QString appdir = "/usr/share/avidemux/i18n/"; + #endif + + loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name()); +@@ -164,4 +164,4 @@ + } + + return "Qt"; +-} +\ No newline at end of file ++} +diff -Naur avidemux_2.5.0.orig/cmake/Ts.cmake avidemux_2.5.0/cmake/Ts.cmake +--- avidemux_2.5.0.orig/cmake/Ts.cmake 2009-07-11 21:12:51.000000000 -0400 ++++ avidemux_2.5.0/cmake/Ts.cmake 2009-07-11 21:22:34.000000000 -0400 +@@ -64,7 +64,7 @@ + + SET(qm_files ${qm_files} ${_outXml} ${_out}) + +- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") ++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") + ENDFOREACH(ts_input ${ts_files}) + + SET(${_sources} ${${_sources}} ${qm_files}) +@@ -95,7 +95,7 @@ + + SET(qm_files ${qm_files} ${_out}) + +- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n") ++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n") + ENDFOREACH(ts_input ${ts_files}) + + SET(${_sources} ${${_sources}} ${qm_files}) diff --git a/extra/babl/ChangeLog b/extra/babl/ChangeLog new file mode 100644 index 000000000..719874f6b --- /dev/null +++ b/extra/babl/ChangeLog @@ -0,0 +1,10 @@ +2008-06-16 Eric Belanger + + * babl 0.0.22-1 + * Upstream update + +2008-04-13 Eric Belanger + + * babl 0.0.20-1 + * Added to [extra] repo + diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD new file mode 100644 index 000000000..3b7d61bb3 --- /dev/null +++ b/extra/babl/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 3008 2008-06-18 02:01:54Z eric $ +# Maintainer: Eric Belanger +# Contributor: Charles-Henri d'Adhemar + +pkgname=babl +pkgver=0.0.22 +pkgrel=1 +pkgdesc="Dynamic, any to any, pixel format conversion library" +arch=('i686' 'x86_64') +url="http://gegl.org/babl/" +license=('LGPL3') +depends=('glibc' ) +options=('!libtool') +source=(ftp://ftp.gtk.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('b821ce696b40feb74552da9d666defad') +sha1sums=('9de50fb5833f41691f50f6e735d6422aad52ea94') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD new file mode 100644 index 000000000..1b6521414 --- /dev/null +++ b/extra/banshee/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 37535 2009-05-02 20:36:11Z jgc $ +# Maintainer: Hugo Doria + +pkgname=banshee +pkgver=1.4.3 +pkgrel=3 +pkgdesc="Music management and playback for GNOME" +arch=('i686' 'x86_64') +url="http://banshee-project.org/" +license=('MIT') +depends=('sqlite3>=3.6.13' 'ndesk-dbus-glib>=0.4.1' 'mono-addins>=0.4' 'taglib-sharp>=2.0.3.2' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'gnome-sharp>=2.24.1' 'libmtp>=0.3.7' 'ipod-sharp>=0.8.1' 'boo' 'mono-zeroconf' 'libxxf86vm' 'gnome-icon-theme>=2.26.0' 'desktop-file-utils') +makedepends=('perlxml' 'pkgconfig' 'intltool>=0.35.0') +optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'brasero: CD burning' + 'notify-sharp-svn: Display Banshee tray icon') +options=('!libtool' '!makeflags' '!emptydirs') +install=banshee.install +source=(http://download.banshee-project.org/${pkgname}/${pkgname}-1-${pkgver}.tar.bz2) +md5sums=('880dee65d2bfe62be711a8edfe4d737f') +sh1sums=('3b137c1efe3eb8881da2e86210104eb292a7c560') + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + cd "${srcdir}/${pkgname}-1-${pkgver}" + LD_PRELOAD="" ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --disable-docs --disable-static || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + + install -d -m755 "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/banshee/banshee.install b/extra/banshee/banshee.install new file mode 100644 index 000000000..df7687ef2 --- /dev/null +++ b/extra/banshee/banshee.install @@ -0,0 +1,24 @@ +pkgname=banshee + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD new file mode 100644 index 000000000..028d7b9d1 --- /dev/null +++ b/extra/barcode/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 30186 2009-03-17 04:20:12Z eric $ +# Maintainer: damir + +pkgname=barcode +pkgver=0.98 +pkgrel=2 +pkgdesc="GNU Barcode is a tool to convert text strings to printed bars." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/barcode/barcode.html" +license=('GPL') +depends=('glibc') +install=barcode.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('7f10c3307b84a19a4ab2fa4b3f2974da') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 + make || return 1 + make prefix=$pkgdir/usr MAN1DIR=$pkgdir/usr/share/man/man1 \ + MAN3DIR=$pkgdir/usr/share/man/man3 INFODIR=$pkgdir/usr/share/info install || return 1 + gzip $pkgdir/usr/share/info/barcode.info +} diff --git a/extra/barcode/barcode.install b/extra/barcode/barcode.install new file mode 100644 index 000000000..2f566fcfd --- /dev/null +++ b/extra/barcode/barcode.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(barcode.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/bash-completion/PKGBUILD b/extra/bash-completion/PKGBUILD new file mode 100644 index 000000000..9189a73d9 --- /dev/null +++ b/extra/bash-completion/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 52863 2009-09-22 18:31:32Z aaron $ +# Maintainer: Aaron Griffin +# Contributor: Aurelien Foret +# Contributor: Evangelos Foutras + +pkgname=bash-completion +pkgver=1.0 +pkgrel=3 +pkgdesc="Programmable completion for the bash shell" +arch=(any) +url="http://bash-completion.alioth.debian.org/" +license=('GPL') +depends=('bash') +source=(http://bash-completion.alioth.debian.org/files/$pkgname-$pkgver.tar.gz + fix-_filedir-on-bash-4.patch) +md5sums=('cd1c5648272917fbe0eef4ba30bb93f4' + '1c707436109fb4c80ef7abeefc7dd1b0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fixes for archlinux + sed -i 's#/sbin/lsmod#/bin/lsmod#' bash_completion || return 1 + + patch -up1 < $srcdir/fix-_filedir-on-bash-4.patch + + ./configure --prefix=/usr --sysconfdir=/etc + make || return 1 + make DESTDIR="$pkgdir" install + + # apache2ctl doesn't work, even when renamed to apachectl (and sed'd) + rm "$pkgdir/etc/bash_completion.d/apache2ctl" +} +# vim:set ts=2 sw=2 et: diff --git a/extra/bash-completion/fix-_filedir-on-bash-4.patch b/extra/bash-completion/fix-_filedir-on-bash-4.patch new file mode 100644 index 000000000..85f5794b5 --- /dev/null +++ b/extra/bash-completion/fix-_filedir-on-bash-4.patch @@ -0,0 +1,28 @@ +commit 1421e55aac075e13491cd212b796bdd453214a2c +Author: Mike Kelly +Date: Thu Apr 2 11:16:46 2009 -0400 + + Fix _filedir on bash 4. + + We don't need to double-quote things for compgen w/ bash 4. Just putting + each file in double quotes is sufficient. + + See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html + +diff --git a/bash_completion b/bash_completion +index 0246cd8..4d21cf8 100644 +--- a/bash_completion ++++ b/bash_completion +@@ -209,6 +209,12 @@ quote() + # results in the original argument + quote_readline() + { ++ if [[ "${BASH_VERSINFO[0]}" -ge 4 ]] ; then ++ # This function isn't really necessary on bash 4 ++ # See: http://lists.gnu.org/archive/html/bug-bash/2009-03/msg00155.html ++ echo "${1}" ++ return ++ fi + local t="${1//\\/\\\\}" + echo \'${t//\'/\'\\\'\'}\' #'# Help vim syntax highlighting + } diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD new file mode 100644 index 000000000..8035a9c79 --- /dev/null +++ b/extra/basket/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 6635 2008-07-26 01:19:44Z eric $ +# Maintainer: James Rayner +# Contributor: lucke + +pkgname=basket +pkgver=1.0.3.1 +pkgrel=1 +pkgdesc="All-purpose notes taker for KDE." +arch=(i686 x86_64) +url="http://basket.kde.org/" +depends=('kdelibs3' 'gpgme') +license=('GPL') +source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.gz) +md5sums=('5a58bbe69c4a80a40747ed80ebb5b3b9') + +build() { + cd $startdir/src/$pkgname-$pkgver + . /etc/profile.d/kde3.sh + ./configure --prefix=/opt/kde --without-arts + make || return 1 + make DESTDIR=$startdir/pkg install +} diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD new file mode 100644 index 000000000..dc6d53ff2 --- /dev/null +++ b/extra/bc/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 42716 2009-06-18 18:13:34Z aaron $ +# Maintainer: dorphell + +pkgname=bc +pkgver=1.06 +pkgrel=6 +pkgdesc="An arbitrary precision calculator language" +arch=(i686 x86_64) +license=('GPL') +depends=('readline') +replaces=(bc-readline) +conflicts=(bc-readline) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz + build-fix.patch) +md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116') + +build() { + CFLAGS="$CFLAGS -O3" + cd ${startdir}/src/${pkgname}-${pkgver} + patch -Np1 -i ${startdir}/src/build-fix.patch || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man \ + --infodir=/usr/share/info --with-readline + make LEX="flex -I" || return 1 + make DESTDIR=${startdir}/pkg install + rm ${pkgdir}/usr/share/info/dir +} diff --git a/extra/bc/build-fix.patch b/extra/bc/build-fix.patch new file mode 100644 index 000000000..98a40820a --- /dev/null +++ b/extra/bc/build-fix.patch @@ -0,0 +1,13 @@ +diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l +--- bc-1.06/bc/scan.l 2000-09-13 22:25:47 +0400 ++++ bc-1.06.my/bc/scan.l 2006-12-25 12:39:34 +0300 +@@ -143,7 +143,9 @@ + + /* Definitions for readline access. */ + extern FILE *rl_instream; ++#if 0 + _PROTOTYPE(char *readline, (char *)); ++#endif + + /* rl_input puts upto MAX characters into BUF with the number put in + BUF placed in *RESULT. If the yy input file is the same as diff --git a/extra/bcprov/PKGBUILD b/extra/bcprov/PKGBUILD new file mode 100644 index 000000000..c18c8c1d1 --- /dev/null +++ b/extra/bcprov/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 49813 2009-08-16 15:39:34Z jgc $ +# Maintainer: Jan de Groot + +pkgname=bcprov +pkgver=1.43 +_pkgver=143 +pkgrel=1 +pkgdesc="Java cryptography APIs (Bouncy Castle)" +arch=(any) +url="http://www.bouncycastle.org/java.html" +license=('custom') +depends=('java-runtime') +makedepends=('openjdk6' 'junit') +source=(http://www.bouncycastle.org/download/bcprov-jdk16-${_pkgver}.tar.gz) +md5sums=('d5b3d6edaacc332251341a79c3f86590') + +build() { + cd "${srcdir}/bcprov-jdk16-${_pkgver}" + jar xf src.zip || return 1 + + mkdir classes + find . -name '*.java' > src.list + javac -cp /usr/share/java/junit.jar -d classes @src.list || return 1 + + cd classes + find . -path '*test/*.class' -delete + find . -depth -type d -empty -delete + jar cf ../bcprov.jar * || return 1 + install -m755 -d "${pkgdir}/usr/share/java" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 ../bcprov.jar "${pkgdir}/usr/share/java/" || return 1 + install -m644 ../LICENSE.html "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +} diff --git a/extra/bdf-unifont/LICENSE b/extra/bdf-unifont/LICENSE new file mode 100644 index 000000000..066ea1699 --- /dev/null +++ b/extra/bdf-unifont/LICENSE @@ -0,0 +1,60 @@ +CENSE +------- +Roman Czyborra released his work (Perl scripts and font .hex files) +under the following terms: + + All of my works you find here are freeware. You may + freely copy, use, quote, modify or redistribute them + as long as you properly attribute my contribution and + have given a quick thought about whether Roman might + perhaps be interested to read what you did with his + stuff. Horizontal rules don't apply. + +David Starner released what in this package is named "hex2bdf-split" +under the same license as Roman Czyborra's work. + +License for all of Paul Hardy's work (except "johab2ucs2" and +"blanks.hex", mentioned separately), Makefile and debian/ mods +by Anthony Fok, and modified software from Luis Gonzalez Miranda +(with permission granted to Paul Hardy): + + These are released under the terms of the GNU General Public + License version 2, or (at your option) a later version. + +License for Fonts: + + Any fonts using glyphs from the "wqy-cjk.hex" file (including + the default TrueType font) are bound by the terms of the Wen + Quan Yi font license. Those fonts are released under the terms + of the GNU General Public License (GPL) versionn 2, with the + exception that embedding the font in a document does not by + itself bind that document to the terms of the GNU GPL. + + Any fonts that do not use glyphs from the "wqy-cjk.hex" file + fall under the above "License for all of Roman Czyborra's work". + + The fonts in "./font/precompiled" do use wqy-cjk.hex, and so + are licensed under the GNU GPL version 2, with the exception + that embedding the font in a document does not in itself bind + that document to the terms of the GNU GPL. The following + paragraphs explaining the exception is taken from the Wen + Quan Yi font distribution: + + ** GPL v2.0 license with font embedding exception: + + As a special exception, if you create a document which + uses this font, and embed this font or unaltered portions + of this font into the document, this font does not by + itself cause the resulting document to be covered by + the GNU General Public License. This exception does not + however invalidate any other reasons why the document + might be covered by the GNU General Public License. + If you modify this font, you may extend this exception + to your version of the font, but you are not obligated + to do so. If you do not wish to do so, delete this + exception statement from your version. + +License for "blanks.hex": + + There is one exception to the above rules: Paul Hardy earlier + released the "blanks.hex" file into the public domain. diff --git a/extra/bdf-unifont/PKGBUILD b/extra/bdf-unifont/PKGBUILD new file mode 100644 index 000000000..2df7993e6 --- /dev/null +++ b/extra/bdf-unifont/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD,v 1.5 2008/09/24 07:16:54 ronald Exp $ +# Maintainer: Ronald van Haren + +pkgname=bdf-unifont +pkgver=5.1.20080820 +pkgrel=1 +pkgdesc="GNU Unifont Glyphs" +arch=('i686' 'x86_64') +license=('custom' 'GPL2') +url="http://unifoundry.com/unifont.html" +depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils') +install=unifont.install +source=('http://unifoundry.com/unifont-5.1.20080820.bdf.gz' 'LICENSE') +md5sums=('6b8263ceccef33bd633aa019d74b7943' + '64da5a96d6789d29d485cd67a43bc547') + +build() { + install -Dm644 ${srcdir}/unifont-5.1.20080820.bdf \ + ${pkgdir}/usr/share/fonts/misc/unifont.bdf + + # install LICENSE file + install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/bdf-unifont/unifont.install b/extra/bdf-unifont/unifont.install new file mode 100644 index 000000000..7d21ab51b --- /dev/null +++ b/extra/bdf-unifont/unifont.install @@ -0,0 +1,15 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -f > /dev/null + mkfontscale /usr/share/fonts/misc + mkfontdir /usr/share/fonts/misc + echo "done." +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/beagle/PKGBUILD b/extra/beagle/PKGBUILD new file mode 100644 index 000000000..8cab0c940 --- /dev/null +++ b/extra/beagle/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 38815 2009-05-10 14:44:53Z jgc $ +# Maintainer: Daniel Isenmann +# Contributor: Shadowhand +pkgname=beagle +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Search tool that ransacks your personal information space" +arch=(i686 x86_64) +url="http://www.gnome.org/projects/beagle/" +license=('custom') +depends=('gnome-sharp>=2.24.1' 'gmime>=2.2.21' 'evolution-sharp>=0.20.0' 'libexif' 'librsvg>=2.26.0' 'sqlite3>=3.6.13' 'libxss' 'wv>=1.2.4' 'chmlib' 'gsf-sharp>=0.8.1' 'libsm' 'xdg-utils' 'ndesk-dbus-glib' 'mono>=2.4' 'taglib-sharp') +makedepends=('intltool' 'zip' 'pkgconfig') +options=('!libtool') +backup=('etc/beagle/crawl-applications' 'etc/beagle/crawl-documentation' + 'etc/beagle/crawl-windows') +install=beagle.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2 + beagle-0.3.9-spew.patch) +md5sums=('b73c12423d2d67133dbb05933f4c8fe1' + '003ada7acc2724e94e0218e4a6705b4a') + +build() { + export "MONO_SHARED_DIR=${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's/CRAWL_USER=beagleindex/CRAWL_USER=beaglidx/' tools/beagle-crawl-system.in || return 1 + sed -i -e 's/libchm.so.1/libchm.so.0/' Util/ChmFile.cs || return 1 + patch -Np1 -i "${srcdir}/beagle-0.3.9-spew.patch" || return 1 + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-inotify \ + --disable-libbeagle \ + --disable-static \ + --disable-docs || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/var/cache/beagle/indexes" || return 1 + chown -R 86:86 "${pkgdir}/var/cache/beagle" || return 1 + install -m755 -d "${pkgdir}/usr/share/licenses/beagle" + install -m644 COPYING "${pkgdir}/usr/share/licenses/beagle/" || return 1 +} diff --git a/extra/beagle/beagle-0.3.9-spew.patch b/extra/beagle/beagle-0.3.9-spew.patch new file mode 100644 index 000000000..6e31c964c --- /dev/null +++ b/extra/beagle/beagle-0.3.9-spew.patch @@ -0,0 +1,12 @@ +diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs +--- beagle-0.3.9.orign/beagled/BeagleDaemon.cs 2008-06-11 20:42:20.000000000 +0200 ++++ beagle-0.3.9/beagled/BeagleDaemon.cs 2009-01-31 12:44:23.000000000 +0100 +@@ -456,7 +456,7 @@ namespace Beagle.Daemon { + // debugging this code, after all... + // arg_debug ? LogLevel.Debug : LogLevel.Warn + +- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg); ++ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg); + Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version); + Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion); + Log.Always ("Command Line: {0}", diff --git a/extra/beagle/beagle.install b/extra/beagle/beagle.install new file mode 100644 index 000000000..bfc90ecd1 --- /dev/null +++ b/extra/beagle/beagle.install @@ -0,0 +1,8 @@ +post_install() { + getent group beaglidx >/dev/null || usr/sbin/groupadd -g 86 beaglidx + getent passwd beaglidx >/dev/null || usr/sbin/useradd -c 'User for Beagle indexing' -u 86 -g beaglidx -d '/' -s /bin/false beaglidx +} + +post_upgrade() { + post_install $1 +} diff --git a/extra/beanshell/PKGBUILD b/extra/beanshell/PKGBUILD new file mode 100644 index 000000000..c48e05d79 --- /dev/null +++ b/extra/beanshell/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 51168 2009-09-05 15:32:16Z andyrtr $ +# Maintainer: AndyRTR + +pkgname=beanshell +pkgver=2.0b4 +pkgrel=1 +pkgdesc="Small, free, embeddable, source level Java interpreter with object based scripting language features written in Java" +arch=('any') +url="http://www.beanshell.org/home.html" +license=('LGPL') +depends=('java-runtime') +provides=('bsh') +source=(http://www.beanshell.org/bsh-${pkgver}.jar) +noextract=(${pkgname}-${pkgver}.jar) +md5sums=('a1c60aa83c9c9a6cb2391c1c1b85eb00') + +build() { + install -m755 -d ${pkgdir}/usr/share/java/ + install -D -m644 ${srcdir}/bsh-${pkgver}.jar ${pkgdir}/usr/share/java/bsh.jar +} diff --git a/extra/beep/PKGBUILD b/extra/beep/PKGBUILD new file mode 100644 index 000000000..e513f3107 --- /dev/null +++ b/extra/beep/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 30187 2009-03-17 04:21:38Z eric $ +# Maintainer: damir +# Contributor: Manolis Tzanidakis + +pkgname=beep +pkgver=1.2.2 +pkgrel=2 +pkgdesc="Advanced PC speaker beeping program." +arch=('i686' 'x86_64') +url="http://www.johnath.com/beep" +license=('GPL2') +depends=('glibc') +source=(http://www.johnath.com/beep/$pkgname-$pkgver.tar.gz) +md5sums=('d541419fd7e5642952d7b48cbb40c712') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i "s:-Wall:${CFLAGS}:" Makefile || return 1 + make || return 1 + install -D -m755 beep $pkgdir/usr/bin/beep || return 1 + install -D -m644 beep.1.gz $pkgdir/usr/share/man/man1/beep.1.gz || return 1 +} diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD new file mode 100644 index 000000000..b7a4cd762 --- /dev/null +++ b/extra/bftpd/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 21438 2008-12-13 09:41:50Z thomas $ +# Maintainer: Thomas Baechler + +pkgname=bftpd +pkgver=2.3 +pkgrel=1 +pkgdesc="A very configurable (and secure) Linux FTP server" +arch=(i686 x86_64) +url="http://bftpd.sourceforge.net/" +license=('GPL') +depends=('glibc' 'pam') +install=bftpd.install +backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd var/log/bftpd.log) +source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz + bftpd.rc bftpd.logrotate bftpd.pam) +md5sums=('4ab1eb33135fa5eaaf050e6d3dd0b319' + '56a1bf7738a6db2b2cff89e611f4f11a' + '853680dad0df39d0b4d2fb43d4be430a' + '96f82c38f3f540b53f3e5144900acf17') + +build() { + cd ${srcdir}/$pkgname + # install fixes + sed -i -e 's| /var| $(DESTDIR)/var|g' Makefile.in + ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man + make || return 1 + install -d -m755 ${pkgdir}/usr/{sbin,share/man/man8} + install -d -m755 ${pkgdir}/var/run/bftpd + install -d -m755 ${pkgdir}/var/log + install -D -m644 ${srcdir}/bftpd.logrotate ${pkgdir}/etc/logrotate.d/bftpd || return 1 + install -D -m755 ${srcdir}/bftpd.rc ${pkgdir}/etc/rc.d/bftpd || return 1 + make DESTDIR=${pkgdir} install || return 1 + rm -f ${pkgdir}/var/log/bftpd.log + rmdir ${pkgdir}/var/log + mkdir -p ${pkgdir}/etc/pam.d + cp ${srcdir}/bftpd.pam ${pkgdir}/etc/pam.d/bftpd || return 1 +} diff --git a/extra/bftpd/bftpd.install b/extra/bftpd/bftpd.install new file mode 100644 index 000000000..7626efea6 --- /dev/null +++ b/extra/bftpd/bftpd.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install () { + [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log +} + +post_upgrade() { + post_install $1 +} diff --git a/extra/bftpd/bftpd.logrotate b/extra/bftpd/bftpd.logrotate new file mode 100644 index 000000000..c0f0b3393 --- /dev/null +++ b/extra/bftpd/bftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/bftpd.log { + missingok + notifempty + delaycompress +} diff --git a/extra/bftpd/bftpd.pam b/extra/bftpd/bftpd.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/extra/bftpd/bftpd.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc new file mode 100755 index 000000000..2f31cf50c --- /dev/null +++ b/extra/bftpd/bftpd.rc @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PIDFILE="/var/run/bftpd.pid" + +case "$1" in + start) + stat_busy "Starting bftpd Server" + PID="$(pidof -o %PPID /usr/sbin/bftpd)" + if [ -z "$PID" ]; then + /usr/sbin/bftpd -d + if [ $? -gt 0 ]; then + stat_fail + else + # wait until it forks + sleep 2 + echo $(pidof -o %PPID /usr/sbin/bftpd) > $PIDFILE + add_daemon bftpd + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping bftpd Server" + if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then + kill -15 $(cat $PIDFILE) + rm $PIDFILE + stat_done + else + stat_fail + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD new file mode 100644 index 000000000..b72734e83 --- /dev/null +++ b/extra/bigloo/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 27493 2009-02-22 03:54:55Z eric $ +# Contributor: John Proctor +# Maintainer: Kevin Piche + +pkgname=bigloo +pkgver=3.2a_2 +pkgrel=1 +pkgdesc="Fast scheme compiler" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" +depends=('openssl' 'sqlite3' 'gmp' 'texinfo') +makedepends=('java-environment') +options=('!makeflags') +install=bigloo.install +source=(ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${pkgname}${pkgver%_*}-${pkgver##*_}.tar.gz) +md5sums=('f8cfd4b6c59c585e8ddea086a9fbd385') + +build() { + cd ${srcdir}/${pkgname}${pkgver%_*}-${pkgver##*_} + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --docdir=/usr/share/doc/bigloo \ + --dotnet=no --javaprefix=/opt/java/bin || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + make -C manuals DESTDIR=${pkgdir} install-man-bee || return 1 + rm ${pkgdir}/usr/share/info/dir + gzip ${pkgdir}/usr/share/info/bigloo* +} diff --git a/extra/bigloo/bigloo.install b/extra/bigloo/bigloo.install new file mode 100644 index 000000000..303b4c7a2 --- /dev/null +++ b/extra/bigloo/bigloo.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(bigloo.info.gz bigloo.info-1.gz bigloo.info-2.gz bigloo.info-3.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/bind/127.0.0.zone b/extra/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/extra/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD new file mode 100644 index 000000000..8f041b76c --- /dev/null +++ b/extra/bind/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 47962 2009-07-30 00:13:26Z thomas $ +# Maintainer: judd +# Contributor: Mario Vazquez +pkgname=bind +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.6.1.P1 +_pkgver=9.6.1-P1 +pkgrel=1 +pkgdesc="Berkeley Internet Name Domain - named server" +arch=(i686 x86_64) +url="http://www.isc.org/index.pl?/sw/bind/" +license=('custom:ISC') +backup=(etc/named.conf etc/logrotate.d/named etc/conf.d/named etc/rndc.key) +depends=('openssl') +provides=('dns-server') +options=('!libtool') +install=bind.install +source=(ftp://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz + bind.so_bsdcompat.diff notools.patch named.conf localhost.zone 127.0.0.zone + named root.hint named.logrotate named.conf.d) +md5sums=('e6ce3b355c4e6bf5d66ef100f555da3f' '447d58721cfee0e1e377b46f7d50b327' + '2ab9db5112cabae23770cdd2f00c6923' 'f58fa49a92df16534d31fcb6b0d1be1e' + 'ab5beef0b41eb6376c7f1f4ee233172b' 'bdbdfe4990b0903984306dd14f98b951' + '750f283c7774ffe75cd215bce46b03cd' '8c212c0260d708f15f75d3adc71f0149' + '91b3463a181561deb845acc122713a2a' '475fde63600d7d95980de991f02d6b6d') + +build() { + export MAKEFLAGS="-j1" + cd ${startdir}/src/${pkgname}-${_pkgver} + patch -Np0 -i ${startdir}/src/bind.so_bsdcompat.diff || return 1 + patch -Np1 -i ${startdir}/src/notools.patch || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --with-libtool --enable-shared --disable-threads \ + --with-openssl=yes --disable-linux-caps --without-libxml2 + make || return 1 + make DESTDIR=${startdir}/pkg install + install -D -m755 ../named ${startdir}/pkg/etc/rc.d/named + install -D -m640 ../named.conf ${startdir}/pkg/etc/named.conf + install -D -m600 ../127.0.0.zone ${startdir}/pkg/var/named/127.0.0.zone + install -D -m600 ../localhost.zone ${startdir}/pkg/var/named/localhost.zone + #grabbed from ftp://ftp.rs.internic.net/domain/named.root + install -D -m600 ../root.hint ${startdir}/pkg/var/named/root.hint + install -D -m600 ../named.logrotate ${startdir}/pkg/etc/logrotate.d/named + install -D -m644 ../named.conf.d ${startdir}/pkg/etc/conf.d/named + install -d -m755 ${startdir}/pkg/var/run/named + install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + + # adjust ownerships (our named user will be uid/gid 40/40) + chmod 700 ${startdir}/pkg/var/named + chown root:40 ${startdir}/pkg/etc/named.conf + chown -R 40:40 ${startdir}/pkg/var/named + chown 40:40 ${startdir}/pkg/var/run/named +} diff --git a/extra/bind/bind.install b/extra/bind/bind.install new file mode 100644 index 000000000..c4acf221c --- /dev/null +++ b/extra/bind/bind.install @@ -0,0 +1,37 @@ +# arg 1: the new package version +post_install() { + getent group named >/dev/null || usr/sbin/groupadd -g 40 named + getent passwd named >/dev/null || usr/sbin/useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + usr/bin/passwd -l named &>/dev/null + + [ -f var/log/named.log ] || : >var/log/named.log + chown named.named var/log/named.log + # create an rndc.key if it doesn't already exist + if [ ! -s etc/rndc.key ]; then + usr/sbin/rndc-confgen -b 256 | head -n 5 >>etc/rndc.key + chown root.named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 + # old versions of this package didn't have a named user + chown -R named:named var/named + # old versions of this package didn't set permissions correct + chown root:named etc/named.conf + chmod 640 etc/named.conf +} + +# arg 1: the old package version +pre_remove() { + usr/sbin/userdel named &>/dev/null + usr/sbin/groupdel named &>/dev/null +} + +op=$1 +shift + +$op $* diff --git a/extra/bind/bind.so_bsdcompat.diff b/extra/bind/bind.so_bsdcompat.diff new file mode 100644 index 000000000..5d78031b7 --- /dev/null +++ b/extra/bind/bind.so_bsdcompat.diff @@ -0,0 +1,11 @@ +--- ./lib/isc/unix/socket.c.orig 2005-11-03 17:08:42.000000000 -0600 ++++ ./lib/isc/unix/socket.c 2006-02-18 13:09:15.000000000 -0600 +@@ -245,6 +245,8 @@ + + #define SOCK_DEAD(s) ((s)->references == 0) + ++#undef SO_BSDCOMPAT ++ + static void + manager_log(isc_socketmgr_t *sockmgr, + isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/extra/bind/localhost.zone b/extra/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/extra/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/extra/bind/named b/extra/bind/named new file mode 100755 index 000000000..aa228092a --- /dev/null +++ b/extra/bind/named @@ -0,0 +1,39 @@ +#!/bin/bash + +NAMED_ARGS= +[ -f /etc/conf.d/named ] && . /etc/conf.d/named + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/named` +case "$1" in + start) + stat_busy "Starting DNS" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping DNS" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/bind/named.conf b/extra/bind/named.conf new file mode 100644 index 000000000..38fb12cbe --- /dev/null +++ b/extra/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/var/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/extra/bind/named.conf.d b/extra/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/extra/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/extra/bind/named.logrotate b/extra/bind/named.logrotate new file mode 100644 index 000000000..ef1a2d032 --- /dev/null +++ b/extra/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/extra/bind/notools.patch b/extra/bind/notools.patch new file mode 100644 index 000000000..832d3d16d --- /dev/null +++ b/extra/bind/notools.patch @@ -0,0 +1,11 @@ +--- bind-9.3.1/bin/Makefile.in.orig 2005-05-06 01:52:36.000000000 -0400 ++++ bind-9.3.1/bin/Makefile.in 2005-05-06 01:53:24.000000000 -0400 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests nsupdate check ++SUBDIRS = named rndc dnssec tests check + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/extra/bind/root.hint b/extra/bind/root.hint new file mode 100644 index 000000000..4ed4c0b3a --- /dev/null +++ b/extra/bind/root.hint @@ -0,0 +1,80 @@ +; This file holds the information on root name servers needed to +; initialize cache of Internet domain name servers +; (e.g. reference this file in the "cache . " +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC +; under anonymous FTP as +; file /domain/named.root +; on server FTP.INTERNIC.NET +; -OR- RS.INTERNIC.NET +; +; last update: Nov 01, 2007 +; related version of root zone: 2007110100 +; +; +; formerly NS.INTERNIC.NET +; +. 3600000 IN NS A.ROOT-SERVERS.NET. +A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 +; +; formerly NS1.ISI.EDU +; +. 3600000 NS B.ROOT-SERVERS.NET. +B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 +; +; formerly C.PSI.NET +; +. 3600000 NS C.ROOT-SERVERS.NET. +C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +; +; formerly TERP.UMD.EDU +; +. 3600000 NS D.ROOT-SERVERS.NET. +D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 +; +; formerly NS.NASA.GOV +; +. 3600000 NS E.ROOT-SERVERS.NET. +E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +; +; formerly NS.ISC.ORG +; +. 3600000 NS F.ROOT-SERVERS.NET. +F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 +; +; formerly NS.NIC.DDN.MIL +; +. 3600000 NS G.ROOT-SERVERS.NET. +G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +; +; formerly AOS.ARL.ARMY.MIL +; +. 3600000 NS H.ROOT-SERVERS.NET. +H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 +; +; formerly NIC.NORDU.NET +; +. 3600000 NS I.ROOT-SERVERS.NET. +I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +; +; operated by VeriSign, Inc. +; +. 3600000 NS J.ROOT-SERVERS.NET. +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 +; +; operated by RIPE NCC +; +. 3600000 NS K.ROOT-SERVERS.NET. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +; +; operated by ICANN +; +. 3600000 NS L.ROOT-SERVERS.NET. +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +; +; operated by WIDE +; +. 3600000 NS M.ROOT-SERVERS.NET. +M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 +; End of File diff --git a/extra/biogrep/PKGBUILD b/extra/biogrep/PKGBUILD new file mode 100644 index 000000000..85a1d374f --- /dev/null +++ b/extra/biogrep/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 36976 2009-04-29 06:01:13Z eric $ +# Maintainer: damir + +pkgname=biogrep +pkgver=1.0 +pkgrel=2 +pkgdesc="match large sets of patterns against biosequence databases" +arch=(i686 x86_64) +license=('GPL') +url="http://web.mit.edu/bamel/biogrep.shtml" +depends=('glibc') +source=(http://web.mit.edu/bamel/biogrep-$pkgver.tar.gz) +md5sums=('90fb4987301b4c84f16e36e82c679e16') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/biopython/PKGBUILD b/extra/biopython/PKGBUILD new file mode 100644 index 000000000..51dd05b0f --- /dev/null +++ b/extra/biopython/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 45068 2009-07-06 21:18:17Z giovanni $ +# Maintainer: damir + +pkgname=biopython +pkgver=1.51b +pkgrel=1 +pkgdesc="Biopython: freely available Python tools for computational molecular biology" +arch=("i686" "x86_64") +url="http://www.biopython.org" +license=('custom') +depends=('glibc' 'python>=2.6' 'python-numpy') +makedepends=('gcc') +source=("$url/DIST/$pkgname-$pkgver.tar.gz") + +build() { + cd $startdir/src/$pkgname-$pkgver + yes | python setup.py build + # python setup.py test + yes | python setup.py install --root=$startdir/pkg + install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD new file mode 100644 index 000000000..0e5ab8ad8 --- /dev/null +++ b/extra/bitlbee/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 21123 2008-12-10 03:47:23Z jeff $ +# Contributor: FUBAR +# Contributor: simo +# Maintainer: Jeff 'codemac' Mickey +pkgname=bitlbee +pkgver=1.2.3 +pkgrel=1 +pkgdesc="An IRC to IM gateway. Supports MSN, ICQ, Jabber, Yahoo!, and AIM" +arch=('i686' 'x86_64') +url="http://www.bitlbee.org/" +license=('GPL') +depends=('gnutls>=2.4.2' 'glib2>=2.18.3' 'xinetd') +install=bitlbee.install +backup=(etc/bitlbee/bitlbee.conf etc/bitlbee/motd.txt etc/xinetd.d/bitlbee) +source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz \ + bitlbee.xinetd \ + bitlbee.rcd) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --ssl=gnutls --etcdir=/etc/bitlbee || return 1 + make || return 1 + + install -m755 -d $pkgdir/var/lib + install -o65 -g65 -d -m0770 $pkgdir/var/lib/bitlbee + install -D -m644 $srcdir/bitlbee.xinetd \ + $pkgdir/etc/xinetd.d/bitlbee + install -D -m755 $srcdir/bitlbee.rcd \ + $pkgdir/etc/rc.d/bitlbee || return 1 + make DESTDIR=$pkgdir install || return 1 + make DESTDIR=$pkgdir install-etc || return 1 + make DESTDIR=$pkgdir install-dev || return 1 +} + +md5sums=('2b1674d98804970809de3da3edf0bed2' + '81e576369e31377f5217e636b00874b1' + '90893b706e0e50d37cfe6b283bc7d46c') diff --git a/extra/bitlbee/bitlbee.install b/extra/bitlbee/bitlbee.install new file mode 100644 index 000000000..0e2fe16ac --- /dev/null +++ b/extra/bitlbee/bitlbee.install @@ -0,0 +1,28 @@ +post_install() { + echo "-> Bitlbee can run through xinetd or as a daemon for now." + if [ ! `grep bitlbee /etc/group` ]; then + groupadd -g 65 bitlbee &>/dev/null; + fi + + id bitlbee &>/dev/null || \ + useradd -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false bitlbee +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + userdel bitlbee &> /dev/null + groupdel bitlbee &> /dev/null +} + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/bitlbee/bitlbee.rcd b/extra/bitlbee/bitlbee.rcd new file mode 100644 index 000000000..b8d6137dc --- /dev/null +++ b/extra/bitlbee/bitlbee.rcd @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof -o %PPID /usr/sbin/bitlbee +} + +case "$1" in + start) + stat_busy "Starting Bitlbee" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/bitlbee/bitlbee.pid ] && rm -f /var/run/bitlbee/bitlbee.pid + su -s /bin/sh -c "/usr/sbin/bitlbee -F" "bitlbee" + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + add_daemon bitlbee + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping Bitlbee" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/bitlbee/bitlbee.pid &> /dev/null + rm_daemon bitlbee + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/bitlbee/bitlbee.xinetd b/extra/bitlbee/bitlbee.xinetd new file mode 100644 index 000000000..d671a8cfc --- /dev/null +++ b/extra/bitlbee/bitlbee.xinetd @@ -0,0 +1,12 @@ +service bitlbee +{ + type = UNLISTED + socket_type = stream + protocol = tcp + wait = no + user = bitlbee + group = bitlbee + server = /usr/sbin/bitlbee + port = 6667 + disable = yes +} diff --git a/extra/bittorrent/PKGBUILD b/extra/bittorrent/PKGBUILD new file mode 100644 index 000000000..4cf7f9051 --- /dev/null +++ b/extra/bittorrent/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 25865 2009-01-31 11:09:20Z allan $ +# Mantainer: Juergen Hoetzel + +pkgname=bittorrent +pkgver=5.2.2 +pkgrel=1 +pkgdesc="BitTorrent is a tool for copying files from one machine to another." +arch=('i686' 'x86_64') +url="http://www.bittorrent.com" +install=bittorrent.install +depends=('twisted' 'pycrypto') +source=(http://download.bittorrent.com/dl/archive/BitTorrent-${pkgver}.tar.gz) +license=('custom') +md5sums=('d8891cfa4c6bb796c8e948eace7694bc') + +build() { + cd $srcdir/BitTorrent-$pkgver + python ./setup.py install --root=$pkgdir + + # remove broken wx interface + rm $pkgdir/usr/bin/{bittorrent,maketorrent} + rm -rf $pkgdir/usr/lib/python2.6/site-packages/BitTorrent/GUI_wx + rm -rf $pkgdir/usr/share/pixmaps + + # install custom license + install -Dm644 $srcdir/BitTorrent-$pkgver/LICENSE.txt \ + $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/bittorrent/bittorrent.install b/extra/bittorrent/bittorrent.install new file mode 100644 index 000000000..562c775b2 --- /dev/null +++ b/extra/bittorrent/bittorrent.install @@ -0,0 +1,9 @@ +post_install() { + echo " The \"bittorrent\" packages no longer includes the GUI interface" + echo " due to not being updated for wx-2.8 after two years." + echo " Forward complaints upstream." +} + +post_upgrade() { + post_install $1 +} diff --git a/extra/bladeenc/PKGBUILD b/extra/bladeenc/PKGBUILD new file mode 100644 index 000000000..5a6177589 --- /dev/null +++ b/extra/bladeenc/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 36977 2009-04-29 06:02:51Z eric $ +# Maintainer: roberto +# Contributor: Tom Newsom +pkgname=bladeenc +pkgver=0.94.2 +pkgrel=2 +pkgdesc="A freeware MP3 encoder" +arch=('i686' 'x86_64') +url="http://blogninja.com/doc/bladeenc-doc/html/" +license=('LGPL') +depends=('glibc') +source=(ftp://ftp.archlinux.org/other/bladeenc/$pkgname-$pkgver-src-stable.tar.gz) +md5sums=('9b9f6eafe1637a48a67f0a0f8f6e71ad') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 bladeenc.html $pkgdir/usr/share/doc/bladeenc/bladeenc.html +} diff --git a/extra/blassic/PKGBUILD b/extra/blassic/PKGBUILD new file mode 100644 index 000000000..28d1d47ea --- /dev/null +++ b/extra/blassic/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 36618 2009-04-26 08:20:36Z douglas $ +# Maintainer: eric +# Contributor: Damir Perisa +pkgname=blassic +pkgver=0.10.2 +pkgrel=1 +pkgdesc="A classic Basic interpreter" +arch=('i686' 'x86_64') +url="http://blassic.org/" +license=('GPL2') +depends=('gcc' 'libsm' 'libx11' 'ncurses') +source=(http://blassic.org/bin/$pkgname-$pkgver.tgz) +md5sums=('f4d66a339c55cb08fdc00cd9db8001c2') + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make prefix=$startdir/pkg/usr install +} +md5sums=('37534abbdbe5bac7b7fc00dbe119df92') diff --git a/extra/blassic/gcc43.patch b/extra/blassic/gcc43.patch new file mode 100644 index 000000000..2da480d9b --- /dev/null +++ b/extra/blassic/gcc43.patch @@ -0,0 +1,92 @@ +diff -Naur blassic-0.10.0-old/blassic.cpp blassic-0.10.0/blassic.cpp +--- blassic-0.10.0-old/blassic.cpp 2005-02-08 01:22:06.000000000 +1000 ++++ blassic-0.10.0/blassic.cpp 2008-08-03 12:20:03.000000000 +1000 +@@ -17,6 +17,7 @@ + #include "error.h" + + #include ++#include + + #include + #include +diff -Naur blassic-0.10.0-old/cursor.cpp blassic-0.10.0/cursor.cpp +--- blassic-0.10.0-old/cursor.cpp 2005-02-08 02:58:37.000000000 +1000 ++++ blassic-0.10.0/cursor.cpp 2008-08-03 12:22:15.000000000 +1000 +@@ -19,7 +19,7 @@ + #include + #include + #include +- ++#include + + #ifdef BLASSIC_USE_WINDOWS + +diff -Naur blassic-0.10.0-old/graphics.cpp blassic-0.10.0/graphics.cpp +--- blassic-0.10.0-old/graphics.cpp 2005-02-08 01:24:07.000000000 +1000 ++++ blassic-0.10.0/graphics.cpp 2008-08-03 12:25:27.000000000 +1000 +@@ -19,6 +19,7 @@ + #include "trace.h" + + #include ++#include + #include + #include + #include +diff -Naur blassic-0.10.0-old/memory.cpp blassic-0.10.0/memory.cpp +--- blassic-0.10.0-old/memory.cpp 2005-02-02 01:45:04.000000000 +1000 ++++ blassic-0.10.0/memory.cpp 2008-08-03 12:27:02.000000000 +1000 +@@ -7,6 +7,8 @@ + #include "error.h" + #include "trace.h" + ++#include ++ + //#ifdef HAVE_SYS_MMAN_H + #ifdef HAVE_MMAP + +diff -Naur blassic-0.10.0-old/program.cpp blassic-0.10.0/program.cpp +--- blassic-0.10.0-old/program.cpp 2005-02-09 01:00:54.000000000 +1000 ++++ blassic-0.10.0/program.cpp 2008-08-03 12:28:00.000000000 +1000 +@@ -11,6 +11,7 @@ + #include "trace.h" + + #include ++#include + #include + #include + #include +diff -Naur blassic-0.10.0-old/runnerline_instructions.cpp blassic-0.10.0/runnerline_instructions.cpp +--- blassic-0.10.0-old/runnerline_instructions.cpp 2005-02-08 01:40:33.000000000 +1000 ++++ blassic-0.10.0/runnerline_instructions.cpp 2008-08-03 12:30:26.000000000 +1000 +@@ -16,6 +16,8 @@ + + #include "trace.h" + ++#include ++ + #include + using std::auto_ptr; + +diff -Naur blassic-0.10.0-old/socket.cpp blassic-0.10.0/socket.cpp +--- blassic-0.10.0-old/socket.cpp 2005-02-10 04:59:12.000000000 +1000 ++++ blassic-0.10.0/socket.cpp 2008-08-03 12:31:45.000000000 +1000 +@@ -3,6 +3,8 @@ + + #include "socket.h" + ++#include ++ + //------------------------------------------------ + // Changed this: now do not use winsock in Cygwin. + //------------------------------------------------ +diff -Naur blassic-0.10.0-old/util.h blassic-0.10.0/util.h +--- blassic-0.10.0-old/util.h 2005-02-03 02:51:14.000000000 +1000 ++++ blassic-0.10.0/util.h 2008-08-03 12:24:10.000000000 +1000 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #ifdef __BORLANDC__ + #pragma warn -8027 diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD new file mode 100644 index 000000000..063f1dcc0 --- /dev/null +++ b/extra/blender/PKGBUILD @@ -0,0 +1,127 @@ +# $Id: PKGBUILD 46731 2009-07-20 00:29:04Z tobias $ +# Contributor: John Sowiak +# Maintainer: tobias + +# TODO: +# - consider switching to scons when it is better supported + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from cvs. Since I'm sick and tired of the urges of users that +# look for release numbers only we make a messy PKGBUILD that can checkout cvs +# tags if necessary. +#cvs=true +cvs=false + +pkgname=blender +pkgver=2.49a +pkgrel=1 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=(i686 x86_64) +license=(GPL) +url="http://blender3d.org" +depends=('libjpeg' 'libpng' 'openexr' 'sdl' 'python>=2.6' 'desktop-file-utils' \ + 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal') +makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm' 'csv') +options=('!makeflags') +install=blender.install +source=($pkgname.desktop $pkgname.svg) +if [ ! $cvs -o $cvs = false ]; then + source=(${source[@]} http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + makedepends=('freeglut' 'libtiff' 'librsvg' 'yasm') +fi + +build() { + if [ $cvs = true ]; then + cd $startdir/src/ + #cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender login + cvs -z3 -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender checkout $pkgname || return 1 + _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release + cvs -d:pserver:anonymous@cvs.blender.org:/cvsroot/bf-blender update -r $_cvsrel || return 1 + find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null + cd $pkgname + else + cd $startdir/src/$pkgname-$pkgver + fi + + rm -f user-def.mk + + ########################################################################## + # tweak the makefiles to prepare build for ArchLinux + # disable static binaries and enable blenderplayer binary + sed -i "s|^.*\(BINTARGETS += blenderstatic\)| #\1|g" source/Makefile + sed -i "s|^#\(.*BINTARGETS += blenderplayer\)|\1|g" source/Makefile + # link freetype and openal dynamically + sed -i 's|LOPTS)|LOPTS) -lfreetype -lopenal|g' source/Makefile + sed -i 's|COMLIB.*libfreetype\.a|#\0|g' source/Makefile + sed -i 's|NAN_SND_LIBS.*libopenal\.a|#\0|g' source/Makefile + # make ode (alternative physics engine) + # does not work for Arch64 + #[ "$CARCH" = "i686" ] && sed -i 's|^\(DIRS.*\)$|\1 ode|' extern/Makefile + # make the nan_makefiles happy + export NAN_PYTHON_VERSION=2.6 + export INTERNATIONAL=true + export WITH_FREETYPE2=true + export NAN_FREETYPE=/usr + export WITH_ICONV=true + + export NAN_NO_PLUGIN=true + + export NAN_OPENAL=/usr + export NAN_FMOD=/usr + export NAN_JPEG=/usr + export NAN_PNG=/usr + export WITH_OPENEXR=true + export NAN_OPENEXR=/usr + export NAN_ODE=/usr + export NAN_OPENEXR_LIBS=$(pkg-config --libs-only-l OpenEXR) + + export NAN_SDL=/usr + export NAN_ZLIB=/usr + export NAN_MESA=/usr + + export NAN_USE_BULLET=true + export NAN_USE_FFMPEG_CONFIG=true + export WITH_BF_VERSE=true + export WITH_VERSE=true + export WITH_BF_OPENMP=true + # there is an issue with a file + export NAN_DEBUG=-O + ########################################################################### + # build + make || return 1 + ########################################################################### +# mkdir -p $startdir/pkg/usr/share/ + cd obj/linux-glibc2*/bin + +# common part + + mkdir -p $startdir/pkg/usr/share/ + + # install binaries + install -Dm755 blender $startdir/pkg/usr/bin/blender + install -Dm755 blenderplayer $startdir/pkg/usr/bin/blenderplayer + + # install internationalization support + cd ../../../bin/.blender + install -D -m644 .Blanguages \ + $startdir/pkg/usr/share/$pkgname/.Blanguages + install -D -m644 .bfont.ttf \ + $startdir/pkg/usr/share/$pkgname/.bfont.ttf + + cp -R locale $startdir/pkg/usr/share/ + + # install scripts + cd ../../release/ + cp -R scripts $startdir/pkg/usr/share/$pkgname/ + + # install all additional stuff + # install a freedesktop.org compliant menu entry + install -Dm644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop + # install some freedesktop.org compatibility + install -D -m644 $startdir/src/$pkgname.svg $startdir/pkg/usr/share/pixmaps/$pkgname.svg + # finally we render a png as fallback for not svg aware menu applications + # Attention: always make sure you check the dimensions of the source-svg, + # you can read the dimensions via inkscapes export funktion + rsvg -w 64 -h 64 -f png $startdir/pkg/usr/share/pixmaps/$pkgname.svg $startdir/pkg/usr/share/pixmaps/$pkgname.png +} diff --git a/extra/blender/blender.desktop b/extra/blender/blender.desktop new file mode 100644 index 000000000..71893dc4a --- /dev/null +++ b/extra/blender/blender.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Blender +Name[da]=Blender +Name[nl]=Blender +Name[no]=Blender +Name[de]=Blender +Name[es]=Blender +Comment=A 3D program +Comment[es]=Un programa de 3D +Comment[no]=Et 3d-program +Comment[da]=Et program til 3d-modelering +Exec=blender +Icon=blender +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=Application;Graphics;3DGraphics; +MimeType=application/blender;application/x-blender; diff --git a/extra/blender/blender.install b/extra/blender/blender.install new file mode 100644 index 000000000..c35e234a1 --- /dev/null +++ b/extra/blender/blender.install @@ -0,0 +1,39 @@ +post_install() { + cat << EOF + +NOTE +---- +blender is using the NAN makefiles to build, so we can access some better +features: + - i18n support + - anti-aliased interface fonts + - gameplayer +We also ship the plugins, but most of these features can be accessed only +from the users home directory. Therefore, you wanna copy everything from +/usr/share/blender to ~/.blender (some are hidden files!). The browser- +plugin builds but is using an old mozilla API, this is why it doesn't work +and we don't ship it. +Happy blending! + +EOF + echo "update desktop mime database..." + update-desktop-database +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + echo "update desktop mime database..." + update-desktop-database +} + +op=$1 +shift + +$op $* diff --git a/extra/blender/blender.svg b/extra/blender/blender.svg new file mode 100644 index 000000000..ab61cc362 --- /dev/null +++ b/extra/blender/blender.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + Created with Inkscape +http://www.inkscape.org/ + image/svg+xml + + ML-Term Icon + 2004-07-14 + + + Tobias Kieslich + + + + + + + + + + + + + + + + + + + + + + diff --git a/extra/blender/blender_x86_64.diff b/extra/blender/blender_x86_64.diff new file mode 100644 index 000000000..f7baba9ef --- /dev/null +++ b/extra/blender/blender_x86_64.diff @@ -0,0 +1,11 @@ +--- source/creator/creator.c 2007-01-28 05:45:58.000000000 +0000 ++++ source/creator/creator.c.new 2007-02-24 21:37:25.000000000 +0000 +@@ -241,7 +241,7 @@ + having to fix all faulty saved 64 bits files (ton) */ + if(sizeof(void *)==8) { + printf("64 bits compiles will give incorrectly saved .blend files. Do not use it. For testing purposes please remove this line from creator.c\n"); +- exit(0); ++ // exit(0); + } + #else + if(sizeof(void *)==8) { diff --git a/extra/blender/config.py b/extra/blender/config.py new file mode 100644 index 000000000..4e6f431c8 --- /dev/null +++ b/extra/blender/config.py @@ -0,0 +1,166 @@ +LCGDIR = '../lib/linux2' +LIBDIR = "${LCGDIR}" + +WITH_BF_VERSE = 'false' +BF_VERSE_INCLUDE = "#extern/verse/dist" + +BF_PYTHON = '/usr' +BF_PYTHON_VERSION = '2.5' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' +BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' +BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] + +#WITH_BF_OPENAL = 'true' +#BF_OPENAL = '/usr' +#BF_OPENAL_INC = '${BF_OPENAL}/include' +#BF_OPENAL_LIB = 'openal' + +WITH_BF_SDL = 'true' +BF_SDL = '/usr' #$(shell sdl-config --prefix) +BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) +BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer + +WITH_BF_FMOD = 'false' +BF_FMOD = LIBDIR + '/fmod' + +WITH_BF_OPENEXR = 'true' +BF_OPENEXR = '/usr' +BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' +BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' + +WITH_BF_JPEG = 'true' +BF_JPEG = '/usr' +BF_JPEG_INC = '${BF_JPEG}/include' +BF_JPEG_LIB = 'jpeg' + +WITH_BF_PNG = 'true' +BF_PNG = '/usr' +BF_PNG_INC = '${BF_PNG}/include' +BF_PNG_LIB = 'png' + +BF_TIFF = '/usr' +BF_TIFF_INC = '${BF_TIFF}/include' + +WITH_BF_ZLIB = 'true' +BF_ZLIB = '/usr' +BF_ZLIB_INC = '${BF_ZLIB}/include' +BF_ZLIB_LIB = 'z' + +WITH_BF_INTERNATIONAL = 'true' + +BF_GETTEXT = '/usr' +BF_GETTEXT_INC = '${BF_GETTEXT}/include' +BF_GETTEXT_LIB = 'gettextlib' +BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' + +WITH_BF_FTGL = 'true' +BF_FTGL = '#extern/bFTGL' +BF_FTGL_INC = '${BF_FTGL}/include' +BF_FTGL_LIB = 'extern_ftgl' + +WITH_BF_GAMEENGINE='true' + +WITH_BF_ODE = 'true' +BF_ODE = LIBDIR + '/ode' +BF_ODE_INC = BF_ODE + '/include' +BF_ODE_LIB = BF_ODE + '/lib/libode.a' + +WITH_BF_BULLET = 'true' +BF_BULLET = '#extern/bullet2/src' +BF_BULLET_INC = '${BF_BULLET}' +BF_BULLET_LIB = 'extern_bullet' + +BF_SOLID = '#extern/solid' +BF_SOLID_INC = '${BF_SOLID}' +BF_SOLID_LIB = 'extern_solid' + +WITH_BF_YAFRAY = 'true' + +#WITH_BF_NSPR = 'true' +#BF_NSPR = $(LIBDIR)/nspr +#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr +#BF_NSPR_LIB = + +# Uncomment the following line to use Mozilla inplace of netscape +#CPPFLAGS += -DMOZ_NOT_NET +# Location of MOZILLA/Netscape header files... +#BF_MOZILLA = $(LIBDIR)/mozilla +#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl +#BF_MOZILLA_LIB = +# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB +# if this is not set. +# +# Be paranoid regarding library creation (do not update archives) +#BF_PARANOID = 'true' + +# enable freetype2 support for text objects +BF_FREETYPE = '/usr' +BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' +BF_FREETYPE_LIB = 'freetype' + +WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +BF_QUICKTIME = '/usr/local' +BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' + +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + +# enable ffmpeg support +WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG +BF_FFMPEG = '/usr' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' +BF_FFMPEG_LIB = 'avformat avcodec avutil' + +# Mesa Libs should go here if your using them as well.... +WITH_BF_STATICOPENGL = 'false' +BF_OPENGL = '/usr' +BF_OPENGL_INC = '${BF_OPENGL}/include' +BF_OPENGL_LIB = 'GL GLU X11 Xi' +BF_OPENGL_LIBPATH = '/usr/X11R6/lib' +BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a' + +## +CC = 'gcc' +CXX = 'g++' +##ifeq ($CPU),alpha) +## CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee + +CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] + +CPPFLAGS = ['-DXP_UNIX'] +CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] +REL_CFLAGS = ['-O2'] +REL_CCFLAGS = ['-O2'] +##BF_DEPEND = 'true' +## +##AR = ar +##ARFLAGS = ruv +##ARFLAGSQUIET = ru +## +C_WARN = '-Wall -Wno-char-subscripts' + +CC_WARN = '-Wall' + +##FIX_STUBS_WARNINGS = -Wno-unused + +LLIBS = 'util c m dl pthread stdc++' +##LOPTS = --dynamic +##DYNLDFLAGS = -shared $(LDFLAGS) + +BF_PROFILE_FLAGS = ['-pg','-g'] +BF_PROFILE = 'false' + +BF_DEBUG = 'false' +BF_DEBUG_FLAGS = '-g' + +BF_BUILDDIR = '../build/linux2' +#BF_INSTALLDIR='../install/linux2' + + +#Link against pthread +PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/extra/bluefish/ChangeLog b/extra/bluefish/ChangeLog new file mode 100644 index 000000000..0b85ad0ac --- /dev/null +++ b/extra/bluefish/ChangeLog @@ -0,0 +1,5 @@ +2009-07-29 Eric Belanger + + * bluefish 1.0.7-4 + * FHS man pages + * Added ChangeLog diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD new file mode 100644 index 000000000..1a22a8a39 --- /dev/null +++ b/extra/bluefish/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 47942 2009-07-29 19:31:47Z eric $ +# Maintainer: Eric Belanger +# Contributor: Tom Newsom + +pkgname=bluefish +pkgver=1.0.7 +pkgrel=4 +pkgdesc="Programmer's HTML editor written using GTK" +arch=('i686' 'x86_64') +url="http://bluefish.openoffice.nl/" +license=('GPL') +depends=('pcre>=6.6-2' 'aspell>=0.60.4-2' 'gnome-vfs' 'desktop-file-utils' 'shared-mime-info') +makedepends=('pkgconfig') +install=bluefish.install +source=(http://www.bennewitz.com/bluefish/stable/source/${pkgname}-${pkgver}.tar.bz2) +md5sums=('2c3b3c9c8f8e32b9473dfd879f216dea') +sha1sums=('c61d6271c49e9fa8c728724e6aadde33a227bdea') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --with-freedesktop_org-menu=/usr/share/applications \ + --with-freedesktop_org-mime=/usr/share/mime \ + --without-gnome2_4-mime \ + --without-gnome2_4-appreg \ + --with-icon-path=/usr/share/pixmaps \ + --disable-update-databases \ + --without-libgnomeui || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m644 data/bluefish.desktop "${pkgdir}/usr/share/applications/bluefish.desktop" || return 1 +} diff --git a/extra/bluefish/bluefish.install b/extra/bluefish/bluefish.install new file mode 100644 index 000000000..855f14584 --- /dev/null +++ b/extra/bluefish/bluefish.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install +} diff --git a/extra/bluez-firmware/PKGBUILD b/extra/bluez-firmware/PKGBUILD new file mode 100644 index 000000000..64466c153 --- /dev/null +++ b/extra/bluez-firmware/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Geoffroy Carrier +# Contributor: Giovanni Scafora +# Contributor: Stefano Zamprogno + +pkgname=bluez-firmware +pkgver=1.2 +pkgrel=4 +pkgdesc="Firmware for Broadcom BCM203x Blutonium devices" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=() +source=("http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --libdir=/lib || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums=('1cc3cefad872e937e05de5a0a2b390dd') diff --git a/extra/bluez-gnome/02_MenusRevisited.patch b/extra/bluez-gnome/02_MenusRevisited.patch new file mode 100644 index 000000000..b23015f51 --- /dev/null +++ b/extra/bluez-gnome/02_MenusRevisited.patch @@ -0,0 +1,8 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.4/analyzer/bluetooth-analyzer.desktop.in bluez-gnome-1.4.new/analyzer/bluetooth-analyzer.desktop.in +--- bluez-gnome-1.4/analyzer/bluetooth-analyzer.desktop.in 2008-08-24 11:05:50.000000000 -0500 ++++ bluez-gnome-1.4.new/analyzer/bluetooth-analyzer.desktop.in 2008-09-26 15:59:26.000000000 -0500 +@@ -9,3 +9,4 @@ + Type=Application + Categories=System;Monitor; + OnlyShowIn=GNOME; ++NoDisplay=true diff --git a/extra/bluez-gnome/04_bluetooth-sendto-ods-svn.patch b/extra/bluez-gnome/04_bluetooth-sendto-ods-svn.patch new file mode 100644 index 000000000..2b8f32ed4 --- /dev/null +++ b/extra/bluez-gnome/04_bluetooth-sendto-ods-svn.patch @@ -0,0 +1,13 @@ +diff --git a/sendto/main.c b/sendto/main.c +index 044bbbc..f0c435b 100644 +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/sendto/main.c bluez-gnome-1.8.new/sendto/main.c +--- bluez-gnome-1.8/sendto/main.c 2008-10-04 14:32:56.000000000 -0500 ++++ bluez-gnome-1.8.new/sendto/main.c 2008-10-06 01:01:19.000000000 -0500 +@@ -790,6 +790,7 @@ + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", + create_notify, NULL, NULL, + G_TYPE_STRING, option_device, ++ G_TYPE_STRING, "00:00:00:00:00:00", + G_TYPE_STRING, "opp", G_TYPE_INVALID); + } else { + GHashTable *hash = NULL; diff --git a/extra/bluez-gnome/05_bluetooth_sendto_dbus-snd.patch b/extra/bluez-gnome/05_bluetooth_sendto_dbus-snd.patch new file mode 100644 index 000000000..29f233920 --- /dev/null +++ b/extra/bluez-gnome/05_bluetooth_sendto_dbus-snd.patch @@ -0,0 +1,153 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/common/marshal.list bluez-gnome-1.8.new/common/marshal.list +--- bluez-gnome-1.8/common/marshal.list 2008-08-24 16:14:24.000000000 -0500 ++++ bluez-gnome-1.8.new/common/marshal.list 2008-10-06 01:01:59.000000000 -0500 +@@ -3,3 +3,4 @@ + VOID:STRING,STRING + VOID:STRING,STRING,UINT64 + VOID:UINT64 ++VOID:STRING,STRING,STRING +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/sendto/main.c bluez-gnome-1.8.new/sendto/main.c +--- bluez-gnome-1.8/sendto/main.c 2008-10-06 01:01:58.000000000 -0500 ++++ bluez-gnome-1.8.new/sendto/main.c 2008-10-06 01:05:05.000000000 -0500 +@@ -64,6 +64,8 @@ + static gint64 first_update = 0; + static gint64 last_update = 0; + ++static DBusGProxy *session_proxy = NULL; ++ + static gchar *filename_to_path(const gchar *filename) + { + GFile *file; +@@ -354,7 +356,16 @@ + static void error_occurred(DBusGProxy *proxy, const gchar *name, + const gchar *message, gpointer user_data) + { +- transfer_completed(proxy, user_data); ++ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), ++ _("Error Occurred")); ++ ++ gchar *text = g_strdup_printf("%s", ++ message); ++ gtk_label_set_markup(GTK_LABEL(label_status), text); ++ g_free(text); ++ ++ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), ++ GTK_RESPONSE_CLOSE, TRUE); + } + + static void session_connected(DBusGProxy *proxy, gpointer user_data) +@@ -363,7 +374,7 @@ + + first_update = get_system_time(); + +- send_file(proxy); ++ send_file(session_proxy); + } + + #define OPENOBEX_CONNECTION_FAILED "org.openobex.Error.ConnectionAttemptFailed" +@@ -407,60 +418,41 @@ + if (dbus_g_proxy_end_call(proxy, call, &error, + DBUS_TYPE_G_OBJECT_PATH, &path, + G_TYPE_INVALID) == FALSE) { +- gchar *text, *message; ++ gchar *message; + + message = get_error_message(error); + +- text = g_strdup_printf("%s", +- message); +- gtk_label_set_markup(GTK_LABEL(label_status), text); +- g_free(text); ++ error_occurred(proxy,NULL,message,NULL); + + g_free(message); + +- gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), +- GTK_RESPONSE_CLOSE, TRUE); + return; + } +- +- proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", ++ session_proxy = dbus_g_proxy_new_for_name(conn, "org.openobex", + path, "org.openobex.Session"); + +- dbus_g_proxy_add_signal(proxy, "Connected", G_TYPE_INVALID); ++ dbus_g_proxy_add_signal(session_proxy, "Cancelled", G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "Connected", +- G_CALLBACK(session_connected), NULL, NULL); +- +- dbus_g_proxy_add_signal(proxy, "ErrorOccurred", +- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); +- +- dbus_g_proxy_connect_signal(proxy, "ErrorOccurred", +- G_CALLBACK(error_occurred), NULL, NULL); +- +- dbus_g_proxy_add_signal(proxy, "Cancelled", G_TYPE_INVALID); +- +- dbus_g_proxy_connect_signal(proxy, "Cancelled", ++ dbus_g_proxy_connect_signal(session_proxy, "Cancelled", + G_CALLBACK(transfer_cancelled), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferStarted", G_TYPE_STRING, ++ dbus_g_proxy_add_signal(session_proxy, "TransferStarted", G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferStarted", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferStarted", + G_CALLBACK(transfer_started), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferProgress", ++ dbus_g_proxy_add_signal(session_proxy, "TransferProgress", + G_TYPE_UINT64, G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferProgress", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferProgress", + G_CALLBACK(transfer_progress), NULL, NULL); + +- dbus_g_proxy_add_signal(proxy, "TransferCompleted", G_TYPE_INVALID); ++ dbus_g_proxy_add_signal(session_proxy, "TransferCompleted", G_TYPE_INVALID); + +- dbus_g_proxy_connect_signal(proxy, "TransferCompleted", ++ dbus_g_proxy_connect_signal(session_proxy, "TransferCompleted", + G_CALLBACK(transfer_completed), NULL, NULL); + +- dbus_g_proxy_call(proxy, "Connect", NULL, G_TYPE_INVALID, +- G_TYPE_INVALID); + } + + static gchar *get_name(DBusGProxy *device) +@@ -766,6 +758,14 @@ + + dbus_g_object_register_marshaller(marshal_VOID__UINT64, + G_TYPE_NONE, G_TYPE_UINT64, G_TYPE_INVALID); ++ ++ dbus_g_object_register_marshaller(marshal_VOID__STRING_STRING_STRING, ++ G_TYPE_NONE, ++ DBUS_TYPE_G_OBJECT_PATH, ++ G_TYPE_STRING, ++ G_TYPE_STRING, ++ G_TYPE_INVALID); ++ + + device_name = get_device_name(option_device); + if (device_name == NULL) +@@ -787,6 +787,18 @@ + dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged", + G_CALLBACK(name_owner_changed), NULL, NULL); + ++ dbus_g_proxy_add_signal(proxy, "SessionConnected", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID); ++ ++ dbus_g_proxy_connect_signal(proxy, "SessionConnected", ++ G_CALLBACK(session_connected), NULL, NULL); ++ ++ dbus_g_proxy_add_signal(proxy, "SessionConnectError", ++ DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); ++ ++ dbus_g_proxy_connect_signal(proxy, "SessionConnectError", ++ G_CALLBACK(error_occurred), NULL, NULL); ++ ++ + dbus_g_proxy_begin_call(proxy, "CreateBluetoothSession", + create_notify, NULL, NULL, + G_TYPE_STRING, option_device, diff --git a/extra/bluez-gnome/06_preferences-horizontal-layout.patch b/extra/bluez-gnome/06_preferences-horizontal-layout.patch new file mode 100644 index 000000000..243b55ac8 --- /dev/null +++ b/extra/bluez-gnome/06_preferences-horizontal-layout.patch @@ -0,0 +1,91 @@ +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.6/properties/adapter.c bluez-gnome-1.6.new/properties/adapter.c +--- bluez-gnome-1.6/properties/adapter.c 2008-09-29 07:08:50.000000000 -0500 ++++ bluez-gnome-1.6.new/properties/adapter.c 2008-09-29 09:55:36.000000000 -0500 +@@ -246,16 +246,10 @@ + } + + update_buttons(adapter, paired, trusted, connected); +- +- if (selected == TRUE) { +- gtk_widget_show(adapter->button_disconnect); +- gtk_widget_show(adapter->button_trusted); +- gtk_widget_show(adapter->button_delete); +- } else { +- gtk_widget_hide(adapter->button_disconnect); +- gtk_widget_hide(adapter->button_trusted); +- gtk_widget_hide(adapter->button_delete); +- } ++ ++ gtk_widget_set_sensitive(adapter->button_disconnect,selected); ++ gtk_widget_set_sensitive(adapter->button_trusted,selected); ++ gtk_widget_set_sensitive(adapter->button_delete,selected); + } + + static void row_callback(GtkTreeModel *model, GtkTreePath *path, +@@ -461,7 +455,7 @@ + adapter->discoverable = discoverable; + adapter->timeout_value = timeout; + +- mainbox = gtk_vbox_new(FALSE, 18); ++ mainbox = gtk_hbox_new(FALSE, 12); + gtk_container_set_border_width(GTK_CONTAINER(mainbox), 12); + + gtk_notebook_prepend_page(GTK_NOTEBOOK(adapter->notebook), +@@ -471,6 +465,9 @@ + + adapter->child = mainbox; + ++ mainbox = gtk_vbox_new (FALSE, 18); ++ gtk_container_add(GTK_CONTAINER (GTK_CONTAINER (adapter->child)), mainbox); ++ + vbox = gtk_vbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0); + +@@ -569,7 +566,7 @@ + entry = gtk_entry_new(); + gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_widget_set_size_request(entry, 240, -1); +- gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); + + if (name != NULL) + gtk_entry_set_text(GTK_ENTRY(entry), name); +@@ -582,7 +579,7 @@ + G_CALLBACK(focus_callback), adapter); + + vbox = gtk_vbox_new(FALSE, 6); +- gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0); ++ gtk_box_pack_start(GTK_BOX(adapter->child), vbox, TRUE, TRUE, 0); + + label = create_label(_("Known devices")); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); +@@ -634,8 +631,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); +@@ -651,8 +648,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); +@@ -668,8 +665,8 @@ + GTK_ICON_SIZE_BUTTON); + gtk_container_add(GTK_CONTAINER(button), image); + gtk_container_set_border_width(GTK_CONTAINER(button), 0); +- gtk_widget_set_no_show_all(button, TRUE); + gtk_widget_show(image); ++ gtk_widget_set_sensitive(button,FALSE); + gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox), + button, TRUE); diff --git a/extra/bluez-gnome/07_null_device_name.patch b/extra/bluez-gnome/07_null_device_name.patch new file mode 100644 index 000000000..c140acc53 --- /dev/null +++ b/extra/bluez-gnome/07_null_device_name.patch @@ -0,0 +1,18 @@ +From: Marcel Holtmann +Date: Mon, 6 Oct 2008 08:01:50 +0000 (+0200) +Subject: Display the alias instead of the remote device name +X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez-gnome.git;a=commitdiff_plain;h=7256de93be73f50913f6689a0690e3c0a28dfe3b + +Display the alias instead of the remote device name +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/wizard/main.c bluez-gnome-1.8.new/wizard/main.c +--- bluez-gnome-1.8/wizard/main.c 2008-10-06 01:23:55.000000000 -0500 ++++ bluez-gnome-1.8.new/wizard/main.c 2008-10-06 08:27:57.000000000 -0500 +@@ -353,7 +353,7 @@ + gtk_tree_model_get(model, &iter, + BLUETOOTH_COLUMN_PAIRED, &paired, + BLUETOOTH_COLUMN_ADDRESS, &address, +- BLUETOOTH_COLUMN_NAME, &name, ++ BLUETOOTH_COLUMN_ALIAS, &name, + BLUETOOTH_COLUMN_TYPE, &type, -1); + + if (paired == TRUE) diff --git a/extra/bluez-gnome/08_XFCE.patch b/extra/bluez-gnome/08_XFCE.patch new file mode 100644 index 000000000..d9140faa1 --- /dev/null +++ b/extra/bluez-gnome/08_XFCE.patch @@ -0,0 +1,35 @@ +# +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/bluez-gnome/+bug/325530 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=571535 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=128584 +# Description: Show BlueZ in XFCE +# + +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/analyzer/bluetooth-analyzer.desktop.in bluez-gnome-1.8.new/analyzer/bluetooth-analyzer.desktop.in +--- bluez-gnome-1.8/analyzer/bluetooth-analyzer.desktop.in 2009-02-04 14:04:41.000000000 -0800 ++++ bluez-gnome-1.8.new/analyzer/bluetooth-analyzer.desktop.in 2009-02-04 14:02:24.000000000 -0800 +@@ -8,5 +8,5 @@ + MimeType=application/x-hcidump;application/x-btsnoop;application/x-pktlog; + Type=Application + Categories=System;Monitor; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; + NoDisplay=true +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/applet/bluetooth-applet.desktop.in bluez-gnome-1.8.new/applet/bluetooth-applet.desktop.in +--- bluez-gnome-1.8/applet/bluetooth-applet.desktop.in 2008-08-29 08:32:53.000000000 -0700 ++++ bluez-gnome-1.8.new/applet/bluetooth-applet.desktop.in 2009-02-04 13:55:31.000000000 -0800 +@@ -7,4 +7,4 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/properties/bluetooth-properties.desktop.in bluez-gnome-1.8.new/properties/bluetooth-properties.desktop.in +--- bluez-gnome-1.8/properties/bluetooth-properties.desktop.in 2008-09-13 10:34:11.000000000 -0700 ++++ bluez-gnome-1.8.new/properties/bluetooth-properties.desktop.in 2009-02-04 14:02:56.000000000 -0800 +@@ -7,4 +7,4 @@ + Terminal=false + Type=Application + Categories=GTK;GNOME;Settings;HardwareSettings; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; diff --git a/extra/bluez-gnome/09_visibility.patch b/extra/bluez-gnome/09_visibility.patch new file mode 100644 index 000000000..269ede9f2 --- /dev/null +++ b/extra/bluez-gnome/09_visibility.patch @@ -0,0 +1,59 @@ +# Description: Fixes visibility settings +# This patch was taken from upstream. Please see this link for more information: +# Upstream: http://git.kernel.org/?p=bluetooth/bluez-gnome.git;a=blobdiff;f=applet/main.c;h=62993755f098d06fbdc5aa3eaaa1325e448aa15f;hp=71f8778dd4388187f163fc736e440bace9256f3c;hb=4d56f10dc2a065d60724ccce8496d173fa0dc85a;hpb=68b98e6b6043acd8f6b2875d9f17fce84b14b9fb +# Ubuntu: 297819 + +diff --git a/applet/main.c b/applet/main.c +index 71f8778..6299375 100644 (file) +diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.8/applet/main.c bluez-gnome-1.8.new/applet/main.c +--- bluez-gnome-1.8/applet/main.c 2008-09-29 07:08:50.000000000 -0500 ++++ bluez-gnome-1.8.new/applet/main.c 2009-02-12 14:39:54.000000000 -0600 +@@ -288,6 +288,20 @@ + } + } + ++static void update_icon_visibility() ++{ ++ if (icon_policy == ICON_POLICY_NEVER) ++ hide_icon(); ++ else if (icon_policy == ICON_POLICY_ALWAYS) ++ show_icon(); ++ else if (icon_policy == ICON_POLICY_PRESENT) { ++ if (adapter_present == TRUE) ++ show_icon(); ++ else ++ hide_icon(); ++ } ++} ++ + static GConfEnumStringPair icon_policy_enum_map [] = { + { ICON_POLICY_NEVER, "never" }, + { ICON_POLICY_ALWAYS, "always" }, +@@ -313,16 +327,7 @@ + + gconf_string_to_enum(icon_policy_enum_map, str, &icon_policy); + +- if (icon_policy == ICON_POLICY_NEVER) +- hide_icon(); +- else if (icon_policy == ICON_POLICY_ALWAYS) +- show_icon(); +- else if (icon_policy == ICON_POLICY_PRESENT) { +- if (adapter_present == TRUE) +- show_icon(); +- else +- hide_icon(); +- } ++ update_icon_visibility(); + return; + } + +@@ -410,8 +415,7 @@ + + statusicon = init_notification(); + +- if (icon_policy != ICON_POLICY_ALWAYS && adapter_present == FALSE) +- hide_icon(); ++ update_icon_visibility(); + + g_signal_connect(statusicon, "activate", + G_CALLBACK(activate_callback), NULL); diff --git a/extra/bluez-gnome/10_wizard-custom-pin.patch b/extra/bluez-gnome/10_wizard-custom-pin.patch new file mode 100644 index 000000000..a6076a7b2 --- /dev/null +++ b/extra/bluez-gnome/10_wizard-custom-pin.patch @@ -0,0 +1,209 @@ +# Description: Allow the user to enter a custom PIN for pairing. A lot of devices use a hardcoded PIN and do not have a keyboard for entering a random one. +# Ubuntu: https://launchpad.net/bugs/284994 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=570457 +Index: bluez-gnome-1.8/wizard/main.c +=================================================================== +--- bluez-gnome-1.8.orig/wizard/main.c ++++ bluez-gnome-1.8/wizard/main.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include + +@@ -47,6 +48,11 @@ static gchar *target_pincode = NULL; + static guint target_type = BLUETOOTH_TYPE_ANY; + static gboolean target_ssp = FALSE; + ++/* NULL means automatic, anything else is a pincode specified by the user */ ++static const gchar *user_pincode = NULL; ++static const gchar *last_fixed_pincode = "0000"; ++ ++static GtkWidget *window_assistant = NULL; + static GtkWidget *page_search = NULL; + static GtkWidget *page_setup = NULL; + static GtkWidget *page_summary = NULL; +@@ -72,6 +78,9 @@ static gboolean pincode_callback(DBusGMe + target_type == BLUETOOTH_TYPE_HEADPHONE) + pincode = "0000"; + ++ if (user_pincode != NULL && strlen(user_pincode) == 4) ++ pincode = user_pincode; ++ + text = g_strdup_printf(_("Please enter the following PIN code: %s"), + pincode); + gtk_label_set_markup(GTK_LABEL(label_passkey), text); +@@ -337,6 +346,19 @@ static void create_type(GtkWidget *assis + } + #endif + ++static void set_page_search_complete(void) ++{ ++ int selected; ++ gboolean complete; ++ ++ selected = gtk_tree_selection_count_selected_rows (search_selection); ++ complete = (selected != 0 && ++ (user_pincode == NULL || strlen(user_pincode) == 4)); ++ ++ gtk_assistant_set_page_complete(GTK_ASSISTANT (window_assistant), ++ page_search, complete); ++} ++ + static void select_callback(GtkTreeSelection *selection, gpointer user_data) + { + GtkAssistant *assistant = user_data; +@@ -368,7 +390,7 @@ static void select_callback(GtkTreeSelec + target_type = type; + } + +- gtk_assistant_set_page_complete(assistant, page_search, selected); ++ set_page_search_complete(); + } + + static gboolean device_filter(GtkTreeModel *model, +@@ -381,6 +403,54 @@ static gboolean device_filter(GtkTreeMod + return (paired == TRUE) ? FALSE : TRUE; + } + ++static gboolean entry_custom_event(GtkWidget *entry, ++ GdkEventKey *event, GtkWidget *box) ++{ ++ if (event->length == 0) ++ return FALSE; ++ ++ if ((event->keyval >= GDK_0 && event->keyval <= GDK_9) || ++ (event->keyval >= GDK_KP_0 && event->keyval <= GDK_KP_9)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static void entry_custom_changed(GtkWidget *entry, gpointer user_data) ++{ ++ user_pincode = gtk_entry_get_text(GTK_ENTRY(entry)); ++ set_page_search_complete(); ++} ++ ++static void toggle_set_sensitive(GtkWidget *button, GtkWidget *widget) ++{ ++ gboolean active; ++ ++ active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)); ++ gtk_widget_set_sensitive(widget, active); ++} ++ ++static void set_user_pincode(GtkWidget *button, const gchar *pincode) ++{ ++ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) ++ return; ++ ++ if (pincode == NULL && user_pincode != NULL) ++ last_fixed_pincode = user_pincode; ++ ++ user_pincode = pincode; ++ set_page_search_complete(); ++} ++ ++static void set_from_last_fixed_pincode(GtkWidget *button, gpointer user_data) ++{ ++ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) ++ return; ++ ++ user_pincode = last_fixed_pincode; ++ set_page_search_complete(); ++} ++ + static void create_search(GtkWidget *assistant) + { + GtkWidget *vbox; +@@ -389,6 +459,16 @@ static void create_search(GtkWidget *ass + GtkTreeModel *model; + GtkTreeModel *sorted; + GtkTreeSelection *selection; ++ GtkWidget *radio_auto; ++ GtkWidget *radio_fixed; ++ GtkWidget *align_fixed; ++ GtkWidget *vbox_fixed; ++ GtkWidget *radio_0000; ++ GtkWidget *radio_1111; ++ GtkWidget *radio_1234; ++ GtkWidget *hbox_custom; ++ GtkWidget *radio_custom; ++ GtkWidget *entry_custom; + + vbox = create_vbox(assistant, GTK_ASSISTANT_PAGE_CONTENT, + _("Device search"), +@@ -418,6 +498,62 @@ static void create_search(GtkWidget *ass + + gtk_container_add(GTK_CONTAINER(scrolled), tree); + ++ radio_auto = gtk_radio_button_new_with_mnemonic(NULL, ++ _("_Automatic PIN code selection")); ++ gtk_container_add(GTK_CONTAINER(vbox), radio_auto); ++ ++ radio_fixed = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio_auto), _("Use _fixed PIN code:")); ++ gtk_container_add(GTK_CONTAINER(vbox), radio_fixed); ++ ++ align_fixed = gtk_alignment_new(0, 0, 1, 1); ++ gtk_alignment_set_padding(GTK_ALIGNMENT(align_fixed), 0, 0, 24, 0); ++ gtk_container_add(GTK_CONTAINER(vbox), align_fixed); ++ vbox_fixed = gtk_vbox_new(FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(align_fixed), vbox_fixed); ++ ++ radio_0000 = gtk_radio_button_new_with_label(NULL, _("'0000' (most headsets, mice and GPS devices)")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_0000); ++ ++ radio_1111 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1111'")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1111); ++ ++ radio_1234 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("'1234'")); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), radio_1234); ++ ++ hbox_custom = gtk_hbox_new(FALSE, 6); ++ radio_custom = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(radio_0000), _("Custom PIN code:")); ++ entry_custom = gtk_entry_new_with_max_length(4); ++ gtk_entry_set_width_chars(GTK_ENTRY(entry_custom), 4); ++ g_signal_connect (entry_custom, "key-press-event", ++ G_CALLBACK (entry_custom_event), NULL); ++ g_signal_connect (entry_custom, "changed", ++ G_CALLBACK (entry_custom_changed), NULL); ++ gtk_box_pack_start(GTK_BOX(hbox_custom), radio_custom, ++ FALSE, FALSE, 0); ++ gtk_box_pack_start(GTK_BOX(hbox_custom), entry_custom, ++ FALSE, FALSE, 0); ++ gtk_container_add(GTK_CONTAINER(vbox_fixed), hbox_custom); ++ ++ toggle_set_sensitive(radio_fixed, vbox_fixed); ++ g_signal_connect(radio_fixed, "toggled", ++ G_CALLBACK(toggle_set_sensitive), vbox_fixed); ++ toggle_set_sensitive(radio_custom, entry_custom); ++ g_signal_connect(radio_custom, "toggled", ++ G_CALLBACK(toggle_set_sensitive), entry_custom); ++ ++ g_signal_connect(radio_auto, "toggled", ++ G_CALLBACK(set_user_pincode), NULL); ++ g_signal_connect(radio_fixed, "toggled", ++ G_CALLBACK(set_from_last_fixed_pincode), NULL); ++ g_signal_connect(radio_0000, "toggled", ++ G_CALLBACK(set_user_pincode), "0000"); ++ g_signal_connect(radio_1111, "toggled", ++ G_CALLBACK(set_user_pincode), "1111"); ++ g_signal_connect(radio_1234, "toggled", ++ G_CALLBACK(set_user_pincode), "1234"); ++ g_signal_connect_swapped (radio_custom, "toggled", ++ G_CALLBACK (entry_custom_changed), entry_custom); ++ + page_search = vbox; + } + +@@ -529,6 +665,7 @@ int main(int argc, char *argv[]) + bluetooth_agent_setup(agent, AGENT_PATH); + + window = create_wizard(); ++ window_assistant = window; + + bluetooth_instance_set_window(instance, GTK_WINDOW(window)); + diff --git a/extra/bluez-gnome/11_bluez-notifications.patch b/extra/bluez-gnome/11_bluez-notifications.patch new file mode 100644 index 000000000..7e678ab80 --- /dev/null +++ b/extra/bluez-gnome/11_bluez-notifications.patch @@ -0,0 +1,174 @@ +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bluez-gnome/+bug/337219 +# Upstream: http://permalink.gmane.org/gmane.linux.bluez.kernel/1912 +# Description: Check if actions are supported by the notification daemon +# and display an unfocused alert box if they aren't +# +=== modified file 'applet/agent.c' +--- old/applet/agent.c 2008-10-30 18:07:50 +0000 ++++ new/applet/agent.c 2009-03-27 14:45:19 +0000 +@@ -258,7 +258,10 @@ + gtk_window_set_title(GTK_WINDOW(dialog), _("Authentication request")); + gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); + gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); +- gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); ++ if (supports_actions ()) ++ gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); ++ else ++ gtk_window_set_focus_on_map(GTK_WINDOW(dialog), FALSE); + gtk_window_set_urgency_hint(GTK_WINDOW(dialog), TRUE); + gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); + input->dialog = dialog; +@@ -530,13 +533,18 @@ + gtk_window_present(GTK_WINDOW(input->dialog)); + } + +-static void notification_closed(GObject *object, gpointer user_data) ++static void present_notification_dialogs () + { + g_list_foreach(input_list, show_dialog, NULL); + + disable_blinking(); + } + ++static void notification_closed (GObject *object, gpointer user_data) ++{ ++ present_notification_dialogs (); ++} ++ + #ifndef DBUS_TYPE_G_DICTIONARY + #define DBUS_TYPE_G_DICTIONARY \ + (dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) +@@ -587,9 +595,12 @@ + + g_free(name); + +- show_notification(_("Bluetooth device"), +- line, _("Enter PIN code"), 0, +- G_CALLBACK(notification_closed)); ++ if (supports_actions ()) ++ show_notification(_("Bluetooth device"), ++ line, _("Enter PIN code"), 0, ++ G_CALLBACK(notification_closed)); ++ else ++ present_notification_dialogs (); + + g_free(line); + +@@ -634,9 +645,12 @@ + + g_free(name); + +- show_notification(_("Bluetooth device"), +- line, _("Enter passkey"), 0, +- G_CALLBACK(notification_closed)); ++ if (supports_actions ()) ++ show_notification(_("Bluetooth device"), ++ line, _("Enter passkey"), 0, ++ G_CALLBACK(notification_closed)); ++ else ++ present_notification_dialogs (); + + g_free(line); + +@@ -684,9 +698,12 @@ + + g_free(name); + +- show_notification(_("Bluetooth device"), +- line, _("Enter passkey"), 0, +- G_CALLBACK(notification_closed)); ++ if (supports_actions ()) ++ show_notification(_("Bluetooth device"), ++ line, _("Enter passkey"), 0, ++ G_CALLBACK(notification_closed)); ++ else ++ present_notification_dialogs (); + + g_free(line); + +@@ -733,9 +750,12 @@ + + g_free(name); + +- show_notification(_("Bluetooth device"), +- line, _("Confirm passkey"), 0, +- G_CALLBACK(notification_closed)); ++ if (supports_actions ()) ++ show_notification(_("Bluetooth device"), ++ line, _("Confirm passkey"), 0, ++ G_CALLBACK(notification_closed)); ++ else ++ present_notification_dialogs (); + + g_free(line); + +@@ -778,9 +798,12 @@ + + g_free(name); + +- show_notification(_("Bluetooth device"), +- line, _("Check authorization"), 0, +- G_CALLBACK(notification_closed)); ++ if (supports_actions ()) ++ show_notification(_("Bluetooth device"), ++ line, _("Check authorization"), 0, ++ G_CALLBACK(notification_closed)); ++ else ++ present_notification_dialogs (); + + g_free(line); + + +=== modified file 'applet/notify.c' +--- old/applet/notify.c 2008-10-30 18:07:50 +0000 ++++ new/applet/notify.c 2009-03-27 14:42:17 +0000 +@@ -38,6 +38,35 @@ + { + } + ++gboolean ++supports_actions () ++{ ++ static gboolean supports_actions = FALSE; ++ static gboolean have_checked = FALSE; ++ ++ if (!have_checked) { ++ GList *caps = NULL; ++ GList *c; ++ ++ have_checked = TRUE; ++ ++ caps = notify_get_server_caps (); ++ if (caps != NULL) { ++ for (c = caps; c != NULL; c = c->next) { ++ if (strcmp ((char*)c->data, "actions") == 0) { ++ supports_actions = TRUE; ++ break; ++ } ++ } ++ ++ g_list_foreach (caps, (GFunc)g_free, NULL); ++ g_list_free (caps); ++ } ++ } ++ ++ return supports_actions; ++} ++ + void show_notification(const gchar *summary, const gchar *message, + const gchar *action, gint timeout, GCallback handler) + { + +=== modified file 'applet/notify.h' +--- old/applet/notify.h 2008-10-30 18:07:50 +0000 ++++ new/applet/notify.h 2009-03-27 14:42:47 +0000 +@@ -25,6 +25,7 @@ + GtkStatusIcon *init_notification(void); + void cleanup_notification(void); + ++gboolean supports_actions(); + void show_notification(const gchar *summary, const gchar *message, + const gchar *action, gint timeout, GCallback handler); + void close_notification(void); + diff --git a/extra/bluez-gnome/PKGBUILD b/extra/bluez-gnome/PKGBUILD new file mode 100644 index 000000000..62a286557 --- /dev/null +++ b/extra/bluez-gnome/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Geoffroy Carrier +# Contributor: Roman Kyrylych +pkgname=bluez-gnome +pkgver=1.8 +pkgrel=5 +pkgdesc="Bluetooth PIN helper applications" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL') +depends=('hal' 'libnotify>=0.4.5' 'obex-data-server' + 'bluez>=4.39' 'desktop-file-utils' 'hicolor-icon-theme' 'gconf>=2.26.0-2') +makedepends=('intltool') +options=('!emptydirs') +install=bluez-gnome.install +source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2 + 02_MenusRevisited.patch + 04_bluetooth-sendto-ods-svn.patch + 05_bluetooth_sendto_dbus-snd.patch + 06_preferences-horizontal-layout.patch + 07_null_device_name.patch + 08_XFCE.patch + 09_visibility.patch + 10_wizard-custom-pin.patch + 11_bluez-notifications.patch) +md5sums=('dd4ebe771d9f2ebd739e1185b767ce3e' + '15a598f7cb1ea52f92e6e4604bdd7aed' + 'e465609e96c5bf128a922b1ac8048b95' + '2835942c65d7e60b8a862a29e4569655' + 'bba8e404c8d02d9374b458d6e33c5856' + 'df501957838b055145c50c5618b2356c' + 'a9a1c32d257aad39aad06bbc0e4eb38f' + '38d24248f0ecef4c93acafb429a28058' + '50e5d1f48b1d24fff1daa6e85d3f4b24' + 'ac4b9824c1d01fc7edf84da7d748e957') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/02_MenusRevisited.patch" || return 1 + patch -Np1 -i "${srcdir}/04_bluetooth-sendto-ods-svn.patch" || return 1 + patch -Np1 -i "${srcdir}/05_bluetooth_sendto_dbus-snd.patch" || return 1 + patch -Np1 -i "${srcdir}/06_preferences-horizontal-layout.patch" || return 1 + patch -Np1 -i "${srcdir}/07_null_device_name.patch" || return 1 + patch -Np1 -i "${srcdir}/08_XFCE.patch" || return 1 + patch -Np1 -i "${srcdir}/09_visibility.patch" || return 1 + patch -Np1 -i "${srcdir}/10_wizard-custom-pin.patch" || return 1 + patch -Np1 -i "${srcdir}/11_bluez-notifications.patch" || return 1 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --disable-desktop-update \ + --disable-mime-update \ + --disable-icon-update || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ + --domain bluetooth-manager ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f "$pkgdir/etc/gconf/schemas/*.schemas" +} diff --git a/extra/bluez-gnome/bluez-gnome.install b/extra/bluez-gnome/bluez-gnome.install new file mode 100644 index 000000000..eb5bb5c86 --- /dev/null +++ b/extra/bluez-gnome/bluez-gnome.install @@ -0,0 +1,23 @@ +pkgname=bluez-gnome + +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime >/dev/null + usr/sbin/gconfpkg --install ${pkgname} +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +pre_upgrade() { + pre_remove +} +post_remove() { + post_install +} diff --git a/extra/bluez-hcidump/PKGBUILD b/extra/bluez-hcidump/PKGBUILD new file mode 100644 index 000000000..25e0fdfa0 --- /dev/null +++ b/extra/bluez-hcidump/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Geoffroy carrier +# Contributor: Giovanni Scafora +# Contributor: Joerie de Gram + +pkgname=bluez-hcidump +pkgver=1.42 +pkgrel=1 +pkgdesc="Bluetooth HCI package analyzer" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('bluez>=4.18') +source=(http://bluez.sf.net/download/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} + +md5sums=('5704737aaf72104eeaf77335218a1827') diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD new file mode 100644 index 000000000..a77f24c75 --- /dev/null +++ b/extra/bmp-musepack/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 30191 2009-03-17 04:29:16Z eric $ +# Maintainer: damir +# Contributor: Nikos Kouremenos + +pkgname=bmp-musepack +pkgver=1.2 +pkgrel=3 +pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" +arch=(i686 x86_64) +url="http://musepack.net/" +license=('BSD') +depends=('bmp' 'libmpcdec>=1.2.5' 'taglib') +groups=('bmp-plugins' 'bmp-io-plugins') +options=('!libtool') +source=(http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2) +md5sums=('5fe0c9d341ca37d05c780a478f829a5f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD new file mode 100644 index 000000000..f626fa060 --- /dev/null +++ b/extra/bmp-wma/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49933 2009-08-16 21:54:27Z jgc $ +# Maintainer: Kevin Piche +# Contributor: Ewoud Nuyts + +pkgname=bmp-wma +pkgver=0.1.1 +pkgrel=3 +pkgdesc="WMA plugin for Beep Media Player" +url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma" +license=('GPL') +arch=('x86_64' 'i686') +depends=('bmp') +groups=('bmp-plugins' 'bmp-io-plugins') +options=(!libtool !emptydirs) +source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz + bmp-wma-gcc4.patch) +md5sums=('8dcf3fcdb10e8e2e386f70745812412b' + '730eba8f41e989dd8b56c18bcc826cc4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1 + if [ "${CARCH}" = "x86_64" ]; then + export CFLAGS="${CFLAGS} -fPIC" + fi + ./configure --prefix=/usr --disable-static || return 1 + echo '#define HAVE_LRINTF 1' >> config.h + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/bmp-wma/bmp-wma-gcc4.patch b/extra/bmp-wma/bmp-wma-gcc4.patch new file mode 100644 index 000000000..9d773e89e --- /dev/null +++ b/extra/bmp-wma/bmp-wma-gcc4.patch @@ -0,0 +1,98 @@ +--- src/libffwma/avcodec.h.orig 2005-10-07 11:49:36.000000000 -0400 ++++ src/libffwma/avcodec.h 2005-10-07 11:51:09.000000000 -0400 +@@ -11,6 +11,43 @@ + extern "C" { + #endif + ++ ++/** ++ * AVOption. ++ */ ++typedef struct AVOption { ++ /** options' name */ ++ const char *name; /* if name is NULL, it indicates a link to next */ ++ /** short English text help or const struct AVOption* subpointer */ ++ const char *help; // const struct AVOption* sub; ++ /** offset to context structure where the parsed value should be stored */ ++ int offset; ++ /** options' type */ ++ int type; ++#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) ++#define FF_OPT_TYPE_DOUBLE 2 ///< double ++#define FF_OPT_TYPE_INT 3 ///< integer ++#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) ++#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags ++//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option ++#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) ++#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) ++ /** min value (min == max -> no limits) */ ++ double min; ++ /** maximum value for double/int */ ++ double max; ++ /** default boo [0,1]l/double/int value */ ++ double defval; ++ /** ++ * default string value (with optional semicolon delimited extra option-list ++ * i.e. option1;option2;option3 ++ * defval might select other then first argument as default ++ */ ++ const char *defstr; ++#define FF_OPT_MAX_DEPTH 10 ++} AVOption; ++ ++ + #include "common.h" + #include /* size_t */ + +@@ -1396,41 +1433,6 @@ + + + /** +- * AVOption. +- */ +-typedef struct AVOption { +- /** options' name */ +- const char *name; /* if name is NULL, it indicates a link to next */ +- /** short English text help or const struct AVOption* subpointer */ +- const char *help; // const struct AVOption* sub; +- /** offset to context structure where the parsed value should be stored */ +- int offset; +- /** options' type */ +- int type; +-#define FF_OPT_TYPE_BOOL 1 ///< boolean - true,1,on (or simply presence) +-#define FF_OPT_TYPE_DOUBLE 2 ///< double +-#define FF_OPT_TYPE_INT 3 ///< integer +-#define FF_OPT_TYPE_STRING 4 ///< string (finished with \0) +-#define FF_OPT_TYPE_MASK 0x1f ///< mask for types - upper bits are various flags +-//#define FF_OPT_TYPE_EXPERT 0x20 // flag for expert option +-#define FF_OPT_TYPE_FLAG (FF_OPT_TYPE_BOOL | 0x40) +-#define FF_OPT_TYPE_RCOVERRIDE (FF_OPT_TYPE_STRING | 0x80) +- /** min value (min == max -> no limits) */ +- double min; +- /** maximum value for double/int */ +- double max; +- /** default boo [0,1]l/double/int value */ +- double defval; +- /** +- * default string value (with optional semicolon delimited extra option-list +- * i.e. option1;option2;option3 +- * defval might select other then first argument as default +- */ +- const char *defstr; +-#define FF_OPT_MAX_DEPTH 10 +-} AVOption; +- +-/** + * Parse option(s) and sets fields in passed structure + * @param strct structure where the parsed results will be written + * @param list list with AVOptions +--- src/libffwma/dsputil.h.orig 2005-10-07 11:51:59.000000000 -0400 ++++ src/libffwma/dsputil.h 2005-10-07 11:52:17.000000000 -0400 +@@ -28,7 +28,6 @@ + #ifndef DSPUTIL_H + #define DSPUTIL_H + +-#include "common.h" + #include "avcodec.h" + + diff --git a/extra/bmp/0.9.7.1-visualization.patch b/extra/bmp/0.9.7.1-visualization.patch new file mode 100644 index 000000000..ac03323f6 --- /dev/null +++ b/extra/bmp/0.9.7.1-visualization.patch @@ -0,0 +1,12 @@ +--- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 ++++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 +@@ -223,7 +223,8 @@ vis_draw(Widget * w) + /* FIXME: The check "shouldn't" be neccessary? */ + /* if (GTK_IS_WINDOW(vis->vs_window)) { */ + GDK_THREADS_ENTER(); +- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, ++ if (GDK_IS_DRAWABLE(vis->vs_window)) ++ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, + vis->vs_widget.x, vis->vs_widget.y, + vis->vs_widget.width, vis->vs_widget.height, + GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD new file mode 100644 index 000000000..ae81faf15 --- /dev/null +++ b/extra/bmp/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 30190 2009-03-17 04:28:32Z eric $ +# Maintainer: Kevin Piche +# Contributor: Ben + +pkgname=bmp +pkgver=0.9.7.1 +pkgrel=5 +pkgdesc="gtk2 port of xmms" +arch=(i686 x86_64) +url="http://sourceforge.net/projects/beepmp/" +license=('GPL') +depends=('esound' 'id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip') +makedepends=('libxt') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) +md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176'\ + '42ad4109ddb66024d4c6d1f3e572ab86') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i ../${pkgver}-visualization.patch || return 1 + patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch new file mode 100644 index 000000000..4c1e46da9 --- /dev/null +++ b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch @@ -0,0 +1,108 @@ +Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to +work. http://www.eisenlohr.org/xmms-crossfade/ + +diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c +--- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 ++++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 +@@ -655,9 +655,11 @@ + mainwin_set_shade(!cfg.player_shaded); + } + ++gboolean is_quitting = FALSE; + void + mainwin_quit_cb(void) + { ++ is_quitting = TRUE; + gtk_widget_hide(equalizerwin); + gtk_widget_hide(playlistwin); + gtk_widget_hide(mainwin); +@@ -1318,7 +1320,7 @@ + change_song(guint pos) + { + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + playlist_set_position(pos); + bmp_playback_initiate(); +diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c +--- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 ++++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 +@@ -89,7 +89,7 @@ + return; + + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + vis_clear_data(mainwin_vis); + vis_clear_data(playlistwin_vis); +@@ -135,6 +135,15 @@ + get_current_input_plugin()->pause(ip_data.paused); + } + ++gboolean input_stopped_for_restart = FALSE; ++void ++bmp_playback_stop_for_restart(void) ++{ ++ input_stopped_for_restart = TRUE; ++ bmp_playback_stop(); ++ input_stopped_for_restart = FALSE; ++} ++ + void + bmp_playback_stop(void) + { +diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h +--- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 ++++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 +@@ -26,6 +26,7 @@ + void bmp_playback_initiate(void); + void bmp_playback_pause(void); + void bmp_playback_stop(void); ++void bmp_playback_stop_for_restart(void); + gboolean bmp_playback_play_file(const gchar * filename); + gboolean bmp_playback_get_playing(void); + gboolean bmp_playback_get_paused(void); +diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c +--- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 ++++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 +@@ -817,7 +817,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -868,7 +868,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1018,7 +1018,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1047,7 +1047,10 @@ + { + GList *plist_pos_list; + +- bmp_playback_stop(); ++ if (cfg.repeat) ++ bmp_playback_stop_for_restart(); ++ else ++ bmp_playback_stop(); + + PLAYLIST_LOCK(); + plist_pos_list = find_playlist_position_list(); diff --git a/extra/bmpx/PKGBUILD b/extra/bmpx/PKGBUILD new file mode 100644 index 000000000..a7aeda240 --- /dev/null +++ b/extra/bmpx/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 703 2008-04-22 00:13:48Z eric $ +# Maintainer: kevin +# Contributor: alzen + +pkgname=bmpx +pkgver=0.40.13 +pkgrel=2 +pkgdesc="A media player and the successor to BMP" +arch=(i686 x86_64) +url="http://bmpx.backtrace.info/site/BMPx_Homepage" +depends=('boost' 'fam' 'gstreamer0.10-alsa' 'gstreamer0.10-cdparanoia' + 'gstreamer0.10-good' 'gstreamer0.10-vorbis' 'hal' 'libglademm' 'libofa' + 'librsvg' 'libsexymm' 'libsoup>=2.4.0' 'sqlite3' 'startup-notification>=0.8' + 'taglib') +# 0.40.0: bmpx provide their own neon and musicbrainz implementation. +makedepends=('bison' 'flex' 'pkgconfig' 'perlxml') +options=('!libtool' '!makeflags') +license=('GPL' 'custom') +install=bmpx.install +source=( http://files.backtrace.info/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 bmpx-libsoup24.patch bmpx-gcc34.diff) +md5sums=('11da3d4c63e77dc15a53d0c6c25ddadb' 'ef433f8b306b5d9e7d3f71dade83b751'\ + 'ac2032eef21102d078b4b03f99af17a6') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + patch -Np1 < ../bmpx-libsoup24.patch || return 1 + patch -Np1 < ../bmpx-gcc34.diff || return 1 + ./configure --prefix=/usr --enable-amazon --libexecdir=/usr/lib/bmpx + sed -e '/BUILD_BUILDUSER/ s@".*"@"http://www.archlinux.org"@' -i build.h + make || return 1 + make DESTDIR=${startdir}/pkg install + + # install license + install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE + + #Fix invalid symlink pointing to builddir + cd ${startdir}/pkg/usr/bin + rm -f bmp2 + ln -sf beep-media-player-2 bmp2 +} diff --git a/extra/bmpx/bmpx-gcc34.diff b/extra/bmpx/bmpx-gcc34.diff new file mode 100644 index 000000000..07c8d9625 --- /dev/null +++ b/extra/bmpx/bmpx-gcc34.diff @@ -0,0 +1,175 @@ +diff -Naur bmpx-0.40.13-orig/json/json_reader.cpp bmpx-0.40.13/json/json_reader.cpp +--- bmpx-0.40.13-orig/json/json_reader.cpp 2007-10-18 13:17:09.000000000 -0400 ++++ bmpx-0.40.13/json/json_reader.cpp 2008-03-17 21:34:10.000000000 -0400 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #if _MSC_VER >= 1400 // VC++ 8.0 + #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. +diff -Naur bmpx-0.40.13-orig/json/json_value.cpp bmpx-0.40.13/json/json_value.cpp +--- bmpx-0.40.13-orig/json/json_value.cpp 2007-10-18 13:17:09.000000000 -0400 ++++ bmpx-0.40.13/json/json_value.cpp 2008-03-17 21:35:23.000000000 -0400 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include "assert.h" + #ifdef JSON_USE_CPPTL + # include +diff -Naur bmpx-0.40.13-orig/json/json_writer.cpp bmpx-0.40.13/json/json_writer.cpp +--- bmpx-0.40.13-orig/json/json_writer.cpp 2007-10-18 13:17:09.000000000 -0400 ++++ bmpx-0.40.13/json/json_writer.cpp 2008-03-17 21:35:44.000000000 -0400 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #if _MSC_VER >= 1400 // VC++ 8.0 + #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. +diff -Naur bmpx-0.40.13-orig/libhal++/util.cc bmpx-0.40.13/libhal++/util.cc +--- bmpx-0.40.13-orig/libhal++/util.cc 2007-10-18 13:17:21.000000000 -0400 ++++ bmpx-0.40.13/libhal++/util.cc 2008-03-17 21:37:01.000000000 -0400 +@@ -1,6 +1,6 @@ + #include + #include +- ++#include + #include "types.hh" + + namespace Hal +diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_folder.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_folder.cc +--- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_folder.cc 2007-10-18 13:17:14.000000000 -0400 ++++ bmpx-0.40.13/plugins/vfs/container/libcontainer_folder.cc 2008-03-17 21:38:50.000000000 -0400 +@@ -23,6 +23,7 @@ + // BMPx is covered by. + + #include ++#include + + // BMP Audio + #include "src/audio/audio.hh" +diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_m3u.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc +--- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_m3u.cc 2007-10-18 13:17:14.000000000 -0400 ++++ bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc 2008-03-17 21:39:21.000000000 -0400 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "src/database.hh" + #include "src/uri.hh" +diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_xspf.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_xspf.cc +--- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_xspf.cc 2007-10-18 13:17:14.000000000 -0400 ++++ bmpx-0.40.13/plugins/vfs/container/libcontainer_xspf.cc 2008-03-17 21:41:39.000000000 -0400 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include + #include +diff -Naur bmpx-0.40.13-orig/src/hal.hh bmpx-0.40.13/src/hal.hh +--- bmpx-0.40.13-orig/src/hal.hh 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/hal.hh 2008-03-18 00:11:05.000000000 -0400 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -169,7 +170,7 @@ + + void device_condition (std::string const& udi, + std::string const& cond_name, +- std::string const& cond_name ); ++ std::string const& cond_details ); + void device_added (std::string const& udi ); + void device_removed (std::string const& udi ); + void device_property (std::string const& udi, +diff -Naur bmpx-0.40.13-orig/src/minisoup.cc bmpx-0.40.13/src/minisoup.cc +--- bmpx-0.40.13-orig/src/minisoup.cc 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/minisoup.cc 2008-03-18 01:18:11.000000000 -0400 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + #include "debug.hh" + #include "minisoup.hh" +diff -Naur bmpx-0.40.13-orig/src/parser/libxml2-sax-base.cc bmpx-0.40.13/src/parser/libxml2-sax-base.cc +--- bmpx-0.40.13-orig/src/parser/libxml2-sax-base.cc 2007-10-18 13:17:06.000000000 -0400 ++++ bmpx-0.40.13/src/parser/libxml2-sax-base.cc 2008-03-17 23:36:34.000000000 -0400 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + using namespace Glib; + using namespace std; +diff -Naur bmpx-0.40.13-orig/src/sanity.cc bmpx-0.40.13/src/sanity.cc +--- bmpx-0.40.13-orig/src/sanity.cc 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/sanity.cc 2008-03-17 23:44:47.000000000 -0400 +@@ -69,7 +69,7 @@ + } + + C_FUNCTION +-gchar * ++const gchar * + sanity_check_gtk (void) + { + return gtk_check_version (GTK_REQUIRED_MAJOR_VER, +diff -Naur bmpx-0.40.13-orig/src/streams-shoutcast.cc bmpx-0.40.13/src/streams-shoutcast.cc +--- bmpx-0.40.13-orig/src/streams-shoutcast.cc 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/streams-shoutcast.cc 2008-03-18 00:03:38.000000000 -0400 +@@ -27,6 +27,7 @@ + + #include + #include ++#include + + #include + #include +diff -Naur bmpx-0.40.13-orig/src/vfs.hh bmpx-0.40.13/src/vfs.hh +--- bmpx-0.40.13-orig/src/vfs.hh 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/vfs.hh 2008-03-17 23:34:57.000000000 -0400 +@@ -25,6 +25,7 @@ + #define BMP_VFS_HH + + #include ++#include + #include + #include + #include +diff -Naur bmpx-0.40.13-orig/src/video-widget.cc bmpx-0.40.13/src/video-widget.cc +--- bmpx-0.40.13-orig/src/video-widget.cc 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/video-widget.cc 2008-03-18 00:04:38.000000000 -0400 +@@ -23,6 +23,7 @@ + // BMPx is covered by. + + #include ++#include + #include "video-widget.hh" + #include "audio/play.hh" + #include +diff -Naur bmpx-0.40.13-orig/src/xds.cc bmpx-0.40.13/src/xds.cc +--- bmpx-0.40.13-orig/src/xds.cc 2007-10-18 13:17:08.000000000 -0400 ++++ bmpx-0.40.13/src/xds.cc 2008-03-17 23:59:04.000000000 -0400 +@@ -23,6 +23,7 @@ + // BMPx is covered by. + + #include ++#include + #include "xds.hh" + #define MAX_URI_LEN 4096 + diff --git a/extra/bmpx/bmpx-libsoup24.patch b/extra/bmpx/bmpx-libsoup24.patch new file mode 100644 index 000000000..465c19f4d --- /dev/null +++ b/extra/bmpx/bmpx-libsoup24.patch @@ -0,0 +1,544 @@ +diff -up bmpx-0.40.13/configure.ac.libsoup24 bmpx-0.40.13/configure.ac +--- bmpx-0.40.13/configure.ac.libsoup24 2007-10-18 19:17:17.000000000 +0200 ++++ bmpx-0.40.13/configure.ac 2008-02-15 20:26:58.000000000 +0100 +@@ -240,8 +240,7 @@ AC_ARG_WITH([pkgconfig-dir], + AC_SUBST([pkgconfigdir]) + + # libsoup +-PKG_CHECK_MODULES([SOUP], [libsoup-2.2 >= 2.2.100]) +-BMP_CHECK_SOUP_EXTERN_C ++PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.3.0.1]) + + # sqlite + PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.3]) +diff -up bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24 bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc +--- bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc.libsoup24 2007-10-18 19:17:06.000000000 +0200 ++++ bmpx-0.40.13/sentinel/beep-media-player-2-sentinel.cc 2008-02-15 20:26:58.000000000 +0100 +@@ -68,13 +68,7 @@ + #include + #include + +-#ifndef LIBSOUP_HAS_EXTERN_C +-G_BEGIN_DECLS +-#endif + #include +-#ifndef LIBSOUP_HAS_EXTERN_C +-G_END_DECLS +-#endif + + #define SERVER_NAME "beep-media-player.org" + +diff -up bmpx-0.40.13/src/minisoup.hh.libsoup24 bmpx-0.40.13/src/minisoup.hh +--- bmpx-0.40.13/src/minisoup.hh.libsoup24 2007-10-18 19:17:08.000000000 +0200 ++++ bmpx-0.40.13/src/minisoup.hh 2008-02-15 20:26:58.000000000 +0100 +@@ -33,13 +33,7 @@ + #include + #include + +-#ifndef LIBSOUP_HAS_EXTERN_C +-G_BEGIN_DECLS +-# include +-G_END_DECLS +-#else +-# include +-#endif // !LIBSOUP_HAS_EXTERN_C ++#include + + namespace Bmp + { +@@ -111,7 +105,7 @@ namespace Bmp + restarted (SoupMessage* /*message*/, gpointer /*data*/); + + static void +- got_chunk (SoupMessage* /*message*/, gpointer /*data*/); ++ got_chunk (SoupMessage* /*message*/, SoupBuffer* /*chunk*/, gpointer /*data*/); + + static void + got_content_length (SoupMessage* /*message*/, gpointer /*data*/); +@@ -161,7 +155,7 @@ namespace Bmp + restarted (SoupMessage* /*message*/, gpointer /*data*/); + + static void +- got_answer (SoupMessage* /*message*/, gpointer /*data*/); ++ got_answer (SoupSession* /*session*/, SoupMessage* /*message*/, gpointer /*data*/); + }; + + +@@ -224,10 +218,10 @@ namespace Bmp + restarted (SoupMessage* /*message*/, gpointer /*data*/); + + static void +- got_answer (SoupMessage* /*message*/, gpointer /*data*/); ++ got_answer (SoupSession* /*session*/, SoupMessage* /*message*/, gpointer /*data*/); + + static void +- got_chunk (SoupMessage* /*message*/, gpointer /*data*/); ++ got_chunk (SoupMessage* /*message*/, SoupBuffer* /*chunk*/, gpointer /*data*/); + + static void + got_content_length (SoupMessage* /*message*/, gpointer /*data*/); +diff -up bmpx-0.40.13/src/minisoup.cc.libsoup24 bmpx-0.40.13/src/minisoup.cc +--- bmpx-0.40.13/src/minisoup.cc.libsoup24 2007-10-18 19:17:08.000000000 +0200 ++++ bmpx-0.40.13/src/minisoup.cc 2008-02-15 20:26:58.000000000 +0100 +@@ -60,8 +60,8 @@ namespace Bmp + { + g_signal_connect (G_OBJECT (m_message), "got-chunk", G_CALLBACK (got_chunk), this); + g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this); +- soup_message_add_header_handler (m_message, "content-length", SOUP_HANDLER_PRE_BODY, +- SoupMessageCallbackFn (got_content_length), this); ++ soup_message_add_header_handler (m_message, "got-headers", "content-length", ++ G_CALLBACK (got_content_length), this); + return soup_session_send_message (m_session, m_message); + } + +@@ -75,26 +75,26 @@ namespace Bmp + RequestSync::get_data () + { + std::string buffer; +- buffer.append (m_message->response.body, m_message->response.length); ++ buffer.append (m_message->response_body->data, m_message->response_body->length); + return buffer; + } + + void + RequestSync::get_data (std::string & buffer) + { +- buffer.append (m_message->response.body, m_message->response.length); ++ buffer.append (m_message->response_body->data, m_message->response_body->length); + } + + char const* + RequestSync::get_data_raw () + { +- return m_message->response.body; ++ return m_message->response_body->data; + } + + guint + RequestSync::get_data_size () + { +- return m_message->response.length; ++ return m_message->response_body->length; + } + + +@@ -102,15 +102,15 @@ namespace Bmp + RequestSync::add_header (std::string const& name, + std::string const& value) + { +- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str()); ++ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str()); + } + + void + RequestSync::add_request (std::string const& type, + std::string const& request) + { +- soup_message_set_request (m_message, type.c_str(), SOUP_BUFFER_SYSTEM_OWNED /* we can't rely on the std::string not being destroyed */, +- g_strdup (const_cast(request.c_str())), strlen (request.c_str())); ++ soup_message_set_request (m_message, type.c_str(), SOUP_MEMORY_COPY, ++ request.c_str(), strlen (request.c_str())); + m_post = true; + } + +@@ -125,11 +125,11 @@ namespace Bmp + } + + void +- RequestSync::got_chunk (SoupMessage* message, gpointer data) ++ RequestSync::got_chunk (SoupMessage* message, SoupBuffer* chunk, gpointer data) + { + RequestSync & request = (*(reinterpret_cast(data))); + +- request.m_read += message->response.length; ++ request.m_read += chunk->length; + double percent = (double (request.m_read) / double (request.m_size)); + if(percent >= 0. && percent <= 1.) + { +@@ -141,7 +141,7 @@ namespace Bmp + RequestSync::got_content_length (SoupMessage* message, gpointer data) + { + RequestSync & request = (*(reinterpret_cast(data))); +- request.m_size = g_ascii_strtoull (soup_message_get_header (message->response_headers, "content-length"), NULL, 10); ++ request.m_size = soup_message_headers_get_content_length (message->response_headers); + } + + +@@ -180,17 +180,17 @@ namespace Bmp + return m_message->status_code; + } + +- guint +- Request::message_status () +- { +- return m_message->status; +- } ++ //guint ++ //Request::message_status () ++ //{ ++ // return m_message->status; ++ //} + + void + Request::run () + { + g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this); +- soup_session_queue_message (m_session, m_message, SoupMessageCallbackFn (got_answer), this); ++ soup_session_queue_message (m_session, m_message, SoupSessionCallback (got_answer), this); + } + + void +@@ -199,9 +199,6 @@ namespace Bmp + if (G_IS_OBJECT(m_session)) + { + soup_session_abort (m_session); +- //soup_message_set_status (m_message, SOUP_STATUS_CANCELLED); +- //soup_session_cancel_message (m_session, m_message); +- //m_message = 0; + } + } + +@@ -210,15 +207,15 @@ namespace Bmp + Request::add_header (std::string const& name, + std::string const& value) + { +- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str()); ++ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str()); + } + + void + Request::add_request (std::string const& type, + std::string const& request) + { +- soup_message_set_request (m_message, type.c_str(), SOUP_BUFFER_SYSTEM_OWNED /* we can't rely on the std::string not being destroyed */, +- g_strdup (const_cast(request.c_str())), strlen (request.c_str())); ++ soup_message_set_request (m_message, type.c_str(), SOUP_MEMORY_COPY, ++ request.c_str(), strlen (request.c_str())); + m_post = true; + } + +@@ -230,7 +227,7 @@ namespace Bmp + } + + void +- Request::got_answer (SoupMessage* message, gpointer data) ++ Request::got_answer (SoupSession* session, SoupMessage* message, gpointer data) + { + Request & request = (*(reinterpret_cast(data))); + +@@ -241,15 +238,12 @@ namespace Bmp + if( block ) + return; + +- if( request.m_message->status != SOUP_MESSAGE_STATUS_FINISHED ) +- return; +- + //if( request.m_message->status_code == SOUP_STATUS_CANCELLED ) + //return; + + request.Signals.Callback.emit( +- request.m_message->response.body, +- request.m_message->response.length, ++ request.m_message->response_body->data, ++ request.m_message->response_body->length, + request.m_message->status_code + ); + } +@@ -269,6 +263,7 @@ namespace Bmp + + m_session = soup_session_async_new (); + m_message = soup_message_new ("GET", m_url.c_str()); ++ soup_message_set_flags (m_message, SOUP_MESSAGE_OVERWRITE_CHUNKS); + } + + Glib::RefPtr +@@ -279,9 +274,9 @@ namespace Bmp + + RequestFile::~RequestFile () + { +- if (G_IS_OBJECT(m_message) && m_message->status == SOUP_MESSAGE_STATUS_RUNNING) ++ if (m_file.is_open()) + { +- cancel (); ++ cancel (); + Signals.Aborted.emit ((boost::format (_("Download of file '%s' was cancelled prematurely!")) % filename_to_utf8 (m_filename).c_str()).str()); + } + g_object_unref (m_session); +@@ -316,9 +311,9 @@ namespace Bmp + { + g_signal_connect (G_OBJECT (m_message), "got-chunk", G_CALLBACK (got_chunk), this); + g_signal_connect (G_OBJECT (m_message), "restarted", G_CALLBACK (restarted), this); +- soup_message_add_header_handler (m_message, "content-length", SOUP_HANDLER_PRE_BODY, +- SoupMessageCallbackFn (got_content_length), this); +- soup_session_queue_message (m_session, m_message, SoupMessageCallbackFn (got_answer), this); ++ soup_message_add_header_handler (m_message, "got-headers", "content-length", ++ G_CALLBACK (got_content_length), this); ++ soup_session_queue_message (m_session, m_message, SoupSessionCallback (got_answer), this); + fileOpen (); + } + +@@ -327,8 +322,7 @@ namespace Bmp + { + if (G_IS_OBJECT(m_message)) + { +- soup_message_set_status (m_message, SOUP_STATUS_CANCELLED); +- soup_session_cancel_message (m_session, m_message); ++ soup_session_cancel_message (m_session, m_message, SOUP_STATUS_CANCELLED); + m_message = 0; + } + +@@ -340,7 +334,7 @@ namespace Bmp + RequestFile::add_header (std::string const& name, + std::string const& value) + { +- soup_message_add_header (m_message->request_headers, name.c_str(), value.c_str()); ++ soup_message_headers_append (m_message->request_headers, name.c_str(), value.c_str()); + } + + +@@ -356,7 +350,7 @@ namespace Bmp + } + + void +- RequestFile::got_answer (SoupMessage* message, gpointer data) ++ RequestFile::got_answer (SoupSession* session, SoupMessage* message, gpointer data) + { + RequestFile & request = (*(reinterpret_cast(data))); + +@@ -368,25 +362,22 @@ namespace Bmp + return; + } + +- if( request.m_message->status != SOUP_MESSAGE_STATUS_FINISHED ) +- return; +- + if( request.m_message->status_code == SOUP_STATUS_CANCELLED) + return; + +- debug("soup","%s: status: %d, status_code: %d", G_STRLOC, request.m_message->status, request.m_message->status_code); ++ debug("soup","%s: status_code: %d", G_STRLOC, request.m_message->status_code); + + request.fileClose (); + request.Signals.Done.emit (request.m_filename); + } + + void +- RequestFile::got_chunk (SoupMessage* message, gpointer data) ++ RequestFile::got_chunk (SoupMessage* message, SoupBuffer* chunk, gpointer data) + { + RequestFile & request = (*(reinterpret_cast(data))); + +- request.m_file.write (message->response.body, message->response.length); +- request.m_read += message->response.length; ++ request.m_file.write (chunk->data, chunk->length); ++ request.m_read += chunk->length; + + double percent = (double (request.m_read) / double (request.m_size)); + if(percent >= 0. && percent <= 1.) +@@ -399,7 +390,7 @@ namespace Bmp + RequestFile::got_content_length (SoupMessage* message, gpointer data) + { + RequestFile & request = (*(reinterpret_cast(data))); +- request.m_size = g_ascii_strtoull (soup_message_get_header (message->response_headers, "content-length"), NULL, 10); ++ request.m_size = soup_message_headers_get_content_length (message->response_headers); + } + } + } +diff -up bmpx-0.40.13/README.libsoup24 bmpx-0.40.13/README +--- bmpx-0.40.13/README.libsoup24 2007-10-18 19:17:17.000000000 +0200 ++++ bmpx-0.40.13/README 2008-02-15 20:26:58.000000000 +0100 +@@ -16,7 +16,7 @@ Requirements: + * libglademm-2.4 >= 2.6.2 + * libsexymm >= 0.1.9 + * librsvg >= 2.14.0 +- * libsoup >= 2.2.100 ++ * libsoup >= 2.3.0.1 + * libofa >= 0.9.3 + * sqlite >= 3.3.11 + * libxml >= 2.6.1 +diff -up bmpx-0.40.13/configure.libsoup24 bmpx-0.40.13/configure +--- bmpx-0.40.13/configure.libsoup24 2008-02-15 20:27:13.000000000 +0100 ++++ bmpx-0.40.13/configure 2008-02-15 20:27:26.000000000 +0100 +@@ -31519,12 +31519,12 @@ echo $ECHO_N "checking for SOUP... $ECHO + + if test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2 >= 2.2.100" 2>/dev/null` ++ pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.3.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -31533,12 +31533,12 @@ else + fi + if test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.2 >= 2.2.100" 2>/dev/null` ++ pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.3.0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -31547,18 +31547,18 @@ else + fi + + if test $pkg_failed = yes; then +- SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2 >= 2.2.100"` ++ SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.3.0.1"` + # Put the nasty error message in config.log where it belongs + echo "$SOUP_PKG_ERRORS" 1>&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.2 >= 2.2.100) were not met. ++ { { echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= 2.3.0.1) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + + Alternatively you may set the SOUP_CFLAGS and SOUP_LIBS environment variables + to avoid the need to call pkg-config. See the pkg-config man page for + more details." >&5 +-echo "$as_me: error: Package requirements (libsoup-2.2 >= 2.2.100) were not met. ++echo "$as_me: error: Package requirements (libsoup-2.4 >= 2.3.0.1) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +@@ -31596,90 +31596,6 @@ echo "${ECHO_T}yes" >&6; } + : + fi + +- CPPFLAGS_SAVED="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $SOUP_CFLAGS" +- export CPPFLAGS +- +- LDFLAGS_SAVED="$LDFLAGS" +- LDFLAGS="$LDFLAGS $SOUP_LDFLAGS" +- export LDFLAGS +- +- { echo "$as_me:$LINENO: checking for extern in libsoup headers" >&5 +-echo $ECHO_N "checking for extern in libsoup headers... $ECHO_C" >&6; } +- +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +- #include +- +-int +-main () +-{ +- +- SoupSession * session = soup_session_sync_new (); +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_cxx_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +- +-cat >>confdefs.h <<\_ACEOF +-#define LIBSOUP_HAS_EXTERN_C +-_ACEOF +- +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- ac_ext=cpp +-ac_cpp='$CXXCPP $CPPFLAGS' +-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +- +- +- CPPFLAGS="$CPPFLAGS_SAVED" +- LDFLAGS="$LDFLAGS_SAVED" +- +- + # sqlite + + pkg_failed=no +diff -up bmpx-0.40.13/m4/soup.m4.libsoup24 bmpx-0.40.13/m4/soup.m4 +--- bmpx-0.40.13/m4/soup.m4.libsoup24 2007-10-18 19:17:06.000000000 +0200 ++++ bmpx-0.40.13/m4/soup.m4 2008-02-15 20:26:58.000000000 +0100 +@@ -1,4 +1,34 @@ + dnl -*- Mode: Autoconf; -*- ++dnl -*- Mode: Autoconf; -*- ++ ++AC_DEFUN([BMP_CHECK_SOUP_EXTERN_C], ++[ ++ CPPFLAGS_SAVED="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $SOUP_CFLAGS" ++ export CPPFLAGS ++ ++ LDFLAGS_SAVED="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $SOUP_LDFLAGS" ++ export LDFLAGS ++ ++ AC_MSG_CHECKING(for extern in libsoup headers) ++ ++ AC_LANG_PUSH(C++) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++ @%:@include ++ ]], [[ ++ SoupSession * session = soup_session_sync_new (); ++ ]])],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(LIBSOUP_HAS_EXTERN_C,,[define if libsoup has extern c]) ++ ]) ++ AC_LANG_POP([C++]) ++ ++ CPPFLAGS="$CPPFLAGS_SAVED" ++ LDFLAGS="$LDFLAGS_SAVED" ++]) + + AC_DEFUN([BMP_CHECK_SOUP_EXTERN_C], + [ diff --git a/extra/bmpx/bmpx-no-notification-error.patch b/extra/bmpx/bmpx-no-notification-error.patch new file mode 100644 index 000000000..337747b91 --- /dev/null +++ b/extra/bmpx/bmpx-no-notification-error.patch @@ -0,0 +1,14 @@ +--- src/shell.cpp.orig 2006-08-27 16:03:26.000000000 -0400 ++++ src/shell.cpp 2006-08-27 16:04:15.000000000 -0400 +@@ -1558,11 +1558,6 @@ + try { + notify = new Bmp::Notify (tray_icon); + } catch (Bmp::NotifyException& cxe) { +- bmp_system_control_message_dispatch (bmp_system_control, +- msg_domain_id, +- GTK_MESSAGE_ERROR, +- _("BMP was unable to start and/or connect to notification-daemon." +- "Notification popups will not be available.")); + notify = 0; + } + #endif diff --git a/extra/bmpx/bmpx.install b/extra/bmpx/bmpx.install new file mode 100644 index 000000000..186d4784b --- /dev/null +++ b/extra/bmpx/bmpx.install @@ -0,0 +1,21 @@ +post_install() { + cat << EOF +- The XMMS/Winamp interface has been dropped. +- Note that BMPX is still in early development. Expect issues. +- BMPX is dbus enabled so your desktop must run in a dbus-session - you'll know + if there is a DBUS_SESSION_BUS_ADDRESS environment variable. If not you can: + 1. modify your .xinitrc "exec dbus-launch my-wm", or + 2. start bmpx directly with "dbus-launch beep-media-player-2" +- Install gstreamer0.10-mad for MP3 support. + +EOF +} + +post_upgrade() { + post_install $1 +} + +op=$1 +shift + +$op $* diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD new file mode 100644 index 000000000..d04f6f0f8 --- /dev/null +++ b/extra/bochs/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 9933 2008-08-21 01:31:41Z eric $ +#Contributor: Tom Newsom +# Maintainer: Kevin Piche + +pkgname=bochs +pkgver=2.3.7 +pkgrel=1 +pkgdesc="A portable x86 PC emulation software package" +arch=(i686 x86_64) +license=('LGPL') +url="http://bochs.sourceforge.net/" +source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz bochs-2.3.7-typo-fixes.patch) +md5sums=('a2e5f922505bf16cabd36bb9d571a2c4' '7d6df4f5f7ee1d4623e7bcf385c9c6e0') +depends=('gcc-libs' 'libxpm') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + patch -Np1 -i ../bochs-2.3.7-typo-fixes.patch || return 1 + ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \ + --enable-4meg-pages --enable-global-pages --enable-pae --enable-fpu \ + --enable-mmx --enable-3dnow --enable-sse --enable-sep + make || return 1 + make prefix=${startdir}/pkg/usr install + install -D -m 644 .bochsrc ${startdir}/pkg/etc/bochsrc-sample.txt +} diff --git a/extra/bochs/bochs-2.3.7-typo-fixes.patch b/extra/bochs/bochs-2.3.7-typo-fixes.patch new file mode 100644 index 000000000..c9fb168e4 --- /dev/null +++ b/extra/bochs/bochs-2.3.7-typo-fixes.patch @@ -0,0 +1,24 @@ +diff -NaurwB bochs-2.3.7.orig/cpu/ia_opcodes.h bochs-2.3.7/cpu/ia_opcodes.h +--- bochs-2.3.7.orig/cpu/ia_opcodes.h 2008-05-30 22:35:08.000000000 +0200 ++++ bochs-2.3.7/cpu/ia_opcodes.h 2008-06-04 14:56:46.000000000 +0200 +@@ -891,7 +891,7 @@ + bx_define_opcode(BX_IA_PF2ID_PqQq, BX_CPU_C::PF2ID_PqQq) + bx_define_opcode(BX_IA_PF2IW_PqQq, BX_CPU_C::PF2IW_PqQq) + bx_define_opcode(BX_IA_PFACC_PqQq, BX_CPU_C::PFACC_PqQq) +-bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::BX_PFADD_PqQq) ++bx_define_opcode(BX_IA_PFADD_PqQq, BX_CPU_C::PFADD_PqQq) + bx_define_opcode(BX_IA_PFCMPEQ_PqQq, BX_CPU_C::PFCMPEQ_PqQq) + bx_define_opcode(BX_IA_PFCMPGE_PqQq, BX_CPU_C::PFCMPGE_PqQq) + bx_define_opcode(BX_IA_PFCMPGT_PqQq, BX_CPU_C::PFCMPGT_PqQq) +diff -NaurwB bochs-2.3.7.orig/iodev/iodebug.h bochs-2.3.7/iodev/iodebug.h +--- bochs-2.3.7.orig/iodev/iodebug.h 2008-05-01 22:46:58.000000000 +0200 ++++ bochs-2.3.7/iodev/iodebug.h 2008-06-04 14:45:50.000000000 +0200 +@@ -18,7 +18,7 @@ + virtual void init(void); + virtual void reset (unsigned type) {} + static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); +- static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, void *data); ++ static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void *data); + + private: + static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len); diff --git a/extra/bogofilter/PKGBUILD b/extra/bogofilter/PKGBUILD new file mode 100644 index 000000000..8e11f5c69 --- /dev/null +++ b/extra/bogofilter/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 53182 2009-09-26 10:37:41Z giovanni $ +# Maintainer: tobias +# Contributor: Low Kian Seong + +pkgname=bogofilter +pkgver=1.2.1 +pkgrel=1 +pkgdesc="A fast Bayesian spam filtering tool" +arch=('i686' 'x86_64') +license=(GPL3) +url="http://bogofilter.sourceforge.net" +depends=('db>=4.8' 'perl>=5.10.1-2' 'gsl') +backup=(etc/bogofilter/bogofilter.cf) +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-stable/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('2eb802f4e271b99c3d8f68b14f8df9ef') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc/bogofilter \ + --localstatedir=/var \ + --enable-transactions + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + + mv ${pkgdir}/etc/bogofilter/bogofilter.cf.example ${pkgdir}/etc/bogofilter/bogofilter.cf + + install -dm755 ${pkgdir}/usr/share/${pkgname}/contrib + install -m644 contrib/* ${pkgdir}/usr/share/${pkgname}/contrib/ +} diff --git a/extra/bomberclone/PKGBUILD b/extra/bomberclone/PKGBUILD new file mode 100644 index 000000000..fb68b0bc2 --- /dev/null +++ b/extra/bomberclone/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 49932 2009-08-16 21:48:44Z jgc $ +# Maintainer: Jeff 'codemac' Mickey +# Contributor: arjan +# Contributor: Aurelien Foret + +pkgname=bomberclone +pkgver=0.11.8 +pkgrel=2 +pkgdesc="A Clone of the game AtomicBomberMan" +arch=(i686 x86_64) +url="http://www.bomberclone.de/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + bomberclone.desktop) +md5sums=('1dedd642120eee8911b12e2ee05e476f' + '2c0151859e7e9aebd1fc95a1455f0c3b') +sha1sums=('a900b716683f9267bfd28d9687049e1f65335f95' + 'd254e8fde5b55714970978619e8ad980b1007792') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}/bomberclone.desktop" \ + "${pkgdir}/usr/share/applications/" || return 1 +} diff --git a/extra/bomberclone/bomberclone.desktop b/extra/bomberclone/bomberclone.desktop new file mode 100644 index 000000000..affc0d8ad --- /dev/null +++ b/extra/bomberclone/bomberclone.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=BomberClone +GenericName=BomberClone +Comment=Atomic Bomberman clone +Icon=/usr/share/games/bomberclone/pixmaps/bomberclone.png +TryExec=bomberclone +Exec=bomberclone +Terminal=false +Categories=Qt;KDE;GNOME;Game; diff --git a/extra/bonnie++/PKGBUILD b/extra/bonnie++/PKGBUILD new file mode 100644 index 000000000..abe011fc4 --- /dev/null +++ b/extra/bonnie++/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 27576 2009-02-23 03:56:06Z eric $ +# Maintainer: eric +# Contributor: Tom Newsom + +pkgname=bonnie++ +pkgver=1.03e +pkgrel=1 +pkgdesc="Bonnie++ is based on the Bonnie hard drive benchmark by Tim Bray" +arch=(i686 x86_64) +url="http://www.coker.com.au/bonnie++/" +license=('GPL') +depends=('gcc' 'perl') +source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz) +md5sums=('750aa5b5051263a99c6c195888c74968') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + /bin/sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" \ + Makefile || return 1 + make || return 1 + make prefix=$pkgdir/usr install || return 1 +} +# vim: ts=2 sw=2 et ft=sh + diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD new file mode 100644 index 000000000..fc2288fce --- /dev/null +++ b/extra/boo/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 53931 2009-10-03 23:05:16Z eric $ +# Maintainer: Hugo Doria +# Contributor: tardo +# Contributor: Brice Carpentier + +pkgname=boo +pkgver=0.9.2.3383 +pkgrel=2 +pkgdesc="A wrist friendly language for the CLI" +arch=('i686' 'x86_64') +url="http://boo.codehaus.org/" +license=('GPL') +depends=('sh' 'mono' 'shared-mime-info') +options=('!makeflags') +install=boo.install +source=(http://dist.codehaus.org/boo/distributions/${pkgname}-${pkgver}.tar.gz) +md5sums=('2b172e95fed2ce31cc2084f51ddebe3d') +sha1sums=('ffbcc6bfed8740eb16c212325202306c15a156c5') + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p $MONO_SHARED_DIR + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's|/lib|/lib/mono|' extras/boo.pc.in || return 1 + ./configure --prefix=/usr --libdir=/usr/lib || return 1 + make VERBOSE=1 || return 1 + make DESTDIR="${pkgdir}" install || return 1 + rm -rf $MONO_SHARED_DIR || return 1 + rm -rf "${pkgdir}/share/" || return 1 + rm -rf "${pkgdir}/usr/share/gtksourceview-1.0/language-specs/boo.lang" +} diff --git a/extra/boo/boo.install b/extra/boo/boo.install new file mode 100644 index 000000000..8652c4ad4 --- /dev/null +++ b/extra/boo/boo.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD new file mode 100644 index 000000000..4c9c1a178 --- /dev/null +++ b/extra/boost/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 47703 2009-07-25 14:37:19Z giovanni $ +# Maintainer: kevin +# TU: Kritoke +# Contributor: Luca Roccia + +pkgname=boost +pkgver=1.39.0 +_boostver=1_39_0 +pkgrel=2 +pkgdesc="Boost provides free peer-reviewed portable C++ source libraries." +arch=(i686 x86_64) +url="http://www.boost.org/" +depends=('python>=2.5' 'bzip2' 'zlib') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${_boostver}.tar.gz layout-tagged.patch translate_exception.patch) +license=('custom') +options=(!ccache) + +build() { + cd ${srcdir}/${pkgname}_${_boostver} + #export CFLAGS="${CFLAGS} -fno-strict-aliasing" + #export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + patch -Np0 -i ${srcdir}/layout-tagged.patch || return 1 + patch -Np1 -i ${srcdir}/translate_exception.patch || return 1 + + # build bjam + cd ${srcdir}/${pkgname}_${_boostver}/tools/jam/src + ./build.sh cc || return 1 + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + + install -m755 -d ${pkgdir}/usr/bin + install -m755 ${_bindir}/bjam ${pkgdir}/usr/bin/bjam || return 1 + + # build bcp + cd ${srcdir}/${pkgname}_${_boostver}/tools/bcp + ../jam/src/${_bindir}/bjam || return 1 + install -m755 ${srcdir}/${pkgname}_${_boostver}/dist/bin/bcp \ + ${pkgdir}/usr/bin/bcp || return 1 + + # build libs + cd ${srcdir}/${pkgname}_${_boostver} + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + ./tools/jam/src/${_bindir}/bjam \ + release debug-symbols=off threading=single,multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing \ + --prefix=${pkgdir}/usr \ + -sPYTHON_ROOT=/usr \ + -sPYTHON_VERSION=2.6 \ + -sTOOLS=gcc \ + --layout=tagged \ + install || return 1 +# --with-wave install || return 1 +# -d2 <- debug cflags=-fno-strict-aliasing \ + + # build pyste + cd ${srcdir}/${pkgname}_${_boostver}/libs/python/pyste/install + python setup.py install --root=${pkgdir} || return 1 + + # license + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 ${srcdir}/${pkgname}_${_boostver}/LICENSE_1_0.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 +} +md5sums=('fcc6df1160753d0b8c835d17fdeeb0a7' + '1f085180881155fbb85be0cb9f7d8f35' + '1785bd2f958de7649b4e378680c44d16') diff --git a/extra/boost/layout-tagged.patch b/extra/boost/layout-tagged.patch new file mode 100644 index 000000000..05e60ec91 --- /dev/null +++ b/extra/boost/layout-tagged.patch @@ -0,0 +1,135 @@ +Patch to add --layout=tagged option which has the same behaviour as the +previous --layout=system. This comes from boost svn changeset r53015 +https://svn.boost.org/trac/boost/changeset/53015/trunk + +--- Jamroot.orig 2009-06-15 23:01:28.000000000 -0400 ++++ Jamroot 2009-06-15 23:08:08.000000000 -0400 +@@ -64,21 +64,26 @@ + # versions of Boost or multiple compilers can + # be used on the same system. + # +-# versioned (default) - Names of boost +-# binaries include the Boost version +-# number and the name and version of the +-# compiler. Boost headers are installed +-# in a subdirectory of whose +-# name contains the Boost version +-# number. +-# +-# system - Binaries names do not include +-# the Boost version number or the name +-# and version number of the compiler. +-# Boost headers are installed directly +-# into . This option is +-# intended for system integrators who +-# are building distribution packages. ++# versioned (default) - Names of boost binaries ++# include the Boost version number, name and ++# version of the compiler and encoded build ++# properties. Boost headers are installed in a ++# subdirectory of whose name contains ++# the Boost version number. ++# ++# tagged -- Names of boost binaries include the ++# encoded build properties such as variant and ++# threading, but do not including compiler name ++# and version, or Boost version. This option is ++# useful if you build several variants of Boost, ++# using the same compiler. ++# ++# system - Binaries names do not include the ++# Boost version number or the name and version ++# number of the compiler. Boost headers are ++# installed directly into . This option ++# is intended for system integrators who are ++# building distribution packages. + # + # --buildid=ID Adds the specified ID to the name of built + # libraries. The default is to not add anything. +@@ -318,53 +323,50 @@ + { + if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB + { ++ local result ; + if $(layout) = versioned + { +- local result = [ common.format-name ++ result = [ common.format-name + -$(BOOST_VERSION_TAG) + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; +- +- # Optionally add version suffix. On NT, library with version suffix +- # will not be recognized by linkers. On CYGWIN, we get strage +- # duplicate symbol errors when library is generated with version +- # suffix. On OSX, version suffix is not needed -- the linker expects +- # the libFoo.1.2.3.dylib format. AIX linkers do not accept version +- # suffixes either. Pgi compilers can not accept library with version +- # suffix. +- if $(type) = SHARED_LIB && +- ( ! ( [ $(property-set).get ] in windows cygwin darwin aix ) && +- ! ( [ $(property-set).get ] in pgi ) ) +- { +- result = $(result).$(BOOST_VERSION) ; +- } +- +- return $(result) ; ++ } ++ else if $(layout) = tagged ++ { ++ result = [ common.format-name ++ ++ -$(BUILD_ID) ++ : $(name) : $(type) : $(property-set) ] ; + } +- else ++ else if $(layout) = system + { +- local result = [ common.format-name ++ result = [ common.format-name + + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; +- +- # Optionally add version suffix. On NT, library with version suffix +- # will not be recognized by linkers. On CYGWIN, we get strage +- # duplicate symbol errors when library is generated with version +- # suffix. On OSX, version suffix is not needed -- the linker expects +- # the libFoo.1.2.3.dylib format. AIX linkers do not accept version +- # suffixes either. Pgi compilers can not accept library with version +- # suffix. +- if $(type) = SHARED_LIB && +- ( ! ( [ $(property-set).get ] in windows cygwin darwin aix ) && +- ! ( [ $(property-set).get ] in pgi ) ) +- { +- result = $(result).$(BOOST_VERSION) ; +- } +- +- return $(result) ; + } +- } ++ else ++ { ++ ECHO "error: invalid layout '$(layout)'" ; ++ EXIT ; ++ } ++ ++ # Optionally add version suffix. On NT, library with version suffix ++ # will not be recognized by linkers. On CYGWIN, we get strage ++ # duplicate symbol errors when library is generated with version ++ # suffix. On OSX, version suffix is not needed -- the linker expects ++ # the libFoo.1.2.3.dylib format. AIX linkers do not accept version ++ # suffixes either. Pgi compilers can not accept library with version ++ # suffix. ++ if $(type) = SHARED_LIB && ++ ( ! ( [ $(property-set).get ] in windows cygwin darwin aix ) && ++ ! ( [ $(property-set).get ] in pgi ) ) ++ { ++ result = $(result).$(BOOST_VERSION) ; ++ } ++ ++ return $(result) ; ++ } + } + + diff --git a/extra/boost/translate_exception.patch b/extra/boost/translate_exception.patch new file mode 100644 index 000000000..68669c137 --- /dev/null +++ b/extra/boost/translate_exception.patch @@ -0,0 +1,10 @@ +--- a/boost/python/detail/translate_exception.hpp 2009-07-25 15:04:50.000000000 -0700 ++++ b/boost/python/detail/translate_exception.hpp 2009-07-25 15:04:50.000000000 -0700 +@@ -9,6 +9,7 @@ + + # include + # include ++# include + + # include + diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD new file mode 100644 index 000000000..642067c1e --- /dev/null +++ b/extra/bootchart/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 27366 2009-02-20 00:14:36Z aaron $ +# Maintainer : Aaron Griffin + +pkgname=bootchart +pkgver=0.9 +pkgrel=5 +pkgdesc="Boot Process Performance Visualization" +url="http://www.bootchart.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('acct' 'sh') +optdepends=('java-runtime: for bootchart-render') +makedepends=('apache-ant') +install=bootchart.install +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + bootchart-render + #FS#8438 - fix the regex used to scan inittab for archlinux + fix-inittab-regex.patch) +md5sums=('4be91177d19069e21beeb106f2f77dff' + 'f02888cda23a5b1c9b931140f6fdbb71' + 'c8a70f1f763a2632dc7759a6387f865f') + +build() +{ + cd $startdir/src/$pkgname-$pkgver + patch -up1 < $startdir/src/fix-inittab-regex.patch + ant + sed -i "s#ROOT=/#ROOT=$startdir/pkg#" install.sh + + mkdir -p $startdir/pkg/sbin + mkdir -p $startdir/pkg/etc + ./install.sh + + chmod 644 $startdir/pkg/etc/bootchartd.conf + + mkdir -p $startdir/pkg/usr/share/bootchart + cp bootchart.jar $startdir/pkg/usr/share/bootchart + + mkdir -p $startdir/pkg/usr/bin + install -m755 $startdir/src/bootchart-render $startdir/pkg/usr/bin/bootchart-render +} diff --git a/extra/bootchart/bootchart-render b/extra/bootchart/bootchart-render new file mode 100644 index 000000000..507e70440 --- /dev/null +++ b/extra/bootchart/bootchart-render @@ -0,0 +1,2 @@ +# !/bin/sh +java -jar /usr/share/bootchart/bootchart.jar diff --git a/extra/bootchart/bootchart.install b/extra/bootchart/bootchart.install new file mode 100644 index 000000000..8b38324ae --- /dev/null +++ b/extra/bootchart/bootchart.install @@ -0,0 +1,26 @@ +post_install() { + echo " Bootchart usage : " + echo " make sure to append init=/sbin/bootchartd to your" + echo " kernel parameters (it is recommended that you " + echo " create another entry specifically for bootchart" + echo " logging)." + echo " Run bootchart-render to render your bootchart" + + /bin/true +} + +post_upgrade() { + /bin/true +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/true +} + +op=$1 +shift +$op $* diff --git a/extra/bootchart/fix-inittab-regex.patch b/extra/bootchart/fix-inittab-regex.patch new file mode 100644 index 000000000..f9c0a9406 --- /dev/null +++ b/extra/bootchart/fix-inittab-regex.patch @@ -0,0 +1,11 @@ +--- a/script/bootchartd 2007-10-27 17:47:04.000000000 +0200 ++++ b/script/bootchartd 2007-10-27 18:45:10.000000000 +0200 +@@ -114,7 +114,7 @@ + # Wait for the boot process to end. + wait_boot() + { +- local runlevel=$( sed -n 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab ) ++ local runlevel=$( sed -n -e 's/#.*//g' -e 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab ) + + # The processes we have to wait for + local exit_proc="gdmgreeter gdm-binary kdm_greet kdm" diff --git a/extra/botan/ChangeLog b/extra/botan/ChangeLog new file mode 100644 index 000000000..1f5b0999a --- /dev/null +++ b/extra/botan/ChangeLog @@ -0,0 +1,5 @@ + +2009-08-01 Douglas Soares de Andrade + + * Updated for x86_64: 1.8.5 + diff --git a/extra/botan/PKGBUILD b/extra/botan/PKGBUILD new file mode 100644 index 000000000..3d07f53b4 --- /dev/null +++ b/extra/botan/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 48503 2009-08-02 17:00:34Z giovanni $ +# Maintainer: Douglas Soares de Andrade +# Contributor: d'Ronin + +pkgname=botan +pkgver=1.8.5 +pkgrel=2 +pkgdesc="BSD-licensed crypto library written in C++." +license=('BSD') +arch=('i686' 'x86_64') +url="http://botan.randombit.net/" +depends=('gcc-libs' 'sh') +makedepends=('python') +source=(http://files.randombit.net/botan/Botan-${pkgver}.tgz) + +build() { + cd ${srcdir}/Botan-${pkgver} + ./configure.py --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir}/usr install +} +md5sums=('26d5d7488bacd12a3779cb3750692399') + diff --git a/extra/brasero/ChangeLog b/extra/brasero/ChangeLog new file mode 100644 index 000000000..e87514bb1 --- /dev/null +++ b/extra/brasero/ChangeLog @@ -0,0 +1,27 @@ +2009-07-01 Jan de Groot + * brasero-2.26.3-1 + * upstream update + * create gconf schemas with the correct gettext domain + +2009-04-18 Allan McRae + * brasero-2.26.1-1 + * upstream update + +2009-03-22 Jan de Groot + * brasero-2.26.0-1 + * upstream update + * Make dependencies versioned + * Fix optdepends + +2008-12-16 Allan McRae + * brasero-0.8.4-1 + * upstream update + * add nautilus as makedepend to build nautilus plugin + +2008-11-14 Allan McRae + * brasero-0.8.3-1 + * upstream update + +2008-10-22 Allan McRae + * brasero-0.8.2-2 + * Rebuild for totem-plparser update diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD new file mode 100644 index 000000000..0dfd6243b --- /dev/null +++ b/extra/brasero/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD,v 1.31 2009/03/14 02:03:57 allan Exp $ +# Maintainer: Allan McRae +# Contributor: William Rea + +pkgname=brasero +pkgver=2.26.3 +pkgrel=1 +pkgdesc="A disc burning application for Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/brasero" +license=('GPL') +options=('!libtool' '!emptydirs') +depends=('gstreamer0.10-base-plugins' 'totem-plparser>=2.26.2' 'libbeagle' 'cdrkit' 'cdrdao' 'desktop-file-utils') +makedepends=('gnome-doc-utils>=0.16.0' 'intltool' 'libburn' 'libisofs' 'nautilus') +optdepends=('libburn: alternative back-end' + 'libisofs: libburn back-end' + 'dvdauthor: video project' + 'gstreamer0.10-bad-plugins: video project' + 'vcdimager: video project') +install=brasero.install +source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.26/brasero-${pkgver}.tar.bz2) +md5sums=('edf1b2b489a4686b84674dc7dbbd8130') + +build() { + cd "${srcdir}/brasero-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-caches || return 1 + make || return 1 + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1 + + mkdir -p ${pkgdir}/usr/share/gconf/schemas + gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain brasero ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/brasero/brasero.install b/extra/brasero/brasero.install new file mode 100644 index 000000000..85807aa2e --- /dev/null +++ b/extra/brasero/brasero.install @@ -0,0 +1,20 @@ +pkgname=brasero + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD new file mode 100644 index 000000000..7862771fb --- /dev/null +++ b/extra/brltty/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 46704 2009-07-19 19:42:52Z giovanni $ +# Maintainer: Jan de Groot +# Contributor: Giovanni Scafora + +pkgname=brltty +pkgver=4.0 +pkgrel=3 +pkgdesc="Braille display driver for Linux/Unix" +arch=('i686' 'x86_64') +url="http://mielke.cc/brltty" +license=('GPL' 'LGPL') +depends=('libxaw' 'at-spi>=1.26.0' 'gpm>=1.20.6' 'icu>=4.2' 'python>=2.6.2' 'tcl') +makedepends=('pyrex') +backup=(etc/brltty.conf etc/conf.d/brltty.conf) +options=('!makeflags' '!emptydirs') +source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz + brltty-4.0-api-socket-dir.patch + brltty + brltty.conf) +md5sums=('2862727384a1308dbff3031efb85c41e' + '865062603a4fcdaa34949d0a9de7d743' + '831ebaf0c56091702929c68805d20c4f' + 'a8ab8b3dd059e96e1734bc9cdcf844fc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # Gentoo patch + patch -Np1 -i ${srcdir}/brltty-4.0-api-socket-dir.patch || return 1 + CFLAGS+="${CFLAGS} -D_GNU_SOURCE" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-gpm \ + --disable-java-bindings \ + --disable-caml-bindings + make || return 1 + make INSTALL_ROOT="${pkgdir}" install + install -D -m 755 ${srcdir}/brltty ${pkgdir}/etc/rc.d/brltty + install -D -m 644 ${srcdir}/brltty.conf ${pkgdir}/etc/conf.d/brltty.conf + install -D -m 644 Documents/brltty.conf ${pkgdir}/etc/brltty.conf +} + diff --git a/extra/brltty/brltty b/extra/brltty/brltty new file mode 100755 index 000000000..5ed21a52d --- /dev/null +++ b/extra/brltty/brltty @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name=brltty + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name $brltty_args + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/extra/brltty/brltty-4.0-api-socket-dir.patch b/extra/brltty/brltty-4.0-api-socket-dir.patch new file mode 100644 index 000000000..76af1bd5a --- /dev/null +++ b/extra/brltty/brltty-4.0-api-socket-dir.patch @@ -0,0 +1,13 @@ +--- a/common.mk 2009-07-19 00:44:37.000000000 -0700 ++++ b/common.mk 2009-07-19 00:44:37.000000000 -0700 +@@ -74,8 +74,9 @@ + install-apihdr-directory: + $(INSTALL_DIRECTORY) $(INSTALL_APIHDR_DIRECTORY) + ++INSTALL_API_SOCKET_DIRECTORY = $(INSTALL_ROOT)$(API_SOCKET_DIRECTORY) + install-apisoc-directory: +- -$(INSTALL_DIRECTORY) -m 1777 $(API_SOCKET_DIRECTORY) ++ -$(INSTALL_DIRECTORY) -m 1777 $(INSTALL_API_SOCKET_DIRECTORY) + + clean:: + -rm -f *.$O *.auto.h *.auto.c core implib.a diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf new file mode 100644 index 000000000..94115e1d5 --- /dev/null +++ b/extra/brltty/brltty.conf @@ -0,0 +1,2 @@ +# Specify any arguments to pass to brltty here. +brltty_args="" \ No newline at end of file diff --git a/extra/bs/PKGBUILD b/extra/bs/PKGBUILD new file mode 100644 index 000000000..0fff23dd3 --- /dev/null +++ b/extra/bs/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 9103 2008-08-17 03:48:53Z allan $ +# Maintainer: damir +pkgname=bs +pkgver=2.7 +pkgrel=1 +pkgdesc="The classic game of Battleships against the computer. Ncurses." +arch=('i686' 'x86_64') +url="http://www.catb.org/~esr/bs/" +license=('GPL2') +depends=('ncurses') +source=($url/$pkgname-$pkgver.tar.gz) +md5sums=('5786c6006e503d100e65139dadb5d5a7') + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + + mkdir -p $startdir/pkg/usr/bin + cp bs $startdir/pkg/usr/bin + + mkdir -p $startdir/pkg/usr/share/man/man6 + cp bs.6 $startdir/pkg/usr/share/man/man6/bs.6 + +} diff --git a/extra/bug-buddy/PKGBUILD b/extra/bug-buddy/PKGBUILD new file mode 100644 index 000000000..721889ca8 --- /dev/null +++ b/extra/bug-buddy/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 42376 2009-06-13 13:01:25Z jgc $ +# Maintainer: Jan de Groot + +pkgname=bug-buddy +pkgver=2.26.0 +pkgrel=2 +pkgdesc="A bug reporting tool for GNOME" +arch=(i686 x86_64) +install=bug-buddy.install +depends=('gnome-menus>=2.26.1' 'evolution-data-server>=2.26.2' 'libgtop>=2.26.1' 'libelf' 'gconf>=2.26.0-2') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0') +groups=('gnome-extra') +license=(GPL) +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2 + gcc-4.4.patch) +md5sums=('f92663a1a819f83e3eb3004f9e8a687a' + '1d6eda79b925b9c20ab745999f0ab7ce') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/gcc-4.4.patch" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain bug-buddy ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/bug-buddy/bug-buddy.install b/extra/bug-buddy/bug-buddy.install new file mode 100644 index 000000000..05fb63159 --- /dev/null +++ b/extra/bug-buddy/bug-buddy.install @@ -0,0 +1,22 @@ +pkgname=bug-buddy + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/bug-buddy/gcc-4.4.patch b/extra/bug-buddy/gcc-4.4.patch new file mode 100644 index 000000000..3a288b879 --- /dev/null +++ b/extra/bug-buddy/gcc-4.4.patch @@ -0,0 +1,32 @@ +--- ./google-breakpad/src/processor/postfix_evaluator-inl.h~ 2009-02-26 19:56:48.000000000 -0500 ++++ ./google-breakpad/src/processor/postfix_evaluator-inl.h 2009-06-11 17:27:18.451971694 -0400 +@@ -37,7 +37,7 @@ + #ifndef PROCESSOR_POSTFIX_EVALUATOR_INL_H__ + #define PROCESSOR_POSTFIX_EVALUATOR_INL_H__ + +- ++#include + #include + + #include "processor/postfix_evaluator.h" +--- ./google-breakpad/src/client/linux/handler/exception_handler.cc~ 2009-02-26 19:56:49.000000000 -0500 ++++ ./google-breakpad/src/client/linux/handler/exception_handler.cc 2009-06-11 20:54:54.667061888 -0400 +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + #include "client/linux/handler/exception_handler.h" + #include "common/linux/guid_creator.h" + #include "google_breakpad/common/minidump_format.h" +--- ./google-breakpad/src/client/linux/handler/minidump_generator.cc~ 2009-02-26 19:56:49.000000000 -0500 ++++ ./google-breakpad/src/client/linux/handler/minidump_generator.cc 2009-06-11 21:06:14.963661633 -0400 +@@ -39,6 +39,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD new file mode 100644 index 000000000..b63f17f65 --- /dev/null +++ b/extra/bzflag/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 9690 2008-08-18 07:14:23Z allan $ +# Contributor: Damir Perisa +# Maintainer: Kevin Piche + +pkgname=bzflag +pkgver=2.0.12 +pkgrel=1 +pkgdesc="A multiplayer 3D tank battle game" +depends=('curl>=7.16.2' 'mesa' 'sdl') +arch=('i686' 'x86_64') +license=('LGPL') +options=(!libtool) +url="http://www.bzflag.org" +source=(http://downloads.sourceforge.net/sourceforge/bzflag/$pkgname-$pkgver.tar.bz2) +md5sums=('1228754cac3eaacd4badba5319f47b41') + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$startdir/pkg install + + # gnome menu entry and icon. + cd misc + make + mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps} + install -m644 bzflag.desktop $startdir/pkg/usr/share/applications/bzflag.desktop + install -m644 ../data/bzflag-48x48.png $startdir/pkg/usr/share/pixmaps/bzflag-48x48.png +} diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD new file mode 100644 index 000000000..a2210b9b5 --- /dev/null +++ b/extra/bzr/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 53258 2009-09-27 14:43:13Z hugo $ +# Maintainer: Hugo Doria + +pkgname=bzr +pkgver=2.0.0 +pkgrel=1 +pkgdesc="A decentralized revision control system" +arch=('i686' 'x86_64') +url="http://www.bazaar-vcs.org" +license=('GPL') +depends=('python') +source=(http://launchpad.net/bzr/2.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +md5sums=('2536b0ef26a5110692e7f32d5a3fd91b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's|man/man1|share/man/man1|' setup.py + python setup.py install --prefix=/usr --root=${pkgdir} + + # bash-completion + install -D -m644 contrib/bash/bzr \ + ${pkgdir}/etc/bash_completion.d/bzr +} diff --git a/extra/c-ares/ChangeLog b/extra/c-ares/ChangeLog new file mode 100644 index 000000000..3701b7826 --- /dev/null +++ b/extra/c-ares/ChangeLog @@ -0,0 +1,11 @@ +2008-12-26 Alexander Fehr + + * c-ares-1.6.0-1: + New upstream release. + New maintainer. + Changed url. + Changed download location. + Removed sha1sums. + Built shared libraries. + Updated license file. + Added ChangeLog. diff --git a/extra/c-ares/LICENSE b/extra/c-ares/LICENSE new file mode 100644 index 000000000..e3f5b64fe --- /dev/null +++ b/extra/c-ares/LICENSE @@ -0,0 +1,10 @@ +Copyright 1998 by the Massachusetts Institute of Technology. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and that +the name of M.I.T. not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +M.I.T. makes no representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied warranty. diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD new file mode 100644 index 000000000..38b62b902 --- /dev/null +++ b/extra/c-ares/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 23085 2009-01-02 12:18:45Z alexanderf $ +# Maintainer: Jeff Mickey +# Maintainer: Alexander Fehr + +pkgname=c-ares +pkgver=1.6.0 +pkgrel=1 +pkgdesc="C library that performs DNS requests and name resolves asynchronously" +arch=('i686' 'x86_64') +url="http://c-ares.haxx.se/" +license=('MIT') +depends=('glibc') +options=('!libtool') +source=(http://c-ares.haxx.se/c-ares-$pkgver.tar.gz + LICENSE) +md5sums=('4503b0db3dd79d3c1f58d87722dbab46' + 'c69f2042941b708ce3e7121424d0b7e6') + +build() { + cd "$srcdir/c-ares-$pkgver" + + ./configure --prefix=/usr --enable-shared || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 + + install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/c-ares/LICENSE" || return 1 +} diff --git a/extra/ca-certificates-java/PKGBUILD b/extra/ca-certificates-java/PKGBUILD new file mode 100644 index 000000000..3dfe1d3f3 --- /dev/null +++ b/extra/ca-certificates-java/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: $ +# Maintainer: Jan de Groot + +pkgname=ca-certificates-java +pkgver=20090629 +pkgrel=1 +pkgdesc='Common CA certificates (JKS keystore)' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/c/ca-certificates-java.html' +license=('GPL') +depends=('ca-certificates') +makedepends=('java-runtime') +install=ca-certificates-java.install +source=(jks-keystore.hook init-jks-keystore default) +md5sums=('0b1ad39b6b06d5b6321071e05f2de254' + '8c7c4fee571192291a9537b855a32852' + '0ded97abeff69c2362939e2e881e214a') + +build() { + cd "${srcdir}" + install -d -m755 "${pkgdir}/etc/ca-certificates/update.d" + install -d -m755 "${pkgdir}/etc/ssl/certs/java" + install -d -m755 "${pkgdir}/etc/default" + install -d -m755 "${pkgdir}/usr/share/ca-certificates-java" + install -d -m755 "${pkgdir}/usr/sbin" + + install -m755 jks-keystore.hook "${pkgdir}/etc/ca-certificates/update.d/jks-keystore" || return 1 + install -m600 default "${pkgdir}/etc/default/cacerts" || return 1 + install -m755 init-jks-keystore "${pkgdir}/usr/sbin/" || return 1 + + for crt in `find /usr/share/ca-certificates -name '*.crt' -printf '%P '`; do + alias=`basename $crt .crt | tr A-Z a-z | tr -cs a-z0-9 _` + alias=${alias%*_} + echo "IMPORT: $crt, alias=$alias" + keytool -importcert -trustcacerts -keystore "${pkgdir}/usr/share/ca-certificates-java/cacerts" -storepass 'changeit' -noprompt -alias "$alias" -file "/usr/share/ca-certificates/$crt" || continue + done +} diff --git a/extra/ca-certificates-java/ca-certificates-java.install b/extra/ca-certificates-java/ca-certificates-java.install new file mode 100644 index 000000000..6429e9fbb --- /dev/null +++ b/extra/ca-certificates-java/ca-certificates-java.install @@ -0,0 +1,20 @@ +post_install() { + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do + if [ -x $jvm/bin/keytool ]; then + break + fi + done + if [ -x $jvm/bin/keytool ]; then + /usr/sbin/init-jks-keystore + fi + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + rm -rf /etc/ssl/certs/java +} diff --git a/extra/ca-certificates-java/default b/extra/ca-certificates-java/default new file mode 100644 index 000000000..d03ec9d13 --- /dev/null +++ b/extra/ca-certificates-java/default @@ -0,0 +1,10 @@ +# defaults for ca-certificates-java + +# The password which is used to protect the integrity of the keystore. +# storepass must be at least 6 characters long. It must be provided to +# all commands that access the keystore contents. +# Only change this if adding private certificates. +#storepass='' + +# enable/disable updates of the keystore /etc/ssl/certs/java/cacerts +cacerts_updates=yes diff --git a/extra/ca-certificates-java/init-jks-keystore b/extra/ca-certificates-java/init-jks-keystore new file mode 100755 index 000000000..959b249d2 --- /dev/null +++ b/extra/ca-certificates-java/init-jks-keystore @@ -0,0 +1,74 @@ +#!/bin/bash +for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do + if [ -x $jvm/bin/keytool ]; then + break + fi +done +if [ ! -x $jvm/bin/keytool ]; then + echo "No supported JRE installed" + exit 1 +fi +export JAVA_HOME=$jvm +PATH=$JAVA_HOME/bin:$PATH + +KEYSTORE=/etc/ssl/certs/java/cacerts +storepass='changeit' +if [ -f /etc/default/cacerts ]; then + . /etc/default/cacerts +fi + +echo "creating $KEYSTORE..." +cp /usr/share/ca-certificates-java/cacerts $KEYSTORE +cacertdir=/usr/share/ca-certificates +pregenerated=$(mktemp) +LANG=C LC_ALL=C keytool -list -keystore $KEYSTORE -storepass "$storepass" \ + | awk -F, '/^Certificate fingerprint/ { print s } { s=$1 } ' \ + | sort > $pregenerated + +grep -v -E '^ *$|^#' /etc/ca-certificates.conf | ( \ +errors=0 +log=$(mktemp) +while read line; do + pem=${line#!*} + alias=$(basename $pem .crt | tr A-Z a-z | tr -cs a-z0-9 _) + alias=${alias%*_} + case "$line" in + !*) + if LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \ + -storepass "$storepass" -alias "$alias" > /dev/null + then + echo " removed untrusted certificate $pem" + fi + ;; + + *) + if [ ! -f "$cacertdir/$pem" ]; then + echo >&2 "warning: /etc/ca-certificates.conf lists $pem," + echo >&2 "warning: but $cacertdir/$pem does not exist." + continue + fi + if ! grep -q "^${alias}$" $pregenerated; then + if LANG=C LC_ALL=C keytool -importcert -trustcacerts -keystore $KEYSTORE \ + -noprompt -storepass "$storepass" \ + -alias "$alias" -file "$cacertdir/$pem" > $log 2>&1 + then + echo " added certificate $pem $alias" + elif grep -q 'Signature not available' $log; then + echo " ignored import, signature not available: ${line#+*}" + cat $log + else + echo >&2 " error adding ${line#+*}" + errors=$(expr $errors + 1) + fi + fi + esac +done +rm -f $log + +rm -f $pregenerated +if [ $errors -gt 0 ]; then + echo >&2 "failed." + exit 1 +fi +echo "done." +) diff --git a/extra/ca-certificates-java/jks-keystore.hook b/extra/ca-certificates-java/jks-keystore.hook new file mode 100644 index 000000000..07dcbff72 --- /dev/null +++ b/extra/ca-certificates-java/jks-keystore.hook @@ -0,0 +1,87 @@ +#! /bin/sh + +set -e + +storepass='changeit' +if [ -f /etc/default/cacerts ]; then + . /etc/default/cacerts +fi + +KEYSTORE=/etc/ssl/certs/java/cacerts + +echo "" +if [ "$cacerts_updates" != yes ] || [ "$CACERT_UPDATES" = disabled ]; then + echo "updates of cacerts keystore disabled." + exit 0 +fi + +for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do + if [ -x $jvm/bin/keytool ]; then + break + fi +done + +if [ ! -x $jvm/bin/keytool ]; then + exit 0 +fi + +export JAVA_HOME=$jvm +PATH=$JAVA_HOME/bin:$PATH + +# read lines of the form: [+-]/etc/ssl/certs/*.pem +echo "updating keystore $KEYSTORE..." + +errors=0 +log=$(mktemp) +while read line; do + pem=${line#[+-]*} + alias=$(basename $pem .crt | tr A-Z a-z | tr -cs a-z0-9 _) + alias=${alias%*_} + LANG=C LC_ALL=C keytool -list -keystore $KEYSTORE \ + -storepass "$storepass" -alias "$alias" >/dev/null 2>&1 \ + && exists=yes || exists=no + case "$line" in + +*) + if [ "$exists" = yes ]; then + echo " already exists: ${line#+*}" + else + if LANG=C LC_ALL=C keytool -importcert -trustcacerts \ + -keystore $KEYSTORE -noprompt -storepass "$storepass" \ + -alias "$alias" -file "$pem" > $log 2>&1 + then + echo " added: ${line#+*}" + elif grep -q 'Signature not available' $log; then + echo " ignored import, signature not available: ${line#+*}" + cat $log + else + echo >&2 " error adding ${line#+*}" + errors=$(expr $errors + 1) + fi + fi + ;; + -*) + if [ "$exists" = yes ]; then + if LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \ + -noprompt -storepass "$storepass" \ + -alias "$alias" + then + echo " removed ${line#-*}" + else + echo >&2 " error removing ${line#+*}" + errors=$(expr $errors + 1) + fi + else + echo " does not exist: ${line#-*}" + fi + ;; + *) + echo >&2 " $0: Unknown line $line" + esac +done +rm -f $log + +if [ $errors -gt 0 ]; then + echo >&2 "failed." + exit 1 +fi +echo "done." diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD new file mode 100644 index 000000000..0d91bacfb --- /dev/null +++ b/extra/cairo-perl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 33026 2009-04-03 21:30:33Z jgc $ +# Maintainer: Jan de Groot + +pkgname=cairo-perl +_realname=Cairo +pkgver=1.061 +pkgrel=1 +pkgdesc="Perl wrappers for cairo" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +options=('!emptydirs') +depends=('cairo>=1.8.6' 'perl>=5.10.0') +makedepends=('perl-extutils-depends>=0.300' 'perl-extutils-pkgconfig>=1.11') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('08cd5e847f61858651fc4de769066e88') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + + find "${pkgdir}" -name '.packlist' -delete + find "${pkgdir}" -name 'perllocal.pod' -delete +} diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD new file mode 100644 index 000000000..e8e5bfe75 --- /dev/null +++ b/extra/cairomm/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 46636 2009-07-19 12:44:52Z jgc $ +# Maintainer: Kevin +# Contributor: criminy + +pkgname=cairomm +pkgver=1.8.2 +pkgrel=1 +pkgdesc="C++ bindings to Cairo vector graphics library" +arch=('i686' 'x86_64') +url="http://www.cairographics.org" +license=('LGPL' 'MPL') +depends=('cairo>=1.8.8' 'libsigc++2.0>=2.2.3') +makedepends=('pkgconfig') +source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) +options=('!libtool' '!emptydirs') +md5sums=('24aa46a4f92bdb2af7cd80e6b335f07f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/came/PKGBUILD b/extra/came/PKGBUILD new file mode 100644 index 000000000..eec00e576 --- /dev/null +++ b/extra/came/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 53618 2009-10-03 05:02:00Z eric $ +# Maintainer: Alexander Baldeck +# Contributor: Curtis Campbell +# Contributor: dorphell + +pkgname=came +pkgver=1.9 +pkgrel=5 +pkgdesc="Replacement for xawtv webcam application" +arch=(i686 x86_64) +license=('GPL') +url='http://linuxbrit.co.uk/camE/' +depends=('giblib' 'curl>=7.19.6') +source=(ftp://ftp.archlinux.org/other/came/camE-${pkgver}.tar.gz + came-1.9-curl-friendly.patch) +md5sums=('8bdc049b01cd32088eef8cccf3c096ab' 'e0f1375b7a554e11c1d161d5112dd53d') +sha1sums=('1718ff0662a3183fd8386711bb4b9195abbd170f' '9b9615d07081331ba51ca8d460b82fa6f6e3a3e3') + +build() { + cd "${srcdir}/camE-${pkgver}" + patch -Np1 -i "${srcdir}/came-1.9-curl-friendly.patch" || return 1 + sed -i 's|#define VERSION "1.7"|#define VERSION "1.7"\n#define TRUE 1\n#define FALSE 0|' webcam.c || return 1 + make || return 1 + + install -m755 -d "${pkgdir}/usr/bin" + install -m755 -d "${pkgdir}/usr/share/came" + + install -m755 camE "${pkgdir}/usr/bin/" || return 1 + install -m644 example.camErc "${pkgdir}/usr/share/came/camErc" || return 1 + install -m644 example.camErc.ssh "${pkgdir}/usr/share/came/camErc.ssh" || return 1 +} diff --git a/extra/came/came-1.9-curl-friendly.patch b/extra/came/came-1.9-curl-friendly.patch new file mode 100644 index 000000000..028c56e22 --- /dev/null +++ b/extra/came/came-1.9-curl-friendly.patch @@ -0,0 +1,11 @@ +--- camE-1.9/webcam.c.orig 2007-04-17 22:33:33.000000000 +1000 ++++ camE-1.9/webcam.c 2007-04-17 22:36:34.000000000 +1000 +@@ -987,8 +987,6 @@ + /* shut up completely */ + if (ftp_debug) + curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1); +- else +- curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1); + + curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1); + diff --git a/extra/camsource/PKGBUILD b/extra/camsource/PKGBUILD new file mode 100644 index 000000000..0959f3249 --- /dev/null +++ b/extra/camsource/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 44474 2009-07-02 06:57:29Z allan $ +# Maintainer: roberto +pkgname=camsource +pkgver=0.7.0 +pkgrel=5 +pkgdesc="Grabs images from a v4l device and makes them available to various plugins for processing or handling." +arch=('i686' 'x86_64') +url="http://camsource.sourceforge.net/" +license=('GPL2') +depends=('libxml2' 'libjpeg>=7') +backup=('etc/camsource.conf') +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 \ + mod_handle.c.patch) +md5sums=('ffd824f13f99011984399fc3b7526c71' 'a8fabaf271b6f575c6e957573908c529') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np0 -i $srcdir/mod_handle.c.patch || return 1 + ./configure --prefix=/usr --sysconfdir=/etc || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + mv $pkgdir/etc/camsource.conf.example $pkgdir/etc/camsource.conf +} diff --git a/extra/camsource/mod_handle.c.patch b/extra/camsource/mod_handle.c.patch new file mode 100644 index 000000000..25e2d52fc --- /dev/null +++ b/extra/camsource/mod_handle.c.patch @@ -0,0 +1,14 @@ +--- src/mod_handle.c.old 2005-01-31 11:16:10.000000000 +0000 ++++ src/mod_handle.c 2005-01-31 11:27:25.000000000 +0000 +@@ -303,10 +303,9 @@ + for (i = 0; i < MAX_MODULES; i++) + { + if (modules[i].dlhand == dlh) +- goto inuse; /* break */ ++ break; + } + dlclose(dlh); +-inuse: + } + } + diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD new file mode 100644 index 000000000..ef17ea041 --- /dev/null +++ b/extra/capi4hylafax/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 39442 2009-05-16 20:41:27Z tpowa $ +#Maintainer: Tobias Powalowski + +pkgname=capi4hylafax +pkgver=010300 +pkgrel=3 +pkgdesc="capi plugin for hylafax to enable isdn faxing" +arch=(i686 x86_64) +url="ftp://ftp.avm.de/tools" +license=('GPL') +depends=('glibc' 'capi4k-utils' 'hylafax' 'gcc-libs' 'libtiff') +source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz + config.faxCAPI capi4hylafax.rc) +md5sums=('d37dc652ac80d1525ef8693be55ee67f' '653b60695d21c128f020a86274ca9192'\ + '1fe40c58289fa3ba625ce6fe2fdb3d07') +install=capi4hylafax.install +backup=(var/spool/hylafax/etc/config.faxCAPI) +build() { + cd $srcdir/$pkgname-01.03.00 +# fix config file + sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in || return 1 + ./configure || return 1 + make || return 1 + install -m755 -D src/faxsend/c2faxsend $pkgdir/usr/bin/c2faxsend + install -m755 -D src/faxrecv/c2faxrecv $pkgdir/usr/bin/c2faxrecv + install -m755 -D setupconffile $pkgdir/usr/bin/c2faxaddmodem + install -m644 -D $srcdir/config.faxCAPI $pkgdir/var/spool/hylafax/etc/config.faxCAPI + install -m755 -D $srcdir/capi4hylafax.rc $pkgdir/etc/rc.d/capi4hylafax +# adding FIFO + mkfifo $pkgdir/var/spool/hylafax/FIFO.faxCAPI + chown 10 $pkgdir/var/spool/hylafax/FIFO.faxCAPI + chgrp 14 $pkgdir/var/spool/hylafax/FIFO.faxCAPI + chmod 0600 $pkgdir/var/spool/hylafax/FIFO.faxCAPI + mkdir -p $pkgdir/etc/udev/rules.d +# fix /var/spool/hylafax permission + chown 10 $pkgdir/var/spool/hylafax + chgrp 14 $pkgdir/var/spool/hylafax +# adding udev rule + mkdir -p $pkgdir/lib/udev/rules.d +cat << EOF >> $pkgdir/lib/udev/rules.d/53-capi4hylafax.rules +# CAPI devices +KERNEL="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp" +KERNEL="capi*", NAME="capi/%n", GROUP="uucp" +EOF +# fix c2faxadd + sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' $pkgdir/usr/bin/c2faxaddmodem || return 1 + echo "main_config_dialog" >> $pkgdir/usr/bin/c2faxaddmodem +} diff --git a/extra/capi4hylafax/capi4hylafax.install b/extra/capi4hylafax/capi4hylafax.install new file mode 100644 index 000000000..20c2d8f63 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax.install @@ -0,0 +1,16 @@ +post_install() { +cat << EOF +For more information about setting up the package, please have a look here: +"http://wiki.archlinux.org/index.php/capi4hylafax" +EOF +} + +post_upgrade() { + post_install $1 +} + +post_remove() { +cat << EOF +Please remove your additions to /var/spool/hylafax/etc/config +EOF +} diff --git a/extra/capi4hylafax/capi4hylafax.rc b/extra/capi4hylafax/capi4hylafax.rc new file mode 100755 index 000000000..51025b020 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax.rc @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/c2faxrecv` +case "$1" in + start) + stat_busy "Starting capi4hylafax" + if [ -z "$PID" ]; then + /usr/bin/c2faxrecv > /dev/null & + faxmodem faxCAPI + fi + if [ ! -f /var/run/faxq.pid ]; then + stat_fail + echo "ERROR: hylafax is not running" + exit 1 + fi + if [ ! -f /var/run/hfaxd.pid ]; then + stat_fail + echo "ERROR: hylafax is not running" + exit 1 + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon capi4hylafax + stat_done + fi + ;; + stop) + stat_busy "Stopping capi4hylafax" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon capi4hylafax + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/capi4hylafax/config.faxCAPI b/extra/capi4hylafax/config.faxCAPI new file mode 100644 index 000000000..b2137757a --- /dev/null +++ b/extra/capi4hylafax/config.faxCAPI @@ -0,0 +1,397 @@ +# +# EDIT THIS CONFIGURATION TO REFLECT YOUR SETUP +# + +# Grundsätzliches: +# - Es gibt für jeden Wert einen Standardzustand (default), sodass jede Zeile +# der Datei oder auch das komplette Configfile ausgelassen werden kann. +# - Es gibt ausschließlich ein Configfile, in dem alle nötigen Angaben für +# "c2faxsend/-receive" eingetragen werden können. +# - Werden für HylaFAX mehrere virtuelle Geräte (devices) angelegt, muss es +# für jedes Device ein Configfile im Format config.[DeviceName] geben. +# Dessen Existenz wird von HylaFAX überprüft. Ohne dieses File kann die +# Arbeit mit dem Device nicht aufgenommen werden. Die Existenz einer +# solchen Datei kann am einfachsten durch einen Link auf dieses ConfigFile +# oder ein minimales "dummy"-ConfigFile nachgewiesen werden. +# +# Basics: +# - There is a default condition for each value, such that each line of the +# file or the complete configfile can be left out. +# - There is only one configfile in which all information required for +# "c2faxsend/-receive" can be entered. +# - If multiple virtual devices are created for HylaFAX, there must be a +# Configfile in the format config.[DeviceName] for each device. HylaFAX +# checks that this file exists. Without this file, it is not possible to +# start working with the device. The easiest way to establish the existence +# of such a file is to create a link to this ConfigFile or a minimum +# "dummy" ConfigFile. + + +# "SpoolDir" gibt den Pfad an, unter dem im HylaFAX-kompatiblen Betrieb die +# HylaFAX-Dateien zu finden sind oder unter dem im Stand-Alone-Betrieb die +# empfangenen Faxe gespeichert werden sollen. Im HylaFAX-kompatiblen Betrieb +# werden die Faxe im Verzeichnis $(SpoolDir)/recvq gespeichert. +# +# "SpoolDir" indicates the path in which the HylaFAX are located in HylaFAX- +# compatible operation or in which received faxes are to be saved in +# stand-alone operation. In HylaFAX-compatible operation, faxes are saved in +# the directory $(SpoolDir)/recvq. +# +# default /var/spool/hylafax +# +SpoolDir: /var/spool/hylafax + + +# "FaxRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein Fax +# empfangen wurde. Im Stand-Alone-Betrieb werden andere Parameter +# übergeben als für HylaFAX (mehr dazu im sample_faxrcvd). +# +# "FaxRcvdCmd" indicates the script performed whenever a fax is +# received. Parameters other than the ones for HylaFAX are returned in +# stand-alone operation (see sample_faxrcvd for more information). +# +# default /var/spool/hylafax/bin/faxrcvd +# +FaxRcvdCmd: /var/spool/hylafax/bin/faxrcvd + + +# "PollRcvdCmd" gibt das Skript an, das ausgeführt wird, sobald ein +# Fax per Faxabruf empfangen wurde. Im Stand-Alone-Betrieb werden +# andereParameter übergeben als für HylaFAX (mehr dazu im +# sample_faxrcvd). +# +# "PollRcvdCmd" indicates the script performed whenever a fax was +# received by fax polling. Parameters other than the ones for HylaFAX +# are returned in stand-alone operation (see sample_faxrcvd for more +# information). +# +# default /var/spool/hylafax/bin/pollrcvd +# +PollRcvdCmd: /var/spool/hylafax/bin/pollrcvd + + +# "FaxReceiveUser" ist der User, als der c2faxrecv ausgeführt wird. +# Die Änderung des Users kann nur vom Superuser bzw. "root" erfolgen. Sollte +# c2faxrecv von einem anderen User gestartet werden, wird dieser Eintrag +# ignoriert. Hier einen anderen als den Hylafax-Standardwert "uucp" +# einzutragen ist dann sinnvoll, wenn beispielsweise die Rechte von +# /dev/capi20 nicht geändert werden sollen oder Ihre Linux-Distribution einen +# anderen User voraussetzt. +# +# "FaxReceiveUser" is the user when c2faxrecv is run. This user can be +# changed only by the Superuser or "root" user. If c2faxrecv is started by +# another user, this entry will be ignored. Here it is a good idea to enter a +# value other than the hylafax default value "uucp", for instance, if the +# rights of /dev/capi20 are not to be changed or your Linux distribution +# requires another user. +# +# default "" +# +FaxReceiveUser: uucp +FaxReceiveGroup: uucp + + +# Im "LogFile" werden Informationen über den Faxablauf abgespeichert. +# +# Information about the order of events in faxing are saved in the "LogFile". +# +# default "" +# +LogFile: /var/spool/hylafax/log/capi4hylafax + + +# Der Befehl "LogTraceLevel" gibt die Menge der Daten an, die in ein LogFile +# geschrieben werden. Die Spanne reicht von 0 = nichts bis 4 = vieles. +# +# The "LogTraceLevel" command indicates the amount of data written in a +# LogFile. The range goes from 0 = nothing to 4 = many. +# +# default 0 +# +LogTraceLevel: 0 + + +# "LogFileMode" sind die Angaben (mode), aufgrund derer sowohl das gerade +# erwähnte LogFile als auch die LogFiles für HylaFAX angelegt werden. +# +# "LogFileMode" is the mode, on the basis of which both the LogFile just +# mentioned and the LogFiles for HylaFAX are generated. +# +# default 0600 +# +LogFileMode: 0600 + + +# Die geschweiften Klammern geben Anfang und Ende einer Section an. +# Jede Section darf eine oder mehrere SubSections enthalten. +# SubSubSections sind nicht erlaubt. +# Dabei enthält die Section Angaben zu einem virtuellen Device; +# die Subsection die Angaben für die Rufannahme jedes Controllers. +# Es können beliebig viele Sections und, darin enthalten, jeweils beliebig +# viele Subsections erzeugt werden. +# Jede Section muss aber einen anderen HylafaxDeviceName erhalten; +# zusätzlich muss in jeder Subsection innerhalb einer Section ein anderer +# Controller aufgeführt werden. Beim Stand-Alone-Betrieb ist eine Section mit +# entsprechend vielen Subsections ausreichend, da in diesem Betriebsmodus die +# virtuellen DeviceNamen keine Rolle spielen. +# +# The curved brackets indicate the beginning and end of a section. +# Each section may contain one or more subsections. +# SubSubSections are not permitted. +# The section contains information about a virtual device; the subsection the +# call acceptance information for each controller. +# Any number of sections containing any number of subsections may be +# generated, but each section must receive a different HylafaxDeviceName; and +# a different controller must be listed in every subsection within a section. +# For stand-alone operation, it is sufficient to have just one section with +# as many subsections as required, since virtual DeviceNames do not play +# any role in this mode of operation. +# +{ + + # "HylafaxDeviceName" ist der Name, unter dem sich C4H bei HylaFAX als + # "virtuelles Modem" anmeldet. Sollen für HylaFAX mehrere dieser "Modems" + # erzeugt werden, legen Sie einfach eine neue Section mit einem anderen + # HylafaxDeviceName an. + # + # "HylafaxDeviceName" is the name, under which C4H registers in HylaFAX as + # a "virtual modem". If multiple "modems" are to be generated for HylaFAX, + # simply create a new section with another HylafaxDeviceName. + # + # default faxCAPI + # + HylafaxDeviceName: faxCAPI + + + # "RecvFileMode" ist der Mode, in dem empfangene Faxe abgespeichert + # werden. User und Group der Datei wird durch FaxReceiveUser (s.o.) + # festgelegt. + # + # "RecvFileMode" is the mode, in which received faxes are saved. User and + # Group of the file are determined by the FaxReceiveUser (see above). + # + # default 0600 + # + RecvFileMode: 0600 + + + # "FAXNumber" ist die eigene Nummer des Computers und wird der Gegenseite + # mitgeteilt (sichtbar z. B. im Fax-Journal). + # + # "FAXNumber" is the fax number of the computer itself and is transmitted + # to the remote site (visible in the Fax Journal). + # + # default "" + # + FAXNumber: +49.00.00000 + + + # "LocalIdentifier" ist der von CAPI aus konfigurierbare Teil der + # Kopfzeile. Ein leerer Eintrag führt dazu, dass keine Fax-Kopfzeile + # eingefügt wird. + # + # "LocalIdentifier" is the part of the fax header which can be configured + # from CAPI. An empty entry specifies an empty header. + # + # default "" + # + LocalIdentifier: "AVM CAPI4HylaFAX" + + + # Die maximale Anzahl von gleichzeitig empfangbaren Faxen kann + # durch "MaxConcurrentRecvs" angepaßt werden. Diese Anzahl wird + # durch die Anzahl der durch die Hardware zur Verfügung + # gestellten B-Kanäle begrenzt. + # + # The maximum number of faxes that can be received at the same + # time can be adjusted using "MaxConcurrentRecvs". This number + # is limited by the number of B channels provided by the hardware. + # + # default 2 + # + MaxConcurrentRecvs: 2 + + + # ----------- outgoing params ----------- + + # "OutgoingController" gibt den Controller an, über den eine externe + # Verbindung aufgebaut werden soll. + # + # "OutgoingController" indicates the controller which is to be used to + # establish an external connection. + # + # default 1 + # + OutgoingController: 1 + + + # Die "OutgoingMSN" ist die MSN, die für ausgehenden Faxe benutzt wird. + # + # The "OutgoingMSN" is the MSN used for outgoing faxes. + # + # default "" + # + OutgoingMSN: + + + # CLIR (Rufnummernunterdrückung) kann über "SuppressMSN" und den Wert (0) + # abgeschaltet oder mit dem Wert (1) erneut angeschaltet werden. + # + # CLIR (Calling Line Identification Restriction) can be switched off using + # the value (0) or switched back on by entering the value (1). + # + # default 0 + # + SuppressMSN: 0 + + + # "NumberPrefix" wird vor jede Telefonnummer gestellt. Dies ist bei + # Nebenstellenanlagen wichtig, bei denen für den Aufbau einer externen + # Verbindung eine Ziffer vorgewählt werden muss. + # + # "NumberPrefix" is set to precede each telephone number. This is + # important for PBX systems which require that a number be dialed to + # obtain an outside line. + # + # default "" + # + NumberPrefix: + + + # Wenn der Wert in "UseISDNFaxService" = 1 ist, wird ein ausgehender Ruf + # mit der ISDN-FAX-G3 Dienstekennung aufgebaut. Bei 0 wird eine 3.1kHz + # Audio-Verbindung hergestellt. + # + # When in "UseISDNFaxService" the value is = 1, an outoing call will be + # established using the ISDN-FAX-G3 service indicator. For 0, a 3.1kHz + # audio connection is established. + # + # default 0 + # + UseISDNFaxService: 0 + + + # Gibt die Dauer in Sekunden an, die auf eine Verbindungsannahme durch die + # Gegenseite gewartet wird. So wird beim Faxversand nicht automatisch die + # gesamte von der Telekom vorgegebene Wartezeit genutzt. Eine Angabe des + # Wertes 0 nutzt die gesamte Wartezeit. + # + # The duration in seconds you wait for the remote site to accept your + # outgoing call In this way you do not have to use the entire ringing + # duration preset by the telephone company. The default value 0 uses the + # entire ringing duration. + # + # default 0 + # + RingingDuration: 0 + + + # ----------- incoming params ----------- + { + + # Controller, für den diese Subsection gilt. + # + # Controller for which this subsection is valid. + # + # default 1 + # + Controller: 1 + + + # Wenn "AcceptSpeech" auf 1 steht, wird auch die Dienstekennung + # "Sprache" angenommen. + # + # If "AcceptSpeech" is set to 1, the service indicator "Voice" also + # will be accepted. + # + # default 0 + # + AcceptSpeech: 1 + + + # Sofern man DDI nutzen will, sollte man "UseDDI" auf 1 stellen. + # + # If DDI is to be used, "UseDDI" should be set to a value of 1. + # + # default 0 + # + UseDDI: 0 + + + # Die DDI-Stammnummer wird bei "DDIOffset" eingetragen. + # Der Standardwert führt zu keinem korrekten Ergebnis und + # sollte, sofern "UseDDI" auf 1 gestellt wurde, immer + # verändert werden. + # + # "DDIOffset" indicates the DDI offset number which precedes + # extension number. Because the default value can't guarantee + # a correct result, this value should be modified whenever + # "UseDDI" is set to 1. + # + # default "" + # + DDIOffset: "12345" + + + # "DDILength" gibt die Anzahl der Durchwahlziffern an. (Diese Ziffern + # werden lediglich als Teil der Empfängernummer mitgeteilt.) Der + # Standardwert sollte bei Verwendung von DDI ebenfalls angepasst + # werden. + # + # "DDILength" indicates the number of digits in the extension. (These + # numbers are only used as a component of the recipient's number.) The + # default value should be adapted whenever DDI is used. + # + # default 0 + # + DDILength: 3 + + + # Bei "IncomingDDIs" können in einer durch Komma getrennten Liste alle + # Durchwahlziffern (DDIs) angegeben werden, für die Rufe angenommen + # werden sollen. Eine Bereichsangabe ist auch möglich (z.B. 100-300), + # wobei aber keine offenen Bereiche (z.B. -100) erlaubt sind. + # Sofern IncommingDDIs gesetzt ist, wird DDILength ignoriert. + # + # In "IncomingDDIs", all extension numbers (DDIs) for which calls are + # to be accepted may be listed, separated by commas. It is also + # possible to specify a range (e.g. 100-300); here no open ranges are + # permitted (e.g. -100). When the "IncomingDDIs" switch is set, the + # parameters for DDILength will be ignored. + # + # default "" + # + IncomingDDIs: + + + # Bei "IncomingMSNs" können in einer durch Komma getrennten Liste alle + # MSNs angegeben werden, für die Rufe angenommen werden sollen. Ist + # die Liste leer, werden alle Rufe auf ISDN FAX G3, 3,1kHz Audio und + # eventuell "Sprache" angenommen. + # Wenn "UseDDI" auf 1 gestellt ist, wird "IncomingMSNs" ignoriert. + # + # In "IncomingMSNs", all MSNs for which calls are to be accepted may + # be listed, separated by commas. When the list is empty, all calls + # are accepted for ISDN FAX G3, 3,1kHz audio and perhaps "Voice". + # When "UseDDI" is set to 1, "IncomingMSNs" is ignored. + # + # default "" + # + IncomingMSNs: + + + # Wenn "AcceptGlobalCall" auf 1 steht, werden auch Calls ohne + # Zielrufnummer (ohne MSN) angenommen. + # Notwendig hinter einigen Telefonanlagen, die keine Zielrufnummer + # senden. + # + # If "AcceptGlobalCall" is set to 1, calls without Called Party + # Number also will be accepted. + # Needed on internal ports of some PBX. + # + # default 1 + # + AcceptGlobalCall: 1 + } +} + diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD new file mode 100644 index 000000000..a2610a96f --- /dev/null +++ b/extra/capi4k-utils/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 39034 2009-05-11 08:28:48Z tpowa $ +#Maintainer: Tobias Powalowski + +pkgname=capi4k-utils +pkgver=050718 +pkgrel=7 +pkgdesc="capi utils for isdn cards" +arch=(i686 x86_64) +license=('GPL2') +url="ftp://ftp.in-berlin.de/pub/capi4linux/" +makedepends=('ppp') +depends=('glibc' 'bash') +backup=(etc/capi.conf) +source=(ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz + ppp-2.4.4.patch + config + capi.conf + capiinit.rc + capi-compile.patch) +options=(!libtool) +md5sums=('c745759b6b3d64e19763727176648cdf' + 'c5416b8b1b76a82c4bcaad76140369e1' + '146aa9e06588511c447d7e81dafec86a' + 'c88940f0ace5759b7a0e8b267ca77ce2' + 'aa59439a70299290a4d9bcdfaeafed72' + '4fa27c5b7b1ee60524fce875bb54bca8') + +build() { + cd $srcdir/$pkgname + patch -Np1 -i ../ppp-2.4.4.patch || return 1 + # fix compiling with gcc 4.2 + patch -Np1 -i ../capi-compile.patch || return 1 + cp ../config .config + # fix pppd plugin + sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $startdir/src/$pkgname/pppdcapiplugin/Makefile + # patch all Makefile.* and Rules.make to use our CFLAGS + sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make + # Arch64 fix from Gentoo + # patch capi20/Makefile.* to use -fPIC for shared library + [ "$CARCH" = "x86_64" ] && (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.* || return 1) + cd capi20 + aclocal + libtoolize --copy --force + cd $srcdir/$pkgname + make subconfig || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -m755 -D $srcdir/capiinit.rc $pkgdir/etc/rc.d/capiinit + install -m644 $srcdir/capi.conf $pkgdir/etc + cd $pkgdir/usr/lib + ln -s libcapi20 libcapi20.so.2 + # fix wrong manpage permission + chmod 644 $pkgdir/usr/share/man/man8/capiplugin.8 +} diff --git a/extra/capi4k-utils/capi-compile.patch b/extra/capi4k-utils/capi-compile.patch new file mode 100644 index 000000000..e6b3acb3b --- /dev/null +++ b/extra/capi4k-utils/capi-compile.patch @@ -0,0 +1,10 @@ +--- capi4k-utils/capi20/capi20.h~ 2000-11-19 11:15:01.000000000 +0100 ++++ capi4k-utils/capi20/capi20.h 2007-11-12 12:07:30.000000000 +0100 +@@ -21,6 +21,7 @@ + #define __CAPI20_H__ + + #include ++#include + + #ifdef __cplusplus + extern "C" { diff --git a/extra/capi4k-utils/capi.conf b/extra/capi4k-utils/capi.conf new file mode 100644 index 000000000..c6b35751f --- /dev/null +++ b/extra/capi4k-utils/capi.conf @@ -0,0 +1,14 @@ +# card file proto io irq mem cardnr options +#b1isa b1.t4 DSS1 0x150 7 - - P2P +#b1pci b1.t4 DSS1 - - - - +#c4 c4.bin DSS1 - - - - +#c4 - DSS1 - - - - +#c4 - DSS1 - - - - P2P +#c4 - DSS1 - - - - P2P +#c2 c2.bin DSS1 - - - - +#c2 - DSS1 - - - - +#t1isa t1.t4 DSS1 0x340 9 - 0 +#t1pci t1.t4 DSS1 - - - - +#fcpci - - - - - - +#fcclassic - - 0x150 10 - - +#fcpcmcia - - - - - - \ No newline at end of file diff --git a/extra/capi4k-utils/capiinit.rc b/extra/capi4k-utils/capiinit.rc new file mode 100755 index 000000000..841be67f3 --- /dev/null +++ b/extra/capi4k-utils/capiinit.rc @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/capiinit` +case "$1" in + start) + stat_busy "Starting capiinit" + [ -f /proc/capi/capi20 ] || /sbin/modprobe -s capi + + CNT=0 # wait for udev + while [ ! -e /dev/capi20 -a $CNT -lt 10 ]; do + sleep 1; : $((CNT++)) + done + + if [ -z "$PID" ]; then + /usr/sbin/capiinit 2>/dev/null start + fi + + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon capiinit + stat_done + fi + ;; + stop) + stat_busy "Stopping capiinit" + /usr/sbin/capiinit 2>/dev/null stop + /sbin/modprobe -sqr capi + rm_daemon capiinit + stat_done + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/capi4k-utils/config b/extra/capi4k-utils/config new file mode 100644 index 000000000..6ca0dfd61 --- /dev/null +++ b/extra/capi4k-utils/config @@ -0,0 +1,11 @@ +# +# Automatically generated by make menuconfig: don't edit +# +CONFIG_KERNELDIR='/usr/src/$(uname -r)' +CONFIG_BINDIR='/usr/bin' +CONFIG_SBINDIR='/usr/sbin' +CONFIG_MANDIR='/usr/share/man' +CONFIG_AVMCAPICTRL=y +CONFIG_CAPIFAX=y +CONFIG_RCAPID=y +CONFIG_PPPDCAPIPLUGIN=y diff --git a/extra/capi4k-utils/ppp-2.4.4.patch b/extra/capi4k-utils/ppp-2.4.4.patch new file mode 100644 index 000000000..24a06a63b --- /dev/null +++ b/extra/capi4k-utils/ppp-2.4.4.patch @@ -0,0 +1,1874 @@ +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/Makefile 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,14 @@ ++# Makefile for the capiplugin for pppd(8). ++# ++# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de) ++# Copyright 2000 AVM GmbH Berlin (info@avm.de) ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License ++# as published by the Free Software Foundation; either version ++# 2 of the License, or (at your option) any later version. ++ ++PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) ++ ++include $(TOPDIR)/Rules.make ++ +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/patchlevel.h 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,4 @@ ++/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */ ++ ++#define VERSION "2.4.4" ++#define DATE "28 June 2006" +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4/pppd/pppd.h 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,909 @@ ++/* ++ * pppd.h - PPP daemon global declarations. ++ * ++ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name "Carnegie Mellon University" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For permission or any legal ++ * details, please contact ++ * Office of Technology Transfer ++ * Carnegie Mellon University ++ * 5000 Forbes Avenue ++ * Pittsburgh, PA 15213-3890 ++ * (412) 268-4387, fax: (412) 268-7395 ++ * tech-transfer@andrew.cmu.edu ++ * ++ * 4. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by Computing Services ++ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." ++ * ++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE ++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ ++ */ ++ ++/* ++ * TODO: ++ */ ++ ++#ifndef __PPPD_H__ ++#define __PPPD_H__ ++ ++#include /* for FILE */ ++#include /* for NGROUPS_MAX */ ++#include /* for MAXPATHLEN and BSD4_4, if defined */ ++#include /* for u_int32_t, if defined */ ++#include /* for struct timeval */ ++#include ++#include "patchlevel.h" ++ ++#if defined(__STDC__) ++#include ++#define __V(x) x ++#else ++#include ++#define __V(x) (va_alist) va_dcl ++#define const ++#define volatile ++#endif ++ ++#ifdef INET6 ++#include "eui64.h" ++#endif ++ ++/* ++ * Limits. ++ */ ++ ++#define NUM_PPP 1 /* One PPP interface supported (per process) */ ++#define MAXWORDLEN 1024 /* max length of word in file (incl null) */ ++#define MAXARGS 1 /* max # args to a command */ ++#define MAXNAMELEN 256 /* max length of hostname or name for auth */ ++#define MAXSECRETLEN 256 /* max length of password or secret */ ++ ++/* ++ * Option descriptor structure. ++ */ ++ ++typedef unsigned char bool; ++ ++enum opt_type { ++ o_special_noarg = 0, ++ o_special = 1, ++ o_bool, ++ o_int, ++ o_uint32, ++ o_string, ++ o_wild ++}; ++ ++typedef struct { ++ char *name; /* name of the option */ ++ enum opt_type type; ++ void *addr; ++ char *description; ++ unsigned int flags; ++ void *addr2; ++ int upper_limit; ++ int lower_limit; ++ const char *source; ++ short int priority; ++ short int winner; ++} option_t; ++ ++/* Values for flags */ ++#define OPT_VALUE 0xff /* mask for presupplied value */ ++#define OPT_HEX 0x100 /* int option is in hex */ ++#define OPT_NOARG 0x200 /* option doesn't take argument */ ++#define OPT_OR 0x400 /* OR in argument to value */ ++#define OPT_INC 0x800 /* increment value */ ++#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */ ++#define OPT_PRIV 0x1000 /* privileged option */ ++#define OPT_STATIC 0x2000 /* string option goes into static array */ ++#define OPT_LLIMIT 0x4000 /* check value against lower limit */ ++#define OPT_ULIMIT 0x8000 /* check value against upper limit */ ++#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) ++#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ ++#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ ++#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ ++#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */ ++#define OPT_NOINCR 0x20000 /* value mustn't be increased */ ++#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ ++#define OPT_PRIO 0x80000 /* process option priorities for this option */ ++#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ ++#define OPT_ALIAS 0x200000 /* option is alias for previous option */ ++#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ ++#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ ++#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ ++#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ ++#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ ++#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ ++#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) ++#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ ++#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ ++#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ ++ ++#define OPT_VAL(x) ((x) & OPT_VALUE) ++ ++/* Values for priority */ ++#define OPRIO_DEFAULT 0 /* a default value */ ++#define OPRIO_CFGFILE 1 /* value from a configuration file */ ++#define OPRIO_CMDLINE 2 /* value from the command line */ ++#define OPRIO_SECFILE 3 /* value from options in a secrets file */ ++#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */ ++ ++#ifndef GIDSET_TYPE ++#define GIDSET_TYPE gid_t ++#endif ++ ++/* Structure representing a list of permitted IP addresses. */ ++struct permitted_ip { ++ int permit; /* 1 = permit, 0 = forbid */ ++ u_int32_t base; /* match if (addr & mask) == base */ ++ u_int32_t mask; /* base and mask are in network byte order */ ++}; ++ ++/* ++ * Unfortunately, the linux kernel driver uses a different structure ++ * for statistics from the rest of the ports. ++ * This structure serves as a common representation for the bits ++ * pppd needs. ++ */ ++struct pppd_stats { ++ unsigned int bytes_in; ++ unsigned int bytes_out; ++ unsigned int pkts_in; ++ unsigned int pkts_out; ++}; ++ ++/* Used for storing a sequence of words. Usually malloced. */ ++struct wordlist { ++ struct wordlist *next; ++ char *word; ++}; ++ ++/* An endpoint discriminator, used with multilink. */ ++#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */ ++struct epdisc { ++ unsigned char class; ++ unsigned char length; ++ unsigned char value[MAX_ENDP_LEN]; ++}; ++ ++/* values for epdisc.class */ ++#define EPD_NULL 0 /* null discriminator, no data */ ++#define EPD_LOCAL 1 ++#define EPD_IP 2 ++#define EPD_MAC 3 ++#define EPD_MAGIC 4 ++#define EPD_PHONENUM 5 ++ ++typedef void (*notify_func) __P((void *, int)); ++ ++struct notifier { ++ struct notifier *next; ++ notify_func func; ++ void *arg; ++}; ++ ++/* ++ * Global variables. ++ */ ++ ++extern int hungup; /* Physical layer has disconnected */ ++extern int ifunit; /* Interface unit number */ ++extern char ifname[]; /* Interface name */ ++extern char hostname[]; /* Our hostname */ ++extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ ++extern int devfd; /* fd of underlying device */ ++extern int fd_ppp; /* fd for talking PPP */ ++extern int phase; /* Current state of link - see values below */ ++extern int baud_rate; /* Current link speed in bits/sec */ ++extern char *progname; /* Name of this program */ ++extern int redirect_stderr;/* Connector's stderr should go to file */ ++extern char peer_authname[];/* Authenticated name of peer */ ++extern int auth_done[NUM_PPP]; /* Methods actually used for auth */ ++extern int privileged; /* We were run by real-uid root */ ++extern int need_holdoff; /* Need holdoff period after link terminates */ ++extern char **script_env; /* Environment variables for scripts */ ++extern int detached; /* Have detached from controlling tty */ ++extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */ ++extern int ngroups; /* How many groups valid in groups */ ++extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */ ++extern int link_stats_valid; /* set if link_stats is valid */ ++extern unsigned link_connect_time; /* time the link was up for */ ++extern int using_pty; /* using pty as device (notty or pty opt.) */ ++extern int log_to_fd; /* logging to this fd as well as syslog */ ++extern bool log_default; /* log_to_fd is default (stdout) */ ++extern char *no_ppp_msg; /* message to print if ppp not in kernel */ ++extern volatile int status; /* exit status for pppd */ ++extern bool devnam_fixed; /* can no longer change devnam */ ++extern int unsuccess; /* # unsuccessful connection attempts */ ++extern int do_callback; /* set if we want to do callback next */ ++extern int doing_callback; /* set if this is a callback */ ++extern int error_count; /* # of times error() has been called */ ++extern char ppp_devnam[MAXPATHLEN]; ++extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ ++extern int ppp_session_number; /* Session number (eg PPPoE session) */ ++extern int fd_devnull; /* fd open to /dev/null */ ++ ++extern int listen_time; /* time to listen first (ms) */ ++extern bool doing_multilink; ++extern bool multilink_master; ++extern bool bundle_eof; ++extern bool bundle_terminating; ++ ++extern struct notifier *pidchange; /* for notifications of pid changing */ ++extern struct notifier *phasechange; /* for notifications of phase changes */ ++extern struct notifier *exitnotify; /* for notification that we're exiting */ ++extern struct notifier *sigreceived; /* notification of received signal */ ++extern struct notifier *ip_up_notifier; /* IPCP has come up */ ++extern struct notifier *ip_down_notifier; /* IPCP has gone down */ ++extern struct notifier *auth_up_notifier; /* peer has authenticated */ ++extern struct notifier *link_down_notifier; /* link has gone down */ ++extern struct notifier *fork_notifier; /* we are a new child process */ ++ ++/* Values for do_callback and doing_callback */ ++#define CALLBACK_DIALIN 1 /* we are expecting the call back */ ++#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */ ++ ++/* ++ * Variables set by command-line options. ++ */ ++ ++extern int debug; /* Debug flag */ ++extern int kdebugflag; /* Tell kernel to print debug messages */ ++extern int default_device; /* Using /dev/tty or equivalent */ ++extern char devnam[MAXPATHLEN]; /* Device name */ ++extern int crtscts; /* Use hardware flow control */ ++extern bool modem; /* Use modem control lines */ ++extern int inspeed; /* Input/Output speed requested */ ++extern u_int32_t netmask; /* IP netmask to set on interface */ ++extern bool lockflag; /* Create lock file to lock the serial dev */ ++extern bool nodetach; /* Don't detach from controlling tty */ ++extern bool updetach; /* Detach from controlling tty when link up */ ++extern char *initializer; /* Script to initialize physical link */ ++extern char *connect_script; /* Script to establish physical link */ ++extern char *disconnect_script; /* Script to disestablish physical link */ ++extern char *welcomer; /* Script to welcome client after connection */ ++extern char *ptycommand; /* Command to run on other side of pty */ ++extern int maxconnect; /* Maximum connect time (seconds) */ ++extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */ ++extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */ ++extern bool auth_required; /* Peer is required to authenticate */ ++extern bool persist; /* Reopen link after it goes down */ ++extern bool uselogin; /* Use /etc/passwd for checking PAP */ ++extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */ ++extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ ++extern bool explicit_remote;/* remote_name specified with remotename opt */ ++extern bool demand; /* Do dial-on-demand */ ++extern char *ipparam; /* Extra parameter for ip up/down scripts */ ++extern bool cryptpap; /* Others' PAP passwords are encrypted */ ++extern int idle_time_limit;/* Shut down link if idle for this long */ ++extern int holdoff; /* Dead time before restarting */ ++extern bool holdoff_specified; /* true if user gave a holdoff value */ ++extern bool notty; /* Stdin/out is not a tty */ ++extern char *pty_socket; /* Socket to connect to pty */ ++extern char *record_file; /* File to record chars sent/received */ ++extern bool sync_serial; /* Device is synchronous serial device */ ++extern int maxfail; /* Max # of unsuccessful connection attempts */ ++extern char linkname[MAXPATHLEN]; /* logical name for link */ ++extern bool tune_kernel; /* May alter kernel settings as necessary */ ++extern int connect_delay; /* Time to delay after connect script */ ++extern int max_data_rate; /* max bytes/sec through charshunt */ ++extern int req_unit; /* interface unit number to use */ ++extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ ++extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ ++extern bool multilink; /* enable multilink operation */ ++extern bool noendpoint; /* don't send or accept endpt. discrim. */ ++extern char *bundle_name; /* bundle name for multilink */ ++extern bool dump_options; /* print out option values */ ++extern bool dryrun; /* check everything, print options, exit */ ++extern int child_wait; /* # seconds to wait for children at end */ ++ ++#ifdef MAXOCTETS ++extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ ++extern int maxoctets_dir; /* Direction : ++ 0 - in+out (default) ++ 1 - in ++ 2 - out ++ 3 - max(in,out) */ ++extern int maxoctets_timeout; /* Timeout for check of octets limit */ ++#define PPP_OCTETS_DIRECTION_SUM 0 ++#define PPP_OCTETS_DIRECTION_IN 1 ++#define PPP_OCTETS_DIRECTION_OUT 2 ++#define PPP_OCTETS_DIRECTION_MAXOVERAL 3 ++/* same as previos, but little different on RADIUS side */ ++#define PPP_OCTETS_DIRECTION_MAXSESSION 4 ++#endif ++ ++#ifdef PPP_FILTER ++extern struct bpf_program pass_filter; /* Filter for pkts to pass */ ++extern struct bpf_program active_filter; /* Filter for link-active pkts */ ++#endif ++ ++#ifdef MSLANMAN ++extern bool ms_lanman; /* Use LanMan password instead of NT */ ++ /* Has meaning only with MS-CHAP challenges */ ++#endif ++ ++/* Values for auth_pending, auth_done */ ++#define PAP_WITHPEER 0x1 ++#define PAP_PEER 0x2 ++#define CHAP_WITHPEER 0x4 ++#define CHAP_PEER 0x8 ++#define EAP_WITHPEER 0x10 ++#define EAP_PEER 0x20 ++ ++/* Values for auth_done only */ ++#define CHAP_MD5_WITHPEER 0x40 ++#define CHAP_MD5_PEER 0x80 ++#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ ++#define CHAP_MS_WITHPEER 0x100 ++#define CHAP_MS_PEER 0x200 ++#define CHAP_MS2_WITHPEER 0x400 ++#define CHAP_MS2_PEER 0x800 ++ ++extern char *current_option; /* the name of the option being parsed */ ++extern int privileged_option; /* set iff the current option came from root */ ++extern char *option_source; /* string saying where the option came from */ ++extern int option_priority; /* priority of current options */ ++ ++/* ++ * Values for phase. ++ */ ++#define PHASE_DEAD 0 ++#define PHASE_INITIALIZE 1 ++#define PHASE_SERIALCONN 2 ++#define PHASE_DORMANT 3 ++#define PHASE_ESTABLISH 4 ++#define PHASE_AUTHENTICATE 5 ++#define PHASE_CALLBACK 6 ++#define PHASE_NETWORK 7 ++#define PHASE_RUNNING 8 ++#define PHASE_TERMINATE 9 ++#define PHASE_DISCONNECT 10 ++#define PHASE_HOLDOFF 11 ++#define PHASE_MASTER 12 ++ ++/* ++ * The following struct gives the addresses of procedures to call ++ * for a particular protocol. ++ */ ++struct protent { ++ u_short protocol; /* PPP protocol number */ ++ /* Initialization procedure */ ++ void (*init) __P((int unit)); ++ /* Process a received packet */ ++ void (*input) __P((int unit, u_char *pkt, int len)); ++ /* Process a received protocol-reject */ ++ void (*protrej) __P((int unit)); ++ /* Lower layer has come up */ ++ void (*lowerup) __P((int unit)); ++ /* Lower layer has gone down */ ++ void (*lowerdown) __P((int unit)); ++ /* Open the protocol */ ++ void (*open) __P((int unit)); ++ /* Close the protocol */ ++ void (*close) __P((int unit, char *reason)); ++ /* Print a packet in readable form */ ++ int (*printpkt) __P((u_char *pkt, int len, ++ void (*printer) __P((void *, char *, ...)), ++ void *arg)); ++ /* Process a received data packet */ ++ void (*datainput) __P((int unit, u_char *pkt, int len)); ++ bool enabled_flag; /* 0 iff protocol is disabled */ ++ char *name; /* Text name of protocol */ ++ char *data_name; /* Text name of corresponding data protocol */ ++ option_t *options; /* List of command-line options */ ++ /* Check requested options, assign defaults */ ++ void (*check_options) __P((void)); ++ /* Configure interface for demand-dial */ ++ int (*demand_conf) __P((int unit)); ++ /* Say whether to bring up link for this pkt */ ++ int (*active_pkt) __P((u_char *pkt, int len)); ++}; ++ ++/* Table of pointers to supported protocols */ ++extern struct protent *protocols[]; ++ ++/* ++ * This struct contains pointers to a set of procedures for ++ * doing operations on a "channel". A channel provides a way ++ * to send and receive PPP packets - the canonical example is ++ * a serial port device in PPP line discipline (or equivalently ++ * with PPP STREAMS modules pushed onto it). ++ */ ++struct channel { ++ /* set of options for this channel */ ++ option_t *options; ++ /* find and process a per-channel options file */ ++ void (*process_extra_options) __P((void)); ++ /* check all the options that have been given */ ++ void (*check_options) __P((void)); ++ /* get the channel ready to do PPP, return a file descriptor */ ++ int (*connect) __P((void)); ++ /* we're finished with the channel */ ++ void (*disconnect) __P((void)); ++ /* put the channel into PPP `mode' */ ++ int (*establish_ppp) __P((int)); ++ /* take the channel out of PPP `mode', restore loopback if demand */ ++ void (*disestablish_ppp) __P((int)); ++ /* set the transmit-side PPP parameters of the channel */ ++ void (*send_config) __P((int, u_int32_t, int, int)); ++ /* set the receive-side PPP parameters of the channel */ ++ void (*recv_config) __P((int, u_int32_t, int, int)); ++ /* cleanup on error or normal exit */ ++ void (*cleanup) __P((void)); ++ /* close the device, called in children after fork */ ++ void (*close) __P((void)); ++}; ++ ++extern struct channel *the_channel; ++ ++/* ++ * Prototypes. ++ */ ++ ++/* Procedures exported from main.c. */ ++void set_ifunit __P((int)); /* set stuff that depends on ifunit */ ++void detach __P((void)); /* Detach from controlling tty */ ++void die __P((int)); /* Cleanup and exit */ ++void quit __P((void)); /* like die(1) */ ++void novm __P((char *)); /* Say we ran out of memory, and die */ ++void timeout __P((void (*func)(void *), void *arg, int s, int us)); ++ /* Call func(arg) after s.us seconds */ ++void untimeout __P((void (*func)(void *), void *arg)); ++ /* Cancel call to func(arg) */ ++void record_child __P((int, char *, void (*) (void *), void *)); ++pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ ++int device_script __P((char *cmd, int in, int out, int dont_wait)); ++ /* Run `cmd' with given stdin and stdout */ ++pid_t run_program __P((char *prog, char **args, int must_exist, ++ void (*done)(void *), void *arg, int wait)); ++ /* Run program prog with args in child */ ++void reopen_log __P((void)); /* (re)open the connection to syslog */ ++void print_link_stats __P((void)); /* Print stats, if available */ ++void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */ ++void update_link_stats __P((int)); /* Get stats at link termination */ ++void script_setenv __P((char *, char *, int)); /* set script env var */ ++void script_unsetenv __P((char *)); /* unset script env var */ ++void new_phase __P((int)); /* signal start of new phase */ ++void add_notifier __P((struct notifier **, notify_func, void *)); ++void remove_notifier __P((struct notifier **, notify_func, void *)); ++void notify __P((struct notifier *, int)); ++int ppp_send_config __P((int, int, u_int32_t, int, int)); ++int ppp_recv_config __P((int, int, u_int32_t, int, int)); ++const char *protocol_name __P((int)); ++void remove_pidfiles __P((void)); ++void lock_db __P((void)); ++void unlock_db __P((void)); ++ ++/* Procedures exported from tty.c. */ ++void tty_init __P((void)); ++ ++/* Procedures exported from utils.c. */ ++void log_packet __P((u_char *, int, char *, int)); ++ /* Format a packet and log it with syslog */ ++void print_string __P((char *, int, void (*) (void *, char *, ...), ++ void *)); /* Format a string for output */ ++int slprintf __P((char *, int, char *, ...)); /* sprintf++ */ ++int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */ ++size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */ ++size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */ ++void dbglog __P((char *, ...)); /* log a debug message */ ++void info __P((char *, ...)); /* log an informational message */ ++void notice __P((char *, ...)); /* log a notice-level message */ ++void warn __P((char *, ...)); /* log a warning message */ ++void error __P((char *, ...)); /* log an error message */ ++void fatal __P((char *, ...)); /* log an error message and die(1) */ ++void init_pr_log __P((char *, int)); /* initialize for using pr_log */ ++void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ ++void end_pr_log __P((void)); /* finish up after using pr_log */ ++void dump_packet __P((const char *, u_char *, int)); ++ /* dump packet to debug log if interesting */ ++ssize_t complete_read __P((int, void *, size_t)); ++ /* read a complete buffer */ ++ ++/* Procedures exported from auth.c */ ++void link_required __P((int)); /* we are starting to use the link */ ++void start_link __P((int)); /* bring the link up now */ ++void link_terminated __P((int)); /* we are finished with the link */ ++void link_down __P((int)); /* the LCP layer has left the Opened state */ ++void upper_layers_down __P((int));/* take all NCPs down */ ++void link_established __P((int)); /* the link is up; authenticate now */ ++void start_networks __P((int)); /* start all the network control protos */ ++void continue_networks __P((int)); /* start network [ip, etc] control protos */ ++void np_up __P((int, int)); /* a network protocol has come up */ ++void np_down __P((int, int)); /* a network protocol has gone down */ ++void np_finished __P((int, int)); /* a network protocol no longer needs link */ ++void auth_peer_fail __P((int, int)); ++ /* peer failed to authenticate itself */ ++void auth_peer_success __P((int, int, int, char *, int)); ++ /* peer successfully authenticated itself */ ++void auth_withpeer_fail __P((int, int)); ++ /* we failed to authenticate ourselves */ ++void auth_withpeer_success __P((int, int, int)); ++ /* we successfully authenticated ourselves */ ++void auth_check_options __P((void)); ++ /* check authentication options supplied */ ++void auth_reset __P((int)); /* check what secrets we have */ ++int check_passwd __P((int, char *, int, char *, int, char **)); ++ /* Check peer-supplied username/password */ ++int get_secret __P((int, char *, char *, char *, int *, int)); ++ /* get "secret" for chap */ ++int get_srp_secret __P((int unit, char *client, char *server, char *secret, ++ int am_server)); ++int auth_ip_addr __P((int, u_int32_t)); ++ /* check if IP address is authorized */ ++int auth_number __P((void)); /* check if remote number is authorized */ ++int bad_ip_adrs __P((u_int32_t)); ++ /* check if IP address is unreasonable */ ++ ++/* Procedures exported from demand.c */ ++void demand_conf __P((void)); /* config interface(s) for demand-dial */ ++void demand_block __P((void)); /* set all NPs to queue up packets */ ++void demand_unblock __P((void)); /* set all NPs to pass packets */ ++void demand_discard __P((void)); /* set all NPs to discard packets */ ++void demand_rexmit __P((int, u_int32_t)); /* retransmit saved frames for an NP*/ ++int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ ++int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ ++ ++/* Procedures exported from multilink.c */ ++#ifdef HAVE_MULTILINK ++void mp_check_options __P((void)); /* Check multilink-related options */ ++int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */ ++void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */ ++void mp_bundle_terminated __P((void)); ++char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */ ++int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */ ++#else ++#define mp_bundle_terminated() /* nothing */ ++#define mp_exit_bundle() /* nothing */ ++#define doing_multilink 0 ++#define multilink_master 0 ++#endif ++ ++/* Procedures exported from sys-*.c */ ++void sys_init __P((void)); /* Do system-dependent initialization */ ++void sys_cleanup __P((void)); /* Restore system state before exiting */ ++int sys_check_options __P((void)); /* Check options specified */ ++void sys_close __P((void)); /* Clean up in a child before execing */ ++int ppp_available __P((void)); /* Test whether ppp kernel support exists */ ++int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */ ++int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ ++int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */ ++void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */ ++void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */ ++int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */ ++void make_new_bundle __P((int, int, int, int)); /* Create new bundle */ ++int bundle_attach __P((int)); /* Attach link to existing bundle */ ++void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */ ++void destroy_bundle __P((void)); /* Tell driver to destroy bundle */ ++void clean_check __P((void)); /* Check if line was 8-bit clean */ ++void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ ++void restore_tty __P((int)); /* Restore port's original parameters */ ++void setdtr __P((int, int)); /* Raise or lower port's DTR line */ ++void output __P((int, u_char *, int)); /* Output a PPP packet */ ++void wait_input __P((struct timeval *)); ++ /* Wait for input, with timeout */ ++void add_fd __P((int)); /* Add fd to set to wait for */ ++void remove_fd __P((int)); /* Remove fd from set to wait for */ ++int read_packet __P((u_char *)); /* Read PPP packet */ ++int get_loop_output __P((void)); /* Read pkts from loopback */ ++void tty_send_config __P((int, u_int32_t, int, int)); ++ /* Configure i/f transmit parameters */ ++void tty_set_xaccm __P((ext_accm)); ++ /* Set extended transmit ACCM */ ++void tty_recv_config __P((int, u_int32_t, int, int)); ++ /* Configure i/f receive parameters */ ++int ccp_test __P((int, u_char *, int, int)); ++ /* Test support for compression scheme */ ++void ccp_flags_set __P((int, int, int)); ++ /* Set kernel CCP state */ ++int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ ++int get_idle_time __P((int, struct ppp_idle *)); ++ /* Find out how long link has been idle */ ++int get_ppp_stats __P((int, struct pppd_stats *)); ++ /* Return link statistics */ ++void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ ++int netif_get_mtu __P((int)); /* Get PPP interface MTU */ ++int sifvjcomp __P((int, int, int, int)); ++ /* Configure VJ TCP header compression */ ++int sifup __P((int)); /* Configure i/f up for one protocol */ ++int sifnpmode __P((int u, int proto, enum NPmode mode)); ++ /* Set mode for handling packets for proto */ ++int sifdown __P((int)); /* Configure i/f down for one protocol */ ++int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); ++ /* Configure IPv4 addresses for i/f */ ++int cifaddr __P((int, u_int32_t, u_int32_t)); ++ /* Reset i/f IP addresses */ ++#ifdef INET6 ++int sif6addr __P((int, eui64_t, eui64_t)); ++ /* Configure IPv6 addresses for i/f */ ++int cif6addr __P((int, eui64_t, eui64_t)); ++ /* Remove an IPv6 address from i/f */ ++#endif ++int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt)); ++ /* Create default route through i/f */ ++int cifdefaultroute __P((int, u_int32_t, u_int32_t)); ++ /* Delete default route through i/f */ ++int sifproxyarp __P((int, u_int32_t)); ++ /* Add proxy ARP entry for peer */ ++int cifproxyarp __P((int, u_int32_t)); ++ /* Delete proxy ARP entry for peer */ ++u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ ++int lock __P((char *)); /* Create lock file for device */ ++int relock __P((int)); /* Rewrite lock file with new pid */ ++void unlock __P((void)); /* Delete previously-created lock file */ ++void logwtmp __P((const char *, const char *, const char *)); ++ /* Write entry to wtmp file */ ++int get_host_seed __P((void)); /* Get host-dependent random number seed */ ++int have_route_to __P((u_int32_t)); /* Check if route to addr exists */ ++#ifdef PPP_FILTER ++int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); ++ /* Set filter programs in kernel */ ++#endif ++#ifdef IPX_CHANGE ++int sipxfaddr __P((int, unsigned long, unsigned char *)); ++int cipxfaddr __P((int)); ++#endif ++int get_if_hwaddr __P((u_char *addr, char *name)); ++char *get_first_ethernet __P((void)); ++ ++/* Procedures exported from options.c */ ++int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ ++int parse_args __P((int argc, char **argv)); ++ /* Parse options from arguments given */ ++int options_from_file __P((char *filename, int must_exist, int check_prot, ++ int privileged)); ++ /* Parse options from an options file */ ++int options_from_user __P((void)); /* Parse options from user's .ppprc */ ++int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ ++int options_from_list __P((struct wordlist *, int privileged)); ++ /* Parse options from a wordlist */ ++int getword __P((FILE *f, char *word, int *newlinep, char *filename)); ++ /* Read a word from a file */ ++void option_error __P((char *fmt, ...)); ++ /* Print an error message about an option */ ++int int_option __P((char *, int *)); ++ /* Simplified number_option for decimal ints */ ++void add_options __P((option_t *)); /* Add extra options */ ++void check_options __P((void)); /* check values after all options parsed */ ++int override_value __P((const char *, int, const char *)); ++ /* override value if permitted by priority */ ++void print_options __P((void (*) __P((void *, char *, ...)), void *)); ++ /* print out values of all options */ ++ ++int parse_dotted_ip __P((char *, u_int32_t *)); ++ ++/* ++ * Hooks to enable plugins to change various things. ++ */ ++extern int (*new_phase_hook) __P((int)); ++extern int (*idle_time_hook) __P((struct ppp_idle *)); ++extern int (*holdoff_hook) __P((void)); ++extern int (*pap_check_hook) __P((void)); ++extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, ++ struct wordlist **paddrs, ++ struct wordlist **popts)); ++extern void (*pap_logout_hook) __P((void)); ++extern int (*pap_passwd_hook) __P((char *user, char *passwd)); ++extern int (*allowed_address_hook) __P((u_int32_t addr)); ++extern void (*ip_up_hook) __P((void)); ++extern void (*ip_down_hook) __P((void)); ++extern void (*ip_choose_hook) __P((u_int32_t *)); ++ ++extern int (*chap_check_hook) __P((void)); ++extern int (*chap_passwd_hook) __P((char *user, char *passwd)); ++ ++/* Let a plugin snoop sent and received packets. Useful for L2TP */ ++extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); ++extern void (*snoop_send_hook) __P((unsigned char *p, int len)); ++ ++/* ++ * Inline versions of get/put char/short/long. ++ * Pointer is advanced; we assume that both arguments ++ * are lvalues and will already be in registers. ++ * cp MUST be u_char *. ++ */ ++#define GETCHAR(c, cp) { \ ++ (c) = *(cp)++; \ ++} ++#define PUTCHAR(c, cp) { \ ++ *(cp)++ = (u_char) (c); \ ++} ++ ++ ++#define GETSHORT(s, cp) { \ ++ (s) = *(cp)++ << 8; \ ++ (s) |= *(cp)++; \ ++} ++#define PUTSHORT(s, cp) { \ ++ *(cp)++ = (u_char) ((s) >> 8); \ ++ *(cp)++ = (u_char) (s); \ ++} ++ ++#define GETLONG(l, cp) { \ ++ (l) = *(cp)++ << 8; \ ++ (l) |= *(cp)++; (l) <<= 8; \ ++ (l) |= *(cp)++; (l) <<= 8; \ ++ (l) |= *(cp)++; \ ++} ++#define PUTLONG(l, cp) { \ ++ *(cp)++ = (u_char) ((l) >> 24); \ ++ *(cp)++ = (u_char) ((l) >> 16); \ ++ *(cp)++ = (u_char) ((l) >> 8); \ ++ *(cp)++ = (u_char) (l); \ ++} ++ ++#define INCPTR(n, cp) ((cp) += (n)) ++#define DECPTR(n, cp) ((cp) -= (n)) ++ ++/* ++ * System dependent definitions for user-level 4.3BSD UNIX implementation. ++ */ ++ ++#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0) ++#define UNTIMEOUT(r, f) untimeout((r), (f)) ++ ++#define BCOPY(s, d, l) memcpy(d, s, l) ++#define BZERO(s, n) memset(s, 0, n) ++#define BCMP(s1, s2, l) memcmp(s1, s2, l) ++ ++#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); } ++ ++/* ++ * MAKEHEADER - Add Header fields to a packet. ++ */ ++#define MAKEHEADER(p, t) { \ ++ PUTCHAR(PPP_ALLSTATIONS, p); \ ++ PUTCHAR(PPP_UI, p); \ ++ PUTSHORT(t, p); } ++ ++/* ++ * Exit status values. ++ */ ++#define EXIT_OK 0 ++#define EXIT_FATAL_ERROR 1 ++#define EXIT_OPTION_ERROR 2 ++#define EXIT_NOT_ROOT 3 ++#define EXIT_NO_KERNEL_SUPPORT 4 ++#define EXIT_USER_REQUEST 5 ++#define EXIT_LOCK_FAILED 6 ++#define EXIT_OPEN_FAILED 7 ++#define EXIT_CONNECT_FAILED 8 ++#define EXIT_PTYCMD_FAILED 9 ++#define EXIT_NEGOTIATION_FAILED 10 ++#define EXIT_PEER_AUTH_FAILED 11 ++#define EXIT_IDLE_TIMEOUT 12 ++#define EXIT_CONNECT_TIME 13 ++#define EXIT_CALLBACK 14 ++#define EXIT_PEER_DEAD 15 ++#define EXIT_HANGUP 16 ++#define EXIT_LOOPBACK 17 ++#define EXIT_INIT_FAILED 18 ++#define EXIT_AUTH_TOPEER_FAILED 19 ++#ifdef MAXOCTETS ++#define EXIT_TRAFFIC_LIMIT 20 ++#endif ++#define EXIT_CNID_AUTH_FAILED 21 ++ ++/* ++ * Debug macros. Slightly useful for finding bugs in pppd, not particularly ++ * useful for finding out why your connection isn't being established. ++ */ ++#ifdef DEBUGALL ++#define DEBUGMAIN 1 ++#define DEBUGFSM 1 ++#define DEBUGLCP 1 ++#define DEBUGIPCP 1 ++#define DEBUGIPV6CP 1 ++#define DEBUGUPAP 1 ++#define DEBUGCHAP 1 ++#endif ++ ++#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ ++#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \ ++ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ ++ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) ++#define LOG_PPP LOG_LOCAL2 ++#else ++#define LOG_PPP LOG_LOCAL2 ++#endif ++#endif /* LOG_PPP */ ++ ++#ifdef DEBUGMAIN ++#define MAINDEBUG(x) if (debug) dbglog x ++#else ++#define MAINDEBUG(x) ++#endif ++ ++#ifdef DEBUGSYS ++#define SYSDEBUG(x) if (debug) dbglog x ++#else ++#define SYSDEBUG(x) ++#endif ++ ++#ifdef DEBUGFSM ++#define FSMDEBUG(x) if (debug) dbglog x ++#else ++#define FSMDEBUG(x) ++#endif ++ ++#ifdef DEBUGLCP ++#define LCPDEBUG(x) if (debug) dbglog x ++#else ++#define LCPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPCP ++#define IPCPDEBUG(x) if (debug) dbglog x ++#else ++#define IPCPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPV6CP ++#define IPV6CPDEBUG(x) if (debug) dbglog x ++#else ++#define IPV6CPDEBUG(x) ++#endif ++ ++#ifdef DEBUGUPAP ++#define UPAPDEBUG(x) if (debug) dbglog x ++#else ++#define UPAPDEBUG(x) ++#endif ++ ++#ifdef DEBUGCHAP ++#define CHAPDEBUG(x) if (debug) dbglog x ++#else ++#define CHAPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPXCP ++#define IPXCPDEBUG(x) if (debug) dbglog x ++#else ++#define IPXCPDEBUG(x) ++#endif ++ ++#ifndef SIGTYPE ++#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) ++#define SIGTYPE void ++#else ++#define SIGTYPE int ++#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */ ++#endif /* SIGTYPE */ ++ ++#ifndef MIN ++#define MIN(a, b) ((a) < (b)? (a): (b)) ++#endif ++#ifndef MAX ++#define MAX(a, b) ((a) > (b)? (a): (b)) ++#endif ++ ++#ifndef offsetof ++#define offsetof(type, member) ((size_t) &((type *)0)->member) ++#endif ++ ++#endif /* __PPP_H__ */ +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/Makefile 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,14 @@ ++# Makefile for the capiplugin for pppd(8). ++# ++# Copyright 2000 Carsten Paeth (calle@calle.in-berlin.de) ++# Copyright 2000 AVM GmbH Berlin (info@avm.de) ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License ++# as published by the Free Software Foundation; either version ++# 2 of the License, or (at your option) any later version. ++ ++PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION) ++ ++include $(TOPDIR)/Rules.make ++ +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/patchlevel.h 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,4 @@ ++/* $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ */ ++ ++#define VERSION "2.4.4b1" ++#define DATE "5 December 2005" +diff -auNr capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h +--- capi4k-utils/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h 1970-01-01 01:00:00.000000000 +0100 ++++ capi4k-utils_patched/pppdcapiplugin/ppp-2.4.4b1/pppd/pppd.h 2006-12-30 16:14:35.000000000 +0100 +@@ -0,0 +1,905 @@ ++/* ++ * pppd.h - PPP daemon global declarations. ++ * ++ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * ++ * 3. The name "Carnegie Mellon University" must not be used to ++ * endorse or promote products derived from this software without ++ * prior written permission. For permission or any legal ++ * details, please contact ++ * Office of Technology Transfer ++ * Carnegie Mellon University ++ * 5000 Forbes Avenue ++ * Pittsburgh, PA 15213-3890 ++ * (412) 268-4387, fax: (412) 268-7395 ++ * tech-transfer@andrew.cmu.edu ++ * ++ * 4. Redistributions of any form whatsoever must retain the following ++ * acknowledgment: ++ * "This product includes software developed by Computing Services ++ * at Carnegie Mellon University (http://www.cmu.edu/computing/)." ++ * ++ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO ++ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE ++ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * $Id: ppp-2.4.4.patch,v 1.1 2007/01/01 15:17:26 tpowa Exp $ ++ */ ++ ++/* ++ * TODO: ++ */ ++ ++#ifndef __PPPD_H__ ++#define __PPPD_H__ ++ ++#include /* for FILE */ ++#include /* for NGROUPS_MAX */ ++#include /* for MAXPATHLEN and BSD4_4, if defined */ ++#include /* for u_int32_t, if defined */ ++#include /* for struct timeval */ ++#include ++#include "patchlevel.h" ++ ++#if defined(__STDC__) ++#include ++#define __V(x) x ++#else ++#include ++#define __V(x) (va_alist) va_dcl ++#define const ++#define volatile ++#endif ++ ++#ifdef INET6 ++#include "eui64.h" ++#endif ++ ++/* ++ * Limits. ++ */ ++ ++#define NUM_PPP 1 /* One PPP interface supported (per process) */ ++#define MAXWORDLEN 1024 /* max length of word in file (incl null) */ ++#define MAXARGS 1 /* max # args to a command */ ++#define MAXNAMELEN 256 /* max length of hostname or name for auth */ ++#define MAXSECRETLEN 256 /* max length of password or secret */ ++ ++/* ++ * Option descriptor structure. ++ */ ++ ++typedef unsigned char bool; ++ ++enum opt_type { ++ o_special_noarg = 0, ++ o_special = 1, ++ o_bool, ++ o_int, ++ o_uint32, ++ o_string, ++ o_wild ++}; ++ ++typedef struct { ++ char *name; /* name of the option */ ++ enum opt_type type; ++ void *addr; ++ char *description; ++ unsigned int flags; ++ void *addr2; ++ int upper_limit; ++ int lower_limit; ++ const char *source; ++ short int priority; ++ short int winner; ++} option_t; ++ ++/* Values for flags */ ++#define OPT_VALUE 0xff /* mask for presupplied value */ ++#define OPT_HEX 0x100 /* int option is in hex */ ++#define OPT_NOARG 0x200 /* option doesn't take argument */ ++#define OPT_OR 0x400 /* OR in argument to value */ ++#define OPT_INC 0x800 /* increment value */ ++#define OPT_A2OR 0x800 /* for o_bool, OR arg to *(u_char *)addr2 */ ++#define OPT_PRIV 0x1000 /* privileged option */ ++#define OPT_STATIC 0x2000 /* string option goes into static array */ ++#define OPT_LLIMIT 0x4000 /* check value against lower limit */ ++#define OPT_ULIMIT 0x8000 /* check value against upper limit */ ++#define OPT_LIMITS (OPT_LLIMIT|OPT_ULIMIT) ++#define OPT_ZEROOK 0x10000 /* 0 value is OK even if not within limits */ ++#define OPT_HIDE 0x10000 /* for o_string, print value as ?????? */ ++#define OPT_A2LIST 0x10000 /* for o_special, keep list of values */ ++#define OPT_A2CLRB 0x10000 /* o_bool, clr val bits in *(u_char *)addr2 */ ++#define OPT_NOINCR 0x20000 /* value mustn't be increased */ ++#define OPT_ZEROINF 0x40000 /* with OPT_NOINCR, 0 == infinity */ ++#define OPT_PRIO 0x80000 /* process option priorities for this option */ ++#define OPT_PRIOSUB 0x100000 /* subsidiary member of priority group */ ++#define OPT_ALIAS 0x200000 /* option is alias for previous option */ ++#define OPT_A2COPY 0x400000 /* addr2 -> second location to rcv value */ ++#define OPT_ENABLE 0x800000 /* use *addr2 as enable for option */ ++#define OPT_A2CLR 0x1000000 /* clear *(bool *)addr2 */ ++#define OPT_PRIVFIX 0x2000000 /* user can't override if set by root */ ++#define OPT_INITONLY 0x4000000 /* option can only be set in init phase */ ++#define OPT_DEVEQUIV 0x8000000 /* equiv to device name */ ++#define OPT_DEVNAM (OPT_INITONLY | OPT_DEVEQUIV) ++#define OPT_A2PRINTER 0x10000000 /* *addr2 is a fn for printing option */ ++#define OPT_A2STRVAL 0x20000000 /* *addr2 points to current string value */ ++#define OPT_NOPRINT 0x40000000 /* don't print this option at all */ ++ ++#define OPT_VAL(x) ((x) & OPT_VALUE) ++ ++/* Values for priority */ ++#define OPRIO_DEFAULT 0 /* a default value */ ++#define OPRIO_CFGFILE 1 /* value from a configuration file */ ++#define OPRIO_CMDLINE 2 /* value from the command line */ ++#define OPRIO_SECFILE 3 /* value from options in a secrets file */ ++#define OPRIO_ROOT 100 /* added to priority if OPT_PRIVFIX && root */ ++ ++#ifndef GIDSET_TYPE ++#define GIDSET_TYPE gid_t ++#endif ++ ++/* Structure representing a list of permitted IP addresses. */ ++struct permitted_ip { ++ int permit; /* 1 = permit, 0 = forbid */ ++ u_int32_t base; /* match if (addr & mask) == base */ ++ u_int32_t mask; /* base and mask are in network byte order */ ++}; ++ ++/* ++ * Unfortunately, the linux kernel driver uses a different structure ++ * for statistics from the rest of the ports. ++ * This structure serves as a common representation for the bits ++ * pppd needs. ++ */ ++struct pppd_stats { ++ unsigned int bytes_in; ++ unsigned int bytes_out; ++ unsigned int pkts_in; ++ unsigned int pkts_out; ++}; ++ ++/* Used for storing a sequence of words. Usually malloced. */ ++struct wordlist { ++ struct wordlist *next; ++ char *word; ++}; ++ ++/* An endpoint discriminator, used with multilink. */ ++#define MAX_ENDP_LEN 20 /* maximum length of discriminator value */ ++struct epdisc { ++ unsigned char class; ++ unsigned char length; ++ unsigned char value[MAX_ENDP_LEN]; ++}; ++ ++/* values for epdisc.class */ ++#define EPD_NULL 0 /* null discriminator, no data */ ++#define EPD_LOCAL 1 ++#define EPD_IP 2 ++#define EPD_MAC 3 ++#define EPD_MAGIC 4 ++#define EPD_PHONENUM 5 ++ ++typedef void (*notify_func) __P((void *, int)); ++ ++struct notifier { ++ struct notifier *next; ++ notify_func func; ++ void *arg; ++}; ++ ++/* ++ * Global variables. ++ */ ++ ++extern int hungup; /* Physical layer has disconnected */ ++extern int ifunit; /* Interface unit number */ ++extern char ifname[]; /* Interface name */ ++extern char hostname[]; /* Our hostname */ ++extern u_char outpacket_buf[]; /* Buffer for outgoing packets */ ++extern int devfd; /* fd of underlying device */ ++extern int fd_ppp; /* fd for talking PPP */ ++extern int phase; /* Current state of link - see values below */ ++extern int baud_rate; /* Current link speed in bits/sec */ ++extern char *progname; /* Name of this program */ ++extern int redirect_stderr;/* Connector's stderr should go to file */ ++extern char peer_authname[];/* Authenticated name of peer */ ++extern int auth_done[NUM_PPP]; /* Methods actually used for auth */ ++extern int privileged; /* We were run by real-uid root */ ++extern int need_holdoff; /* Need holdoff period after link terminates */ ++extern char **script_env; /* Environment variables for scripts */ ++extern int detached; /* Have detached from controlling tty */ ++extern GIDSET_TYPE groups[NGROUPS_MAX]; /* groups the user is in */ ++extern int ngroups; /* How many groups valid in groups */ ++extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */ ++extern int link_stats_valid; /* set if link_stats is valid */ ++extern unsigned link_connect_time; /* time the link was up for */ ++extern int using_pty; /* using pty as device (notty or pty opt.) */ ++extern int log_to_fd; /* logging to this fd as well as syslog */ ++extern bool log_default; /* log_to_fd is default (stdout) */ ++extern char *no_ppp_msg; /* message to print if ppp not in kernel */ ++extern volatile int status; /* exit status for pppd */ ++extern bool devnam_fixed; /* can no longer change devnam */ ++extern int unsuccess; /* # unsuccessful connection attempts */ ++extern int do_callback; /* set if we want to do callback next */ ++extern int doing_callback; /* set if this is a callback */ ++extern int error_count; /* # of times error() has been called */ ++extern char ppp_devnam[MAXPATHLEN]; ++extern char remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */ ++extern int ppp_session_number; /* Session number (eg PPPoE session) */ ++extern int fd_devnull; /* fd open to /dev/null */ ++ ++extern int listen_time; /* time to listen first (ms) */ ++extern bool doing_multilink; ++extern bool multilink_master; ++extern bool bundle_eof; ++extern bool bundle_terminating; ++ ++extern struct notifier *pidchange; /* for notifications of pid changing */ ++extern struct notifier *phasechange; /* for notifications of phase changes */ ++extern struct notifier *exitnotify; /* for notification that we're exiting */ ++extern struct notifier *sigreceived; /* notification of received signal */ ++extern struct notifier *ip_up_notifier; /* IPCP has come up */ ++extern struct notifier *ip_down_notifier; /* IPCP has gone down */ ++extern struct notifier *auth_up_notifier; /* peer has authenticated */ ++extern struct notifier *link_down_notifier; /* link has gone down */ ++extern struct notifier *fork_notifier; /* we are a new child process */ ++ ++/* Values for do_callback and doing_callback */ ++#define CALLBACK_DIALIN 1 /* we are expecting the call back */ ++#define CALLBACK_DIALOUT 2 /* we are dialling out to call back */ ++ ++/* ++ * Variables set by command-line options. ++ */ ++ ++extern int debug; /* Debug flag */ ++extern int kdebugflag; /* Tell kernel to print debug messages */ ++extern int default_device; /* Using /dev/tty or equivalent */ ++extern char devnam[MAXPATHLEN]; /* Device name */ ++extern int crtscts; /* Use hardware flow control */ ++extern bool modem; /* Use modem control lines */ ++extern int inspeed; /* Input/Output speed requested */ ++extern u_int32_t netmask; /* IP netmask to set on interface */ ++extern bool lockflag; /* Create lock file to lock the serial dev */ ++extern bool nodetach; /* Don't detach from controlling tty */ ++extern bool updetach; /* Detach from controlling tty when link up */ ++extern char *initializer; /* Script to initialize physical link */ ++extern char *connect_script; /* Script to establish physical link */ ++extern char *disconnect_script; /* Script to disestablish physical link */ ++extern char *welcomer; /* Script to welcome client after connection */ ++extern char *ptycommand; /* Command to run on other side of pty */ ++extern int maxconnect; /* Maximum connect time (seconds) */ ++extern char user[MAXNAMELEN];/* Our name for authenticating ourselves */ ++extern char passwd[MAXSECRETLEN]; /* Password for PAP or CHAP */ ++extern bool auth_required; /* Peer is required to authenticate */ ++extern bool persist; /* Reopen link after it goes down */ ++extern bool uselogin; /* Use /etc/passwd for checking PAP */ ++extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */ ++extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ ++extern bool explicit_remote;/* remote_name specified with remotename opt */ ++extern bool demand; /* Do dial-on-demand */ ++extern char *ipparam; /* Extra parameter for ip up/down scripts */ ++extern bool cryptpap; /* Others' PAP passwords are encrypted */ ++extern int idle_time_limit;/* Shut down link if idle for this long */ ++extern int holdoff; /* Dead time before restarting */ ++extern bool holdoff_specified; /* true if user gave a holdoff value */ ++extern bool notty; /* Stdin/out is not a tty */ ++extern char *pty_socket; /* Socket to connect to pty */ ++extern char *record_file; /* File to record chars sent/received */ ++extern bool sync_serial; /* Device is synchronous serial device */ ++extern int maxfail; /* Max # of unsuccessful connection attempts */ ++extern char linkname[MAXPATHLEN]; /* logical name for link */ ++extern bool tune_kernel; /* May alter kernel settings as necessary */ ++extern int connect_delay; /* Time to delay after connect script */ ++extern int max_data_rate; /* max bytes/sec through charshunt */ ++extern int req_unit; /* interface unit number to use */ ++extern bool multilink; /* enable multilink operation */ ++extern bool noendpoint; /* don't send or accept endpt. discrim. */ ++extern char *bundle_name; /* bundle name for multilink */ ++extern bool dump_options; /* print out option values */ ++extern bool dryrun; /* check everything, print options, exit */ ++extern int child_wait; /* # seconds to wait for children at end */ ++ ++#ifdef MAXOCTETS ++extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ ++extern int maxoctets_dir; /* Direction : ++ 0 - in+out (default) ++ 1 - in ++ 2 - out ++ 3 - max(in,out) */ ++extern int maxoctets_timeout; /* Timeout for check of octets limit */ ++#define PPP_OCTETS_DIRECTION_SUM 0 ++#define PPP_OCTETS_DIRECTION_IN 1 ++#define PPP_OCTETS_DIRECTION_OUT 2 ++#define PPP_OCTETS_DIRECTION_MAXOVERAL 3 ++/* same as previos, but little different on RADIUS side */ ++#define PPP_OCTETS_DIRECTION_MAXSESSION 4 ++#endif ++ ++#ifdef PPP_FILTER ++extern struct bpf_program pass_filter; /* Filter for pkts to pass */ ++extern struct bpf_program active_filter; /* Filter for link-active pkts */ ++#endif ++ ++#ifdef MSLANMAN ++extern bool ms_lanman; /* Use LanMan password instead of NT */ ++ /* Has meaning only with MS-CHAP challenges */ ++#endif ++ ++/* Values for auth_pending, auth_done */ ++#define PAP_WITHPEER 0x1 ++#define PAP_PEER 0x2 ++#define CHAP_WITHPEER 0x4 ++#define CHAP_PEER 0x8 ++#define EAP_WITHPEER 0x10 ++#define EAP_PEER 0x20 ++ ++/* Values for auth_done only */ ++#define CHAP_MD5_WITHPEER 0x40 ++#define CHAP_MD5_PEER 0x80 ++#define CHAP_MS_SHIFT 8 /* LSB position for MS auths */ ++#define CHAP_MS_WITHPEER 0x100 ++#define CHAP_MS_PEER 0x200 ++#define CHAP_MS2_WITHPEER 0x400 ++#define CHAP_MS2_PEER 0x800 ++ ++extern char *current_option; /* the name of the option being parsed */ ++extern int privileged_option; /* set iff the current option came from root */ ++extern char *option_source; /* string saying where the option came from */ ++extern int option_priority; /* priority of current options */ ++ ++/* ++ * Values for phase. ++ */ ++#define PHASE_DEAD 0 ++#define PHASE_INITIALIZE 1 ++#define PHASE_SERIALCONN 2 ++#define PHASE_DORMANT 3 ++#define PHASE_ESTABLISH 4 ++#define PHASE_AUTHENTICATE 5 ++#define PHASE_CALLBACK 6 ++#define PHASE_NETWORK 7 ++#define PHASE_RUNNING 8 ++#define PHASE_TERMINATE 9 ++#define PHASE_DISCONNECT 10 ++#define PHASE_HOLDOFF 11 ++#define PHASE_MASTER 12 ++ ++/* ++ * The following struct gives the addresses of procedures to call ++ * for a particular protocol. ++ */ ++struct protent { ++ u_short protocol; /* PPP protocol number */ ++ /* Initialization procedure */ ++ void (*init) __P((int unit)); ++ /* Process a received packet */ ++ void (*input) __P((int unit, u_char *pkt, int len)); ++ /* Process a received protocol-reject */ ++ void (*protrej) __P((int unit)); ++ /* Lower layer has come up */ ++ void (*lowerup) __P((int unit)); ++ /* Lower layer has gone down */ ++ void (*lowerdown) __P((int unit)); ++ /* Open the protocol */ ++ void (*open) __P((int unit)); ++ /* Close the protocol */ ++ void (*close) __P((int unit, char *reason)); ++ /* Print a packet in readable form */ ++ int (*printpkt) __P((u_char *pkt, int len, ++ void (*printer) __P((void *, char *, ...)), ++ void *arg)); ++ /* Process a received data packet */ ++ void (*datainput) __P((int unit, u_char *pkt, int len)); ++ bool enabled_flag; /* 0 iff protocol is disabled */ ++ char *name; /* Text name of protocol */ ++ char *data_name; /* Text name of corresponding data protocol */ ++ option_t *options; /* List of command-line options */ ++ /* Check requested options, assign defaults */ ++ void (*check_options) __P((void)); ++ /* Configure interface for demand-dial */ ++ int (*demand_conf) __P((int unit)); ++ /* Say whether to bring up link for this pkt */ ++ int (*active_pkt) __P((u_char *pkt, int len)); ++}; ++ ++/* Table of pointers to supported protocols */ ++extern struct protent *protocols[]; ++ ++/* ++ * This struct contains pointers to a set of procedures for ++ * doing operations on a "channel". A channel provides a way ++ * to send and receive PPP packets - the canonical example is ++ * a serial port device in PPP line discipline (or equivalently ++ * with PPP STREAMS modules pushed onto it). ++ */ ++struct channel { ++ /* set of options for this channel */ ++ option_t *options; ++ /* find and process a per-channel options file */ ++ void (*process_extra_options) __P((void)); ++ /* check all the options that have been given */ ++ void (*check_options) __P((void)); ++ /* get the channel ready to do PPP, return a file descriptor */ ++ int (*connect) __P((void)); ++ /* we're finished with the channel */ ++ void (*disconnect) __P((void)); ++ /* put the channel into PPP `mode' */ ++ int (*establish_ppp) __P((int)); ++ /* take the channel out of PPP `mode', restore loopback if demand */ ++ void (*disestablish_ppp) __P((int)); ++ /* set the transmit-side PPP parameters of the channel */ ++ void (*send_config) __P((int, u_int32_t, int, int)); ++ /* set the receive-side PPP parameters of the channel */ ++ void (*recv_config) __P((int, u_int32_t, int, int)); ++ /* cleanup on error or normal exit */ ++ void (*cleanup) __P((void)); ++ /* close the device, called in children after fork */ ++ void (*close) __P((void)); ++}; ++ ++extern struct channel *the_channel; ++ ++/* ++ * Prototypes. ++ */ ++ ++/* Procedures exported from main.c. */ ++void set_ifunit __P((int)); /* set stuff that depends on ifunit */ ++void detach __P((void)); /* Detach from controlling tty */ ++void die __P((int)); /* Cleanup and exit */ ++void quit __P((void)); /* like die(1) */ ++void novm __P((char *)); /* Say we ran out of memory, and die */ ++void timeout __P((void (*func)(void *), void *arg, int s, int us)); ++ /* Call func(arg) after s.us seconds */ ++void untimeout __P((void (*func)(void *), void *arg)); ++ /* Cancel call to func(arg) */ ++void record_child __P((int, char *, void (*) (void *), void *)); ++pid_t safe_fork __P((int, int, int)); /* Fork & close stuff in child */ ++int device_script __P((char *cmd, int in, int out, int dont_wait)); ++ /* Run `cmd' with given stdin and stdout */ ++pid_t run_program __P((char *prog, char **args, int must_exist, ++ void (*done)(void *), void *arg)); ++ /* Run program prog with args in child */ ++void reopen_log __P((void)); /* (re)open the connection to syslog */ ++void print_link_stats __P((void)); /* Print stats, if available */ ++void reset_link_stats __P((int)); /* Reset (init) stats when link goes up */ ++void update_link_stats __P((int)); /* Get stats at link termination */ ++void script_setenv __P((char *, char *, int)); /* set script env var */ ++void script_unsetenv __P((char *)); /* unset script env var */ ++void new_phase __P((int)); /* signal start of new phase */ ++void add_notifier __P((struct notifier **, notify_func, void *)); ++void remove_notifier __P((struct notifier **, notify_func, void *)); ++void notify __P((struct notifier *, int)); ++int ppp_send_config __P((int, int, u_int32_t, int, int)); ++int ppp_recv_config __P((int, int, u_int32_t, int, int)); ++void remove_pidfiles __P((void)); ++void lock_db __P((void)); ++void unlock_db __P((void)); ++ ++/* Procedures exported from tty.c. */ ++void tty_init __P((void)); ++ ++/* Procedures exported from utils.c. */ ++void log_packet __P((u_char *, int, char *, int)); ++ /* Format a packet and log it with syslog */ ++void print_string __P((char *, int, void (*) (void *, char *, ...), ++ void *)); /* Format a string for output */ ++int slprintf __P((char *, int, char *, ...)); /* sprintf++ */ ++int vslprintf __P((char *, int, char *, va_list)); /* vsprintf++ */ ++size_t strlcpy __P((char *, const char *, size_t)); /* safe strcpy */ ++size_t strlcat __P((char *, const char *, size_t)); /* safe strncpy */ ++void dbglog __P((char *, ...)); /* log a debug message */ ++void info __P((char *, ...)); /* log an informational message */ ++void notice __P((char *, ...)); /* log a notice-level message */ ++void warn __P((char *, ...)); /* log a warning message */ ++void error __P((char *, ...)); /* log an error message */ ++void fatal __P((char *, ...)); /* log an error message and die(1) */ ++void init_pr_log __P((char *, int)); /* initialize for using pr_log */ ++void pr_log __P((void *, char *, ...)); /* printer fn, output to syslog */ ++void end_pr_log __P((void)); /* finish up after using pr_log */ ++void dump_packet __P((const char *, u_char *, int)); ++ /* dump packet to debug log if interesting */ ++ssize_t complete_read __P((int, void *, size_t)); ++ /* read a complete buffer */ ++ ++/* Procedures exported from auth.c */ ++void link_required __P((int)); /* we are starting to use the link */ ++void link_terminated __P((int)); /* we are finished with the link */ ++void link_down __P((int)); /* the LCP layer has left the Opened state */ ++void upper_layers_down __P((int));/* take all NCPs down */ ++void link_established __P((int)); /* the link is up; authenticate now */ ++void start_networks __P((int)); /* start all the network control protos */ ++void continue_networks __P((int)); /* start network [ip, etc] control protos */ ++void np_up __P((int, int)); /* a network protocol has come up */ ++void np_down __P((int, int)); /* a network protocol has gone down */ ++void np_finished __P((int, int)); /* a network protocol no longer needs link */ ++void auth_peer_fail __P((int, int)); ++ /* peer failed to authenticate itself */ ++void auth_peer_success __P((int, int, int, char *, int)); ++ /* peer successfully authenticated itself */ ++void auth_withpeer_fail __P((int, int)); ++ /* we failed to authenticate ourselves */ ++void auth_withpeer_success __P((int, int, int)); ++ /* we successfully authenticated ourselves */ ++void auth_check_options __P((void)); ++ /* check authentication options supplied */ ++void auth_reset __P((int)); /* check what secrets we have */ ++int check_passwd __P((int, char *, int, char *, int, char **)); ++ /* Check peer-supplied username/password */ ++int get_secret __P((int, char *, char *, char *, int *, int)); ++ /* get "secret" for chap */ ++int get_srp_secret __P((int unit, char *client, char *server, char *secret, ++ int am_server)); ++int auth_ip_addr __P((int, u_int32_t)); ++ /* check if IP address is authorized */ ++int auth_number __P((void)); /* check if remote number is authorized */ ++int bad_ip_adrs __P((u_int32_t)); ++ /* check if IP address is unreasonable */ ++ ++/* Procedures exported from demand.c */ ++void demand_conf __P((void)); /* config interface(s) for demand-dial */ ++void demand_block __P((void)); /* set all NPs to queue up packets */ ++void demand_unblock __P((void)); /* set all NPs to pass packets */ ++void demand_discard __P((void)); /* set all NPs to discard packets */ ++void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ ++int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ ++int loop_frame __P((unsigned char *, int)); /* should we bring link up? */ ++ ++/* Procedures exported from multilink.c */ ++#ifdef HAVE_MULTILINK ++void mp_check_options __P((void)); /* Check multilink-related options */ ++int mp_join_bundle __P((void)); /* join our link to an appropriate bundle */ ++void mp_exit_bundle __P((void)); /* have disconnected our link from bundle */ ++void mp_bundle_terminated __P((void)); ++char *epdisc_to_str __P((struct epdisc *)); /* string from endpoint discrim. */ ++int str_to_epdisc __P((struct epdisc *, char *)); /* endpt disc. from str */ ++#else ++#define mp_bundle_terminated() /* nothing */ ++#define mp_exit_bundle() /* nothing */ ++#define doing_multilink 0 ++#define multilink_master 0 ++#endif ++ ++/* Procedures exported from sys-*.c */ ++void sys_init __P((void)); /* Do system-dependent initialization */ ++void sys_cleanup __P((void)); /* Restore system state before exiting */ ++int sys_check_options __P((void)); /* Check options specified */ ++void sys_close __P((void)); /* Clean up in a child before execing */ ++int ppp_available __P((void)); /* Test whether ppp kernel support exists */ ++int get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */ ++int open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ ++int tty_establish_ppp __P((int)); /* Turn serial port into a ppp interface */ ++void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */ ++void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */ ++int generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */ ++void make_new_bundle __P((int, int, int, int)); /* Create new bundle */ ++int bundle_attach __P((int)); /* Attach link to existing bundle */ ++void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */ ++void destroy_bundle __P((void)); /* Tell driver to destroy bundle */ ++void clean_check __P((void)); /* Check if line was 8-bit clean */ ++void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ ++void restore_tty __P((int)); /* Restore port's original parameters */ ++void setdtr __P((int, int)); /* Raise or lower port's DTR line */ ++void output __P((int, u_char *, int)); /* Output a PPP packet */ ++void wait_input __P((struct timeval *)); ++ /* Wait for input, with timeout */ ++void add_fd __P((int)); /* Add fd to set to wait for */ ++void remove_fd __P((int)); /* Remove fd from set to wait for */ ++int read_packet __P((u_char *)); /* Read PPP packet */ ++int get_loop_output __P((void)); /* Read pkts from loopback */ ++void tty_send_config __P((int, u_int32_t, int, int)); ++ /* Configure i/f transmit parameters */ ++void tty_set_xaccm __P((ext_accm)); ++ /* Set extended transmit ACCM */ ++void tty_recv_config __P((int, u_int32_t, int, int)); ++ /* Configure i/f receive parameters */ ++int ccp_test __P((int, u_char *, int, int)); ++ /* Test support for compression scheme */ ++void ccp_flags_set __P((int, int, int)); ++ /* Set kernel CCP state */ ++int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ ++int get_idle_time __P((int, struct ppp_idle *)); ++ /* Find out how long link has been idle */ ++int get_ppp_stats __P((int, struct pppd_stats *)); ++ /* Return link statistics */ ++void netif_set_mtu __P((int, int)); /* Set PPP interface MTU */ ++int netif_get_mtu __P((int)); /* Get PPP interface MTU */ ++int sifvjcomp __P((int, int, int, int)); ++ /* Configure VJ TCP header compression */ ++int sifup __P((int)); /* Configure i/f up for one protocol */ ++int sifnpmode __P((int u, int proto, enum NPmode mode)); ++ /* Set mode for handling packets for proto */ ++int sifdown __P((int)); /* Configure i/f down for one protocol */ ++int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); ++ /* Configure IPv4 addresses for i/f */ ++int cifaddr __P((int, u_int32_t, u_int32_t)); ++ /* Reset i/f IP addresses */ ++#ifdef INET6 ++int sif6addr __P((int, eui64_t, eui64_t)); ++ /* Configure IPv6 addresses for i/f */ ++int cif6addr __P((int, eui64_t, eui64_t)); ++ /* Remove an IPv6 address from i/f */ ++#endif ++int sifdefaultroute __P((int, u_int32_t, u_int32_t)); ++ /* Create default route through i/f */ ++int cifdefaultroute __P((int, u_int32_t, u_int32_t)); ++ /* Delete default route through i/f */ ++int sifproxyarp __P((int, u_int32_t)); ++ /* Add proxy ARP entry for peer */ ++int cifproxyarp __P((int, u_int32_t)); ++ /* Delete proxy ARP entry for peer */ ++u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ ++int lock __P((char *)); /* Create lock file for device */ ++int relock __P((int)); /* Rewrite lock file with new pid */ ++void unlock __P((void)); /* Delete previously-created lock file */ ++void logwtmp __P((const char *, const char *, const char *)); ++ /* Write entry to wtmp file */ ++int get_host_seed __P((void)); /* Get host-dependent random number seed */ ++int have_route_to __P((u_int32_t)); /* Check if route to addr exists */ ++#ifdef PPP_FILTER ++int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); ++ /* Set filter programs in kernel */ ++#endif ++#ifdef IPX_CHANGE ++int sipxfaddr __P((int, unsigned long, unsigned char *)); ++int cipxfaddr __P((int)); ++#endif ++int get_if_hwaddr __P((u_char *addr, char *name)); ++char *get_first_ethernet __P((void)); ++ ++/* Procedures exported from options.c */ ++int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */ ++int parse_args __P((int argc, char **argv)); ++ /* Parse options from arguments given */ ++int options_from_file __P((char *filename, int must_exist, int check_prot, ++ int privileged)); ++ /* Parse options from an options file */ ++int options_from_user __P((void)); /* Parse options from user's .ppprc */ ++int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ ++int options_from_list __P((struct wordlist *, int privileged)); ++ /* Parse options from a wordlist */ ++int getword __P((FILE *f, char *word, int *newlinep, char *filename)); ++ /* Read a word from a file */ ++void option_error __P((char *fmt, ...)); ++ /* Print an error message about an option */ ++int int_option __P((char *, int *)); ++ /* Simplified number_option for decimal ints */ ++void add_options __P((option_t *)); /* Add extra options */ ++void check_options __P((void)); /* check values after all options parsed */ ++int override_value __P((const char *, int, const char *)); ++ /* override value if permitted by priority */ ++void print_options __P((void (*) __P((void *, char *, ...)), void *)); ++ /* print out values of all options */ ++ ++int parse_dotted_ip __P((char *, u_int32_t *)); ++ ++/* ++ * Hooks to enable plugins to change various things. ++ */ ++extern int (*new_phase_hook) __P((int)); ++extern int (*idle_time_hook) __P((struct ppp_idle *)); ++extern int (*holdoff_hook) __P((void)); ++extern int (*pap_check_hook) __P((void)); ++extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp, ++ struct wordlist **paddrs, ++ struct wordlist **popts)); ++extern void (*pap_logout_hook) __P((void)); ++extern int (*pap_passwd_hook) __P((char *user, char *passwd)); ++extern int (*allowed_address_hook) __P((u_int32_t addr)); ++extern void (*ip_up_hook) __P((void)); ++extern void (*ip_down_hook) __P((void)); ++extern void (*ip_choose_hook) __P((u_int32_t *)); ++ ++extern int (*chap_check_hook) __P((void)); ++extern int (*chap_passwd_hook) __P((char *user, char *passwd)); ++ ++/* Let a plugin snoop sent and received packets. Useful for L2TP */ ++extern void (*snoop_recv_hook) __P((unsigned char *p, int len)); ++extern void (*snoop_send_hook) __P((unsigned char *p, int len)); ++ ++/* ++ * Inline versions of get/put char/short/long. ++ * Pointer is advanced; we assume that both arguments ++ * are lvalues and will already be in registers. ++ * cp MUST be u_char *. ++ */ ++#define GETCHAR(c, cp) { \ ++ (c) = *(cp)++; \ ++} ++#define PUTCHAR(c, cp) { \ ++ *(cp)++ = (u_char) (c); \ ++} ++ ++ ++#define GETSHORT(s, cp) { \ ++ (s) = *(cp)++ << 8; \ ++ (s) |= *(cp)++; \ ++} ++#define PUTSHORT(s, cp) { \ ++ *(cp)++ = (u_char) ((s) >> 8); \ ++ *(cp)++ = (u_char) (s); \ ++} ++ ++#define GETLONG(l, cp) { \ ++ (l) = *(cp)++ << 8; \ ++ (l) |= *(cp)++; (l) <<= 8; \ ++ (l) |= *(cp)++; (l) <<= 8; \ ++ (l) |= *(cp)++; \ ++} ++#define PUTLONG(l, cp) { \ ++ *(cp)++ = (u_char) ((l) >> 24); \ ++ *(cp)++ = (u_char) ((l) >> 16); \ ++ *(cp)++ = (u_char) ((l) >> 8); \ ++ *(cp)++ = (u_char) (l); \ ++} ++ ++#define INCPTR(n, cp) ((cp) += (n)) ++#define DECPTR(n, cp) ((cp) -= (n)) ++ ++/* ++ * System dependent definitions for user-level 4.3BSD UNIX implementation. ++ */ ++ ++#define TIMEOUT(r, f, t) timeout((r), (f), (t), 0) ++#define UNTIMEOUT(r, f) untimeout((r), (f)) ++ ++#define BCOPY(s, d, l) memcpy(d, s, l) ++#define BZERO(s, n) memset(s, 0, n) ++#define BCMP(s1, s2, l) memcmp(s1, s2, l) ++ ++#define PRINTMSG(m, l) { info("Remote message: %0.*v", l, m); } ++ ++/* ++ * MAKEHEADER - Add Header fields to a packet. ++ */ ++#define MAKEHEADER(p, t) { \ ++ PUTCHAR(PPP_ALLSTATIONS, p); \ ++ PUTCHAR(PPP_UI, p); \ ++ PUTSHORT(t, p); } ++ ++/* ++ * Exit status values. ++ */ ++#define EXIT_OK 0 ++#define EXIT_FATAL_ERROR 1 ++#define EXIT_OPTION_ERROR 2 ++#define EXIT_NOT_ROOT 3 ++#define EXIT_NO_KERNEL_SUPPORT 4 ++#define EXIT_USER_REQUEST 5 ++#define EXIT_LOCK_FAILED 6 ++#define EXIT_OPEN_FAILED 7 ++#define EXIT_CONNECT_FAILED 8 ++#define EXIT_PTYCMD_FAILED 9 ++#define EXIT_NEGOTIATION_FAILED 10 ++#define EXIT_PEER_AUTH_FAILED 11 ++#define EXIT_IDLE_TIMEOUT 12 ++#define EXIT_CONNECT_TIME 13 ++#define EXIT_CALLBACK 14 ++#define EXIT_PEER_DEAD 15 ++#define EXIT_HANGUP 16 ++#define EXIT_LOOPBACK 17 ++#define EXIT_INIT_FAILED 18 ++#define EXIT_AUTH_TOPEER_FAILED 19 ++#ifdef MAXOCTETS ++#define EXIT_TRAFFIC_LIMIT 20 ++#endif ++#define EXIT_CNID_AUTH_FAILED 21 ++ ++/* ++ * Debug macros. Slightly useful for finding bugs in pppd, not particularly ++ * useful for finding out why your connection isn't being established. ++ */ ++#ifdef DEBUGALL ++#define DEBUGMAIN 1 ++#define DEBUGFSM 1 ++#define DEBUGLCP 1 ++#define DEBUGIPCP 1 ++#define DEBUGIPV6CP 1 ++#define DEBUGUPAP 1 ++#define DEBUGCHAP 1 ++#endif ++ ++#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */ ++#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \ ++ || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \ ++ || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP) ++#define LOG_PPP LOG_LOCAL2 ++#else ++#define LOG_PPP LOG_DAEMON ++#endif ++#endif /* LOG_PPP */ ++ ++#ifdef DEBUGMAIN ++#define MAINDEBUG(x) if (debug) dbglog x ++#else ++#define MAINDEBUG(x) ++#endif ++ ++#ifdef DEBUGSYS ++#define SYSDEBUG(x) if (debug) dbglog x ++#else ++#define SYSDEBUG(x) ++#endif ++ ++#ifdef DEBUGFSM ++#define FSMDEBUG(x) if (debug) dbglog x ++#else ++#define FSMDEBUG(x) ++#endif ++ ++#ifdef DEBUGLCP ++#define LCPDEBUG(x) if (debug) dbglog x ++#else ++#define LCPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPCP ++#define IPCPDEBUG(x) if (debug) dbglog x ++#else ++#define IPCPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPV6CP ++#define IPV6CPDEBUG(x) if (debug) dbglog x ++#else ++#define IPV6CPDEBUG(x) ++#endif ++ ++#ifdef DEBUGUPAP ++#define UPAPDEBUG(x) if (debug) dbglog x ++#else ++#define UPAPDEBUG(x) ++#endif ++ ++#ifdef DEBUGCHAP ++#define CHAPDEBUG(x) if (debug) dbglog x ++#else ++#define CHAPDEBUG(x) ++#endif ++ ++#ifdef DEBUGIPXCP ++#define IPXCPDEBUG(x) if (debug) dbglog x ++#else ++#define IPXCPDEBUG(x) ++#endif ++ ++#ifndef SIGTYPE ++#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) ++#define SIGTYPE void ++#else ++#define SIGTYPE int ++#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */ ++#endif /* SIGTYPE */ ++ ++#ifndef MIN ++#define MIN(a, b) ((a) < (b)? (a): (b)) ++#endif ++#ifndef MAX ++#define MAX(a, b) ((a) > (b)? (a): (b)) ++#endif ++ ++#ifndef offsetof ++#define offsetof(type, member) ((size_t) &((type *)0)->member) ++#endif ++ ++#endif /* __PPP_H__ */ diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD new file mode 100644 index 000000000..404daa569 --- /dev/null +++ b/extra/capseo/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 49928 2009-08-16 21:41:13Z jgc $ +# Maintainer: Tobias Powalowski + +pkgname=capseo +pkgver=0.3 +pkgrel=1 +pkgdesc="Capseo video codec" +arch=('i686' 'x86_64') +url="http://dev.gentoo.org/~trapni/capseo/" +license=('GPL2') +depends=('libgl' 'gcc-libs') +options=('force' '!libtool') +makedepends=('pkgconfig' 'mesa' 'libogg') +source=(ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz) +md5sums=('bd869e8c9b1081e90a44567092ea8c5e') + +build() { + # start building + cd "${srcdir}" + ./autogen.sh || return 1 + ./configure --prefix=/usr --disable-static || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/catdoc/PKGBUILD b/extra/catdoc/PKGBUILD new file mode 100644 index 000000000..69a4ebfec --- /dev/null +++ b/extra/catdoc/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 31737 2009-03-28 04:16:53Z eric $ +# Maintainer: Juergen Hoetzel +# Contributor: Paulius Palevicius + +pkgname=catdoc +pkgver=0.94.2 +pkgrel=2 +pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text" +arch=(i686 x86_64) +url="http://www.wagner.pp.ru/~vitus/software/catdoc/" +license=('GPL') +depends=('glibc') +optdepends=('tk: for using wordview') +options=('!makeflags') +source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz) +md5sums=('243e1680bb3e703616f5adecfee24491') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1 + make || return 1 + make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1 +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/ccache/PKGBUILD b/extra/ccache/PKGBUILD new file mode 100644 index 000000000..14c3be955 --- /dev/null +++ b/extra/ccache/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 33524 2009-04-04 13:56:15Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Tom Newsom + +pkgname=ccache +pkgver=2.4 +pkgrel=5 +pkgdesc="ccache is a compiler cache" +url="http://ccache.samba.org/" +source=(http://samba.org/ftp/${pkgname}/$pkgname-$pkgver.tar.gz) +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc') +md5sums=('73c1ed1e767c1752dd0f548ec1e66ce7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 + install -Dm 755 ccache ${pkgdir}/usr/bin/ccache + install -Dm 644 ccache.1 ${pkgdir}/usr/share/man/man1/ccache.1 + + mkdir -p ${pkgdir}/usr/lib/ccache/bin + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/c++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-gcc + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-g++ + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-cpp + ln -sf /usr/bin/ccache ${pkgdir}/usr/lib/ccache/bin/${CHOST}-c++ +} + diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD new file mode 100644 index 000000000..6b4b555f3 --- /dev/null +++ b/extra/ccrtp/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 44975 2009-07-05 23:14:10Z giovanni $ +# Maintainer: Jeff Mickey +# Contributor: John Proctor + +pkgname=ccrtp +pkgver=1.7.0 +pkgrel=3 +pkgdesc="GNU ccRTP" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ccrtp" +license=('GPL' 'custom') +depends=('commoncpp2' 'zlib' 'libxml2' 'libgcrypt') +options=('!libtool') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('eb86cd2ac06af27ea60b1a349122605c') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + # arch64 fix from Mandriva + [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fpermissive" + + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install + install -D -m644 COPYING.addendum ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + rm -rf ${pkgdir}/usr/share/info/dir +} diff --git a/extra/ccscript3/PKGBUILD b/extra/ccscript3/PKGBUILD new file mode 100644 index 000000000..b07b1f595 --- /dev/null +++ b/extra/ccscript3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 44984 2009-07-06 02:20:00Z giovanni $ +# Maintainer: arjan +# Contributor: John Proctor + +pkgname=ccscript3 +pkgver=1.1.7 +pkgrel=1 +pkgdesc="GNU ccScript" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ccscript" +license=('GPL2') +depends=('commoncpp2' 'unixodbc') +makedepends=('pkgconfig') +replaces=('ccscript') +options=('!libtool') +source=(ftp://ftp.gnu.org/pub/gnu/ccscript/$pkgname-$pkgver.tar.gz + ccscript3-1.1.7-gcc44.patch) +md5sums=('126435f25568e88f0e5daf189dc0c847' + 'afdebdbcf835ee584a2a1c8eeddb0fdc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/ccscript3-1.1.7-gcc44.patch || return 1 + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install +} diff --git a/extra/ccscript3/ccscript3-1.1.7-gcc44.patch b/extra/ccscript3/ccscript3-1.1.7-gcc44.patch new file mode 100644 index 000000000..d2f023208 --- /dev/null +++ b/extra/ccscript3/ccscript3-1.1.7-gcc44.patch @@ -0,0 +1,21 @@ +--- a/optional/odbc/thread.cpp 2009-07-06 03:56:14.000000000 -0700 ++++ b/optional/odbc/thread.cpp 2009-07-06 03:56:14.000000000 -0700 +@@ -64,7 +64,7 @@ + SQLCHAR errmsg[128]; + SQLSMALLINT mlen, col, cols; + #if ODBCVER >= 0x0300 && !defined(__ppc__) +- SQLINTEGER rowcnt; ++ long int rowcnt; + #else + long int rowcnt; + #endif +--- a/src/script3.h 2007-08-11 04:39:53.000000000 -0700 ++++ b/src/script3.h 2009-07-06 04:10:28.000000000 -0700 +@@ -40,6 +40,7 @@ + * @short Threaded step execute scripting engine framework. + **/ + ++#include + + #ifndef CCXX_SCRIPT3_H_ + #define CCXX_SCRIPT3_H_ diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD new file mode 100644 index 000000000..57a6c7d99 --- /dev/null +++ b/extra/cd-discid/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 32270 2009-03-29 22:54:36Z eric $ +# Maintainer: dorphell +# Contributor: Jochem Kossen + +pkgname=cd-discid +pkgver=0.9 +pkgrel=2 +pkgdesc="cd-discid is a backend utility to get CDDB discid information from a CD-ROM disc." +arch=(i686 x86_64) +url="http://lly.org/~rcw/cd-discid/" +license=('GPL') +depends=('glibc') +source=(http://lly.org/~rcw/$pkgname/$pkgname\_$pkgver.orig.tar.gz) +md5sums=('64677b8b63d1db0db015043f5455171a') + +build() { + cd $srcdir/$pkgname-$pkgver + make || return 1 + make DESTDIR=$pkgdir INSTALL=/bin/install install || return 1 +} diff --git a/extra/cdargs/PKGBUILD b/extra/cdargs/PKGBUILD new file mode 100644 index 000000000..0849048ac --- /dev/null +++ b/extra/cdargs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 9109 2008-08-17 03:50:44Z allan $ +# Maintainer: damir +# Contributor: Damir Perisa + +pkgname=cdargs +pkgver=1.35 +pkgrel=2 +pkgdesc="A replacement for 'cd' that includes bookmarks/browsing for faster navigation" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.skamphausen.de/software/cdargs/" +depends=('glibc' 'ncurses' 'gcc-libs') +source=(http://www.skamphausen.de/downloads/$pkgname/$pkgname-$pkgver.tar.gz) +install=$pkgname.install + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make || return 1 + make DESTDIR=$startdir/pkg install + # install helper scripts + mkdir -p $startdir/pkg/usr/share/cdargs + cd contrib + make || return 1 + make DESTDIR=$startdir/pkg install + install $pkgname-{tcsh.csh,bash.sh} $startdir/pkg/usr/share/cdargs +} + +md5sums=('50be618d67f0b9f2439526193c69c567') diff --git a/extra/cdargs/cdargs.install b/extra/cdargs/cdargs.install new file mode 100644 index 000000000..bf60483fd --- /dev/null +++ b/extra/cdargs/cdargs.install @@ -0,0 +1,20 @@ +# arg 1: the new package version +post_install() { + echo "cdargs: helper scripts are in /usr/share/cdargs/" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + echo "cdargs: helper scripts are in /usr/share/cdargs/" +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/cdcd/PKGBUILD b/extra/cdcd/PKGBUILD new file mode 100644 index 000000000..1638d884b --- /dev/null +++ b/extra/cdcd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 52064 2009-09-14 22:54:46Z giovanni $ +# Maintainer: dorphell +#contributor Sarah Hay + +pkgname=cdcd +pkgver=0.6.6 +pkgrel=5 +pkgdesc="A commandline cd-player" +arch=('i686' 'x86_64') +depends=('libcdaudio' 'readline') +source=(http://downloads.sourceforge.net/sourceforge/libcdaudio/$pkgname-$pkgver.tar.gz + cdcd-0.6.6-x86_64.patch) +url="http://libcdaudio.sourceforge.net/" +license=('GPL2') +md5sums=('dc17f2e275c7214cb693f6abb50f29fb' + '7c39f01408fc084e2c62da4da324370e') + +build() { + cd $startdir/src/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/cdcd-0.6.6-x86_64.patch + ./configure --prefix=/usr + make || return 1 + make prefix=$startdir/pkg/usr install + + install -dm755 ${pkgdir}/usr/share + mv ${pkgdir}/usr/{man,info} ${pkgdir}/usr/share + rm ${pkgdir}/usr/share/info/dir +} diff --git a/extra/cdcd/cdcd-0.6.6-x86_64.patch b/extra/cdcd/cdcd-0.6.6-x86_64.patch new file mode 100644 index 000000000..25d122435 --- /dev/null +++ b/extra/cdcd/cdcd-0.6.6-x86_64.patch @@ -0,0 +1,11 @@ +--- a/config.sub 2009-09-15 00:42:36.000000000 -0700 ++++ b/config.sub 2009-09-15 00:42:36.000000000 -0700 +@@ -155,7 +155,7 @@ + | alpha | we32k | ns16k | clipper | i370 | sh \ + | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ + | pdp11 | mips64el | mips64orion | mips64orionel \ +- | sparc | sparclet | sparclite | sparc64) ++ | sparc | sparclet | sparclite | sparc64 | x86_64-*) + basic_machine=$basic_machine-unknown + ;; + # We use `pc' rather than `unknown' diff --git a/extra/cddb_get/PKGBUILD b/extra/cddb_get/PKGBUILD new file mode 100644 index 000000000..8c851804f --- /dev/null +++ b/extra/cddb_get/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# Contributor Sarah Hay +# Maintainer: dorphell + +pkgname=cddb_get +_realname=CDDB_get +pkgver=2.27 +pkgrel=3 +pkgdesc="This module/script gets the CDDB info for an audio cd." +license=('GPL' 'PerlArtistic') +arch=("i686" "x86_64") +depends=('perl>=5.10.0') +options=(!emptydirs) +source=(http://armin.emx.at/cddb/${_realname}-${pkgver}.tar.gz) +md5sums=('405a3704ad5db45f117cc7cc5bd1ce7c') +url="http://armin.emx.at/cddb/" +sha1sums=('cec39851678bbb1fdd76f2cbd170628baf4971e6') + +build() { + cd ${startdir}/src/${_realname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor || return 1 + make || return 1 + make DESTDIR=${startdir}/pkg install || return 1 + + # remove perllocal.pod and .packlist + find ${startdir}/pkg -name perllocal.pod -delete + find ${startdir}/pkg -name .packlist -delete +} diff --git a/extra/cdlabelgen/LICENSE b/extra/cdlabelgen/LICENSE new file mode 100644 index 000000000..a5720065c --- /dev/null +++ b/extra/cdlabelgen/LICENSE @@ -0,0 +1,30 @@ +# ----------------------------------------------------------------------- +# Copyright (C) 2002 Avinash Chopde http://www.aczoom.com/ +# +# All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, and/or sell copies of the Software, and to permit persons +# to whom the Software is furnished to do so, provided that the above +# copyright notice(s) and this permission notice appear in all copies of +# the Software and that both the above copyright notice(s) and this +# permission notice appear in supporting documentation. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Except as contained in this notice, the name of a copyright holder +# shall not be used in advertising or otherwise to promote the sale, use +# or other dealings in this Software without prior written authorization +# of the copyright holder. +# ======================================================================== diff --git a/extra/cdlabelgen/PKGBUILD b/extra/cdlabelgen/PKGBUILD new file mode 100644 index 000000000..45cd20e49 --- /dev/null +++ b/extra/cdlabelgen/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 32271 2009-03-29 22:58:01Z eric $ +# Maintainer: Kevin Piche +# Contributor: Tom Newsom + +pkgname=cdlabelgen +pkgver=4.1.0 +pkgrel=2 +pkgdesc="Generates frontcards and traycards for CDs." +arch=('i686' 'x86_64') +url="http://www.aczoom.com/tools/cdinsert/" +license=('MIT') +depends=('perl') +source=(http://www.aczoom.com/pub/tools/$pkgname-$pkgver.tgz LICENSE) +md5sums=('327673292732c1ad71ae15e0db13d0e4' '48166ff2bf32faab4b45c6b9981446ee') + +build() { + cd $srcdir/$pkgname-$pkgver + install -d $pkgdir/usr/share/man/man1 + make BASE_DIR=$pkgdir/usr install || return 1 + install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/cdparanoia/ChangeLog b/extra/cdparanoia/ChangeLog new file mode 100644 index 000000000..a1a1d4df4 --- /dev/null +++ b/extra/cdparanoia/ChangeLog @@ -0,0 +1,23 @@ +2008-09-15 Alexander Fehr + + * cdparanoia-10.2-1: + New upstream release. + +2008-08-07 Alexander Fehr + + * cdparanoia-10.1-1: + New upstream release. + Changed license to GPL. + Added !makeflags option. + +2008-07-07 Alexander Fehr + + * cdparanoia-10.0-1: + New upstream release. + New maintainer. + Added arch variable. + Changed license to GPL3. + Fixed man page location. + Removed cdparanoia.patch. + Removed gcc34.patch. + Added ChangeLog. diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD new file mode 100644 index 000000000..00dc3b9a7 --- /dev/null +++ b/extra/cdparanoia/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 53530 2009-10-02 03:48:49Z eric $ +# Maintainer: Alexander Fehr + +pkgname=cdparanoia +pkgver=10.2 +pkgrel=2 +pkgdesc="Compact Disc Digital Audio extraction tool" +arch=('i686' 'x86_64') +url="http://www.xiph.org/paranoia/" +license=('GPL') +depends=('glibc') +options=('!makeflags') +source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch) +md5sums=('b304bbe8ab63373924a744eac9ebc652' '12da14958d2b84c6719fe69890436445') +sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' '67faaf0e3eed2e3de6f66d8168604bc6c7295921') + +build() { + cd "$srcdir/cdparanoia-III-$pkgver" + patch -p0 -i ${srcdir}/gcc.patch || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1 +} diff --git a/extra/cdparanoia/gcc.patch b/extra/cdparanoia/gcc.patch new file mode 100644 index 000000000..b157353e2 --- /dev/null +++ b/extra/cdparanoia/gcc.patch @@ -0,0 +1,582 @@ +Index: interface/test_interface.c +=================================================================== +--- interface/test_interface.c (Revision 15337) ++++ interface/test_interface.c (Revision 15340) +@@ -66,9 +66,9 @@ + if(!fd)fd=fdopen(d->cdda_fd,"r"); + + if(beginprivate->last_milliseconds=20; ++ d->private_data->last_milliseconds=20; + else +- d->private->last_milliseconds=sectors; ++ d->private_data->last_milliseconds=sectors; + + #ifdef CDDA_TEST_UNDERRUN + sectors-=1; +Index: interface/cdda_interface.h +=================================================================== +--- interface/cdda_interface.h (Revision 15337) ++++ interface/cdda_interface.h (Revision 15340) +@@ -84,7 +84,7 @@ + int is_atapi; + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *private_data; + void *reserved; + unsigned char inqbytes[4]; + +Index: interface/interface.c +=================================================================== +--- interface/interface.c (Revision 15337) ++++ interface/interface.c (Revision 15340) +@@ -39,9 +39,9 @@ + if(d->drive_model)free(d->drive_model); + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + + free(d); +@@ -127,7 +127,7 @@ + } + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->private_data->last_milliseconds; + return(sectors); + } + +Index: interface/scsi_interface.c +=================================================================== +--- interface/scsi_interface.c (Revision 15337) ++++ interface/scsi_interface.c (Revision 15340) +@@ -15,13 +15,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +@@ -96,7 +96,7 @@ + static void clear_garbage(cdrom_drive *d){ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + int flag=0; + + /* clear out any possibly preexisting garbage */ +@@ -185,7 +185,7 @@ + struct timespec tv2; + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->private_data->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + + /* generic scsi device services */ +@@ -195,7 +195,7 @@ + + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; + sg_hd->reply_len = SG_OFF + out_size; +@@ -209,7 +209,7 @@ + tell if the command failed. Scared yet? */ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ + writebytes+=(out_size-in_size); +@@ -243,7 +243,7 @@ + } + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->private_data->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); + +@@ -289,7 +289,7 @@ + } + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->private_data->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); +@@ -313,7 +313,7 @@ + if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -326,9 +326,9 @@ + + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); + } +@@ -347,7 +347,7 @@ + + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; + hdr.cmd_len = cmd_len; +@@ -355,7 +355,7 @@ + hdr.mx_sb_len = SG_MAX_SENSE; + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->private_data->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + + /* scary buffer fill hack */ +@@ -400,7 +400,7 @@ + if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ ++ if(d->private_data->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -412,7 +412,7 @@ + } + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->private_data->last_milliseconds = hdr.duration; */ + + errno = 0; + return 0; +@@ -445,9 +445,9 @@ + + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->private_data->sg_buffer[2] & 0xf; ++ ASC = d->private_data->sg_buffer[12]; ++ ASCQ = d->private_data->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; + return 1; +@@ -492,7 +492,7 @@ + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->private_data->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ + +@@ -604,8 +604,8 @@ + static unsigned int get_orig_sectorsize(cdrom_drive *d){ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->private_data->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); + } + + /* switch CDROM scsi drives to given sector size */ +@@ -664,8 +664,8 @@ + return(-4); + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->private_data->sg_buffer[2]; ++ last=d->private_data->sg_buffer[3]; + tracks=last-first+1; + + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { +@@ -683,7 +683,7 @@ + return(-5); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=i; +@@ -704,7 +704,7 @@ + return(-2); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=0xAA; +@@ -738,7 +738,7 @@ + } + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->private_data->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); + return(-3); +@@ -754,33 +754,33 @@ + return(-5); + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | ++ (d->private_data->sg_buffer[3]<<16)| ++ (d->private_data->sg_buffer[4]<<8)| ++ (d->private_data->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | ++ (d->private_data->sg_buffer[7]<<16)| ++ (d->private_data->sg_buffer[8]<<8)| ++ (d->private_data->sg_buffer[9])))); + + + d->cd_extra = FixupTOC(d,tracks+1); +@@ -817,7 +817,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -836,7 +836,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -854,7 +854,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -872,7 +872,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -890,7 +890,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -908,7 +908,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -922,7 +922,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -936,7 +936,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -950,7 +950,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -964,7 +964,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -978,7 +978,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -992,7 +992,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1026,7 +1026,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1039,7 +1039,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1052,7 +1052,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1275,7 +1275,7 @@ + static int count_2352_bytes(cdrom_drive *d){ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + + return(0); +@@ -1284,7 +1284,7 @@ + static int verify_nonzero(cdrom_drive *d){ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->private_data->sg_buffer[i]!=0){ + flag=1; + break; + } +@@ -1621,7 +1621,7 @@ + d->is_mmc=0; + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->private_data->sg_buffer; + b+=b[3]+4; + + if((b[0]&0x3F)==0x2A){ +@@ -1669,7 +1669,7 @@ + cderror(d,"008: Unable to identify CDROM model\n"); + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->private_data->sg_buffer); + } + + int scsi_init_drive(cdrom_drive *d){ +@@ -1725,8 +1725,8 @@ + check_cache(d); + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + d->report_all=1; + return(0); + } +Index: interface/cooked_interface.c +=================================================================== +--- interface/cooked_interface.c (Revision 15337) ++++ interface/cooked_interface.c (Revision 15340) +@@ -13,13 +13,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->private_data->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->private_data->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->private_data->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +Index: interface/scan_devices.c +=================================================================== +--- interface/scan_devices.c (Revision 15337) ++++ interface/scan_devices.c (Revision 15340) +@@ -264,11 +264,11 @@ + d->interface=COOKED_IOCTL; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); + return(d); +@@ -674,15 +674,15 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ + version=verify_SG_version(d,messagedest,messages); +@@ -696,8 +696,8 @@ + } + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; + } + + { +@@ -772,9 +772,9 @@ + if(i_fd!=-1)close(i_fd); + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->private_data){ ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); ++ free(d->private_data); + } + free(d); + } +@@ -821,7 +821,7 @@ + d->interface=TEST_INTERFACE; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->private_data=calloc(1,sizeof(*d->private_data)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); + diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD new file mode 100644 index 000000000..052e670b6 --- /dev/null +++ b/extra/cdrdao/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 49925 2009-08-16 21:37:34Z jgc $ +# Maintainer: dorphell +pkgname=cdrdao +pkgver=1.2.3rc2 +pkgrel=1 +pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode" +arch=(i686 x86_64) +license=('GPL') +url="http://cdrdao.sourceforge.net/" +depends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao') +source=(ftp://ftp.archlinux.org/other/cdrdao/${pkgname}-${pkgver}.tar.bz2 + cdrdao-1.2.3-autoconf-update.patch + cdrdao-1.2.3-gcc44.patch + cdrdao-1.2.3-k3b.patch + cdrdao-1.2.3-pkg-config.patch + cdrdao-1.2.3-toc2cue.patch + cdrdao-1.2.3-tocparser.patch) +md5sums=('862f35eeb1c148db8bea99abb4a643fc' + '8e53dfc174f7c0882194caa05e68b85e' + '0e09ec11d6804d8db2eccaeb539f3f83' + '696f6ca01e1eeb9b6a5be88e535d9398' + '829ff219a1c98a0fcccd9ab3ced0cbd1' + '6982de2c8ae02169ef5756b5ca1d03a8' + 'e4afe12b00f686562056b66b29a7e6e4') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-gcc44.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-pkg-config.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-toc2cue.patch" || return 1 + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-tocparser.patch" || return 1 + aclocal || return 1 + autoconf || return 1 + automake || return 1 + ./configure --prefix=/usr --with-lame || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/cdrdao/cdrdao-1.2.3-autoconf-update.patch b/extra/cdrdao/cdrdao-1.2.3-autoconf-update.patch new file mode 100644 index 000000000..4eb1ade7e --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-autoconf-update.patch @@ -0,0 +1,52 @@ +--- cdrdao-1.2.3rc2/acinclude.m4.orig 2009-02-21 11:30:02.000000000 +0100 ++++ cdrdao-1.2.3rc2/acinclude.m4 2009-05-22 22:38:15.448770972 +0200 +@@ -1,5 +1,49 @@ ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl ++ ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi ++ ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++ ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi ++ ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) ++ ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--disable-schemas-install], ++ [Disable the schemas installation]), ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) + # Configure paths for GTK-- + # Erik Andersen 30 May 1998 + # Modified by Tero Pulkkinen (added the compiler checks... I hope they work..) + + dnl Check and configure include and link paths for lame library diff --git a/extra/cdrdao/cdrdao-1.2.3-gcc44.patch b/extra/cdrdao/cdrdao-1.2.3-gcc44.patch new file mode 100644 index 000000000..b7483147d --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-gcc44.patch @@ -0,0 +1,23 @@ +--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~ 2008-02-17 14:05:05.000000000 +0100 ++++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc 2009-04-07 09:05:41.000000000 +0200 +@@ -20,6 +20,7 @@ + #include "TempFileManager.h" + #include "log.h" + ++#include + #include + #include + #include +--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~ 2009-02-21 11:01:32.000000000 +0100 ++++ cdrdao-1.2.3rc2/dao/CdrDriver.cc 2009-04-07 09:07:14.000000000 +0200 +@@ -2114,8 +2114,8 @@ + ret = 1; + } + else { +- if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0) +- ret = 1; ++ if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0) ++ ret = 1; + } + break; + diff --git a/extra/cdrdao/cdrdao-1.2.3-k3b.patch b/extra/cdrdao/cdrdao-1.2.3-k3b.patch new file mode 100644 index 000000000..3de655d54 --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-k3b.patch @@ -0,0 +1,11 @@ +--- cdrdao/dao/main.cc~ 2009-04-16 15:34:27.000000000 +0200 ++++ cdrdao/dao/main.cc 2009-04-16 15:34:38.000000000 +0200 +@@ -207,7 +207,7 @@ + + static void printVersion() + { +- log_message(2, "Cdrdao version %s - (C) Andreas Mueller ", ++ log_message(0, "Cdrdao version %s - (C) Andreas Mueller ", + VERSION); + + std::list list; diff --git a/extra/cdrdao/cdrdao-1.2.3-pkg-config.patch b/extra/cdrdao/cdrdao-1.2.3-pkg-config.patch new file mode 100644 index 000000000..51bb6adc9 --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-pkg-config.patch @@ -0,0 +1,15 @@ +diff -NrU5 cdrdao-1.2.3rc2.orig/configure.ac cdrdao-1.2.3rc2/configure.ac +--- cdrdao-1.2.3rc2.orig/configure.ac 2009-05-19 16:03:03.616292795 +0200 ++++ cdrdao-1.2.3rc2/configure.ac 2009-05-19 16:04:55.826318499 +0200 +@@ -32,10 +32,11 @@ + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_RANLIB + AC_CHECK_PROG(AR,ar,ar) + AC_PROG_MAKE_SET ++PKG_PROG_PKG_CONFIG + + dnl Checks for header files. + AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h) diff --git a/extra/cdrdao/cdrdao-1.2.3-toc2cue.patch b/extra/cdrdao/cdrdao-1.2.3-toc2cue.patch new file mode 100644 index 000000000..076b55f90 --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-toc2cue.patch @@ -0,0 +1,12 @@ +diff -Naur cdrdao-1.2.2/trackdb/TocParser.g cdrdao-1.2.2-cclpatch/trackdb/TocParser.g +--- cdrdao-1.2.2/trackdb/TocParser.g 2008-10-06 08:50:48.000000000 -0700 ++++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g 2008-10-06 08:50:48.000000000 -0700 +@@ -774,7 +774,7 @@ + << if (item != NULL) { + int type = item->packType(); + +- if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) { ++ if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) { + log_message(-2, "%s:%d: Invalid CD-TEXT item for a track.", + filename_, lineNr); + error_ = 1; diff --git a/extra/cdrdao/cdrdao-1.2.3-tocparser.patch b/extra/cdrdao/cdrdao-1.2.3-tocparser.patch new file mode 100644 index 000000000..d5fb9b776 --- /dev/null +++ b/extra/cdrdao/cdrdao-1.2.3-tocparser.patch @@ -0,0 +1,17 @@ +--- cdrdao-1.2.3.orig/trackdb/TocParser.g 2009/02/21 21:40:56 1.14 ++++ cdrdao-1.2.3/trackdb/TocParser.g 2009/05/04 15:49:52 1.15 +@@ -511,8 +511,12 @@ + >> + ) + << if ($st != NULL && $st->length() == 0) { +- // try to determine length +- $st->determineLength(); ++ // try to determine length ++ if ($st->determineLength() != 0) { ++ log_message(-2, "%s:%d: Cannot determine length of track data specification.", ++ filename_, $lineNr); ++ error_ = 1; ++ } + } + >> + ; diff --git a/extra/cdrkit/ChangeLog b/extra/cdrkit/ChangeLog new file mode 100644 index 000000000..eaaf7a18e --- /dev/null +++ b/extra/cdrkit/ChangeLog @@ -0,0 +1,16 @@ +2008-11-26 Alexander Fehr + + * cdrkit-1.1.9-1: + New upstream release. + Added dependency on perl. + +2008-07-14 Alexander Fehr + + * cdrkit-1.1.8-1: + New upstream release. + New maintainer. + Changed license to GPL2. + Added dependency on bzip2. + Removed replaces cdrtools. + Cleaned up cdrtools compatibility symlinks. + Added ChangeLog. diff --git a/extra/cdrkit/PKGBUILD b/extra/cdrkit/PKGBUILD new file mode 100644 index 000000000..b9707fd43 --- /dev/null +++ b/extra/cdrkit/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 29718 2009-03-12 01:27:00Z hugo $ +# Maintainer: Alexander Fehr + +pkgname=cdrkit +pkgver=1.1.9 +pkgrel=2 +pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction" +arch=('i686' 'x86_64') +url="http://cdrkit.org/" +license=('GPL2') +depends=('libcap>=2.16' 'file' 'bzip2' 'perl') +makedepends=('cmake') +provides=('cdrtools') +conflicts=('cdrtools') +source=(http://cdrkit.org/releases/cdrkit-$pkgver.tar.gz) +md5sums=('cbc0647e5d85f0e8fb3a692ba1d42edd') + +build() { + cd "$srcdir/cdrkit-$pkgver" + + make || return 1 + make PREFIX="$pkgdir/usr" install || return 1 + + # Make symlinks for cdrtools compatibility + cd "$pkgdir/usr/bin" + ln -s wodim cdrecord || return 1 + ln -s readom readcd || return 1 + ln -s genisoimage mkisofs || return 1 + ln -s genisoimage mkhybrid || return 1 + ln -s icedax cdda2wav || return 1 + + cd "$pkgdir/usr/share/man/man1" + ln -s wodim.1 cdrecord.1 || return 1 + ln -s readom.1 readcd.1 || return 1 + ln -s genisoimage.1 mkisofs.1 || return 1 + ln -s genisoimage.1 mkhybrid.1 || return 1 + ln -s icedax.1 cdda2wav.1 || return 1 +} diff --git a/extra/cdtool/PKGBUILD b/extra/cdtool/PKGBUILD new file mode 100644 index 000000000..763ac9f33 --- /dev/null +++ b/extra/cdtool/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 30629 2009-03-21 03:30:26Z hugo $ +# Maintainer: Alexander Baldeck +# Contributer: dorphell +# Contributor: Sarah Hay + +pkgname=cdtool +pkgver=2.1.8 +pkgrel=2 +pkgdesc="A package of command-line utilities to play and catalog audio CD-ROMs." +arch=('i686' 'x86_64') +license=('GPL2') +depends=('bash') +source=(http://www.sfr-fresh.com/linux/misc//${pkgname}-${pkgver}.tar.gz) +url="http://hinterhof.net/cdtool/" + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 || return 1 + make DESTDIR=${pkgdir} install || return 1 +} +md5sums=('7b19b6f68d2c648296378b784d5f7681') diff --git a/extra/cegui/PKGBUILD b/extra/cegui/PKGBUILD new file mode 100644 index 000000000..884bd6530 --- /dev/null +++ b/extra/cegui/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 24196 2009-01-15 01:30:29Z douglas $ +# Maintainer: Juergen Hoetzel +# Contributors: William Rea , +# Bjorn Lindeijer + +pkgname=cegui +pkgver=0.6.2b +pkgrel=4 +pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" +arch=(i686 x86_64) +url="http://crayzedsgui.sourceforge.net" +options=('!libtool') +license=("MIT") +depends=('pcre' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') +[ "$CARCH" = "x86_64" ] && depends=(${depends[@]} 'silly') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) + +build() { + cd $startdir/src/CEGUI-0.6.2 + + ./configure --prefix=/usr --sysconfdir=/etc --enable-devil --enable-silly \ + --disable-xerces-c --with-default-image-codec=SILLYImageCodec \ + --enable-lua + make || return 1 + make DESTDIR=$startdir/pkg install + + install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING +} +md5sums=('4fbd95e5a2ac1c7acf2a8f5df3ac6b93') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD new file mode 100644 index 000000000..1fd7cbbc2 --- /dev/null +++ b/extra/celestia/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 46231 2009-07-14 19:30:45Z ronald $ +# Maintainer: Ronald van Haren +# Contributor : Damir Perisa + +pkgname=celestia +pkgver=1.6.0 +pkgrel=1 +pkgdesc="Real-time space simulation" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.shatters.net/celestia/" +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg>=7') +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz + 'celestia-1.5.1-gcc44.patch') +md5sums=('9b96a8e7666ab5a26f032b9d605e023d' + '0c606dbd3a641afb1b0725428db854c8') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # build patch + patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch || return 1 + + ./configure --prefix=/usr \ + --with-lua=/usr \ + --datadir=/usr/share \ + --with-gtk + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} + diff --git a/extra/celestia/celestia-1.5.1-gcc44.patch b/extra/celestia/celestia-1.5.1-gcc44.patch new file mode 100644 index 000000000..b1ee896f0 --- /dev/null +++ b/extra/celestia/celestia-1.5.1-gcc44.patch @@ -0,0 +1,20 @@ +--- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400 ++++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400 +@@ -10,6 +10,7 @@ + #ifndef _OVERLAY_H_ + #define _OVERLAY_H_ + ++#include + #include + #include + #include +--- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400 ++++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400 +@@ -8,6 +8,7 @@ + // of the License, or (at your option) any later version. + + #include ++#include + #include + #include + #include "celestia.h" diff --git a/extra/centerim/PKGBUILD b/extra/centerim/PKGBUILD new file mode 100644 index 000000000..b1a1d7918 --- /dev/null +++ b/extra/centerim/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 44912 2009-07-05 11:09:24Z giovanni $ +# Maintainer: Aaron Griffin +# Contributor: shild + +pkgname=centerim +pkgver=4.22.7 +pkgrel=2 +pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface" +arch=('i686' 'x86_64') +url="http://www.centerim.org" +license=('GPL') +depends=('python' 'libjpeg>=7' 'gpgme') +replaces=('centericq') +source=("http://www.centerim.org/download/releases/$pkgname-$pkgver.tar.bz2") + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --with-ssl \ + --with-openssl \ + --enable-locales-fix + + make || return 1 + make DESTDIR=${pkgdir} install +} +md5sums=('2db303baa9b7680c2cccb3314bfa7ae2') diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD new file mode 100644 index 000000000..22ca91495 --- /dev/null +++ b/extra/cfitsio/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 27242 2009-02-17 08:32:02Z eric $ +# Maintainer: Tobias Powalowski + +pkgname=cfitsio +pkgver=3130 +pkgrel=1 +pkgdesc="CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format." +arch=('i686' 'x86_64') +url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +license=('GPL2') +makedepends=('pkgconfig') +options=('!libtool') +source=(ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver}.tar.gz) +md5sums=('a353503755f57610d22a6b6c158b02d0') + +build() { + cd ${srcdir}/${pkgname} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 +} diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD new file mode 100644 index 000000000..d1392aa4e --- /dev/null +++ b/extra/cheese/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 44677 2009-07-03 17:47:28Z jgc $ +# Maintainer: Jan de Groot + +pkgname=cheese +pkgver=2.26.3 +pkgrel=1 +pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" +arch=(i686 x86_64) +license=('GPL') +depends=('gnome-desktop>=2.26.3' 'gstreamer0.10-base-plugins>=0.10.23' 'gstreamer0.10-good-plugins>=0.10.14' 'evolution-data-server>=2.26.3' 'librsvg>=2.26.0' 'gnome-icon-theme>=2.26.0' 'gconf>=2.26.0-2') +makedepends=('pkgconfig' 'gnome-doc-utils>=0.16.0' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org/projects/cheese/" +install=cheese.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) +md5sums=('c00fbf9e79e39cb95af57c0a6cf9ce88') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib \ + --disable-scrollkeeper || return 1 + make || return 1 + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain cheese ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/cheese/cheese.install b/extra/cheese/cheese.install new file mode 100644 index 000000000..2ee180576 --- /dev/null +++ b/extra/cheese/cheese.install @@ -0,0 +1,22 @@ +pkgname=cheese + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD new file mode 100644 index 000000000..6e354af3b --- /dev/null +++ b/extra/chemtool/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 49294 2009-08-05 21:34:50Z tpowa $ +#Maintainer: Tobias Powalowski + +pkgname=chemtool +pkgver=1.6.12 +pkgrel=2 +pkgdesc="A small program for drawing chemical structures" +arch=(i686 x86_64) +license=('GPL2') +url="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html" +depends=('gtk2') +options=(!libtool) +source=(http://ruby.chemie.uni-freiburg.de/~martin/$pkgname/$pkgname-$pkgver.tar.gz chemtool.desktop) + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make || return 1 + make DESTDIR=$startdir/pkg/ install + install -D -m644 gnome/chemtool.png $startdir/pkg/usr/share/pixmaps/chemtool.png + install -D -m644 $startdir/src/chemtool.desktop $startdir/pkg/usr/share/applications/chemtool.desktop +} +md5sums=('f9e0633cbda09fcfe5a4ea4c56bcd460' + '8cbb6f7021bd5aaa6f6a31fc4d95a06e') diff --git a/extra/chemtool/chemtool.desktop b/extra/chemtool/chemtool.desktop new file mode 100644 index 000000000..a93770aea --- /dev/null +++ b/extra/chemtool/chemtool.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Chemtool +Comment=Molecules 2D drawing +Name[cs_CZ.ISO8859-2]=Chemtool +Comment[cs_CZ.ISO8859-2]=Editor molekul +Comment[de_DE.ISO8859-1]=MolekĂĽleditor +Exec=chemtool +Icon=chemtool.png +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Graphics;2DGraphics;GTK; +MimeType=application/x-chemtool; diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD new file mode 100644 index 000000000..709dafe55 --- /dev/null +++ b/extra/chkrootkit/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 52033 2009-09-14 13:59:39Z hugo $ +# Maintainer: Hugo Doria +# Contributor: Gregor Ibic + +pkgname=chkrootkit +pkgver=0.49 +pkgrel=1 +pkgdesc="Locally checks for signs of a rootkit." +arch=('i686' 'x86_64') +url="http://www.chkrootkit.org" +depends=('bash') +license=('BSD') +source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz fix-tools-path.patch) +md5sums=('304d840d52840689e0ab0af56d6d3a18' '6a2f3038114b8b14e1ad74e30fe44eee') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 < ${srcdir}/fix-tools-path.patch + chown root:root * + make sense || return 1 + find ${srcdir}/${pkgname}-${pkgver} -perm /u+x -type f \ + -execdir install -D -m755 "{}" ${pkgdir}/usr/bin/"{}" ";" +} diff --git a/extra/chkrootkit/chkrootkit.install b/extra/chkrootkit/chkrootkit.install new file mode 100644 index 000000000..8813d2b50 --- /dev/null +++ b/extra/chkrootkit/chkrootkit.install @@ -0,0 +1,21 @@ +post_install() { + cat << EOF + +Check out the /opt/chkrootkit directory, run chkrootkit as root this way: + # ./chkrootkit + +EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch new file mode 100644 index 000000000..2f3c38528 --- /dev/null +++ b/extra/chkrootkit/fix-tools-path.patch @@ -0,0 +1,161 @@ +--- chkrootkit 2008-01-19 11:01:15.000000000 +0100 ++++ chkrootkit 2008-11-01 13:11:14.000000000 +0100 +@@ -158,23 +158,23 @@ + fi + + if [ "${EXPERT}" = "t" ]; then +- expertmode_output "./ifpromisc" -v ++ expertmode_output "/usr/bin/ifpromisc" -v + return 5 + fi +- if [ ! -x ./ifpromisc ]; then +- echo "not tested: can't exec ./ifpromisc" ++ if [ ! -x /usr/bin/ifpromisc ]; then ++ echo "not tested: can't exec /usr/bin/ifpromisc" + return ${NOT_TESTED} + else +- [ "${QUIET}" != "t" ] && ./ifpromisc -v || ./ifpromisc -q ++ [ "${QUIET}" != "t" ] && /usr/bin/ifpromisc -v || /usr/bin/ifpromisc -q + fi + } + + chkutmp() { +- if [ ! -x ./chkutmp ]; then +- echo "not tested: can't exec ./chkutmp" ++ if [ ! -x /usr/bin/chkutmp ]; then ++ echo "not tested: can't exec /usr/bin/chkutmp" + return ${NOT_TESTED} + fi +- if ./chkutmp ++ if /usr/bin/chkutmp + then + if [ "${QUIET}" != "t" ]; then echo "chkutmp: nothing deleted"; fi + fi +@@ -182,8 +182,8 @@ + } + + z2 () { +- if [ ! -x ./chklastlog ]; then +- echo "not tested: can't exec ./chklastlog" ++ if [ ! -x /usr/bin/chklastlog ]; then ++ echo "not tested: can't exec /usr/bin/chklastlog" + return ${NOT_TESTED} + fi + +@@ -196,32 +196,32 @@ + fi + + if [ "${EXPERT}" = "t" ]; then +- expertmode_output "./chklastlog -f ${WTMP} -l ${LASTLOG}" ++ expertmode_output "/usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG}" + return 5 + fi + +- if ./chklastlog -f ${WTMP} -l ${LASTLOG} ++ if /usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG} + then + if [ "${QUIET}" != "t" ]; then echo "chklastlog: nothing deleted"; fi + fi + } + + wted () { +- if [ ! -x ./chkwtmp ]; then +- echo "not tested: can't exec ./chkwtmp" ++ if [ ! -x /usr/bin/chkwtmp ]; then ++ echo "not tested: can't exec /usr/bin/chkwtmp" + return ${NOT_TESTED} + fi + + if [ "$SYSTEM" = "SunOS" ]; then +- if [ ! -x ./check_wtmpx ]; then +- echo "not tested: can't exec ./check_wtmpx" ++ if [ ! -x /usr/bin/check_wtmpx ]; then ++ echo "not tested: can't exec /usr/bin/check_wtmpx" + else + if [ "${EXPERT}" = "t" ]; then +- expertmode_output "./check_wtmpx" ++ expertmode_output "/usr/bin/check_wtmpx" + return 5 + fi + if [ -f ${ROOTDIR}var/adm/wtmp ]; then +- if ./check_wtmpx ++ if /usr/bin/check_wtmpx + then + if [ "${QUIET}" != "t" ]; then \ + echo "check_wtmpx: nothing deleted in /var/adm/wtmpx"; fi +@@ -232,12 +232,12 @@ + WTMP=`loc wtmp wtmp "${ROOTDIR}var/log ${ROOTDIR}var/adm"` + + if [ "${EXPERT}" = "t" ]; then +- expertmode_output "./chkwtmp -f ${WTMP}" ++ expertmode_output "/usr/bin/chkwtmp -f ${WTMP}" + return 5 + fi + fi + +- if ./chkwtmp -f ${WTMP} ++ if /usr/bin/chkwtmp -f ${WTMP} + then + if [ "${QUIET}" != "t" ]; then echo "chkwtmp: nothing deleted"; fi + fi +@@ -275,8 +275,8 @@ + prog="" + if [ \( "${SYSTEM}" = "Linux" -o \( "${SYSTEM}" = "FreeBSD" -a \ + `echo ${V} | ${awk} '{ if ($1 > 4.3 || $1 < 6.0) print 1; else print 0 }'` -eq 1 \) \) -a "${ROOTDIR}" = "/" ]; then +- [ -x ./chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="./chkproc" +- [ -x ./chkdirs ] && prog="$prog ./chkdirs" ++ [ -x /usr/bin/chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="/usr/bin/chkproc" ++ [ -x /usr/bin/chkdirs ] && prog="$prog /usr/bin/chkdirs" + if [ "$prog" = "" ]; then + echo "not tested: can't exec $prog" + return ${NOT_TESTED} +@@ -288,7 +288,7 @@ + PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` + [ "$PV" = "" ] && PV=2 + [ "${SYSTEM}" = "SunOS" ] && PV=0 +- expertmode_output "./chkproc -v -v -p $PV" ++ expertmode_output "/usr/bin/chkproc -v -v -p $PV" + return 5 + fi + +@@ -315,7 +315,7 @@ + if [ "${DEBUG}" = "t" ]; then + ${echo} "*** PV=$PV ***" + fi +- if ./chkproc -p ${PV}; then ++ if /usr/bin/chkproc -p ${PV}; then + if [ "${QUIET}" != "t" ]; then echo "chkproc: nothing detected"; fi + else + echo "chkproc: Warning: Possible LKM Trojan installed" +@@ -324,7 +324,7 @@ + for i in /usr/share /usr/bin /usr/sbin /lib; do + [ -d $i ] && dirs="$dirs $i" + done +- if ./chkdirs $dirs; then ++ if /usr/bin/chkdirs $dirs; then + if [ "${QUIET}" != "t" ]; then echo "chkdirs: nothing detected"; fi + else + echo "chkdirs: Warning: Possible LKM Trojan installed" +@@ -1690,18 +1690,18 @@ + + if [ "${SYSTEM}" = "Linux" ] + then +- if [ ! -x ./strings-static ]; then +- printn "can't exec ./strings-static, " ++ if [ ! -x /usr/bin/strings-static ]; then ++ printn "can't exec /usr/bin/strings-static, " + return ${NOT_TESTED} + fi + + if [ "${EXPERT}" = "t" ]; then +- expertmode_output "./strings-static -a ${CMD}" ++ expertmode_output "/usr/bin/strings-static -a ${CMD}" + return 5 + fi + + ### strings must be a statically linked binary. +- if ./strings-static -a ${CMD} > /dev/null 2>&1 ++ if /usr/bin/strings-static -a ${CMD} > /dev/null 2>&1 + then + STATUS=${INFECTED} + fi diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD new file mode 100644 index 000000000..c99f399fd --- /dev/null +++ b/extra/chmlib/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 42202 2009-06-11 18:57:27Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Alexander 'dma147' Mieland +# Contributor: Simon Morgan + +pkgname=chmlib +pkgver=0.40 +pkgrel=1 +pkgdesc="Library for dealing with Microsoft ITSS/CHM format files" +arch=('i686' 'x86_64') +url="http://morte.jedrea.com/~jedwin/projects/chmlib/" +options=('!libtool' '!emptydirs') +license=('LGPL') +depends=('glibc') +source=(http://morte.jedrea.com/~jedwin/projects/chmlib/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7ea49ed8c335215c1edc6fae83e6b912') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-examples=yes + make || return 1 + make DESTDIR=${pkgdir} install +} + diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD new file mode 100644 index 000000000..d434e5755 --- /dev/null +++ b/extra/cinepaint/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 45152 2009-07-08 01:28:16Z eric $ +# Maintainer: tobias [tobias.archlinux.org] +# Contributor: tobias [tobias.justdreams.de] + +pkgname=cinepaint +_srcver=0.22-1 +pkgver=${_srcver/-/.} +pkgrel=5 +pkgdesc="sophisticated graphics manipulation programm supporting >8bit pictures" +arch=(i686 x86_64) +license=('LGPL' 'GPL' 'MIT-OSI') +url=(http://cinepaint.org.sourceforge.net/) +depends=('gtk2>=2.16.1' 'openexr>=1.6.1' 'lcms>=1.18' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'fltk>=1.1.9' 'desktop-file-utils' 'ftgl>=2.1.3rc5' 'libjpeg>=7') +makedepends=('python>=2.6' 'gutenprint>=5.2.3') +optdepends=('python' 'gutenprint') +options=('!libtool') +install=cinepaint.install +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz + cinepaint-0.22.1-gcc43.patch + cinepaint-0.22.1-multiple_parameters_named.patch + cinepaint-0.22.1-ambiguousawake.patch + cinepaint-0.22-gcc44.patch) +md5sums=('f360587240db6b6d2f0bfd94c420c492' 'f05e17a16d0018e5301aff0e1fa597b0'\ + '0876510a5ce3d581ebdde7e18199c09f' '4586aa153a0d3cac36120afc1f95a880'\ + '368e820c27f525e3569d43388f1c119a') + +build() { + cd "${srcdir}/${pkgname}-${_srcver}" + # FIXES + patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" || return 1 + patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" || return 1 + patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" || return 1 + patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" || return 1 + find plug-ins/print -type f -exec \ + sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \; + # Fix insecure rpath + sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure + + # build + ./configure --prefix=/usr --mandir=/usr/share/man \ + --enable-gtk2 --enable-pygimp \ + --with-python=/usr/bin/python2.6 + # FIXES + sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/applications" + install -m755 -d "${pkgdir}/usr/share/pixmaps" + install -m644 cinepaint.desktop "${pkgdir}/usr/share/applications/" || return 1 + install -m644 cinepaint.png "${pkgdir}/usr/share/pixmaps/" || return 1 +} diff --git a/extra/cinepaint/cinepaint-0.22-gcc44.patch b/extra/cinepaint/cinepaint-0.22-gcc44.patch new file mode 100644 index 000000000..340057834 --- /dev/null +++ b/extra/cinepaint/cinepaint-0.22-gcc44.patch @@ -0,0 +1,22 @@ +diff -Nru cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp cinepaint-0.22-1/plug-ins/collect/collect.cpp +--- cinepaint-0.22-1.orig/plug-ins/collect/collect.cpp 2007-03-30 11:11:33.000000000 +0200 ++++ cinepaint-0.22-1/plug-ins/collect/collect.cpp 2009-05-21 14:54:45.000000000 +0200 +@@ -301,7 +301,7 @@ + return -1; + + // renaming the layer to the original filename +- gimp_layer_set_name (layers[0], strrchr(fc->value(1),'/')+1); ++ gimp_layer_set_name (layers[0], strrchr((char *)fc->value(1),'/')+1); + GPrecisionType image_base_prec = gimp_drawable_precision (layers[0]); + int base_gray = gimp_drawable_gray (layers[0]); + +@@ -341,7 +341,7 @@ + #endif + gimp_image_add_layer (image_ID, layers[0], 0); DBG + // set layer name to filename +- gimp_layer_set_name(layers[0], strrchr(fc->value(i),'/')+1); ++ gimp_layer_set_name(layers[0], strrchr((char *)fc->value(i),'/')+1); + + // searching max dimensions + if (gimp_image_width(load_image_ID) > max_w) + diff --git a/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch b/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch new file mode 100644 index 000000000..f1d09fa27 --- /dev/null +++ b/extra/cinepaint/cinepaint-0.22.1-ambiguousawake.patch @@ -0,0 +1,11 @@ +--- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2008-09-03 02:07:08.000000000 +0200 ++++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp 2008-09-03 02:08:02.000000000 +0200 +@@ -226,7 +226,7 @@ + + int awake(void) + { +- Fl::awake(0); ++ Fl::awake((void *)0); + return 0; + } + int leerWait(void) { return 0; } diff --git a/extra/cinepaint/cinepaint-0.22.1-gcc43.patch b/extra/cinepaint/cinepaint-0.22.1-gcc43.patch new file mode 100644 index 000000000..64ba76099 --- /dev/null +++ b/extra/cinepaint/cinepaint-0.22.1-gcc43.patch @@ -0,0 +1,73 @@ +Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp ++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp +@@ -34,6 +34,7 @@ + + + #include ++#include + #include "TNT/tnt_misc.hpp" // proof_least_square_fit() + #include "TNT/tnt_stopwatch.hpp" + #include "TNT/jama_qr.hpp" // JAMA::QR +Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp ++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp +@@ -26,6 +26,7 @@ + */ + #include + #include // pow() ++#include + + #include "br_types.hpp" // ImageID + #include "br_enums.hpp" // DataType, ReportWhat +Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp ++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp +@@ -29,6 +29,7 @@ + + #include "icc_utils.h" + #include "icc_fenster.h" ++#include + + using namespace icc_examin_ns; + +Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h ++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h +@@ -33,6 +33,8 @@ + + #include "icc_utils.h" + #include ++#include ++#include + + #define DBG_SPEICHER_START if(icc_debug >= 3) DBG_PROG_START + #define DBG_SPEICHER_ENDE if(icc_debug >= 3) DBG_PROG_ENDE +Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp ++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp +@@ -42,6 +42,7 @@ + #include + # if HAVE_PTHREAD_H + // Use POSIX threading... ++#include + + int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p) + { +Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp +=================================================================== +--- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp ++++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp +@@ -39,6 +39,7 @@ + + #include "pdf.h" + #include "pdf_dialog.h" ++#include + + extern "C" { + #include diff --git a/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch b/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch new file mode 100644 index 000000000..e030593c2 --- /dev/null +++ b/extra/cinepaint/cinepaint-0.22.1-multiple_parameters_named.patch @@ -0,0 +1,42 @@ +--- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig 2008-06-27 19:28:52.000000000 +0200 ++++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h 2008-06-27 19:31:34.000000000 +0200 +@@ -142,9 +142,6 @@ + + // colour transformations + ColourTransformKey erzeugeTrafo ( +- const char* eingangs_profil__geraet, +- int byte, +- int kanaele, + const char* ausgangs_profil__geraet, + int byte, + int kanaele, +@@ -152,9 +149,6 @@ + const char* cmm, // 4 bytes 'lcms' 'APPL' + int cmm_optionen); // BPC, precission + ColourTransformKey erzeugeTrafo ( +- const char* eingangs_profil__geraet, +- int byte, +- int kanaele, + const char* ausgangs_profil__geraet, + int byte, + int kanaele, +@@ -163,9 +157,6 @@ + int cmm_optionen, + std::list &profile ); + ColourTransformKey erzeugeTrafo ( +- const char* eingangs_profil__geraet, +- int byte, +- int kanaele, + const char* ausgangs_profil__geraet, + int byte, + int kanaele, +@@ -181,9 +172,6 @@ + std::string cmm; + private: + ColourTransformKey erzeugeSchluessel_ ( +- const char* eingangs_profil__geraet, +- int byte, +- int kanaele, + const char* ausgangs_profil__geraet, + int byte, + int kanaele, diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install new file mode 100644 index 000000000..5e5cfef4d --- /dev/null +++ b/extra/cinepaint/cinepaint.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD new file mode 100644 index 000000000..98d77837a --- /dev/null +++ b/extra/clamav/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 46323 2009-07-15 20:34:35Z eric $ +# Maintainer: Dale Blount +# Contributor: Gregor Ibic + +pkgname=clamav +pkgver=0.95.2 +pkgrel=1 +pkgdesc="Anti-virus toolkit for Unix." +arch=(i686 x86_64) +depends=('bzip2' 'zlib' 'gmp' 'curl>=7.16.2' 'perl' 'libtool') +options=(!libtool) +install="$pkgname.install" +license=(GPL) +backup=(etc/clamav/clamav.conf etc/clamav/clamd.conf etc/clamav/freshclam.conf etc/conf.d/clamav) +url="http://www.clamav.net" +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + clamav + clamav.confd + clamav.logrotate) +md5sums=('930362397d30e01ba81b5f24c1046d48' '338db2f3fbca9d5747ba635d576d8739'\ + 'f1fd8e736f808da0487928274f585851' 'a7a4d527ba80ec9d4811e2264e9fab9e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc/clamav \ + --with-dbdir=/var/lib/clamav --disable-clamav + # will add clamav user with clamav.install + make || return 1 + make DESTDIR="$pkgdir" install || return 1 + + # make sure conf files get installed, cause make install + # doesn't do that if clamav is already installed upon building. + for i in clamd freshclam; do + install -D -m644 etc/$i.conf "$pkgdir/etc/clamav/$i.conf" + done + + install -D -m644 "$srcdir/clamav.confd" "$pkgdir/etc/conf.d/clamav" + install -D -m755 "$srcdir/clamav" "$pkgdir/etc/rc.d/clamav" + install -D -m644 "$srcdir/clamav.logrotate" "$pkgdir/etc/logrotate.d/clamav" + + # create log dirs/files & fix conf files. + mkdir -p "$pkgdir/var/log/clamav/" + mkdir -p "$pkgdir/var/run/clamav/" + chown 64.root "$pkgdir/var/log/clamav/" + chown 64.root "$pkgdir/var/run/clamav/" + + sed -i -e "s:\#LogFile /tmp/clamd.log:LogFile /var/log/clamav/clamd.log:" \ + -e "s:\#PidFile /var/run/clamd.pid:PidFile /var/run/clamav/clamd.pid:" \ + -e "s:\#User clamav:User clamav:" \ + -e "s:\#LogTime:LogTime:" \ + -e "s:\#TemporaryDirectory /var/tmp:TemporaryDirectory /tmp:" \ + -e "s:\LocalSocket /tmp/clamd.socket:LocalSocket /var/lib/clamav/clamd.sock:" \ + "$pkgdir/etc/clamav/clamd.conf" || return 1 + + sed -i -e "s:\#UpdateLogFile /var/log/freshclam.log:UpdateLogFile /var/log/clamav/freshclam.log:" \ + -e "s:\#NotifyClamd /path/to/clamd.conf$:NotifyClamd /etc/clamav/clamd.conf:" \ + "$pkgdir/etc/clamav/freshclam.conf" || return 1 + + # fix perms on virus database directory and un-distribute databases to require freshclam + rm "$pkgdir"/var/lib/clamav/*.cvd + chown 64:64 -R "$pkgdir/var/lib/clamav/" + + # install clamdwatch + cd "$srcdir/$pkgname-$pkgver/contrib/clamdwatch" + tar zxf clamdwatch.tar.gz + sed -i -e 's@/tmp/clamd.socket@/var/lib/clamav/clamd.sock@' \ + -e 's@/var/lock/subsys/clamd@/var/run/clamav/clamd.pid@' \ + -e 's@mkstemp( "/tmp/clamdwatch-XXXXXXXXXXXXXXXX" );@mkstemp( "/tmp/clamdwatch-XXXXXXXXXXXXXXXX" );\nchmod 0644, "$tempFile";@' clamdwatch || return 1 + + install -D -m755 clamdwatch "$pkgdir/usr/sbin/clamdwatch.pl" || return 1 +} diff --git a/extra/clamav/clamav b/extra/clamav/clamav new file mode 100644 index 000000000..8e9c6afa9 --- /dev/null +++ b/extra/clamav/clamav @@ -0,0 +1,72 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav + +PID_FC=`pidof -o %PPID /usr/bin/freshclam` +PID_CD=`pidof -o %PPID /usr/sbin/clamd` + +case "$1" in + start) + # if clamd isn't started first, notifyclamd fails at times + if [ "$START_CLAMD" == "yes" ]; then + stat_busy "Starting ClamD" + [ -z "$PID_CD" ] && /usr/sbin/clamd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + + # give clamd enough time to start + sleep 1 + + if [ "$START_FRESHCLAM" == "yes" ]; then + stat_busy "Starting FreshClam" + [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + ;; + stop) + if [ "$START_CLAMD" == "yes" ]; then + stat_busy "Stopping ClamD" + [ -n "$PID_CD" ] && kill $PID_CD &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + + if [ "$START_FRESHCLAM" == "yes" ]; then + stat_busy "Stopping FreshClam" + [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + ;; + restart) + $0 stop + # will not start if not fully stopped, so sleep + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/clamav/clamav.confd b/extra/clamav/clamav.confd new file mode 100644 index 000000000..9cd44d9f8 --- /dev/null +++ b/extra/clamav/clamav.confd @@ -0,0 +1,8 @@ +# clamav startup script config options + +# change these to "yes" to start +START_FRESHCLAM="no" +START_CLAMD="no" + +# Options to pass to freshclam (man freshclam for more info). +FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/clamav.install b/extra/clamav/clamav.install new file mode 100644 index 000000000..87625bdb8 --- /dev/null +++ b/extra/clamav/clamav.install @@ -0,0 +1,22 @@ +post_install() { + if [ -z "`getent group clamav`" ]; then + groupadd -g 64 clamav + fi + if [ -z "`getent passwd clamav`" ]; then + useradd -u 64 -g clamav -c "Clam AntiVirus" -d /dev/null -s /bin/false clamav + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + userdel clamav &> /dev/null + groupdel clamav &> /dev/null +} + +op=$1 +shift + +$op $* diff --git a/extra/clamav/clamav.logrotate b/extra/clamav/clamav.logrotate new file mode 100644 index 000000000..d1dc94dce --- /dev/null +++ b/extra/clamav/clamav.logrotate @@ -0,0 +1,8 @@ +/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { + create 644 clamav clamav + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript +} diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD new file mode 100644 index 000000000..220969057 --- /dev/null +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 53390 2009-09-30 19:55:26Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: Mildred + +pkgname=claws-mail-extra-plugins +pkgver=3.7.2 +pkgrel=3 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.7.2') +makedepends=('make' 'bc' 'perl>=5.10.1-3' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.4.5' 'libxml2>=2.7.3-2' 'curl>=7.19.5-2' 'libytnef>=1.5-2' 'libwebkit>=1.1.10-1') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 + fix_fancy_hangups.patch) +md5sums=('0bdbbf69b2420e4bbb8d0ae85f9f85d6' + '894388c033072cba170c921912090d22') + + +build() { + cd "${srcdir}/claws-mail-extra-plugins-$pkgver"/fancy*/src + patch -Np0 -i ${srcdir}/fix_fancy_hangups.patch || return 1 + + cd "${srcdir}/claws-mail-extra-plugins-$pkgver" + for dir in *; do + # Continue if it is not a directory or the synce plugin + [ ! -d "$dir" ] && continue + echo "$dir" | grep synce >/dev/null 2>/dev/null && continue + # Else, compile + cd "$dir" + [ -e "$configured_file" ] || \ + ./configure --prefix=/usr --disable-static || return 1 + touch "arch-configured" + make || return 1 + make DESTDIR=$startdir/pkg install || return 1 + cd .. + done + + # fix fileconflict with libical, #11485 + rm -f ${pkgdir}/usr/include/ical.h +} diff --git a/extra/claws-mail-extra-plugins/fix_fancy_hangups.patch b/extra/claws-mail-extra-plugins/fix_fancy_hangups.patch new file mode 100644 index 000000000..3048adb48 --- /dev/null +++ b/extra/claws-mail-extra-plugins/fix_fancy_hangups.patch @@ -0,0 +1,64 @@ +--- fancy_viewer.c 2009/06/16 16:04:35 1.1.2.11 ++++ fancy_viewer.c 2009/07/04 16:34:52 1.1.2.14 +@@ -107,8 +107,19 @@ + return FALSE; + } + if (procmime_get_part(viewer->filename, partinfo) < 0) { +- g_free(viewer->filename); ++ g_free(viewer->filename); ++ viewer->filename = NULL; + } else { ++ const gchar *charset = NULL; ++ if (_viewer && _viewer->mimeview && ++ _viewer->mimeview->messageview->forced_charset) ++ charset = _viewer->mimeview->messageview->forced_charset; ++ else ++ charset = procmime_mimeinfo_get_parameter(partinfo, "charset"); ++ if (!charset) ++ charset = conv_get_locale_charset_str(); ++ debug_print("using %s charset\n", charset); ++ g_object_set(viewer->settings, "default-encoding", charset, NULL); + gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL); + webkit_web_view_open(viewer->view, tmp); + g_free(tmp); +@@ -182,6 +193,7 @@ + debug_print("filename: %s\n", viewer->filename); + if (!viewer->filename) { + alertpanel_error(_("Filename is null.")); ++ g_free(program); + return; + } + +@@ -275,8 +287,6 @@ + webkit_web_view_open(viewer->view, "about:blank"); + debug_print("fancy_clear_viewer\n"); + viewer->to_load = NULL; +- if(viewer->cur_link) +- g_free(viewer->cur_link); + vadj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(viewer->scrollwin)); + vadj->value = 0.0; + g_signal_emit_by_name(G_OBJECT(vadj), "value-changed", 0); +@@ -345,12 +355,9 @@ + { + gtk_label_set_text(GTK_LABEL(viewer->l_link), link); + if(link) { +- if (viewer->cur_link) { ++ if (viewer->cur_link) + g_free(viewer->cur_link); +- viewer->cur_link = g_strdup(link); +- } else { +- viewer->cur_link = g_strdup(link); +- } ++ viewer->cur_link = g_strdup(link); + } + } + +@@ -795,7 +802,7 @@ + + const gchar *plugin_desc(void) + { +- return g_strdup_printf("This plugin renders HTML e-mail using the WebKit" ++ return g_strdup_printf("This plugin renders HTML mail using the WebKit " + "%d.%d.%d library.", WEBKIT_MAJOR_VERSION, + WEBKIT_MINOR_VERSION, WEBKIT_MICRO_VERSION); + } diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD new file mode 100644 index 000000000..e75aecf97 --- /dev/null +++ b/extra/claws-mail/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 53238 2009-09-27 13:28:51Z pierre $ +# Maintainer: Andreas Radke + +pkgname=claws-mail +pkgver=3.7.2 +pkgrel=3 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2>=2.16.2' 'gnutls>=2.8.1' 'startup-notification>=0.10' 'pilot-link>=0.12.3-5' 'enchant>=1.4.2-1' + 'gpgme>=1.1.8' 'libetpan>=0.58' 'libsm>=1.1.0' 'db>=4.8' 'curl>=7.19.5-2' 'dbus-glib>=0.80') +makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind') +optdepends=('python: needed for some tools' + 'perl: needed for some tools' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering') +replaces=('sylpheed-claws') +provides=('claws') +options=(!libtool) +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) +md5sums=('df27c2488df499d8c05646d3e101d095') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --disable-dillo-viewer-plugin \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + --enable-jpilot + + make || return 1 + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} diff --git a/extra/claws-mail/claws-mail.install b/extra/claws-mail/claws-mail.install new file mode 100644 index 000000000..5f3cb0109 --- /dev/null +++ b/extra/claws-mail/claws-mail.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD new file mode 100644 index 000000000..8c0c0e936 --- /dev/null +++ b/extra/clisp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 43139 2009-06-19 23:22:15Z eric $ +# Maintainer: Juergen Hoetzel +pkgname=clisp +pkgver=2.47 +pkgrel=3 +pkgdesc="ANSI Common Lisp interpreter, compiler and debugger" +arch=('i686' 'x86_64') +license=('GPL') +url="http://clisp.cons.org/" +depends=('readline' 'libsigsegv') +provides=('common-lisp') +makedepends=('ffcall') +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/clisp/clisp-${pkgver}.tar.bz2 + clisp-2.47-cpp.patch) +md5sums=('8fa89bb13e865fc7c7150b82682f35af' + 'c7b706135ca640cc088a4ecc68177d0f') + +build() { + cd $srcdir/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/clisp-2.47-cpp.patch + unset CFLAGS CXXFLAGS + ./configure --prefix=/usr --with-readline --with-ffcall src + cd src + ./makemake --prefix=/usr --with-readline --with-ffcall --with-dynamic-ffi > Makefile + make || return 1 + sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/clisp/clisp-2.47-cpp.patch b/extra/clisp/clisp-2.47-cpp.patch new file mode 100644 index 000000000..d0331f949 --- /dev/null +++ b/extra/clisp/clisp-2.47-cpp.patch @@ -0,0 +1,13 @@ +diff -up clisp-2.47/modules/libsvm/svm.cpp clisp-2.47/modules/libsvm/svm +diff -up clisp-2.47/src/time.d.cpp clisp-2.47/src/time.d +--- clisp-2.47/src/time.d.cpp 2009-03-01 20:14:24.000000000 +0100 ++++ clisp-2.47/src/time.d 2009-03-01 20:14:46.000000000 +0100 +@@ -302,7 +302,7 @@ global object internal_time_to_I (const + #ifdef TIME_WIN32 + return L2_to_I(tp->dwHighDateTime,tp->dwLowDateTime); + #endif +-#elif TIME_METHOD = 1 ++#elif TIME_METHOD == 1 + return UL_to_I(*tp); + #else + #error internal_time_to_I: invalid TIME_METHOD diff --git a/extra/cln/ChangeLog b/extra/cln/ChangeLog new file mode 100644 index 000000000..31d56f9c3 --- /dev/null +++ b/extra/cln/ChangeLog @@ -0,0 +1,6 @@ +2009-06-09 Eric Belanger + + * Added info page + * Fixed docs location + * Added gcc 4.4 patch (close FS#15015) + * Added ChangeLog diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD new file mode 100644 index 000000000..08d651432 --- /dev/null +++ b/extra/cln/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 42050 2009-06-09 23:46:36Z eric $ +# Maintainer: Eric Belanger +# Contributor: Ben + +pkgname=cln +pkgver=1.2.2 +pkgrel=2 +pkgdesc="Class library for numbers" +arch=('i686' 'x86_64') +url="http://www.ginac.de/CLN/" +license=('GPL') +options=('!libtool') +depends=('gmp' 'bash' 'texinfo') +install=cln.install +source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2 cln-gcc44.patch) +md5sums=('6b479281fec86314b4c7a9357bd83ef8' 'aa678ade85c1e364c879b2e0b40ba80d') +sha1sums=('2d2a5d3e383a3043c5bf68299a466685ef4ec8ec' '6abb412a387ba8d27a6a80f963a55677e431daf8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../cln-gcc44.patch || return 1 + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" htmldir=/usr/share/doc/cln/html dvidir=/usr/share/doc/cln/dvi install || return 1 + rm "${pkgdir}/usr/share/info/dir" + gzip "${pkgdir}/usr/share/info/cln.info" +} diff --git a/extra/cln/cln-gcc44.patch b/extra/cln/cln-gcc44.patch new file mode 100644 index 000000000..72c2f0e0f --- /dev/null +++ b/extra/cln/cln-gcc44.patch @@ -0,0 +1,50 @@ +--- ./src/base/string/input/cl_st_get1.cc~ 2000-12-14 11:53:06.000000000 -0500 ++++ ./src/base/string/input/cl_st_get1.cc 2009-06-07 16:36:45.681507023 -0400 +@@ -1,6 +1,7 @@ + // cl_fget(). + + // General includes. ++#include + #include "cl_sysdep.h" + + // Specification. +--- ./src/base/string/input/cl_st_get2.cc~ 2000-12-14 11:53:06.000000000 -0500 ++++ ./src/base/string/input/cl_st_get2.cc 2009-06-07 16:52:15.291008894 -0400 +@@ -1,6 +1,7 @@ + // cl_fget(). + + // General includes. ++#include + #include "cl_sysdep.h" + + // Specification. +--- ./src/base/string/input/cl_st_getline1.cc~ 2000-12-14 11:53:06.000000000 -0500 ++++ ./src/base/string/input/cl_st_getline1.cc 2009-06-08 19:18:18.815843098 -0400 +@@ -1,6 +1,7 @@ + // cl_fgetline(). + + // General includes. ++#include + #include "cl_sysdep.h" + + // Specification. +--- ./src/base/string/input/cl_st_getline2.cc~ 2000-12-14 11:53:06.000000000 -0500 ++++ ./src/base/string/input/cl_st_getline2.cc 2009-06-08 19:18:12.899175378 -0400 +@@ -1,6 +1,7 @@ + // cl_fgetline(). + + // General includes. ++#include + #include "cl_sysdep.h" + + // Specification. +--- ./src/base/string/input/cl_st_gettoken.cc~ 2004-06-23 17:11:21.000000000 -0400 ++++ ./src/base/string/input/cl_st_gettoken.cc 2009-06-08 19:47:41.202332829 -0400 +@@ -1,6 +1,7 @@ + // operator>>. + + // General includes. ++#include + #include "cl_sysdep.h" + + // Specification. diff --git a/extra/cln/cln.install b/extra/cln/cln.install new file mode 100644 index 000000000..7706dea0c --- /dev/null +++ b/extra/cln/cln.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(cln.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD new file mode 100644 index 000000000..e0b94d32d --- /dev/null +++ b/extra/clucene/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 20267 2008-12-01 21:27:38Z tpowa $ +# Contributor: Alois Nespor +# Maintainer: Tobias Powalowski + +pkgname=clucene +pkgver=0.9.21b +pkgrel=1 +pkgdesc="CLucene is a C++ port of Lucene: A high-performance, full-featured text search engine." +arch=('i686' 'x86_64') +url="http://clucene.sourceforge.net" +license=('APACHE' 'LGPL') +depends=('gcc-libs') +makedepends=('libtool' 'autoconf' 'automake' 'doxygen') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.bz2) +options=(!libtool) + +build() { + cd ${srcdir}/$pkgname-core-$pkgver + # fix for some packages + CXXFLAGS="$CXXFLAGS -fPIC" + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install +} +md5sums=('ba1a8f764a2ca19c66ad907dddd88352') diff --git a/extra/cmake/cmake.install b/extra/cmake/cmake.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/extra/cmake/cmake.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD new file mode 100644 index 000000000..89249902c --- /dev/null +++ b/extra/cmatrix/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 53888 2009-10-03 19:02:27Z eric $ +# Contributor: john + +pkgname=cmatrix +pkgver=1.2a +pkgrel=5 +pkgdesc="Let you see the matrix code in your console" +arch=('i686' 'x86_64') +url="http://www.asty.org/cmatrix/" +license=('GPL') +depends=('ncurses' 'fontconfig') +install=$pkgname.install +source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz) +md5sums=('ebfb5733104a258173a9ccf2669968a1') +sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 + + install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" || return 1 + install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" || return 1 + install -m644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts" || return 1 +} diff --git a/extra/cmatrix/cmatrix.install b/extra/cmatrix/cmatrix.install new file mode 100644 index 000000000..c46fe4469 --- /dev/null +++ b/extra/cmatrix/cmatrix.install @@ -0,0 +1,3 @@ +post_install() { + fc-cache +} diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD new file mode 100644 index 000000000..ff31aaafa --- /dev/null +++ b/extra/cmt/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 49922 2009-08-16 21:34:12Z jgc $ +#Maintainer: Damir Perisa +#Contributor: Robert Emil Berge + +pkgname=cmt +pkgver=1.16 +pkgrel=2 +pkgdesc="CMT for LADSPA" +arch=(i686 x86_64) +license=('GPL') +url="http://www.ladspa.org" +depends=('ladspa' 'gcc-libs') +groups=('ladspa-plugins') +source=(http://www.ladspa.org/download/${pkgname}_src_${pkgver}.tgz) +md5sums=('15a875e5aaf79c209c223babfb41cb1c') + +build() { + cd "${srcdir}/${pkgname}/src" + sed -e "/^CFLAGS/ s/-O3/${CFLAGS}/" \ + -e 's|-Werror||g' \ + -i makefile || return 1 + make || return 1 + install -m755 -d "${pkgdir}/usr/lib/ladspa" + install -m755 ../plugins/cmt.so "${pkgdir}/usr/lib/ladspa/" || return 1 +} diff --git a/extra/cmucl/PKGBUILD b/extra/cmucl/PKGBUILD new file mode 100644 index 000000000..80ec0136f --- /dev/null +++ b/extra/cmucl/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 30037 2009-03-15 17:49:45Z juergen $ +# Contributor: John Proctor +# Maintainer: Juergen Hoetzel + +pkgname=cmucl +pkgver=19f +pkgrel=1 +pkgdesc="CMU Common Lisp" +depends=('glibc' 'lesstif') +provides=('common-lisp') +makedepends=('sed' 'bc') +license=('custom') +#license PublicDomain +source=(http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-src-${pkgver}.tar.bz2 \ + http://common-lisp.net/project/cmucl/downloads/release/${pkgver}/cmucl-${pkgver}-x86-linux.tar.bz2) +md5sums=('89529846608fe6fbf1227d52556109d9' 'b4d5e17959f808448f90ba074ef84843') +url="http://www.cons.org/cmucl/" +arch=(i686) + +build() { + cd $startdir/src + export CMUCLCORE=$startdir/src/lib/cmucl/lib/lisp-x87.core + # Create target buildroot + ./src/tools/create-target.sh $CHOST + # Use binary-dist lisp to create initial kernel.core + ./src/tools/build-world.sh $CHOST $startdir/src/bin/lisp + # build native lisp binary + ./src/tools/rebuild-lisp.sh $CHOST + # Generate lisp.core + ./src/tools/load-world.sh $CHOST ${pkgver} + # rebuild kernel.core using native lisp + ./src/tools/build-world.sh $CHOST $CHOST/lisp/lisp + # "(Re)generate lisp.core" + ./src/tools/load-world.sh $CHOST ${pkgver} + # Build auxilary stuff + ./src/tools/build-utils.sh $CHOST + # make new binary dist archives + ./src/tools/make-dist.sh $CHOST ${pkgver} x86 linux + + mkdir -p $startdir/pkg/usr/lib/cmucl/ + mkdir -p $startdir/pkg/usr/share/man/man1 + mkdir dist + tar xjf cmucl-${pkgver}-x86-linux.tar.bz2 -C dist + tar xjf cmucl-${pkgver}-x86-linux.extra.tar.bz2 -C dist + cp -a dist/bin ${startdir}/pkg/usr/lib/cmucl + cp -a dist/lib/cmucl ${startdir}/pkg/usr/lib/ + cp -a dist/man/man1/* ${startdir}/pkg/usr/share/man/man1/ + + ## Setup app-wrapper + install -m755 -p -D lib/cmucl/sample-wrapper $startdir/pkg/usr/bin/cmucl + # Fixup paths in wrapper + sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=/usr/lib/cmucl/lib|" $startdir/pkg/usr/bin/cmucl + sed -i -e "s|/<>|/usr/lib/cmucl|" $startdir/pkg/usr/bin/cmucl + # many apps (ie, maxima) expect to find the wrapper named 'lisp' too + ln -sf cmucl $startdir/pkg/usr/bin/lisp + ## Unpackaged files + rm -f $startdir/pkg/usr/lib/cmucl/sample-wrapper + # license + install -D -m644 ${startdir}/src/src/general-info/COPYRIGHTS \ + ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt +} diff --git a/extra/cmucl/cmucl-19b-fedora-4.patch b/extra/cmucl/cmucl-19b-fedora-4.patch new file mode 100644 index 000000000..f762487f0 --- /dev/null +++ b/extra/cmucl/cmucl-19b-fedora-4.patch @@ -0,0 +1,91 @@ +--- cmucl-19/src/motif/server/Config.x86.motif 2004-04-26 07:07:36.000000000 -0500 ++++ cmucl-19/src/motif/server/Config.x86 2004-08-04 12:59:32.209585248 -0500 +@@ -1,6 +1,6 @@ +-CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) ++CFLAGS = -O2 $(RPM_OPT_FLAGS) -I/usr/X11R6/include -I. -I$(VPATH) + LDFLAGS = -L/usr/X11R6/lib +-LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread ++LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread + # This def assumes you are building in the same or parallel + # tree to the CVS souce layout. Sites may need to customize + # this path. +--- cmucl-19b/src/lisp/Linux-os.h.gcc4 2005-01-13 13:55:00.000000000 -0600 ++++ cmucl-19b/src/lisp/Linux-os.h 2005-09-21 23:00:28.000000000 -0500 +@@ -80,7 +80,13 @@ + #define GET_CONTEXT int code=0; struct sigcontext_struct *context=&contextstruct; + #endif + +-#define setfpucw(cw) asm("fldcw %0" : : "m" (cw)) ++#ifdef _HAVE_FPU_CONTROL_H ++#include ++#define setfpucw(cw) {fpu_control_t cw_tmp=cw;_FPU_SETCW(cw_tmp);} ++#else ++/* _FPU_SETCW code borrowed from fpu_control.h above */ ++#define setfpucw(cw) {unsigned int cw_tmp=cw;__asm__ __volatile__ ("fldcw %0" : : "m" (*&cw_tmp)); } ++#endif + + #define sigvec sigaction + #define sv_mask sa_mask +--- cmucl-19b/src/lisp/Config.linux_gencgc.mak 2005-09-22 08:04:35.157010000 -0500 ++++ cmucl-19b/src/lisp/Config.linux_gencgc 2005-09-22 08:10:12.947121112 -0500 +@@ -19,7 +19,18 @@ + GC_SRC = gencgc.c + endif + +-RUNTIME = $(GENCGC) $(LINKAGE) ++PERSONALITY=$(wildcard /usr/include/sys/personality.h) ++ifneq ($(PERSONALITY),) ++NO_RANDOMIZE=-DADDR_NO_RANDOMIZE ++endif ++ ++HAVE_FPU_CONTROL_H=$(wildcard /usr/include/fpu_control.h) ++ifneq ($(HAVE_FPU_CONTROL_H),) ++HAVE_FPU_CONTROL_H=-D_HAVE_FPU_CONTROL_H ++endif ++ ++RUNTIME = $(GENCGC) $(LINKAGE) $(NO_RANDOMIZE) $(HAVE_FPU_CONTROL_H) ++ + # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's. + CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH2) -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME) + CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) $(RPM_OPT_FLAGS) +--- cmucl-19b/src/lisp/Config.linux_gencgc.optflags 2004-06-29 22:27:47.000000000 -0500 ++++ cmucl-19b/src/lisp/Config.linux_gencgc 2005-09-19 09:44:18.649617939 -0500 +@@ -22,7 +22,7 @@ + RUNTIME = $(GENCGC) $(LINKAGE) + # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's. + CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH2) -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME) +-CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) ++CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) $(RPM_OPT_FLAGS) + ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE + NM = $(PATH1)/linux-nm + UNDEFSYMPATTERN = -Xlinker -u -Xlinker & +--- cmucl-19b/src/lisp/lisp.c.pers 2005-04-14 20:40:08.000000000 -0500 ++++ cmucl-19b/src/lisp/lisp.c 2005-09-19 09:03:57.929151702 -0500 +@@ -12,6 +12,9 @@ + #include + #include + #include ++#if defined(__linux__) && defined(ADDR_NO_RANDOMIZE) ++#include ++#endif + + #include "signal.h" + +@@ -455,6 +458,17 @@ + boolean monitor; + lispobj initial_function = 0; + ++#if defined(__linux__) && defined(ADDR_NO_RANDOMIZE) ++ long pers = personality(-1); ++ /* 0x40000 aka. ADDR_NO_RANDOMIZE */ ++ if (!(pers & 0x40000)) { ++ if (personality(pers | 0x40000) != -1) { ++ execvp(argv[0], argv); ++ } ++ fprintf(stderr, "WARNING: Couldn't re-exec with the proper personality flags. Trying to continue anyway.\n"); ++ } ++#endif ++ + if (builtin_image_flag != 0) + initial_function = (lispobj) &initial_function_addr; + diff --git a/extra/cmucl/cmucl-19e-GNUmakefile.patch b/extra/cmucl/cmucl-19e-GNUmakefile.patch new file mode 100644 index 000000000..3580eebe8 --- /dev/null +++ b/extra/cmucl/cmucl-19e-GNUmakefile.patch @@ -0,0 +1,17 @@ +diff -urb src.old/lisp/GNUmakefile src/lisp/GNUmakefile +--- src.old/lisp/GNUmakefile 2008-01-18 15:31:50.000000000 +0100 ++++ src/lisp/GNUmakefile 2008-09-04 14:37:22.000000000 +0200 +@@ -30,10 +30,12 @@ + $(NM) lisp | grep -v " [F] " >> ,lisp.nm + mv ,lisp.nm lisp.nm + +-lisp: version.c ${OBJS} version ++version.o: version.c version + echo '1 + ' `cat version` | bc > ,version + mv ,version version + $(CC) ${CFLAGS} -DVERSION=`cat version` -c $< ++ ++lisp: ${OBJS} version.o + $(CC) -g ${OS_LINK_FLAGS} -o ,lisp \ + ${OBJS} version.o \ + ${OS_LIBS} -lm diff --git a/extra/cmucl/cmucl_19b-gcc-401.diff b/extra/cmucl/cmucl_19b-gcc-401.diff new file mode 100644 index 000000000..5206f4a9a --- /dev/null +++ b/extra/cmucl/cmucl_19b-gcc-401.diff @@ -0,0 +1,30 @@ +diff -ur src.sic/lisp/x86-arch.c src/lisp/x86-arch.c +--- src.sic/lisp/x86-arch.c 2005-10-12 00:22:16.000000000 +0200 ++++ src/lisp/x86-arch.c 2005-10-12 00:25:00.000000000 +0200 +@@ -55,7 +55,7 @@ + vlen = *(char*) SC_PC(context)++; + /* Skip lisp error arg data bytes */ + while(vlen-- > 0) +- ((char*) SC_PC(context))++; ++ SC_PC(context)++; + break; + + case trap_Breakpoint: +@@ -265,7 +265,7 @@ + #if 0 + fprintf(stderr,"*C break\n"); + #endif +- (char*) SC_PC(context) -= 1; ++ SC_PC(context) -= 1; + + handle_breakpoint(signal, code, context); + #if 0 +@@ -274,7 +274,7 @@ + break; + + case trap_FunctionEndBreakpoint: +- (char*) SC_PC(context) -= 1; ++ SC_PC(context) -= 1; + SC_PC(context) = (int) handle_function_end_breakpoint(signal, code, context); + break; + diff --git a/extra/cmus/ChangeLog b/extra/cmus/ChangeLog new file mode 100644 index 000000000..d204bc736 --- /dev/null +++ b/extra/cmus/ChangeLog @@ -0,0 +1,24 @@ +2009-04-19 Eric Belanger + + * cmus 2.2.0-9 + * Updated ffmpeg versioned depends + +2009-02-19 Eric Belanger + + * cmus 2.2.0-8 + * Rebuilt against faad2 2.7 + +2008-07-19 Eric Belanger + + * cmus 2.2.0-6 + * Rebuilt agains faad2 2.6.1 + +2008-07-04 Eric Belanger + + * cmus 2.2.0-5 + * rebuilt against ffmpeg 20080625 + +2007-10-29 Aaron Griffin +* 2.2.0-3 +Removed arts support (FS#8341) +Added flac and libmad diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD new file mode 100644 index 000000000..588a65627 --- /dev/null +++ b/extra/cmus/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 36121 2009-04-20 02:47:12Z eric $ +# Maintainer: Aaron Griffin +# Contributor: dorphell + +pkgname=cmus +pkgver=2.2.0 +pkgrel=9 +pkgdesc="A very feature-rich ncurses-based music player" +arch=(i686 x86_64) +url="http://cmus.sourceforge.net/" +license=('GPL') +# namcap assured me it was safe to remove ncurses and the like... /shrug +depends=(libao libmpcdec 'ffmpeg>=0.5' flac libmad 'faad2>=2.7') +source=(http://mirror.greaterscope.net/cmus/$pkgname-$pkgver.tar.bz2) +md5sums=('7a9895ecfc10cd16577c73051436962f') + +build() { + cd $srcdir/$pkgname-$pkgver + sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ffmpeg.c || return 1 + sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c || return 1 + sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c || return 1 + + export CONFIG_ARTS=n + ./configure prefix=/usr || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/colortail/PKGBUILD b/extra/colortail/PKGBUILD new file mode 100644 index 000000000..bdfa0b760 --- /dev/null +++ b/extra/colortail/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 49920 2009-08-16 21:31:38Z jgc $ +# Maintainer: Aaron Griffin +# Contributor: Mauricio Barrera + +pkgname=colortail +pkgver=0.3.0 +pkgrel=3 +pkgdesc="Log colorizer to make log checking easier" +arch=(i686 x86_64) +license=('GPL') +url="http://joakimandersson.se/projects/colortail/" +depends=('gcc-libs>=4.4.1') +source=(http://joakimandersson.se/files/${pkgname}-${pkgver}.tar.gz + http://joakimandersson.se/files/${pkgname}-${pkgver}-gcc3.patch.gz + colortail-0.3.0-gcc4.4.patch) +md5sums=('2589d3e372080f4052d1cc0d6550508f' + '504b3c31dde38bba11e2ee407e3225c4' + 'd5093db5a9016544064f94045e862608') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-gcc3.patch" || return 1 + patch -Np1 -i "${srcdir}/colortail-0.3.0-gcc4.4.patch" || return 1 + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/etc/colortail" + install -m644 example-conf/conf.messages "${pkgdir}/etc/colortail/" || return 1 +} diff --git a/extra/colortail/ansi-c++-gcc-3.2.diff b/extra/colortail/ansi-c++-gcc-3.2.diff new file mode 100644 index 000000000..2b0e7a32c --- /dev/null +++ b/extra/colortail/ansi-c++-gcc-3.2.diff @@ -0,0 +1,345 @@ +diff -Naur colortail-0.3.0/CfgFileParser.cc colortail-0.3.0-new/CfgFileParser.cc +--- colortail-0.3.0/CfgFileParser.cc Tue Aug 3 14:40:44 1999 ++++ colortail-0.3.0-new/CfgFileParser.cc Sat Aug 24 16:03:58 2002 +@@ -19,12 +19,12 @@ + + #include "CfgFileParser.h" + +-#include +-#include ++#include + #include +-#include ++#include + #include + ++using namespace std; + + // ## class SearchData ## + +@@ -499,7 +499,7 @@ + + + +-int CfgFileParser::parse(char *filename) ++int CfgFileParser::parse(const char *filename) + { + // parses the cfg file and sets up the list of SearchData elements + // returns number of SearchData items created +diff -Naur colortail-0.3.0/CfgFileParser.h colortail-0.3.0-new/CfgFileParser.h +--- colortail-0.3.0/CfgFileParser.h Tue Aug 3 14:40:52 1999 ++++ colortail-0.3.0-new/CfgFileParser.h Sat Aug 24 16:03:21 2002 +@@ -25,7 +25,8 @@ + + #include + #include +-#include ++#include ++#include + + #ifdef HAVE_GNUREGEX_H + # include +@@ -80,7 +81,7 @@ + { + private: + List *m_items_list; +- ifstream m_infile; ++ std::ifstream m_infile; + char *m_filename; + int m_line; + +@@ -97,7 +98,7 @@ + CfgFileParser(); + ~CfgFileParser(); + +- int parse(char *filename); ++ int parse(const char *filename); + List* get_items_list(); + }; + +diff -Naur colortail-0.3.0/ColorTail.cc colortail-0.3.0-new/ColorTail.cc +--- colortail-0.3.0/ColorTail.cc Tue Aug 3 14:41:02 1999 ++++ colortail-0.3.0-new/ColorTail.cc Sat Aug 24 15:28:21 2002 +@@ -17,7 +17,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + #include + #include + +@@ -26,6 +26,7 @@ + #include "OptionsParser.h" + #include "Colorizer.h" + ++using namespace std; + + // the constructor + ColorTail::ColorTail() +diff -Naur colortail-0.3.0/Colorizer.cc colortail-0.3.0-new/Colorizer.cc +--- colortail-0.3.0/Colorizer.cc Tue Aug 3 14:41:17 1999 ++++ colortail-0.3.0-new/Colorizer.cc Sat Aug 24 16:07:33 2002 +@@ -22,9 +22,10 @@ + #include "TailFile.h" + + #include +-#include +-#include ++#include ++#include + ++using namespace std; + + Colorizer::Colorizer() + { +@@ -58,7 +59,7 @@ + } + + +-Colorizer::Colorizer(char *cfg_file) ++Colorizer::Colorizer(const char *cfg_file) + { + // other constructor + +@@ -85,7 +86,7 @@ + free_items(); + } + +-char* Colorizer::colorize(char *str) ++const char* Colorizer::colorize(const char *str) + { + // colorize the string, returns a new string containing + // the colorized version of str +@@ -111,7 +112,7 @@ + ListIterator itr(*m_items_list); + + // will contain the new string +- ostrstream newstr; ++ ostringstream newstr; + + SearchData *current; + int i = 0; +@@ -174,7 +175,7 @@ + // write ansi reset str and a newline + newstr << ANSI_RESET_STR << endl << ends; + // return the new string +- return newstr.str(); ++ return newstr.str().c_str(); + } + } + } +@@ -196,7 +197,7 @@ + } + + // return the new string +- return newstr.str(); ++ return newstr.str().c_str(); + } + + // did we find submatches? +@@ -250,7 +251,7 @@ + // cout << "DEBUG: " << bla << " END DEBUG" << endl; + + +- return newstr.str(); ++ return newstr.str().c_str(); + + } + +diff -Naur colortail-0.3.0/Colorizer.h colortail-0.3.0-new/Colorizer.h +--- colortail-0.3.0/Colorizer.h Tue Aug 3 14:41:25 1999 ++++ colortail-0.3.0-new/Colorizer.h Sat Aug 24 16:07:43 2002 +@@ -35,10 +35,10 @@ + Colorizer(); + + public: +- Colorizer(char *cfg_file); ++ Colorizer(const char *cfg_file); + ~Colorizer(); + +- char* colorize(char *str); ++ const char* colorize(const char *str); + }; + + +diff -Naur colortail-0.3.0/Info.cc colortail-0.3.0-new/Info.cc +--- colortail-0.3.0/Info.cc Tue Aug 3 14:41:38 1999 ++++ colortail-0.3.0-new/Info.cc Sat Aug 24 15:58:29 2002 +@@ -17,11 +17,13 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + + #include "Info.h" + #include "config.h" + ++using namespace std; ++ + Info::Info() + { + } +diff -Naur colortail-0.3.0/OptionsParser.cc colortail-0.3.0-new/OptionsParser.cc +--- colortail-0.3.0/OptionsParser.cc Wed Aug 4 18:23:39 1999 ++++ colortail-0.3.0-new/OptionsParser.cc Sat Aug 24 15:59:41 2002 +@@ -17,8 +17,8 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -27,6 +27,7 @@ + #include "Info.h" + #include "Usage.h" + ++using namespace std; + // methods for class Options + + Options::Options() +@@ -130,7 +131,7 @@ + int loop = 1; + while (loop) + { +- ostrstream filename; ++ ostringstream filename; + + while (1) + { +@@ -138,7 +139,7 @@ + { + // found seperator + // set filename in options class +- o->cfg_filenames[o->nr_cfg_files] = filename.str(); ++ o->cfg_filenames[o->nr_cfg_files] = filename.str().c_str(); + + // increase the nr_cfg_files counter + (o->nr_cfg_files)++; +@@ -154,7 +155,7 @@ + { + // found end of string + // set filename in options class +- o->cfg_filenames[o->nr_cfg_files] = filename.str(); ++ o->cfg_filenames[o->nr_cfg_files] = filename.str().c_str(); + + // increase the nr_cfg_files counter + (o->nr_cfg_files)++; +diff -Naur colortail-0.3.0/OptionsParser.h colortail-0.3.0-new/OptionsParser.h +--- colortail-0.3.0/OptionsParser.h Wed Aug 4 18:33:08 1999 ++++ colortail-0.3.0-new/OptionsParser.h Sat Aug 24 16:00:42 2002 +@@ -77,7 +77,7 @@ + int color; + int rows; + int verbose; +- char *cfg_filenames[MAX_FILES]; ++ const char *cfg_filenames[MAX_FILES]; + int nr_cfg_files; + int global_cfg_file; + +diff -Naur colortail-0.3.0/TailFile.cc colortail-0.3.0-new/TailFile.cc +--- colortail-0.3.0/TailFile.cc Wed Aug 4 18:09:38 1999 ++++ colortail-0.3.0-new/TailFile.cc Sat Aug 24 16:08:12 2002 +@@ -17,7 +17,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + #include + #include + #include +@@ -25,6 +25,8 @@ + + #include "TailFile.h" + ++using namespace std; ++ + TailFile::TailFile() + { + m_filename = NULL; +@@ -375,7 +377,7 @@ + // check if there isn't a follow buffer + if (m_follow_buffer == NULL) + { +- m_follow_buffer = new ostrstream(); ++ m_follow_buffer = new ostringstream(); + } + + // make buffer +@@ -454,7 +456,7 @@ + m_follow_buffer->put('\0'); + + // get the string +- char *str = m_follow_buffer->str(); ++ const char *str = m_follow_buffer->str().c_str(); + + // print the line + print_to_stdout(str); +@@ -560,7 +562,7 @@ + // delete buf; + } + +-void TailFile::print_to_stdout(char *str) ++void TailFile::print_to_stdout(const char *str) + { + // checks if there is a colorizer. If so the string is colorized + // before it's printed. If not the string isn't colorized. +@@ -575,7 +577,7 @@ + if (m_colorizer) + { + // colorize the string +- char *buf = m_colorizer->colorize(str); ++ const char *buf = m_colorizer->colorize(str); + // print the new colorized string + cout << buf; + // free the mem +diff -Naur colortail-0.3.0/TailFile.h colortail-0.3.0-new/TailFile.h +--- colortail-0.3.0/TailFile.h Tue Aug 3 14:42:33 1999 ++++ colortail-0.3.0-new/TailFile.h Sat Aug 24 16:06:00 2002 +@@ -23,7 +23,7 @@ + #include "Colorizer.h" + + #include +-#include ++#include + + #define MAX_CHARS_READ 1024 + +@@ -40,12 +40,12 @@ + // the stream position + long m_position; + // the follow buffer, used in follow_print +- ostrstream *m_follow_buffer; ++ std::ostringstream *m_follow_buffer; + + // private methods + void find_position(int n); + long end_of_file_position(); +- void print_to_stdout(char *str); ++ void print_to_stdout(const char *str); + + // methods + public: +diff -Naur colortail-0.3.0/Usage.cc colortail-0.3.0-new/Usage.cc +--- colortail-0.3.0/Usage.cc Wed Aug 4 18:44:37 1999 ++++ colortail-0.3.0-new/Usage.cc Sat Aug 24 16:08:35 2002 +@@ -17,10 +17,12 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include ++#include + + #include "Usage.h" + ++using namespace std; ++ + Usage::Usage() + { + } diff --git a/extra/colortail/colortail-0.3.0-gcc4.4.patch b/extra/colortail/colortail-0.3.0-gcc4.4.patch new file mode 100644 index 000000000..094511f0a --- /dev/null +++ b/extra/colortail/colortail-0.3.0-gcc4.4.patch @@ -0,0 +1,33 @@ +diff -ru colortail-0.3.0/CfgFileParser.cc colortail-0.3.0.patched/CfgFileParser.cc +--- colortail-0.3.0/CfgFileParser.cc 2009-08-16 20:21:33.000000000 +0200 ++++ colortail-0.3.0.patched/CfgFileParser.cc 2009-08-16 20:19:41.000000000 +0200 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + #include + #include + +diff -ru colortail-0.3.0/Colorizer.cc colortail-0.3.0.patched/Colorizer.cc +--- colortail-0.3.0/Colorizer.cc 2009-08-16 20:21:33.000000000 +0200 ++++ colortail-0.3.0.patched/Colorizer.cc 2009-08-16 20:19:55.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #include + + using namespace std; +diff -ru colortail-0.3.0/main.cc colortail-0.3.0.patched/main.cc +--- colortail-0.3.0/main.cc 1999-08-03 21:42:59.000000000 +0200 ++++ colortail-0.3.0.patched/main.cc 2009-08-16 20:20:34.000000000 +0200 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include "main.h" + #include "ColorTail.h" diff --git a/extra/commoncpp2/PKGBUILD b/extra/commoncpp2/PKGBUILD new file mode 100644 index 000000000..9cc7e7c22 --- /dev/null +++ b/extra/commoncpp2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 44972 2009-07-05 23:00:52Z giovanni $ +# Maintainer: Jeff Mickey +# Contributor: John Proctor + +pkgname=commoncpp2 +pkgver=1.7.3 +pkgrel=1 +pkgdesc="GNU Common C++ 2" +arch=('i686' 'x86_64') +url='http://www.gnu.org/software/commoncpp/' +license=('GPL' 'custom') +depends=('gcc-libs' 'zlib' 'bash') +options=('!libtool' '!makeflags') +source=(http://ftp.gnu.org/pub/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz + commoncpp2-1.7.3-gcc44.patch) +md5sums=('ca741179a728d264eb276ae471ebaf70' + '120dc19fa21b78a18caf2e1db8a66a97') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/commoncpp2-1.7.3-gcc44.patch || return 1 + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${pkgdir} install + + gzip -9 ${pkgdir}/usr/share/info/commoncpp2.info + rm ${pkgdir}/usr/share/info/dir + + install -D -m644 COPYING.addendum ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/extra/commoncpp2/commoncpp2-1.7.3-gcc44.patch b/extra/commoncpp2/commoncpp2-1.7.3-gcc44.patch new file mode 100644 index 000000000..7966605ac --- /dev/null +++ b/extra/commoncpp2/commoncpp2-1.7.3-gcc44.patch @@ -0,0 +1,21 @@ +diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp +--- commoncpp2-1.7.3/src/cidr.cpp.orig 2009-04-06 21:24:07.857718325 +0200 ++++ commoncpp2-1.7.3/src/cidr.cpp 2009-04-06 21:50:26.874088776 +0200 +@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp) + #if defined(_MSC_VER) && _MSC_VER >= 1500 + ep = (char *)strchr(cp, '/'); + #else +- ep = strchr(cp, '/'); ++ ep = (char *)strchr(cp, '/'); + #endif + + if(ep) +@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp) + memset(&netmask, 0, sizeof(netmask)); + bitset((bit_t *)&netmask, getMask(cp)); + setString(cbuf, sizeof(cbuf), cp); +- ep = strchr(cp, '/'); ++ ep = (char *)strchr(cp, '/'); + if(ep) + *ep = 0; + diff --git a/extra/compface/LICENSE b/extra/compface/LICENSE new file mode 100644 index 000000000..4e8119b8f --- /dev/null +++ b/extra/compface/LICENSE @@ -0,0 +1,94 @@ +Extracted from Debian GNU/Linux's package: + +[...] + +Compface - 48x48x1 image compression and decompression +Copyright (c) James Ashton 1990. +Written 89/11/11 + +Feel free to distribute this source at will so long as the above +message and this message are included in full. + +This copyright message dosn't specify whether modified version is allowed, +but the following mail from the author does allow them: + +> From: James Ashton +> Subject: Re: Bug#72019: compface not DFSG +> Date: Wed, 20 Sep 2000 09:48:34 +1100 (EST) +> +> >On Tue, Sep 19, 2000 at 08:58:43AM -0400, Raul Miller wrote: +> >> Package: compface +> >> Version: 1989.11.11-17.1 +> >> Severity: important +> >> +> >> compface's copyright doesn't grant permission to +> >> distribute modified versions +> > +> >The compface copyright says: +> > +> >Feel free to distribute this source at will so long as the above +> >message and this message are included in full. +> > +> > +> >Which could be interpretated as it is allowed to distribute modified +> >versions of it. James Ashton is the original author, would you care to +> >clairify the matter, mr Ashton? +> +> I don't mind modified versions being distributed. Please included the +> original copyright notices as specified and also prominently note, if +> it is a modified version, the nature and author(s) of the +> modifications. +> -- +> James Ashton VK1XJA System Administrator +> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering +> Voice +61 2 6279 8675 Research School of Information Sciences and Engineering +> FAX +61 2 6279 8688 Australian National University +> Email James.Ashton@anu.edu.au Canberra ACT 0200 Australia +> + +Another peoblem with the copyright of this source code is that the +copyright message in the source files and in the readme file is conflicting. +The following mail from the author should clear that up: + +> From: James Ashton +> Subject: Re: libcompface license (again) +> Date: Thu, 22 Feb 2001 09:32:23 +1100 (EST) +> +> >Hi, +> >I'm maintaining the debian pkg of your compface lib, and I've talket to you +> >before about it's license. And now ouer legal people have found another +> >problem. The sourcefiles contains a diffrent copyright notice than the +> >redmefile. They say: +> > + +/* + * Compface - 48x48x1 image compression and decompression + * + * Copyright (c) James Ashton - Sydney University - June 1990. + * + * Written 11th November 1989. + * + * Permission is given to distribute these sources, as long as the + * copyright messages are not removed, and no monies are exchanged. + * + * No responsibility is taken for any errors on inaccuracies inherent + * either to the comments or the code of this program, but if reported + * to me, then an attempt will be made to fix them. + */ + +> > +> >The problem is the last part "no monies are exchanged". As you probably=20 +> >know we do allow third party companies to produce debian CDs and sell them. +> >So this statement would inmply that we can't have your libcompface in +> debian +> >at all. +> +> I'm happy to remove the phrase no monies are exchanged' from the +> source and allow distribution as per the README file. Do you need more +> from me than just this email? +> -- +> James Ashton VK1XJA System Administrator +> http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering +> Voice +61 2 6125 8675 Research School of Information Sciences and Engineering +> FAX +61 2 6125 8660 Australian National University +> Email James.Ashton@anu.edu.au Canberra ACT 0200 Australia diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD new file mode 100644 index 000000000..888843de6 --- /dev/null +++ b/extra/compface/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 32272 2009-03-29 23:04:29Z eric $ +# Maintainer: simo +# Contributor: Manolis Tzanidakis +# + +pkgname=compface +pkgver=1.5.2 +pkgrel=2 +pkgdesc="Utils & libs to convert from/to X-Face format." +arch=(i686 x86_64) +url="http://ftp.xemacs.org/pub/xemacs/aux/" +license=('custom') +depends=('glibc') +source=($url/$pkgname-$pkgver.tar.gz LICENSE) +md5sums=('62f4f79c0861ad292ba3cf77b4c48319' '27a0d5a4d695e68b4d3eebe17db77189') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \ + INCLUDEDIR=$pkgdir/usr/include install || return 1 + install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD new file mode 100644 index 000000000..cd52d9e55 --- /dev/null +++ b/extra/conky/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 50303 2009-08-25 11:05:41Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: James Rayner + +pkgname=conky +pkgver=1.7.2 +pkgrel=1 +pkgdesc="An advanced, highly configurable system monitor for X based on torsmo" +arch=('i686' 'x86_64') +url="http://conky.sourceforge.net/" +license=('custom') +replaces=('torsmo') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') +makedepends=('pkgconfig') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('cf6f5d45d42ad68c618c00271813b80d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-wlan \ + --enable-rss \ + --enable-ibm \ + --enable-imlib2 \ + --disable-lua + make || return 1 + make DESTDIR=${pkgdir} install + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} + diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD new file mode 100644 index 000000000..b73cdf888 --- /dev/null +++ b/extra/consolekit/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 38835 2009-05-10 16:12:13Z jgc $ +# Maintainer: Jan de Groot +# Contributor: onestep_ua + +pkgname=consolekit +pkgver=0.3.0 +pkgrel=5 +pkgdesc="A framework for defining and tracking users, login sessions, and seats" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/ConsoleKit" +license=('GPL') +depends=('dbus-glib>=0.76' 'glib2>=2.18.2' 'policykit>=0.9' 'zlib') +makedepends=('pkgconfig') +options=(!libtool) +source=(http://people.freedesktop.org/~mccann/dist/ConsoleKit-${pkgver}.tar.bz2 + pam-foreground-compat.ck + consolekit-dbus-permissions.patch) +md5sums=('43b02a52212330b54cfb34c4044d9ce0' + 'a8a4de71d9b0549b8143e5f6c2a36fc7' + '02cd8d4d0ea279a70a435c7c28b04e39') + +build() { + cd "${srcdir}/ConsoleKit-${pkgver}" + patch -Np1 -i "${srcdir}/consolekit-dbus-permissions.patch" || return 1 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/ConsoleKit \ + --enable-pam-module || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/" || return 1 +} diff --git a/extra/consolekit/consolekit-dbus-permissions.patch b/extra/consolekit/consolekit-dbus-permissions.patch new file mode 100644 index 000000000..0cab28583 --- /dev/null +++ b/extra/consolekit/consolekit-dbus-permissions.patch @@ -0,0 +1,175 @@ +diff -up ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit ConsoleKit-0.3.0/data/ConsoleKit.conf +--- ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit 2008-04-19 01:39:49.000000000 -0400 ++++ ConsoleKit-0.3.0/data/ConsoleKit.conf 2009-04-08 11:40:33.347814036 -0400 +@@ -8,88 +8,131 @@ + + + +- +- +- ++ + + + + +- +- +- ++ ++ ++ ++ + + +- +- +- +- +- +- ++ +- +- +- +- +- +- + +- +- +- +- +- +- + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ + + diff --git a/extra/consolekit/pam-foreground-compat.ck b/extra/consolekit/pam-foreground-compat.ck new file mode 100644 index 000000000..7f6b122d5 --- /dev/null +++ b/extra/consolekit/pam-foreground-compat.ck @@ -0,0 +1,16 @@ +#!/bin/sh +TAGDIR=/var/run/console + +[ -n "$CK_SESSION_USER_UID" ] || exit 1 + +TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" + +if [ "$1" = "session_added" ]; then + mkdir -p "$TAGDIR" + echo "$CK_SESSION_ID" >> "$TAGFILE" +fi + +if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then + sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" + [ -s "$TAGFILE" ] || rm -f "$TAGFILE" +fi diff --git a/extra/convmv/PKGBUILD b/extra/convmv/PKGBUILD new file mode 100644 index 000000000..7aff5fc45 --- /dev/null +++ b/extra/convmv/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 26709 2009-02-11 17:19:18Z tpowa $ +# Maintainer : Aaron Griffin + +pkgname=convmv +pkgver=1.14 +pkgrel=1 +pkgdesc="Tool for converting encodings on filesystems" +license=('GPL2') +arch=(i686 x86_64) +url="http://j3e.de/linux/convmv/" +depends=('perl') +source=(http://j3e.de/linux/convmv/$pkgname-$pkgver.tar.gz) + +build() +{ + cd $startdir/src/$pkgname-$pkgver + make + make PREFIX=$startdir/pkg/usr install || return 1 +} +md5sums=('d41238051c13b2e6c0cc2310a8f69d68') diff --git a/extra/corewars/PKGBUILD b/extra/corewars/PKGBUILD new file mode 100644 index 000000000..85c08715f --- /dev/null +++ b/extra/corewars/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 49917 2009-08-16 21:24:08Z jgc $ +# Maintainer: damir +pkgname=corewars +pkgver=0.9.13 +pkgrel=2 +pkgdesc="Simulation game where a number of programs try to crash each other" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/corewars/" +license=('GPL2') +depends=('gtk') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('0a0b8067533b83a96488109ee265f664') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/courier-authlib/PKGBUILD b/extra/courier-authlib/PKGBUILD new file mode 100644 index 000000000..d59485860 --- /dev/null +++ b/extra/courier-authlib/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 53167 2009-09-26 09:48:47Z allan $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +pkgname=courier-authlib +pkgver=0.62.4 +pkgrel=4 +pkgdesc="Authentification library for the courier mailserver(s)" +arch=(i686 x86_64) +license=('GPL2') +url="http://courier-mta.org/authlib/" +backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \ + 'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc') +depends=('openssl' 'db>=4.8' 'perl' 'libtool' 'expect') +makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') +optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') +conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + authdaemond.rc.d) +md5sums=('40b01d7f19c29db7c919c0938a7537c7' + '911ee9f40d70fafc6bb4cc636c5ad531') + +build() { + export MAKEFLAGS="-j1" + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --with-db=db \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-authpam --with-authpwd --with-authshadow \ + --with-authldap --with-authmysql --with-authpgsql \ + --with-authuserdb --with-authcram --with-authdaemon + make || return 1 + make DESTDIR=${pkgdir} install + ############################################################################### + # post_installation ---- rename the config file and change ownerschip + for distfile in ${pkgdir}/etc/authlib/*.dist; do + chown 72:72 ${distfile} + mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist` + done + # copy the .schema; mostly refered to as courier.schema -> rename it + install -Dm 444 authldap.schema \ + ${pkgdir}/etc/openldap/schema/courier.schema + ############################################################################### + # Install daemon, that wraps couriers bashscript + install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond + chown -R 72:72 ${pkgdir}/var/spool/authdaemon + mkdir ${pkgdir}/var/spool/courier + chown -R 72:72 ${pkgdir}/var/spool/courier + # docs say we can remove .a files after make + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/extra/courier-authlib/authdaemond.rc.d b/extra/courier-authlib/authdaemond.rc.d new file mode 100644 index 000000000..ff4abb182 --- /dev/null +++ b/extra/courier-authlib/authdaemond.rc.d @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start() { + stat_busy "Starting Authdaemond" + /usr/sbin/authdaemond start &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + ln -s /var/spool/authdaemon/pid /var/run/authdaemond.pid + add_daemon authdaemond + stat_done + fi +} + +stop() { + stat_busy "Stopping Authdaemond" + /usr/sbin/authdaemond stop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/authdaemond.pid + rm_daemon authdaemond + # housecleaning; just like kids'n toys - don't care when it's needed anymore + rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null + stat_done + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + # calling 'stop' and 'start' without the $0 fails... + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/courier-authlib/courier-authlib.install b/extra/courier-authlib/courier-authlib.install new file mode 100644 index 000000000..cbccc636b --- /dev/null +++ b/extra/courier-authlib/courier-authlib.install @@ -0,0 +1,32 @@ +# arg 1: the new package version +post_install() { + # creates group and user on virgin systems + if [ -z "`grep '^courier::' /etc/group`" ]; then + groupadd -g 72 courier >& /dev/null + fi + if [ -z "`grep '^courier:' /etc/passwd`" ]; then + useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + userdel courier &> /dev/null + groupdel courier &> /dev/null +} + + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/courier-imap/PKGBUILD b/extra/courier-imap/PKGBUILD new file mode 100644 index 000000000..b4157c816 --- /dev/null +++ b/extra/courier-imap/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 53185 2009-09-26 10:44:12Z allan $ +# Maintainer: tobias +# Committer: Manolis Tzanidakis + +pkgname=courier-imap +pkgver=4.4.1 +pkgrel=2 +pkgdesc="IMAP(s)/POP3(s) Server" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.courier-mta.org/imap/" +depends=('courier-maildrop>=2.0.4-4' 'gcc-libs' 'fam' 'db>=4.8' 'openssl') +backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ + 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ + 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ + 'etc/conf.d/courier-imap') +conflicts=('courier-mta') +provides=('imap-server' 'pop3-server') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + courier-imap.conf.d courier-imap.rc.d) +md5sums=('71482dff367e5161a3c0f9c61bbfd2b1' 'f00a0756ae41d9e993d141f24de8bf64' \ + 'e01be01a11654ce437f53d92ebc696c0') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier-imap \ + --libexecdir=/usr/lib/courier-imap \ + --localstatedir=/var/spool/courier-imap \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --with-piddir=/var/run/courier \ + --with-trashquota \ + --with-db=db \ + --with-trashquota \ + --with-mailuser=courier --with-mailgroup=courier + make || return 1 + make DESTDIR=${pkgdir} install + # cleanup - provided by courier-maildrop + rm ${pkgdir}/usr/bin/{deliverquota,maildirmake} || return 1 + rm ${pkgdir}/usr/share/man/man1/maildirmake* || return 1 + rm ${pkgdir}/usr/share/man/man8/deliverquota* || return 1 + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier-imap/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier-imap/$(basename ${distfile} .dist) + done + sed -i 's|TLS_CERTFILE=/usr/share/|TLS_CERTFILE=/etc/courier-imap/|' \ + ${pkgdir}/etc/courier-imap/*-ssl + for pamfile in imap/*.pam; do + sed -i "s|/lib/security/||;s|pam_pwdb|pam_unix|" ${pamfile} + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .pam | sed "s/d$//") + done + # install thingies + install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap + install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap + install -dm755 -g courier -o courier ${pkgdir}/var/run/courier +} diff --git a/extra/courier-imap/courier-imap.conf.d b/extra/courier-imap/courier-imap.conf.d new file mode 100644 index 000000000..b2d96f405 --- /dev/null +++ b/extra/courier-imap/courier-imap.conf.d @@ -0,0 +1,10 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# imapd pop3d imapd-ssl pop3d-ssl +# +CI_DAEMONS="imapd pop3d imapd-ssl pop3d-ssl" diff --git a/extra/courier-imap/courier-imap.pam b/extra/courier-imap/courier-imap.pam new file mode 100644 index 000000000..fa52db541 --- /dev/null +++ b/extra/courier-imap/courier-imap.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so nullok +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/extra/courier-imap/courier-imap.rc.d b/extra/courier-imap/courier-imap.rc.d new file mode 100644 index 000000000..9438da8a8 --- /dev/null +++ b/extra/courier-imap/courier-imap.rc.d @@ -0,0 +1,47 @@ +CI_DAEMONS= +[ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/lib/courier-imap/${daemon}.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/lib/courier-imap/$daemon.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/extra/courier-maildrop/PKGBUILD b/extra/courier-maildrop/PKGBUILD new file mode 100644 index 000000000..4d2c593d1 --- /dev/null +++ b/extra/courier-maildrop/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 53177 2009-09-26 10:33:43Z allan $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +pkgname=courier-maildrop +_srcname=maildrop +pkgver=2.0.4 +pkgrel=5 +pkgdesc="mail delivery agent - procmail like but nicer syntax" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://courier-mta.org/maildrop/" +depends=('courier-authlib>=0.60.5-2' 'fam' 'pcre' 'db>=4.7') +makedepends=() +conflicts=('courier-mta') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) +md5sums=('6a760efe429716ab0be67a1ddc554ed7') + +build() { + cd ${srcdir}/${_srcname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --localstatedir=/var \ + --with-db=db \ + --with-devel + make LDFLAGS+=-lstdc++ || return 1 + make DESTDIR=${pkgdir} install + chmod u+s ${pkgdir}/usr/bin/maildrop + cd ${pkgdir}/usr/share/maildrop/html + for files in *; do + install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files} + done + rm -rf ${pkgdir}/usr/share/maildrop + # docs say we can remove .a files after make + cd ${pkgdir} + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/extra/courier-mta/PKGBUILD b/extra/courier-mta/PKGBUILD new file mode 100644 index 000000000..c2424af95 --- /dev/null +++ b/extra/courier-mta/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 53172 2009-09-26 10:12:15Z allan $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +# ----------- NOTE TO ALL USERS ------------ +# Go read http://www.courier-mta.org/install.html b4 running or building courier + + +pkgname=courier-mta +pkgver=0.62.1 +pkgrel=4 +pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" +arch=(i686 x86_64) +license=('GPL2') +backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ + 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ + 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ + 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ + 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ + 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ + 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ + 'etc/conf.d/courier-mta') +url="http://courier-mta.org" +depends=('courier-authlib>=0.62.2' 'fam' 'gcc-libs' 'db>=4.8' 'pcre' 'mime-types' 'ca-certificates') +optdepends=('libldap') +makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') +provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') +conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') +options=('!libtool') +install=courier-mta.install +source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 + courier-mta.rc.d courier-mta.conf.d ) +md5sums=('4437906c139a6a334ee9ae625730ae5e' + 'a915ebe9f3539c99e1f7cda437f0811a' + 'c299a91338e882aa7eed5a159f9d7eac') + +build() { + cd ${srcdir}/courier-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + # courier is more about configuring than compiling :-), lets start the mess + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var/spool/courier \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --enable-mimetypes=/etc/mime.types \ + --with-piddir=/var/run/courier \ + --with-locking-method=lockf \ + --with-trashquota \ + --with-db=db \ + --with-trashquota \ + --with-random=/dev/urandom --without-ispell \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-certdb=/etc/ssl/certs/ + make || return 1 + #chown mail.mail ${pkgdir}/var/spool/courier + make DESTDIR=${pkgdir} install + # docs say we can get rid of those after make + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + # install the perftest-script for testings + install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) + done + # install pam files according to the layout used in Archlinux + for pamfile in ${pkgdir}/etc/courier/*.authpam; do + sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} + #echo "password required pam_unix.so" >> $pamfile + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") + rm -f ${pamfile} + done + ############################################################################### + # Arch Linux specific tweaks to make things easier for the user + # create passwordfile for webadmin -> standard archwebadmin + sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile + yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password + # arch specific scripts + install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta + install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta + #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ + # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache + # bug http://bugs.archlinux.org/task/5154 + find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; + # fixing some permissions + chown -R courier:courier ${pkgdir}/usr/lib/courier/modules + chown -R courier:courier ${pkgdir}/var/run/courier + chown root.root ${pkgdir}/usr/{.,bin,lib,sbin,share} + # make a link to /usr/sbin/sendmail + install -dm 755 ${pkgdir}/usr/sbin + cd ${pkgdir}/usr/sbin + ln -s ../bin/sendmail ./sendmail +} diff --git a/extra/courier-mta/courier-mta.conf.d b/extra/courier-mta/courier-mta.conf.d new file mode 100644 index 000000000..71487dd28 --- /dev/null +++ b/extra/courier-mta/courier-mta.conf.d @@ -0,0 +1,17 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild +# +CI_DAEMONS="courier esmtpd imapd pop3d" + +# if this is set you can have the courierdaemon start and stop the +# authdaemon automatically +# the lag means the seconds to wait between start authdamond and courier +#AUTO_AUTHDAEMON=true +#AUTO_AUTHDAEMON_LAG=2 + diff --git a/extra/courier-mta/courier-mta.install b/extra/courier-mta/courier-mta.install new file mode 100644 index 000000000..eac627867 --- /dev/null +++ b/extra/courier-mta/courier-mta.install @@ -0,0 +1,46 @@ +# arg 1: the new package version +post_install() { + cat << EOM + --> if you are using LDAP services to provide lookup in sqwebmail or aliases + --> then you have to install: + libldap +EOM + # create the *.dat files + makealiases + makesmtpaccess +} + +pre_upgrade() { + pre_remove $1 +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + + +pre_remove() { + # manual backup, since courier is always processing the whole directory + # - so it would process "system" AND "system.pacsave" -> bad + [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup + cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system + cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default + cat << EOM + --> the /etc/courier/aliase/system and the /etc/courier/smtpaccess/default + --> files have been backed up to /etc/courier/_backup since the *.pacsave + --> files cannot stay in place. Read about couriers alias handling from the + --> documentation! +EOM +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/courier-mta/courier-mta.rc.d b/extra/courier-mta/courier-mta.rc.d new file mode 100644 index 000000000..11ea9bc8d --- /dev/null +++ b/extra/courier-mta/courier-mta.rc.d @@ -0,0 +1,55 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ${AUTO_AUTHDAEMON="true"} ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if [ ! -f /var/run/daemons/authdaemond ]; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/sbin/${daemon} start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/sbin/${daemon} stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ ${AUTO_AUTHDAEMON="true"} ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/courier-mta/courier-webmail-cleancache.cron.hourly b/extra/courier-mta/courier-webmail-cleancache.cron.hourly new file mode 100644 index 000000000..6c541321e --- /dev/null +++ b/extra/courier-mta/courier-webmail-cleancache.cron.hourly @@ -0,0 +1,6 @@ +#!/bin/sh + +# Cleans the cache of the sqwebmail server +if [ -x /usr/share/sqwebmail/cleancache.pl ]; then + su -c "/usr/share/sqwebmail/cleancache.pl" bin +fi diff --git a/extra/cowsay/ChangeLog b/extra/cowsay/ChangeLog new file mode 100644 index 000000000..ca646a273 --- /dev/null +++ b/extra/cowsay/ChangeLog @@ -0,0 +1,7 @@ +2008-12-08 Eric Belanger + + * cowsay 3.03-6 + * Added license + * FHS man pages + * Added arch tag + * Added ChangeLog diff --git a/extra/cowsay/PKGBUILD b/extra/cowsay/PKGBUILD new file mode 100644 index 000000000..46348663c --- /dev/null +++ b/extra/cowsay/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 21052 2008-12-09 04:51:05Z eric $ +# Maintainer: Eric Belanger +# Contributor: Sarah Hay + +pkgname=cowsay +pkgver=3.03 +pkgrel=6 +pkgdesc="Add speaking and thinking cows (and a few other creatures) to anything" +arch=('i686' 'x86_64') +url="http://www.nog.net/~tony/warez/cowsay.shtml" +license=('PerlArtistic' 'GPL') +depends=('perl') +source=(http://www.nog.net/~tony/warez/${pkgname}-${pkgver}.tar.gz cowsay.patch) +md5sums=('b29169797359420dadb998079021a494' '7091f9a6d97006299a1f27a665b638b6') +sha1sums=('cc65a9b13295c87df94a58caa8a9176ce5ec4a27' '0da25fd2f80de4d92096c5d1ece2c6dcc05bea75') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 < ../cowsay.patch + sed -i 's|/man/|/share/man/|' install.sh + echo "${pkgdir}/usr" | ./install.sh +} diff --git a/extra/cowsay/cowsay.patch b/extra/cowsay/cowsay.patch new file mode 100644 index 000000000..299d52895 --- /dev/null +++ b/extra/cowsay/cowsay.patch @@ -0,0 +1,11 @@ +--- cowsay-3.03/install.sh 1999-11-01 21:19:21.000000000 +0100 ++++ cowsay-3.03-new/install.sh 2003-08-15 17:14:23.000000000 +0200 +@@ -67,7 +67,7 @@ + echo Okay, time to install this puppy. + + echo s,%BANGPERL%,!$usethisperl,\; > install.pl +-echo s,%PREFIX%,$PREFIX,\; >> install.pl ++echo s,%PREFIX%,/usr,\; >> install.pl + set -x + mkdir -p $PREFIX/bin || (mkdir $PREFIX; mkdir $PREFIX/bin) + $usethisperl -p install.pl cowsay > $PREFIX/bin/cowsay diff --git a/extra/cpudyn/PKGBUILD b/extra/cpudyn/PKGBUILD new file mode 100644 index 000000000..476c0a7c5 --- /dev/null +++ b/extra/cpudyn/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 4771 2008-07-09 21:19:56Z kevin $ +# Maintainer: Kevin Piche + +pkgname=cpudyn +pkgver=1.0.1 +pkgrel=2 +pkgdesc="CPU dynamic frequency control" +url="http://mnm.uib.es/~gallir/cpudyn" +arch=('i686') +license=('GPL2') +depends=('glibc') +backup=(etc/conf.d/cpudyn) +source=($url/download/$pkgname-$pkgver.tgz cpudyn.confd cpudyn.rc) +md5sums=('670d32eb953f99ba04aee44848864228' '0d6226a3594bbd526d98d704440c987b'\ + '8ab37c6554adea48f075b28a40b75b2b') + +build() { + cd $startdir/src/$pkgname + make || return 1 + install -D -m755 cpudynd $startdir/pkg/usr/sbin/cpudynd + install -D -m644 cpudynd.8.gz $startdir/pkg/usr/man/man8/cpudynd.8.gz + install -D -m755 $startdir/src/cpudyn.rc $startdir/pkg/etc/rc.d/cpudyn + install -D -m644 $startdir/src/cpudyn.confd $startdir/pkg/etc/conf.d/cpudyn +} + +# vim:ts=2:ft=sh diff --git a/extra/cpudyn/cpudyn.confd b/extra/cpudyn/cpudyn.confd new file mode 100644 index 000000000..2fa49e18d --- /dev/null +++ b/extra/cpudyn/cpudyn.confd @@ -0,0 +1,9 @@ +# +# Parameters to be passed to cpudynd +# + +# default +CPUDYN_OPTS="-i 1 -p 0.5 0.90" + +# comment 'default' & uncomment this to have your disk spin down. +#CPUDYN_OPTS="-i 1 -p 0.5 0.90 -t 120 -h /dev/hda" diff --git a/extra/cpudyn/cpudyn.rc b/extra/cpudyn/cpudyn.rc new file mode 100644 index 000000000..51a083b85 --- /dev/null +++ b/extra/cpudyn/cpudyn.rc @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/cpudyn ] && . /etc/conf.d/cpudyn + +PID=`pidof -o %PPID /usr/sbin/cpudynd` +case "$1" in + start) + stat_busy "Starting Cpudyn" + [ -z "$PID" ] && /usr/sbin/cpudynd -d $CPUDYN_OPTS 2>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon cpudyn + stat_done + fi + ;; + stop) + stat_busy "Stopping Cpudyn" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon cpudyn + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/cpufreqd/PKGBUILD b/extra/cpufreqd/PKGBUILD new file mode 100644 index 000000000..9e2893abc --- /dev/null +++ b/extra/cpufreqd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 36633 2009-04-26 15:34:01Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Kevin Piche +# Contributor: Manolis Tzanidakis + +pkgname=cpufreqd +pkgver=2.3.4 +pkgrel=1 +pkgdesc="A small daemon to adjust cpu speed (and indeed voltage)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/cpufreqd" +license=('GPL2') +depends=('cpufrequtils') +install="$pkgname.install" +backup=(etc/cpufreqd.conf) +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + 'cpufreqd') +md5sums=('f4193f688305566a8422dd3989667668' + 'ae7b0ec1e8e9f9e7f05fb83749af4ed4') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc + make || return 1 + make DESTDIR=$pkgdir install + + install -D -m 755 $srcdir/cpufreqd $pkgdir/etc/rc.d/cpufreqd || return 1 +} diff --git a/extra/cpufreqd/cpufreqd b/extra/cpufreqd/cpufreqd new file mode 100644 index 000000000..af554560a --- /dev/null +++ b/extra/cpufreqd/cpufreqd @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/cpufreqd` +case "$1" in + start) + stat_busy "Starting cpufreqd" + [ -z "$PID" ] && /usr/sbin/cpufreqd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon cpufreqd + stat_done + fi + ;; + stop) + stat_busy "Stopping cpufreqd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon cpufreqd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/cpufreqd/cpufreqd.install b/extra/cpufreqd/cpufreqd.install new file mode 100644 index 000000000..e56ce571b --- /dev/null +++ b/extra/cpufreqd/cpufreqd.install @@ -0,0 +1,26 @@ +post_install() { + cat << EOF + +NOTE +---- +In order to use that daemon you need to either patch your +kernel-2.4.x with cpufreq patch (check +http://www.codemonkey.org.uk/projects/cpufreq/), +or use kernel-2.6.x or 2.4.x.-ac. + +EOF +} + +post_upgrade() { + /bin/true +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/cpufrequtils/PKGBUILD b/extra/cpufrequtils/PKGBUILD new file mode 100644 index 000000000..3d11ef93c --- /dev/null +++ b/extra/cpufrequtils/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 13320 2008-09-26 16:44:09Z giovanni $ +# Maintainer: kevin +# Contributor: phrakture + +pkgname=cpufrequtils +pkgver=005 +pkgrel=2 +pkgdesc="Userspace tools for the kernel cpufreq subsystem" +arch=('i686' 'x86_64') +url="http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html" +license=('GPL') +depends=('sysfsutils') +backup=('etc/conf.d/cpufreq') +source=(http://www.kernel.org/pub/linux/utils/kernel/cpufreq/$pkgname-$pkgver.tar.bz2 \ + cpufreq.rcd cpufreq.confd) +options=(force !libtool) +md5sums=('73a41589fe74b73fc530f4179f2c6142' '7be9ea55db712327783162ba6f7659ab' + '8335b8503376a3776da2ddc84043887c') + +build() +{ + cd $startdir/src/$pkgname-$pkgver + make -j1 || return 1 + make INSTALL="/bin/install -c" mandir=/usr/share/man DESTDIR=$startdir/pkg install + + install -D -m755 ../cpufreq.rcd $startdir/pkg/etc/rc.d/cpufreq + install -D -m644 ../cpufreq.confd $startdir/pkg/etc/conf.d/cpufreq +} diff --git a/extra/cpufrequtils/cpufreq.confd b/extra/cpufrequtils/cpufreq.confd new file mode 100644 index 000000000..8d21bc0bf --- /dev/null +++ b/extra/cpufrequtils/cpufreq.confd @@ -0,0 +1,10 @@ +#configuration for cpufreq control + +# valid governors: +# ondemand, performance, powersave, +# conservative, userspace +governor="ondemand" + +# valid suffixes: Hz, kHz (default), MHz, GHz, THz +min_freq="2.25GHz" +max_freq="3GHz" diff --git a/extra/cpufrequtils/cpufreq.rcd b/extra/cpufrequtils/cpufreq.rcd new file mode 100644 index 000000000..ed002ce22 --- /dev/null +++ b/extra/cpufrequtils/cpufreq.rcd @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/cpufreq ] && . /etc/conf.d/cpufreq + +case "$1" in + start) + stat_busy "Setting cpufreq governing rules" + + params="" + if [ -n $governor ]; then + mod="cpufreq_$governor" + params="-g $governor" + modprobe $mod > /dev/null 2>&1 + if [ $? -eq 0 ]; then + if [ "$min_freq" != "" ]; then + params="$params -d $min_freq" + fi + if [ "$max_freq" != "" ]; then + params="$params -u $max_freq" + fi + else + stat_busy " Cannot load governor module '$governor'" + stat_fail + exit + fi + fi + + if [ "$params" != "" ]; then + CPUS=$(sed -ne 's/^processor.* \([0-9]\+\)$/\1/p' /proc/cpuinfo) + stat_append ", cpu" + for cpu in $CPUS; do + stat_append " $cpu" + cpufreq-set -c $cpu $params + done + stat_done + else + stat_busy " Invalid configuration in /etc/conf.d/cpufreq" + stat_fail + fi + ;; + stop) + # nothing to do + ;; + restart) + $0 start + ;; + set) + # TODO: make callable... "cpufreq set 800MHz" + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/crimson/PKGBUILD b/extra/crimson/PKGBUILD new file mode 100644 index 000000000..730149ca2 --- /dev/null +++ b/extra/crimson/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 28726 2009-03-01 22:19:55Z douglas $ +# Contributor: Tom Newsom +# Maintainer: James Rayner + +pkgname=crimson +pkgver=0.5.3 +pkgrel=1 +pkgdesc="Crimson Fields is a tactical war game in the tradition of Battle Isle" +arch=(i686 x86_64) +license=("GPL") +depends=('sdl_mixer' 'sdl_ttf' 'sdl_net') +source=(http://crimson.seul.org/files/$pkgname-$pkgver.tar.bz2 ) +url="http://crimson.seul.org" + + +build() { + cd $startdir/src/$pkgname-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$startdir/pkg install +} +md5sums=('9e71bc8c12ddadf42136a3e07ae86a2c') diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD new file mode 100644 index 000000000..5c3164fd8 --- /dev/null +++ b/extra/crypto++/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 39445 2009-05-16 20:51:07Z giovanni $ +# Maintainer: Andrea Scarpino +# Contributor: Damir +# Contributor: Kritoke +# Contributor: jlvsimoes + +pkgname=crypto++ +pkgver=5.6.0 +_srcver=560 +pkgrel=2 +pkgdesc="A free C++ class library of cryptographic schemes." +arch=('i686' 'x86_64') +license=('custom') +makedepends=('unzip') +url="http://www.cryptopp.com/" +source=(http://www.cryptopp.com/cryptopp${_srcver}.zip) +md5sums=('36f35789ad60489d58003d3c849807e8') + +build() { + cd ${srcdir} + sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile + make -f GNUmakefile || return 1 + install -d ${pkgdir}/usr/{lib,include/cryptopp} + install -m644 *.h ${pkgdir}/usr/include/cryptopp/ + install -m644 libcryptopp.a ${pkgdir}/usr/lib/ + install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD new file mode 100644 index 000000000..e54754854 --- /dev/null +++ b/extra/cscope/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 9121 2008-08-17 03:57:34Z allan $ +# Contributor: Tom Newsom +# Maintainer: Jason Chu + +pkgname=cscope +pkgver=15.6 +pkgrel=2 +pkgdesc="Cscope is a developers tool for browsing program code" +arch=(i686 x86_64) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('beb6032a301bb11524aec74bfb5e4840') +url="http://cscope.sourceforge.net/index.html" +license=('custom') +depends=(ncurses) + +build() { +cd $startdir/src/$pkgname-$pkgver +#patch -Np1 -i ../../cscope.patch +./configure --prefix=/usr +make || return 1 +make prefix=$startdir/pkg/usr install +install -dm755 ${pkgdir}/usr/share/man +mv ${pkgdir}/usr/man ${pkgdir}/usr/share +install -Dm644 COPYING ${pkgdir}/usr/share/licenses/cscope/LICENSE +} +md5sums=('db87833f90d8267b1fc0c419cfc4d219') diff --git a/extra/cscope/cscope.patch b/extra/cscope/cscope.patch new file mode 100644 index 000000000..e5782d60b --- /dev/null +++ b/extra/cscope/cscope.patch @@ -0,0 +1,65 @@ +--- cscope-15.4/src/egrep.y.orig 2002-11-30 08:11:02.000000000 +0100 ++++ cscope-15.4/src/egrep.y 2002-11-30 08:22:13.000000000 +0100 +@@ -113,45 +113,45 @@ + + %% + s: t +- ={ unary(FINAL, $1); ++ { unary(FINAL, $1); + line--; + } + ; + t: b r +- ={ $$ = node(CAT, $1, $2); } ++ { $$ = node(CAT, $1, $2); } + | OR b r OR +- ={ $$ = node(CAT, $2, $3); } ++ { $$ = node(CAT, $2, $3); } + | OR b r +- ={ $$ = node(CAT, $2, $3); } ++ { $$ = node(CAT, $2, $3); } + | b r OR +- ={ $$ = node(CAT, $1, $2); } ++ { $$ = node(CAT, $1, $2); } + ; + b: +- ={ $$ = enter(DOT); ++ { $$ = enter(DOT); + $$ = unary(STAR, $$); } + ; + r: CHAR +- ={ $$ = enter($1); } ++ { $$ = enter($1); } + | DOT +- ={ $$ = enter(DOT); } ++ { $$ = enter(DOT); } + | CCL +- ={ $$ = cclenter(CCL); } ++ { $$ = cclenter(CCL); } + | NCCL +- ={ $$ = cclenter(NCCL); } ++ { $$ = cclenter(NCCL); } + ; + + r: r OR r +- ={ $$ = node(OR, $1, $3); } ++ { $$ = node(OR, $1, $3); } + | r r %prec CAT +- ={ $$ = node(CAT, $1, $2); } ++ { $$ = node(CAT, $1, $2); } + | r STAR +- ={ $$ = unary(STAR, $1); } ++ { $$ = unary(STAR, $1); } + | r PLUS +- ={ $$ = unary(PLUS, $1); } ++ { $$ = unary(PLUS, $1); } + | r QUEST +- ={ $$ = unary(QUEST, $1); } ++ { $$ = unary(QUEST, $1); } + | '(' r ')' +- ={ $$ = $2; } ++ { $$ = $2; } + | error + ; + + diff --git a/extra/cssed/PKGBUILD b/extra/cssed/PKGBUILD new file mode 100644 index 000000000..3c404381e --- /dev/null +++ b/extra/cssed/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 32306 2009-03-30 04:32:07Z eric $ +# Maintainer: eric +# Contributor: Damir Perisa + +pkgname=cssed +pkgver=0.4.0 +pkgrel=2 +pkgdesc="A GTK2 based Cascading Style Sheets (CSS) editor" +arch=('i686' 'x86_64') +url="http://cssed.sourceforge.net/" +license=('GPL') +depends=('gtk2' 'libxml2' 'desktop-file-utils') +install=$pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.desktop) +md5sums=('ff7c818d1f819b7d76b4f714be64e08e' '90003378b6d74a7b85b22de67c6aa893') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 ../$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/extra/cssed/cssed.desktop b/extra/cssed/cssed.desktop new file mode 100644 index 000000000..2fce1e42b --- /dev/null +++ b/extra/cssed/cssed.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Name=CssED +Comment=GTK2 based editor for cascading style sheets +Exec=cssed +Icon=/usr/share/cssed/pixmaps/cssed-icon.png +Terminal=false +X-MultipleArgs=false +Type=Application +Categories=GTK;Application;Development;WebDevelopment; +MimeType=text/html;text/css;text/x-perl;text/x-php;text/x-php-source; diff --git a/extra/cssed/cssed.install b/extra/cssed/cssed.install new file mode 100644 index 000000000..5cf963fad --- /dev/null +++ b/extra/cssed/cssed.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/ctags/PKGBUILD b/extra/ctags/PKGBUILD new file mode 100644 index 000000000..8a7199f28 --- /dev/null +++ b/extra/ctags/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 46423 2009-07-18 07:32:07Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: John Proctor + +pkgname=ctags +pkgver=5.8 +pkgrel=1 +pkgdesc="Generates an index file of language objects found in source files" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc') +url="http://ctags.sourceforge.net/" +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('c00f82ecdcc357434731913e5b48630d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make || return 1 + make prefix=${pkgdir}/usr install +} + diff --git a/extra/culmus/PKGBUILD b/extra/culmus/PKGBUILD new file mode 100644 index 000000000..63f3116ff --- /dev/null +++ b/extra/culmus/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 52024 2009-09-14 12:26:55Z francois $ +# Maintainer: + +pkgname=culmus +pkgver=0.103 +pkgrel=1 +pkgdesc="A collection of Type1 and TrueType Hebrew fonts" +arch=(any) +url="http://culmus.sf.net" +license=('GPL2') +depends=('fontconfig' 'xorg-fonts-alias' 'xorg-font-utils' 'xorg-fonts-encodings') +install=('culmus.install') +source=("http://downloads.sourceforge.net/sourceforge/culmus/culmus-$pkgver.tar.gz") +md5sums=('36c0fcd674eda12de6a5e9a4bc52abdb') + +build() { +# install fonts +mkdir -p ${pkgdir}/usr/share/fonts/Type1 +install -m644 ${srcdir}/culmus-$pkgver/*.{afm,pfa} \ + ${pkgdir}/usr/share/fonts/Type1 + +mkdir -p ${pkgdir}/usr/share/fonts/TTF +install -m644 ${srcdir}/culmus-$pkgver/*.ttf \ + ${pkgdir}/usr/share/fonts/TTF + +# install provided config file with priority 61 +mkdir -p ${pkgdir}/etc/fonts/conf.avail/ +install -m644 ${srcdir}/culmus-$pkgver/culmus.conf \ + ${pkgdir}/etc/fonts/conf.avail/61-culmus.conf +} diff --git a/extra/culmus/culmus.install b/extra/culmus/culmus.install new file mode 100644 index 000000000..6d1ac880b --- /dev/null +++ b/extra/culmus/culmus.install @@ -0,0 +1,46 @@ +configs=('61-culmus.conf') + +update_fontcache() { + fc-cache -fs + mkfontscale /usr/share/fonts/Type1 + mkfontdir /usr/share/fonts/Type1 + mkfontscale /usr/share/fonts/TTF + mkfontdir /usr/share/fonts/TTF +} + +post_install() { + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + ln -sf ../conf.avail/${config} . + done + popd > /dev/null + + update_fontcache +} + +post_upgrade() { + if [ "`vercmp 0.102-1 $2`" != "-1" ] || [ ! -L /etc/fonts/conf.d/61-culmus.conf ]; then + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + ln -sf ../conf.avail/${config} . + done + popd > /dev/null + fi + + update_fontcache +} + +post_remove() { + pushd /etc/fonts/conf.d > /dev/null + for config in "${configs[@]}"; do + rm -f ${config} + done + popd > /dev/null + + update_fontcache +} + +op=$1 +shift + +$op $* diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD new file mode 100644 index 000000000..5880c7f8f --- /dev/null +++ b/extra/cups-pdf/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 30279 2009-03-18 07:40:11Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: Thomas Baechler + +pkgname=cups-pdf +pkgver=2.5.0 +pkgrel=1 +pkgdesc="PDF printer for cups" +arch=(i686 x86_64) +depends=('cups' 'ghostscript') +install=cups-pdf.install +url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf" +license=('GPL2') +source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz) +backup=(etc/cups/cups-pdf.conf) +md5sums=('9194af099a8c0e9aa213505b29ec6818') + +build() { + # Build and install + cd $srcdir/$pkgname-$pkgver/src + [ -z "$CC" ] && CC=gcc + $CC $CFLAGS -Wall -o cups-pdf cups-pdf.c || return 1 + install -D -m700 cups-pdf $pkgdir/usr/lib/cups/backend/cups-pdf || return 1 + + # Install Postscript Color printer + cd ../extra + install -D -m644 CUPS-PDF.ppd $pkgdir/usr/share/cups/model/CUPS-PDF.ppd || return 1 + + # Install config file + install -D -m644 cups-pdf.conf $startdir/pkg/etc/cups/cups-pdf.conf || return 1 +} diff --git a/extra/cups-pdf/cups-pdf.install b/extra/cups-pdf/cups-pdf.install new file mode 100644 index 000000000..0ef82189a --- /dev/null +++ b/extra/cups-pdf/cups-pdf.install @@ -0,0 +1,20 @@ +post_install() { + cat << "EOF" +------------------------------------------------- +To use cups-pdf, restart cups and visit the cups +web interface at http://localhost:631/ + +You can now add a "Virtual Printer (PDF Printer)" +and use the Postscript/Generic postscript color +printer driver. + +Note that cups-pdf has a configuration +file in /etc/cups. The default location for +pdf output is /var/spool/cups-pdf/$username. +------------------------------------------------- +EOF +} + +op=$1 +shift +$op $* diff --git a/extra/cups/gnutls-pkgconfig.dpatch b/extra/cups/gnutls-pkgconfig.dpatch new file mode 100644 index 000000000..022174daf --- /dev/null +++ b/extra/cups/gnutls-pkgconfig.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gnutls-pkgconfig.dpatch by +## +## Use pkg-config instead of deprecated libgnutls-config +## (STR #3178, Debian #529903; from upstream SVN) +@DPATCH@ +diff -urNad cups-1.3.10~/config-scripts/cups-ssl.m4 cups-1.3.10/config-scripts/cups-ssl.m4 +--- cups-1.3.10~/config-scripts/cups-ssl.m4 2007-07-11 23:46:42.000000000 +0200 ++++ cups-1.3.10/config-scripts/cups-ssl.m4 2009-06-08 08:03:27.854814655 +0200 +@@ -64,11 +64,11 @@ + fi + + dnl Then look for GNU TLS... +- if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno"; then ++ if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- if test "x$LIBGNUTLSCONFIG" != x; then +- SSLLIBS=`$LIBGNUTLSCONFIG --libs` +- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` ++ if $PKGCONFIG --exists gnutls; then ++ SSLLIBS=`$PKGCONFIG --libs gnutls` ++ SSLFLAGS=`$PKGCONFIG --cflags gnutls` + ENCRYPTION_REQUIRED=" Encryption Required" + AC_DEFINE(HAVE_SSL) + AC_DEFINE(HAVE_GNUTLS) + diff --git a/extra/curl/ChangeLog b/extra/curl/ChangeLog new file mode 100644 index 000000000..09bc2f4fc --- /dev/null +++ b/extra/curl/ChangeLog @@ -0,0 +1,54 @@ +2009-08-12 Eric Belanger + + * curl 7.19.6-1 + * Upstream update + +2009-05-18 Eric Belanger + + * curl 7.19.5-1 + * Upstream update + +2009-03-03 Eric Belanger + + * curl 7.19.4-1 + * Upstream update + +2009-01-21 Eric Belanger + + * curl 7.19.3-1 + * Upstream update + +2008-11-14 Eric Belanger + + * curl 7.19.2-1 + * Upstream update + +2008-11-08 Eric Belanger + + * curl 7.19.1-1 + * Upstream update + +2008-09-20 Eric Belanger + + * curl 7.19.0-1 + * Upstream update + +2008-06-04 Eric Belanger + + * curl 7.18.2-1 + * Upstream update + * Switched to the CA Root Certificates provided by the ca-certificates package (close FS#10569) + * Removed bundled certificates + * Removed perl-libwww makedepends + +2008-04-30 Eric Belanger + + * curl 7.18.1-2 + * Added CA Root Certificates (close FS#10129) + * Added perl-libwww makedepends + +2008-03-31 Eric Belanger + + * curl 7.18.1-1 + * Upstream update + * Added ChangeLog diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD new file mode 100644 index 000000000..65685d195 --- /dev/null +++ b/extra/curl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 49576 2009-08-13 02:24:53Z eric $ +# Maintainer: Eric Belanger +# Contributor: Lucien Immink + +pkgname=curl +pkgver=7.19.6 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl>=0.9.8b' 'bash' 'ca-certificates') +options=('!libtool') +source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2) +md5sums=('8402c1f654c51ad7287aad57c3aa79be') +sha1sums=('b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --without-libidn --disable-ldap \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 + install -D -m644 docs/libcurl/libcurl.m4 "${pkgdir}/usr/share/aclocal/libcurl.m4" || return 1 +} diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD new file mode 100644 index 000000000..eb91a638a --- /dev/null +++ b/extra/cvsps/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 49914 2009-08-16 21:16:15Z jgc $ +# Maintainer: Jeff 'codemac' Mickey + +pkgname=cvsps +pkgver=2.1 +pkgrel=2 +pkgdesc="Generating 'patchset' information from a CVS repository." +url="http://www.cobite.com/cvsps/" +license=('GPL') +arch=('x86_64' 'i686') +depends=('zlib') +source=(http://www.cobite.com/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('bde2110ed9f5d14de8f8cb04e9d596fe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=/usr || return 1 + make prefix="${pkgdir}/usr" install || return 1 +} diff --git a/extra/cx_freeze/FreezePython.sh b/extra/cx_freeze/FreezePython.sh new file mode 100644 index 000000000..5bba21cac --- /dev/null +++ b/extra/cx_freeze/FreezePython.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd /usr/share/cx-freeze +./FreezePython "$@" diff --git a/extra/cx_freeze/PKGBUILD b/extra/cx_freeze/PKGBUILD new file mode 100644 index 000000000..4c07ce149 --- /dev/null +++ b/extra/cx_freeze/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 49306 2009-08-06 00:12:41Z giovanni $ +# Maintainer: Douglas Soares de Andrade +# Contributor: Eric Belanger +# Contributor: Roberto Alsina + +pkgname=cx_freeze +pkgver=4.1 +pkgrel=1 +pkgdesc="A set of utilities for freezing Python scripts into executables" +arch=('i686' 'x86_64') +url="http://www.python.net/crew/atuining/cx_Freeze/" +license=('custom') +depends=('python') +source=(http://downloads.sourceforge.net/sourceforge/cx-freeze/cx_Freeze-$pkgver.tar.gz FreezePython.sh) + +build() { + cd $startdir/src/cx_Freeze-$pkgver + + python setup.py install --root $startdir/pkg + + install -d $startdir/pkg/usr/share/cx-freeze/{bases,initscripts} + install -m755 source/bases/* $startdir/pkg/usr/share/cx-freeze/bases + install -m644 initscripts/* $startdir/pkg/usr/share/cx-freeze/initscripts + install -D -m644 LICENSE.txt $startdir/pkg/usr/share/licenses/cx_freeze/COPYING +} +md5sums=('a096ea2b7d04edfe95c16307ba86d637' + '5cc60d1644eba12a57c22cc1348a4afd') diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD new file mode 100644 index 000000000..0ecb34de3 --- /dev/null +++ b/extra/cyrus-sasl-plugins/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 52138 2009-09-16 10:13:53Z allan $ +# Maintainer: Jan de Groot + +pkgname=cyrus-sasl-plugins +pkgver=2.1.23 +pkgrel=1 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" +arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/" +license=('custom') +depends=('postgresql-libs>=8.4.1' 'heimdal>=1.2-1' 'libldap>2.4' 'libmysqlclient') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.22-gcc44.patch) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + '5deb4d67b53ecba20c7887fc8fdebee1') + +build() { + cd ${srcdir}/cyrus-sasl-${pkgver} + patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch || return 1 + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-login \ + --disable-plain \ + --enable-sql \ + --disable-sqlite \ + --enable-gssapi=/usr/include/gssapi \ + --with-mysql=/usr \ + --with-pgsql=/usr \ + --enable-postgresql \ + --enable-ldapdb \ + --with-ldap=/usr + cd sasldb + make + cd ../plugins + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + + install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + + rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.* +} diff --git a/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch new file mode 100644 index 000000000..e2621278b --- /dev/null +++ b/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch @@ -0,0 +1,24 @@ +fix warnings with gcc-4.4 + +http://bugs.gentoo.org/248738 + +--- cyrus-sasl-2.1.22/plugins/digestmd5.c ++++ cyrus-sasl-2.1.22/plugins/digestmd5.c +@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD new file mode 100644 index 000000000..38d390df3 --- /dev/null +++ b/extra/cyrus-sasl/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 52143 2009-09-16 10:26:14Z allan $ +# Maintainer: Jan de Groot + +pkgname=cyrus-sasl +pkgver=2.1.23 +pkgrel=1 +pkgdesc="SASL authentication daemon" +arch=(i686 x86_64) +license=('custom') +url="http://asg.web.cmu.edu/cyrus/download/" +depends=('pam>=1.0.1-2' 'heimdal>=1.2-1' 'libldap' 'cyrus-sasl-plugins>=2.1.22-7' 'db>=4.7') +replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) +conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) +backup=(etc/conf.d/saslauthd) +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz + saslauthd + saslauthd.conf.d) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + '697dfb51206c398bc976ce9f4cffe72d' + '96d8a2f6189501f8044838e04d5cae7f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --with-ldap=/usr --with-saslauthd=/var/run/saslauthd + cd saslauthd + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + make testsaslauthd + install -m755 testsaslauthd ${pkgdir}/usr/sbin || return 1 + + install -dm766 ${pkgdir}/var/run/saslauthd + install -Dm755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/saslauthd + install -Dm644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd + install -Dm644 saslauthd.mdoc ${pkgdir}/usr/man/man8/saslauthd.8 + + install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING +} diff --git a/extra/cyrus-sasl/saslauthd b/extra/cyrus-sasl/saslauthd new file mode 100644 index 000000000..c470c801c --- /dev/null +++ b/extra/cyrus-sasl/saslauthd @@ -0,0 +1,50 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="saslauthd" +SASLAUTHD_BIN=/usr/sbin/saslauthd +SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid + fi + add_daemon $DAEMON_NAME + stat_done + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ ! -z "$SASLAUTHD_PID" ] && kill $SASLAUTHD_PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm /var/run/$DAEMON_NAME.pid &> /dev/null + fi + rm_daemon $DAEMON_NAME + stat_done + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/cyrus-sasl/saslauthd.conf.d b/extra/cyrus-sasl/saslauthd.conf.d new file mode 100644 index 000000000..b42b5d0b0 --- /dev/null +++ b/extra/cyrus-sasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam" diff --git a/extra/d4x/PKGBUILD b/extra/d4x/PKGBUILD new file mode 100644 index 000000000..01463f95a --- /dev/null +++ b/extra/d4x/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 6077 2008-07-23 16:36:20Z hugo $ +# Maintainer: Hugo Doria + +pkgname=d4x +pkgver=2.5.7.1 +pkgrel=2 +pkgdesc="A GUI XFree86 program for downloading files" +arch=('i686' 'x86_64') +depends=('esd' 'gtk2' 'openssl<=0.9.8' 'alsa-lib' 'libstdc++5' 'audiofile') +source=(http://d4x.krasu.ru/files/${pkgname}-${pkgver}.tar.bz2 d4x-gtkurl.patch) +url="http://www.krasu.ru/soft/chuchelo/" +license=('PerlArtistic') +makedepends=('boost') +conflicts=('downloaderx') +replaces=('downloaderx') +md5sums=('68d6336c3749a7caabb0f5a5f84f4102' '3639f6d3fb7253a50a085c0b1037268b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 < ${srcdir}/d4x-gtkurl.patch || return 1 + + ./configure --prefix=/usr + make || return 1 + make prefix=${pkgdir}/usr install +} diff --git a/extra/d4x/d4x-gtkurl.patch b/extra/d4x/d4x-gtkurl.patch new file mode 100644 index 000000000..3850a7c78 --- /dev/null +++ b/extra/d4x/d4x-gtkurl.patch @@ -0,0 +1,49 @@ +diff -aur d4x-2.5.7.1/configure d4x-2.5.7.1/configure +--- d4x-2.5.7.1/configure 2006-04-12 18:48:29.000000000 +0200 ++++ d4x-2.5.7.1/configure 2008-06-03 23:44:14.000000000 +0200 +@@ -18396,12 +18396,6 @@ + #define _REENTRANT + _ACEOF + +- +-cat >>confdefs.h <<\_ACEOF +-#define GTK_DISABLE_DEPRECATED +-_ACEOF +- +- + cat >>confdefs.h <<\_ACEOF + #define _FILE_OFFSET_BITS 64 + _ACEOF +diff -aur d4x-2.5.7.1/configure.ac d4x-2.5.7.1/configure.ac +--- d4x-2.5.7.1/configure.ac 2005-11-05 00:35:38.000000000 +0100 ++++ d4x-2.5.7.1/configure.ac 2008-06-03 23:43:01.000000000 +0200 +@@ -298,7 +298,6 @@ + + # Other needed defines + AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc]) +-AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage]) + AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB]) + + # Prepare all requiered flags +diff -aur d4x-2.5.7.1/main/addr.cc d4x-2.5.7.1/main/addr.cc +--- d4x-2.5.7.1/main/addr.cc 2006-04-05 20:19:36.000000000 +0200 ++++ d4x-2.5.7.1/main/addr.cc 2008-06-03 23:42:00.000000000 +0200 +@@ -181,7 +181,6 @@ + file=path.substr(p+1); + path=path.substr(0,p); + }; +- path=d4x::Path("/")/path; + + if (!port) + port=get_port_by_proto(proto); +diff -aur d4x-2.5.7.1/main/face/list.cc d4x-2.5.7.1/main/face/list.cc +--- d4x-2.5.7.1/main/face/list.cc 2006-03-20 01:29:41.000000000 +0100 ++++ d4x-2.5.7.1/main/face/list.cc 2008-06-03 23:42:18.000000000 +0200 +@@ -8,7 +8,6 @@ + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ +-#define GTK_DISABLE_DEPRECATED + + #include + #include diff --git a/extra/dansguardian/PKGBUILD b/extra/dansguardian/PKGBUILD new file mode 100644 index 000000000..a43cc7d36 --- /dev/null +++ b/extra/dansguardian/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 51988 2009-09-13 23:08:05Z kevin $ +# Maintainer: Kevin Piche +# Contributor: Manolis Tzanidakis + +pkgname=dansguardian +pkgver=2.10.1.1 +pkgrel=1 +pkgdesc="Squid plugin for web content filtering." +url="http://dansguardian.org" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('squid' 'pcre' 'zlib') +install=$pkgname.install +backup=(etc/dansguardian/dansguardian.conf etc/dansguardian/dansguardianf1.conf) +source=(http://dansguardian.org/downloads/2/Stable/${pkgname}-${pkgver}.tar.gz +dansguardian dg2.10.1.1-missing.stdio.patch) +md5sums=('0987a1c9bfbdf398118386f10279611a' 'a65a2cb6309670ad8978f1544907d290' + '3444718c00cc17337cba711ceaa1c0e5') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/dg2.10.1.1-missing.stdio.patch + ./configure --prefix="/usr" --with-proxyuser=proxy --with-proxygroup=proxy \ + --sysconfdir=/etc --localstatedir=/var --enable-email + make || return 1 + make DESTDIR=${pkgdir} install + + install -D data/scripts/dansguardian ${pkgdir}/etc/logrotate.d/dansguardian + install -D -m755 ${srcdir}/dansguardian ${pkgdir}/etc/rc.d/dansguardian +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dansguardian/dansguardian b/extra/dansguardian/dansguardian new file mode 100644 index 000000000..c537da8bd --- /dev/null +++ b/extra/dansguardian/dansguardian @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/dansguardian` +case "$1" in + start) + stat_busy "Starting DansGuardian" + [ -z "$PID" ] && /usr/sbin/dansguardian + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon dansguardian + stat_done + fi + ;; + stop) + stat_busy "Stopping DansGuardian" + [ ! -z "$PID" ] && /usr/sbin/dansguardian -q &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon dansguardian + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/dansguardian/dansguardian.install b/extra/dansguardian/dansguardian.install new file mode 100644 index 000000000..05a72ad80 --- /dev/null +++ b/extra/dansguardian/dansguardian.install @@ -0,0 +1,8 @@ +post_install() { + echo "--------------------------------------------------" + echo "NOTE: DansGuardian is NOT free for commercial use." + echo " See http://dansguardian.org for details on" + echo " setup, configuration, and licensing." + echo "--------------------------------------------------" + chown -R proxy.proxy var/log/dansguardian +} diff --git a/extra/dansguardian/dg2.10.1.1-missing.stdio.patch b/extra/dansguardian/dg2.10.1.1-missing.stdio.patch new file mode 100644 index 000000000..b92aef008 --- /dev/null +++ b/extra/dansguardian/dg2.10.1.1-missing.stdio.patch @@ -0,0 +1,10 @@ +--- src/downloadmanagers/fancy.cpp.orig 2009-09-13 18:37:56.000000000 -0400 ++++ src/downloadmanagers/fancy.cpp 2009-09-13 18:38:14.000000000 -0400 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + + // GLOBALS diff --git a/extra/darcs/PKGBUILD b/extra/darcs/PKGBUILD new file mode 100644 index 000000000..3fecbfe89 --- /dev/null +++ b/extra/darcs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 52503 2009-09-21 05:59:07Z vesa $ +# Maintainer: Vesa Kaihlavirta +# Contributor: Simo Leone + +pkgname=darcs +pkgver=2.3.1 +pkgrel=1 +pkgdesc="Decentralized replacement for CVS with roots in quantum mechanics" +arch=(i686 x86_64) +url="http://darcs.net/" +license=('GPL') +depends=('curl' 'gmp' 'ncurses>=5.6-7') +makedepends=('ghc' 'haskell-hashed-storage' 'haskell-haskeline') +#install=darcs.install +source=("http://darcs.net/releases/$pkgname-$pkgver.tar.gz") + +build() { + cd $startdir/src/$pkgname-$pkgver + runhaskell Setup.lhs configure --ghc --prefix=/usr \ + --disable-library-for-ghci --libsubdir=\$compiler/site-local/\$pkgid || return 1 + + runhaskell Setup.lhs build || return 1 + + #runhaskell Setup.lhs register --gen-script + #runhaskell Setup.lhs unregister --gen-script + + #install -D -m744 register.sh $startdir/pkg/usr/share/haskell/$pkgname/register.sh + #install -m744 unregister.sh $startdir/pkg/usr/share/haskell/$pkgname/unregister.sh + runhaskell Setup.lhs copy --destdir=$startdir/pkg + rm -r $startdir/pkg/usr/lib/ +} +md5sums=('376e58a09da2c1e5c881eaaa3df455a1') diff --git a/extra/darcs/darcs.install b/extra/darcs/darcs.install new file mode 100644 index 000000000..d298bd9bd --- /dev/null +++ b/extra/darcs/darcs.install @@ -0,0 +1,21 @@ +HS_DIR=/usr/share/haskell/darcs + +post_install() { + ${HS_DIR}/register.sh +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} +op=$1 +shift + +$op $* diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD new file mode 100644 index 000000000..9165bb051 --- /dev/null +++ b/extra/dasher/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 37440 2009-05-01 20:06:21Z jgc $ +# Maintainer: damir + +pkgname=dasher +pkgver=4.10.1 +pkgrel=1 +pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures" +arch=(i686 x86_64) +license=('GPL') +depends=('at-spi>=1.26.0' 'libgnomeui>=2.24.1' 'gnome-speech>=0.4.25' 'gconf>=2.26.0-2') +makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.16.1') +url="http://www.gnome.org" +groups=('gnome-extra') +options=(!emptydirs) +install=dasher.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2) +md5sums=('83e556690ac54c4bb8c49c050510259e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-scrollkeeper --enable-speech || return 1 + make LDFLAGS+=-Wl,--export-dynamic || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/dasher/dasher.install b/extra/dasher/dasher.install new file mode 100644 index 000000000..7004dc5cb --- /dev/null +++ b/extra/dasher/dasher.install @@ -0,0 +1,22 @@ +pkgname=dasher + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD new file mode 100644 index 000000000..650af28d6 --- /dev/null +++ b/extra/davfs2/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 22396 2008-12-26 17:15:44Z jgc $ +# Maintainer: Thomas Baechler +pkgname=davfs2 +pkgver=1.3.3 +pkgrel=1 +pkgdesc="File system driver that allows you to mount a WebDAV server as a local disk drive." +arch=(i686 x86_64) +url="http://dav.sourceforge.net" +license=('GPL') +depends=('neon>=0.28.3') +backup=(etc/davfs2/davfs2.conf etc/davfs2/secrets) +source=(http://downloads.sourceforge.net/sourceforge/dav/${pkgname}-${pkgver}.tar.gz) +md5sums=('57def26e4d6d63527e01612d10fd0515') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + dav_user=nobody dav_group=network ./configure --prefix=/usr --sysconfdir=/etc --disable-debug || return 1 + make || return 1 + # Create some dirs + install -d -m755 "${pkgdir}/sbin" + make DESTDIR="${pkgdir}" install || return 1 + + rm -f ${pkgdir}/sbin/{u,}mount.davfs + ln -sf /usr/sbin/mount.davfs "${pkgdir}/sbin/mount.davfs" + ln -sf /usr/sbin/umount.davfs "${pkgdir}/sbin/umount.davfs" + + rm -f ${pkgdir}/usr/share/davfs2/{BUGS,COPYING,FAQ,NEWS,TODO,ChangeLog,GPL,README,THANKS} +} diff --git a/extra/db4.1/PKGBUILD b/extra/db4.1/PKGBUILD new file mode 100644 index 000000000..552a129e8 --- /dev/null +++ b/extra/db4.1/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 49911 2009-08-16 21:05:41Z jgc $ +# Maintainer: Jan de Groot +pkgname=db4.1 +pkgver=4.1.25 +pkgrel=3 +pkgdesc="The Berkeley DB embedded database system 4.1" +arch=(i686 x86_64) +license=('custom') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +depends=('gcc-libs') +options=('!libtool' '!makeflags') +source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz + http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.1 + http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.2 + http://www.oracle.com/technology/products/berkeley-db/db/update/4.1.25/patch.4.1.25.3) +md5sums=('d82ed75cb53b0daba4a7e959e8a6f86c' + '1e073d12cd89f9345e281ca07368f74b' + '5eedc6818783b4b89317d89d2babb6f7' + 'bda83ce3ce18a3e9001d0c2eb90d9508') + +build() { + cd "${srcdir}/db-${pkgver}/" + patch -Np0 -i "${srcdir}/patch.4.1.25.1" || return 1 + patch -Np0 -i "${srcdir}/patch.4.1.25.2" || return 1 + patch -Np0 -i "${srcdir}/patch.4.1.25.3" || return 1 + cd build_unix + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --disable-static --enable-cxx || return 1 + make LIBSO_LIBS=-lpthread || return 1 + make prefix="${pkgdir}/usr" \ + includedir="${pkgdir}/usr/include/db4.1" install || return 1 + + rm -rf "${pkgdir}/usr/docs" + rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}.so + rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}-4.so + + cd "${pkgdir}/usr/bin" + for i in *; do + mv ${i} db4.1_${i/db_/} || return 1 + done + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/db-${pkgver}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +} diff --git a/extra/db4.5/PKGBUILD b/extra/db4.5/PKGBUILD new file mode 100644 index 000000000..a51452bfa --- /dev/null +++ b/extra/db4.5/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 49913 2009-08-16 21:13:45Z jgc $ +# Maintainer: Jan de Groot +pkgname=db4.5 +pkgver=4.5.20 +pkgrel=2 +pkgdesc="The Berkeley DB embedded database system 4.5" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +depends=('gcc-libs') +options=('!libtool' '!makeflags') +source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz + http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 + http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2) +md5sums=('b0f1c777708cb8e9d37fb47e7ed3312d' + 'a571e239b9041d7990df287cbc59ad6f' + 'b7a7086a067ba116f5a8464362c9a9a7') + +build() { + cd "${srcdir}/db-${pkgver}" + patch -Np0 -i "${srcdir}/patch.4.5.20.1" || return 1 + patch -Np0 -i "${srcdir}/patch.4.5.20.2" || return 1 + + cd build_unix + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --disable-static --enable-cxx || return 1 + make LIBSO_LIBS=-lpthread || return 1 + make prefix="${pkgdir}/usr" \ + includedir="${pkgdir}/usr/include/db4.5" install || return 1 + + rm -rf "${pkgdir}/usr/docs" + rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}.so + rm -f "${pkgdir}/usr/lib"/libdb{,_cxx}-4.so + + cd "${pkgdir}/usr/bin" + for i in *; do + mv ${i} db4.5_${i/db_/} || return 1 + done + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/db-${pkgver}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 +} diff --git a/extra/dbh/PKGBUILD b/extra/dbh/PKGBUILD new file mode 100644 index 000000000..e52a53479 --- /dev/null +++ b/extra/dbh/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 37527 2009-05-02 18:30:25Z eric $ +# Maintainer: aurelien +pkgname=dbh +pkgver=1.0.24 +pkgrel=3 +pkgdesc="A library to create Disk Based Hashtables on POSIX systems" +arch=('i686' 'x86_64') +url="http://dbh.sourceforge.net/" +license=('LGPL') +depends=('glibc') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('42e122a321089f2429986d0d161ed92a') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 +} diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD new file mode 100644 index 000000000..50fc839b5 --- /dev/null +++ b/extra/dbus-glib/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 29414 2009-03-08 16:54:54Z jgc $ +# Maintainer: Jan de Groot + +pkgname=dbus-glib +pkgver=0.80 +pkgrel=1 +pkgdesc="GLib bindings for DBUS" +arch=(i686 x86_64) +license=('GPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +depends=('dbus-core>=1.2.4' 'glib2>=2.18.4') +makedepends=('pkgconfig') +options=('!libtool' '!emptydirs') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --enable-bash-completion=no || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD new file mode 100644 index 000000000..ae77c04d4 --- /dev/null +++ b/extra/dbus-python/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 17272 2008-10-27 16:25:58Z douglas $ +# Maintainer: Jan de Groot + +pkgname=dbus-python +pkgver=0.83.0 +pkgrel=2 +pkgdesc="Python bindings for DBUS" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +url="http://www.freedesktop.org/wiki/Software/DBusBindings" +depends=('dbus-glib>=0.76' 'python>=2.6') +makedepends=('pkgconfig') +options=('!libtool') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR=${startdir}/pkg install || return 1 +} +md5sums=('562c78876219bf458d79a041af18293d') diff --git a/extra/dbus-qt3/PKGBUILD b/extra/dbus-qt3/PKGBUILD new file mode 100644 index 000000000..52ff9532b --- /dev/null +++ b/extra/dbus-qt3/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 49910 2009-08-16 20:58:20Z jgc $ +# Maintainer: Jan de Groot + +pkgname=dbus-qt3 +pkgver=0.62 +pkgrel=4 +pkgdesc="QT3 bindings for DBUS" +arch=(i686 x86_64) +license=('GPL') +url="http://www.freedesktop.org/software/dbus" +depends=('qt3' 'dbus-core>=1.2.14') +makedepends=('pkgconfig') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/dbus/dbus-qt3_0.62.git.20060814.orig.tar.gz + dbus-qt3-compile-fix-thoenig-01.patch + dbus-qt3-do-not-close-shared-connection-thoenig-01.patch) +md5sums=('bdc61add46f64238fdc68a15e5f7269c' + '6c7a45865568340ee601d31e184653c1' + '9252c03a00d751201e53839d6a8ef78f') + +build() { + . /etc/profile.d/qt3.sh + cd "${srcdir}/${pkgname}-${pkgver}/qt3" + patch -Np1 -i "${srcdir}/dbus-qt3-compile-fix-thoenig-01.patch" || return 1 + patch -Np1 -i "${srcdir}/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch" || return 1 + cd .. + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 + sed -e "s|DBUS_QT3_LIBS =|DBUS_QT3_LIBS = -L${QTDIR}/lib -lqt-mt|" \ + -i Makefile qt3/Makefile || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch new file mode 100644 index 000000000..00b8b6026 --- /dev/null +++ b/extra/dbus-qt3/dbus-qt3-compile-fix-thoenig-01.patch @@ -0,0 +1,85 @@ +--- dbus-qt3/connection.cpp 2005-04-18 05:19:17.000000000 -0600 ++++ dbus-qt3/connection.cpp 2005-04-19 14:35:07.000000000 -0600 +@@ -154,6 +154,7 @@ + + void* Connection::virtual_hook( int, void* ) + { ++ return (void *)NULL; + } + + void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection) +--- dbus-qt3/message.cpp 2005-04-18 05:19:17.000000000 -0600 ++++ dbus-qt3/message.cpp 2005-04-19 14:55:32.000000000 -0600 +@@ -359,6 +359,7 @@ + Message Message::operator=( const Message& other ) + { + //FIXME: ref the other.d->msg instead of copying it? ++ return (Message &)(d->msg); + } + /** + * Destructs message. +@@ -508,42 +509,49 @@ + const dbus_bool_t right_size_bool = b; + dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT8 byte ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT32 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_UINT32 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_INT64 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( Q_UINT64 num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( double num ) + { + dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( const QString& str ) +@@ -551,11 +559,13 @@ + const char *u = str.utf8(); + dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u, + DBUS_TYPE_INVALID ); ++ return (Message &)(d->msg); + } + + Message& Message::operator<<( const QVariant& custom ) + { + //FIXME: imeplement ++ return (Message &)(d->msg); + } + + } + diff --git a/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch b/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch new file mode 100644 index 000000000..c159c0a90 --- /dev/null +++ b/extra/dbus-qt3/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch @@ -0,0 +1,12 @@ +--- dbus-qt3/connection.cpp 2006-10-20 16:33:29.000000000 +0200 ++++ dbus-qt3/connection.cpp 2006-10-20 16:33:10.000000000 +0200 +@@ -106,7 +106,7 @@ + + void Connection::close() + { +- dbus_connection_close( d->connection ); ++ dbus_connection_unref ( d->connection ); + } + + void Connection::flush() + diff --git a/extra/dbus-sharp/PKGBUILD b/extra/dbus-sharp/PKGBUILD new file mode 100644 index 000000000..06b6775aa --- /dev/null +++ b/extra/dbus-sharp/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 32490 2009-04-01 03:19:22Z eric $ +# Maintainer: Jan de Groot + +pkgname=dbus-sharp +pkgver=0.63 +pkgrel=2 +pkgdesc="GLib bindings for DBUS" +arch=(i686 x86_64) +url="http://www.freedesktop.org/software/dbus" +license=('GPL2') +depends=('dbus-glib>=0.71') +makedepends=('pkgconfig' 'mono') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz + dbus-sharp-0.63-nogtk.patch + dbus-0.62-mono-no-abi-version-change.patch) +md5sums=('f2e3e008619bcc373d9a65f323380a36' '5a48876b174c3aa082040ebaef87e885'\ + 'd266bc9c081d3026bbd33c5ed0ec681c') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + + patch -Np1 -i ${srcdir}/dbus-sharp-0.63-nogtk.patch || return 1 + patch -Np1 -i ${srcdir}/dbus-0.62-mono-no-abi-version-change.patch || return 1 + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-tests --disable-verbose-mode --disable-asserts || return 1 + + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + + rm -rf "${MONO_SHARED_DIR}" +} diff --git a/extra/dbus-sharp/dbus-0.62-mono-no-abi-version-change.patch b/extra/dbus-sharp/dbus-0.62-mono-no-abi-version-change.patch new file mode 100644 index 000000000..9d72065fe --- /dev/null +++ b/extra/dbus-sharp/dbus-0.62-mono-no-abi-version-change.patch @@ -0,0 +1,10 @@ +--- dbus-0.61/mono/AssemblyInfo.cs.in.old-version 2006-02-24 18:04:34.000000000 -0500 ++++ dbus-0.61/mono/AssemblyInfo.cs.in 2006-02-24 18:04:47.000000000 -0500 +@@ -1,6 +1,6 @@ + using System.Reflection; + using System.Runtime.CompilerServices; + +-[assembly:AssemblyVersion("0.60")] ++[assembly:AssemblyVersion("0.61")] + [assembly:AssemblyDelaySign(false)] + [assembly:AssemblyKeyFile("@srcdir@/dbus-sharp.snk")] diff --git a/extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch b/extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch new file mode 100644 index 000000000..52fd0a681 --- /dev/null +++ b/extra/dbus-sharp/dbus-sharp-0.63-nogtk.patch @@ -0,0 +1,8 @@ +--- dbus-sharp-0.63/mono/Makefile.am.nogtk 2006-08-18 14:55:13.000000000 +0200 ++++ dbus-sharp-0.63/mono/Makefile.am 2006-08-18 14:55:21.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS=. doc example ++SUBDIRS=. doc + + TARGET=$(ASSEMBLY) + NOINST_EXES=test-dbus-sharp.exe diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD new file mode 100644 index 000000000..6b9d0535c --- /dev/null +++ b/extra/dcfldd/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 47985 2009-07-30 02:35:29Z eric $ +# Contributor: Paul Mattal +# Maintainer: Paul Mattal +pkgname=dcfldd +pkgver=1.3.4.1 +pkgrel=2 +pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing" +arch=(i686 x86_64) +url="http://dcfldd.sourceforge.net/" +license=('GPL') +depends=(glibc) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz) +md5sums=('952026c872f11b53ce0ec6681a3eef0a') +sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913') + +build() { + cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD new file mode 100644 index 000000000..459675bcb --- /dev/null +++ b/extra/dcraw/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 44479 2009-07-02 07:01:00Z allan $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +# Note for rebuilders: +# dcraw.c is released as pure C file, not as a package with a changing version +# number in the name. The name of the file to be downloaded is always the same! +# So if you are a bad boy (Santa knows everything!) and build as root, this file +# will be saved in /var/cache/pacman/src . Therefore, rebuilding a later version +# likely will fail due to an MD5 error. If so, delete the files from the cache +# to force a new download. + +pkgname=dcraw +pkgver=1.425 +pkgrel=1 +pkgdesc="A command line based converter for digicams raw output" +arch=(i686 x86_64) +license=('custom') +depends=('libjpeg>=7' 'lcms') +makedepends=('gzip') +source=(http://www.cybercom.net/~dcoffin/${pkgname}/${pkgname}.{c,1} license.txt) +url="http://www.cybercom.net/~dcoffin/dcraw/" +install=dcraw.install +md5sums=('d71404427935fb70eb7f2b8c535b8d75' + '6ba2a797c4ad698589f83171d6b36396' + '110b4604a6dacd5537339c4082e9e12a') + +build() { + cd ${startdir}/src + gcc -o dcraw ${CFLAGS} dcraw.c -lm -ljpeg -llcms + install -D -m755 ${pkgname} ${startdir}/pkg/usr/bin/${pkgname} + # compress and install a manpage, provided separately on authors homepage + gzip -c -9 ${pkgname}.1 > ${pkgname}.1.gz + install -D -m644 ${pkgname}.1.gz ${startdir}/pkg/usr/share/man/man1/${pkgname}.1.gz + install -Dm 644 ${startdir}/src/license.txt \ + ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt +} diff --git a/extra/dcraw/dcraw.install b/extra/dcraw/dcraw.install new file mode 100644 index 000000000..296d7959b --- /dev/null +++ b/extra/dcraw/dcraw.install @@ -0,0 +1,30 @@ +post_install() { + cat << EOF + +NOTE for drcaw: +---- + ==> dcraw provides the simple commandline tools for raw conversion. If you + ==> are looking for a more sophisticated way consider gimp-ufraw, which + ==> provides a gimp-plugin and a standalone application that can even convert + ==> to 16-bit tiff files (which you can use in cinepaint eg.) So please do a + ==> 'pacman -S gimp-ufraw' to get it. + +EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/dcraw/license.txt b/extra/dcraw/license.txt new file mode 100644 index 000000000..5803cf601 --- /dev/null +++ b/extra/dcraw/license.txt @@ -0,0 +1,16 @@ +This is a command-line ANSI C program to convert raw photos from +any digital camera on any computer running any operating system. + +No license is required to download and use dcraw.c. However, +to lawfully redistribute this code, you must either (a) include +full source code* for all executable files containing RESTRICTED +functions, (b) remove all RESTRICTED functions, re-implement them, +or copy them from an earlier, unrestricted Revision of dcraw.c, +or (c) purchase a license from the author. + +The functions that process Foveon images have been RESTRICTED +since Revision 1.237. All other code remains free for all uses. + +*If you have not modified dcraw.c in any way, a link to my +homepage qualifies as "full source code". + diff --git a/extra/ddd/ChangeLog b/extra/ddd/ChangeLog new file mode 100644 index 000000000..1f6d714c6 --- /dev/null +++ b/extra/ddd/ChangeLog @@ -0,0 +1,12 @@ +2009-03-22 Eric Belanger + + * ddd 3.3.12-1 + * Upstream update + * Updated license + +2008-11-11 Eric Belanger + + * ddd 3.3.11-5 + * Rebuilt against libxaw 1.0.5 (close FS#12074) + * Added info file support + * Added ChangeLog diff --git a/extra/ddd/PKGBUILD b/extra/ddd/PKGBUILD new file mode 100644 index 000000000..0ba26417f --- /dev/null +++ b/extra/ddd/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 30847 2009-03-22 07:10:20Z eric $ +# Maintainer: Eric Belanger +# Contributor: Aurelien Foret + +pkgname=ddd +pkgver=3.3.12 +pkgrel=1 +pkgdesc="A graphical front-end for command-line debuggers such as GDB, JDB, pydb, perl debugger..." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ddd/" +license=('GPL3' 'LGPL3') +depends=('gcc-libs' 'ncurses' 'lesstif' 'libxaw>=1.0.5' 'libelf' 'libxext') +optdepends=('gdb: to use the Gnu debugger' 'jdk: to use the Java debugger' 'pydb: to use the Python debugger' 'perl: to use the Perl debugger') +install=$pkgname.install +source=(http://ftp.gnu.org/gnu/ddd/${pkgname}-${pkgver}.tar.gz) +md5sums=('c50396db7bac3862a6d2555b3b22c34e') +sha1sums=('b91d2dfb1145af409138bd34517a898341724e56') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + install -D -m644 icons/ddd.xpm ${pkgdir}/usr/share/pixmaps/ddd.xpm || return 1 + rm ${pkgdir}/usr/share/info/dir || return 1 + gzip ${pkgdir}/usr/share/info/* || return 1 +} diff --git a/extra/ddd/ddd.install b/extra/ddd/ddd.install new file mode 100644 index 000000000..55e3d0364 --- /dev/null +++ b/extra/ddd/ddd.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(ddd.info.gz ddd.info-1.gz ddd.info-2.gz ddd-themes.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD new file mode 100644 index 000000000..4b797d42c --- /dev/null +++ b/extra/ddrescue/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 47507 2009-07-24 02:16:41Z paul $ +# Maintainer: Paul Mattal + +pkgname=ddrescue +pkgver=1.11 +pkgrel=1 +pkgdesc="GNU data recovery tool" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ddrescue/ddrescue.html" +license=('GPL3') +depends=('gcc-libs') +install=$pkgname.install +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('7146046bb1851351d1337bb1f5b4e903') + +build() { + cd "$srcdir"/$pkgname-$pkgver + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="$pkgdir" install install-man || return 1 + rm "$pkgdir"/usr/share/info/dir || return 1 +} diff --git a/extra/ddrescue/ddrescue.install b/extra/ddrescue/ddrescue.install new file mode 100644 index 000000000..9e2afa74e --- /dev/null +++ b/extra/ddrescue/ddrescue.install @@ -0,0 +1,22 @@ +infodir=/usr/share/info +filelist=(ddrescue.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/deluge/PKGBUILD b/extra/deluge/PKGBUILD new file mode 100644 index 000000000..f665e0fc3 --- /dev/null +++ b/extra/deluge/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 46264 2009-07-15 00:34:53Z giovanni $ +# Maintainer: Hugo Doria + +pkgname=deluge +pkgver=1.1.9 +pkgrel=2 +pkgdesc="A bittorrent client written with python and pygtk" +arch=('i686' 'x86_64') +url="http://deluge-torrent.org/" +license=('GPL3') +depends=('pygtk' 'boost>=1.39.0' 'pyxdg' 'dbus-python' 'librsvg' +'setuptools' 'libtorrent-rasterbar>=0.14.2') +makedepends=('subversion' 'intltool') +optdepends=('python-chardet: used to load non-UTF8 encoded torrents') +source=(http://download.deluge-torrent.org/source/${pkgname}-${pkgver}.tar.bz2 deluged) +md5sums=('38b9dbf255ed9620760d546dbb757882' '6e1585bdc79243b1cd22ed9423cc4ec2') +install="deluge.install" + +build() { + + cd ${srcdir}/${pkgname}-${pkgver}/ + + python setup.py build || return 1 + python setup.py install --prefix=/usr --root=${pkgdir} || return 1 + + install -d -m755 ${pkgdir}/srv/deluge || return 1 + install -D -m644 deluge/data/pixmaps/deluge.svg ${pkgdir}/usr/share/pixmaps/deluge.svg || return 1 + install -D -m755 ${srcdir}/deluged ${pkgdir}/etc/rc.d/deluged || return 1 + +} + diff --git a/extra/deluge/deluge.install b/extra/deluge/deluge.install new file mode 100644 index 000000000..e5b386421 --- /dev/null +++ b/extra/deluge/deluge.install @@ -0,0 +1,22 @@ +post_install() { + getent group deluge >/dev/null || usr/sbin/groupadd -g 125 deluge + getent passwd deluge >/dev/null || usr/sbin/useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge + usr/bin/passwd -l deluge &>/dev/null + + chown deluge.deluge srv/deluge -R + +cat << _EOF + +>>> Deluge's daemon is running with the "deluge" user. The default download directory is /srv/deluge/ + +_EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/userdel deluge &> /dev/null +} + diff --git a/extra/deluge/deluged b/extra/deluge/deluged new file mode 100644 index 000000000..d7d923cf6 --- /dev/null +++ b/extra/deluge/deluged @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[[ -f /var/run/deluged.pid ]] && PID=`cat /var/run/deluged.pid` + +case "$1" in + start) + stat_busy "Starting Deluge Daemon" + [[ -z $PID ]] && /usr/bin/deluged 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + echo $(pgrep deluged) > /var/run/deluged.pid + add_daemon deluged + stat_done + fi + ;; + stop) + stat_busy "Stopping Deluge Daemon" + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/deluged.pid + rm_daemon deluged + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + + + diff --git a/extra/denyhosts/PKGBUILD b/extra/denyhosts/PKGBUILD new file mode 100644 index 000000000..48cbcbeb8 --- /dev/null +++ b/extra/denyhosts/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 31063 2009-03-24 08:53:30Z douglas $ +# Contributor : phrakture < aaron m griffin :: gmail-com > +# Maintainer: simo +pkgname=denyhosts +pkgver=2.6 +pkgrel=4 +pkgdesc="DenyHosts is a script to help thwart ssh server attacks" +arch=('i686' 'x86_64') +url="http://denyhosts.sourceforge.net/" +license=('GPL') +depends=('python') +backup=('etc/denyhosts/denyhosts.cfg') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/DenyHosts-$pkgver.tar.gz \ + denyhosts.cfg \ + denyhosts \ + archify.diff + regex-fixes.diff) +md5sums=('fc2365305a9402886a2b0173d1beb7df' + '5352744bf34b29bfc95c54bfb14eb3e3' + '0f186257e2473b8710c9b9e9f601ff19' + 'ab8b175618f76b53c9cc81355cad0f86' + '3171c2fd783321af724a8539151bbd8d') + +build() +{ + cd $startdir/src/DenyHosts-$pkgver + patch -p1 < $startdir/src/archify.diff + patch -p1 < $startdir/src/regex-fixes.diff + python setup.py install --root=$startdir/pkg + install -D -m644 $startdir/src/denyhosts.cfg $startdir/pkg/etc/denyhosts/denyhosts.cfg + install -D -m755 $startdir/src/denyhosts $startdir/pkg/etc/rc.d/denyhosts + mkdir -p $startdir/pkg/var/lib/denyhosts +} diff --git a/extra/denyhosts/archify.diff b/extra/denyhosts/archify.diff new file mode 100644 index 000000000..e26512e6d --- /dev/null +++ b/extra/denyhosts/archify.diff @@ -0,0 +1,32 @@ +diff -Nru DenyHosts-2.1.old/DenyHosts/constants.py DenyHosts-2.1/DenyHosts/constants.py +--- DenyHosts-2.1.old/DenyHosts/constants.py 2006-02-08 23:59:20.000000000 -0600 ++++ DenyHosts-2.1/DenyHosts/constants.py 2006-02-12 22:27:01.000000000 -0600 +@@ -34,7 +34,7 @@ + # Miscellaneous constants # + ################################################################################# + +-CONFIG_FILE = "denyhosts.cfg" # default can be overridden on cmd line ++CONFIG_FILE = "/etc/denyhosts/denyhosts.cfg" # default can be overridden on cmd line + + DENY_DELIMITER = "# DenyHosts:" + ENTRY_DELIMITER = " | " +diff -Nru DenyHosts-2.1.old/setup.py DenyHosts-2.1/setup.py +--- DenyHosts-2.1.old/setup.py 2006-02-09 19:03:39.000000000 -0600 ++++ DenyHosts-2.1/setup.py 2006-02-12 22:26:39.000000000 -0600 +@@ -23,14 +23,8 @@ + scripts=['denyhosts.py'], + package_dir={'DenyHosts': 'DenyHosts'}, + packages=["DenyHosts"], +- data_files=[(libpath, glob("denyhosts.cfg-dist")), +- (libpath, glob("setup.py")), +- (libpath, glob("daemon-control-dist")), +- (libpath, glob("CHANGELOG.txt")), +- (libpath, glob("README.txt")), +- (scriptspath, glob("scripts/*")), +- (pluginspath, glob("plugins/*")), +- (libpath, glob("LICENSE.txt"))], ++ data_files=[(scriptspath, glob("scripts/*")), ++ (pluginspath, glob("plugins/*"))], + license="GPL v2", + ##extra_path='denyhosts', + long_description=""" diff --git a/extra/denyhosts/denyhosts b/extra/denyhosts/denyhosts new file mode 100755 index 000000000..9e9aebbcb --- /dev/null +++ b/extra/denyhosts/denyhosts @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -x -o %PPID /usr/bin/denyhosts.py` +case "$1" in + start) + stat_busy "Starting denyhosts" + [ -z "$PID" ] && /usr/bin/denyhosts.py --daemon + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon denyhosts + stat_done + fi + ;; + stop) + stat_busy "Stopping denyhosts" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon denyhosts + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/denyhosts/denyhosts.cfg b/extra/denyhosts/denyhosts.cfg new file mode 100644 index 000000000..479c19700 --- /dev/null +++ b/extra/denyhosts/denyhosts.cfg @@ -0,0 +1,537 @@ + ############ THESE SETTINGS ARE REQUIRED ############ + +######################################################################## +# +# SECURE_LOG: the log file that contains sshd logging info +# if you are not sure, grep "sshd:" /var/log/* +# +# The file to process can be overridden with the --file command line +# argument +# +# Redhat or Fedora Core: +#SECURE_LOG = /var/log/secure +# +# Arch, Mandrake, FreeBSD or OpenBSD: +SECURE_LOG = /var/log/auth.log +# +# SuSE: +#SECURE_LOG = /var/log/messages +# +######################################################################## + +######################################################################## +# HOSTS_DENY: the file which contains restricted host access information +# +# Most operating systems: +HOSTS_DENY = /etc/hosts.deny +# +# Some BSD (FreeBSD) Unixes: +#HOSTS_DENY = /etc/hosts.allow +# +# Another possibility (also see the next option): +#HOSTS_DENY = /etc/hosts.evil +####################################################################### + + +######################################################################## +# PURGE_DENY: removed HOSTS_DENY entries that are older than this time +# when DenyHosts is invoked with the --purge flag +# +# format is: i[dhwmy] +# Where 'i' is an integer (eg. 7) +# 'm' = minutes +# 'h' = hours +# 'd' = days +# 'w' = weeks +# 'y' = years +# +# never purge: +PURGE_DENY = +# +# purge entries older than 1 week +#PURGE_DENY = 1w +# +# purge entries older than 5 days +#PURGE_DENY = 5d +####################################################################### + + +####################################################################### +# BLOCK_SERVICE: the service name that should be blocked in HOSTS_DENY +# +# man 5 hosts_access for details +# +# eg. sshd: 127.0.0.1 # will block sshd logins from 127.0.0.1 +# +# To block all services for the offending host: +BLOCK_SERVICE = ALL +# To block only sshd: +#BLOCK_SERVICE = sshd +# To only record the offending host and nothing else (if using +# an auxilary file to list the hosts). Refer to: +# http://denyhosts.sourceforge.net/faq.html#aux +#BLOCK_SERVICE = +# +####################################################################### + + +####################################################################### +# +# DENY_THRESHOLD_INVALID: block each host after the number of failed login +# attempts has exceeded this value. This value applies to invalid +# user login attempts (eg. non-existent user accounts) +# +DENY_THRESHOLD_INVALID = 5 +# +####################################################################### + +####################################################################### +# +# DENY_THRESHOLD_VALID: block each host after the number of failed +# login attempts has exceeded this value. This value applies to valid +# user login attempts (eg. user accounts that exist in /etc/passwd) except +# for the "root" user +# +DENY_THRESHOLD_VALID = 10 +# +####################################################################### + +####################################################################### +# +# DENY_THRESHOLD_ROOT: block each host after the number of failed +# login attempts has exceeded this value. This value applies to +# "root" user login attempts only. +# +DENY_THRESHOLD_ROOT = 1 +# +####################################################################### + + +####################################################################### +# +# DENY_THRESHOLD_RESTRICTED: block each host after the number of failed +# login attempts has exceeded this value. This value applies to +# usernames that appear in the WORK_DIR/restricted-usernames file only. +# +DENY_THRESHOLD_RESTRICTED = 1 +# +####################################################################### + + +####################################################################### +# +# WORK_DIR: the path that DenyHosts will use for writing data to +# (it will be created if it does not already exist). +# +# Note: it is recommended that you use an absolute pathname +# for this value (eg. /home/foo/denyhosts/data) +# +WORK_DIR = /var/lib/denyhosts +# +####################################################################### + +####################################################################### +# +# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS +# +# SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES|NO +# If set to YES, if a suspicious login attempt results from an allowed-host +# then it is considered suspicious. If this is NO, then suspicious logins +# from allowed-hosts will not be reported. All suspicious logins from +# ip addresses that are not in allowed-hosts will always be reported. +# +SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS=YES +###################################################################### + +###################################################################### +# +# HOSTNAME_LOOKUP +# +# HOSTNAME_LOOKUP=YES|NO +# If set to YES, for each IP address that is reported by Denyhosts, +# the corresponding hostname will be looked up and reported as well +# (if available). +# +HOSTNAME_LOOKUP=YES +# +###################################################################### + + +###################################################################### +# +# LOCK_FILE +# +# LOCK_FILE=/path/denyhosts +# If this file exists when DenyHosts is run, then DenyHosts will exit +# immediately. Otherwise, this file will be created upon invocation +# and deleted upon exit. This ensures that only one instance is +# running at a time. +# +# Redhat/Fedora: +#LOCK_FILE = /var/lock/subsys/denyhosts +# +# Arch, Debian +LOCK_FILE = /var/run/denyhosts.pid +# +# Misc +#LOCK_FILE = /tmp/denyhosts.lock +# +###################################################################### + + + ############ THESE SETTINGS ARE OPTIONAL ############ + + +####################################################################### +# +# ADMIN_EMAIL: if you would like to receive emails regarding newly +# restricted hosts and suspicious logins, set this address to +# match your email address. If you do not want to receive these reports +# leave this field blank (or run with the --noemail option) +# +ADMIN_EMAIL = +# +####################################################################### + +####################################################################### +# +SMTP_HOST = localhost +SMTP_PORT = 25 +SMTP_FROM = DenyHosts +SMTP_SUBJECT = DenyHosts Report +#SMTP_USERNAME=foo +#SMTP_PASSWORD=bar +# +####################################################################### + +###################################################################### +# +# ALLOWED_HOSTS_HOSTNAME_LOOKUP +# +# ALLOWED_HOSTS_HOSTNAME_LOOKUP=YES|NO +# If set to YES, for each entry in the WORK_DIR/allowed-hosts file, +# the hostname will be looked up. If your versions of tcp_wrappers +# and sshd sometimes log hostnames in addition to ip addresses +# then you may wish to specify this option. +# +#ALLOWED_HOSTS_HOSTNAME_LOOKUP=NO +# +###################################################################### + +###################################################################### +# +# AGE_RESET_VALID: Specifies the period of time between failed login +# attempts that, when exceeded will result in the failed count for +# this host to be reset to 0. This value applies to login attempts +# to all valid users (those within /etc/passwd) with the +# exception of root. If not defined, this count will never +# be reset. +# +# See the comments in the PURGE_DENY section (above) +# for details on specifying this value or for complete details +# refer to: http://denyhosts.sourceforge.net/faq.html#timespec +# +AGE_RESET_VALID=5d +# +###################################################################### + +###################################################################### +# +# AGE_RESET_ROOT: Specifies the period of time between failed login +# attempts that, when exceeded will result in the failed count for +# this host to be reset to 0. This value applies to all login +# attempts to the "root" user account. If not defined, +# this count will never be reset. +# +# See the comments in the PURGE_DENY section (above) +# for details on specifying this value or for complete details +# refer to: http://denyhosts.sourceforge.net/faq.html#timespec +# +AGE_RESET_ROOT=25d +# +###################################################################### + +###################################################################### +# +# AGE_RESET_RESTRICTED: Specifies the period of time between failed login +# attempts that, when exceeded will result in the failed count for +# this host to be reset to 0. This value applies to all login +# attempts to entries found in the WORK_DIR/restricted-usernames file. +# If not defined, the count will never be reset. +# +# See the comments in the PURGE_DENY section (above) +# for details on specifying this value or for complete details +# refer to: http://denyhosts.sourceforge.net/faq.html#timespec +# +AGE_RESET_RESTRICTED=25d +# +###################################################################### + + +###################################################################### +# +# AGE_RESET_INVALID: Specifies the period of time between failed login +# attempts that, when exceeded will result in the failed count for +# this host to be reset to 0. This value applies to login attempts +# made to any invalid username (those that do not appear +# in /etc/passwd). If not defined, count will never be reset. +# +# See the comments in the PURGE_DENY section (above) +# for details on specifying this value or for complete details +# refer to: http://denyhosts.sourceforge.net/faq.html#timespec +# +AGE_RESET_INVALID=10d +# +###################################################################### + + +###################################################################### +# +# RESET_ON_SUCCESS: If this parameter is set to "yes" then the +# failed count for the respective ip address will be reset to 0 +# if the login is successful. +# +# The default is RESET_ON_SUCCESS = no +# +#RESET_ON_SUCCESS = yes +# +##################################################################### + + +###################################################################### +# +# PLUGIN_DENY: If set, this value should point to an executable +# program that will be invoked when a host is added to the +# HOSTS_DENY file. This executable will be passed the host +# that will be added as it's only argument. +# +#PLUGIN_DENY=/usr/bin/true +# +###################################################################### + + +###################################################################### +# +# PLUGIN_PURGE: If set, this value should point to an executable +# program that will be invoked when a host is removed from the +# HOSTS_DENY file. This executable will be passed the host +# that is to be purged as it's only argument. +# +#PLUGIN_PURGE=/usr/bin/true +# +###################################################################### + +###################################################################### +# +# USERDEF_FAILED_ENTRY_REGEX: if set, this value should contain +# a regular expression that can be used to identify additional +# hackers for your particular ssh configuration. This functionality +# extends the built-in regular expressions that DenyHosts uses. +# This parameter can be specified multiple times. +# See this faq entry for more details: +# http://denyhosts.sf.net/faq.html#userdef_regex +# +#USERDEF_FAILED_ENTRY_REGEX= +# +# +###################################################################### + + + + + ######### THESE SETTINGS ARE SPECIFIC TO DAEMON MODE ########## + + + +####################################################################### +# +# DAEMON_LOG: when DenyHosts is run in daemon mode (--daemon flag) +# this is the logfile that DenyHosts uses to report it's status. +# To disable logging, leave blank. (default is: /var/log/denyhosts) +# +DAEMON_LOG = /var/log/denyhosts +# +# disable logging: +#DAEMON_LOG = +# +###################################################################### + +####################################################################### +# +# DAEMON_LOG_TIME_FORMAT: when DenyHosts is run in daemon mode +# (--daemon flag) this specifies the timestamp format of +# the DAEMON_LOG messages (default is the ISO8061 format: +# ie. 2005-07-22 10:38:01,745) +# +# for possible values for this parameter refer to: man strftime +# +# Jan 1 13:05:59 +#DAEMON_LOG_TIME_FORMAT = %b %d %H:%M:%S +# +# Jan 1 01:05:59 +#DAEMON_LOG_TIME_FORMAT = %b %d %I:%M:%S +# +###################################################################### + +####################################################################### +# +# DAEMON_LOG_MESSAGE_FORMAT: when DenyHosts is run in daemon mode +# (--daemon flag) this specifies the message format of each logged +# entry. By default the following format is used: +# +# %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s +# +# Where the "%(asctime)s" portion is expanded to the format +# defined by DAEMON_LOG_TIME_FORMAT +# +# This string is passed to python's logging.Formatter contstuctor. +# For details on the possible format types please refer to: +# http://docs.python.org/lib/node357.html +# +# This is the default: +#DAEMON_LOG_MESSAGE_FORMAT = %(asctime)s - %(name)-12s: %(levelname)-8s %(message)s +# +# +###################################################################### + + +####################################################################### +# +# DAEMON_SLEEP: when DenyHosts is run in daemon mode (--daemon flag) +# this is the amount of time DenyHosts will sleep between polling +# the SECURE_LOG. See the comments in the PURGE_DENY section (above) +# for details on specifying this value or for complete details +# refer to: http://denyhosts.sourceforge.net/faq.html#timespec +# +# +DAEMON_SLEEP = 30s +# +####################################################################### + +####################################################################### +# +# DAEMON_PURGE: How often should DenyHosts, when run in daemon mode, +# run the purge mechanism to expire old entries in HOSTS_DENY +# This has no effect if PURGE_DENY is blank. +# +DAEMON_PURGE = 1h +# +####################################################################### + + + ######### THESE SETTINGS ARE SPECIFIC TO ########## + ######### DAEMON SYNCHRONIZATION ########## + + +####################################################################### +# +# Synchronization mode allows the DenyHosts daemon the ability +# to periodically send and receive denied host data such that +# DenyHosts daemons worldwide can automatically inform one +# another regarding banned hosts. This mode is disabled by +# default, you must uncomment SYNC_SERVER to enable this mode. +# +# for more information, please refer to: +# http:/denyhosts.sourceforge.net/faq.html#sync +# +####################################################################### + + +####################################################################### +# +# SYNC_SERVER: The central server that communicates with DenyHost +# daemons. Currently, denyhosts.net is the only available server +# however, in the future, it may be possible for organizations to +# install their own server for internal network synchronization +# +# To disable synchronization (the default), do nothing. +# +# To enable synchronization, you must uncomment the following line: +#SYNC_SERVER = http://xmlrpc.denyhosts.net:9911 +# +####################################################################### + +####################################################################### +# +# SYNC_INTERVAL: the interval of time to perform synchronizations if +# SYNC_SERVER has been uncommented. The default is 1 hour. +# +#SYNC_INTERVAL = 1h +# +####################################################################### + + +####################################################################### +# +# SYNC_UPLOAD: allow your DenyHosts daemon to transmit hosts that have +# been denied? This option only applies if SYNC_SERVER has +# been uncommented. +# The default is SYNC_UPLOAD = yes +# +#SYNC_UPLOAD = no +#SYNC_UPLOAD = yes +# +####################################################################### + + +####################################################################### +# +# SYNC_DOWNLOAD: allow your DenyHosts daemon to receive hosts that have +# been denied by others? This option only applies if SYNC_SERVER has +# been uncommented. +# The default is SYNC_DOWNLOAD = yes +# +#SYNC_DOWNLOAD = no +#SYNC_DOWNLOAD = yes +# +# +# +####################################################################### + +####################################################################### +# +# SYNC_DOWNLOAD_THRESHOLD: If SYNC_DOWNLOAD is enabled this paramter +# filters the returned hosts to those that have been blocked this many +# times by others. That is, if set to 1, then if a single DenyHosts +# server has denied an ip address then you will receive the denied host. +# +# See also SYNC_DOWNLOAD_RESILIENCY +# +#SYNC_DOWNLOAD_THRESHOLD = 10 +# +# The default is SYNC_DOWNLOAD_THRESHOLD = 3 +# +#SYNC_DOWNLOAD_THRESHOLD = 3 +# +####################################################################### + +####################################################################### +# +# SYNC_DOWNLOAD_RESILIENCY: If SYNC_DOWNLOAD is enabled then the +# value specified for this option limits the downloaded data +# to this resiliency period or greater. +# +# Resiliency is defined as the timespan between a hackers first known +# attack and it's most recent attack. Example: +# +# If the centralized denyhosts.net server records an attack at 2 PM +# and then again at 5 PM, specifying a SYNC_DOWNLOAD_RESILIENCY = 4h +# will not download this ip address. +# +# However, if the attacker is recorded again at 6:15 PM then the +# ip address will be downloaded by your DenyHosts instance. +# +# This value is used in conjunction with the SYNC_DOWNLOAD_THRESHOLD +# and only hosts that satisfy both values will be downloaded. +# This value has no effect if SYNC_DOWNLOAD_THRESHOLD = 1 +# +# The default is SYNC_DOWNLOAD_RESILIENCY = 5h (5 hours) +# +# Only obtain hackers that have been at it for 2 days or more: +#SYNC_DOWNLOAD_RESILIENCY = 2d +# +# Only obtain hackers that have been at it for 5 hours or more: +#SYNC_DOWNLOAD_RESILIENCY = 5h +# +####################################################################### + diff --git a/extra/denyhosts/log-injection-fix.diff b/extra/denyhosts/log-injection-fix.diff new file mode 100644 index 000000000..a3498761c --- /dev/null +++ b/extra/denyhosts/log-injection-fix.diff @@ -0,0 +1,11 @@ +--- DenyHosts-2.6/DenyHosts/regex-old.py 2008-01-29 03:07:51.000000000 +0100 ++++ DenyHosts-2.6/DenyHosts/regex.py 2008-01-29 03:07:53.000000000 +0100 +@@ -17,7 +17,7 @@ + + FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P.*) .*from (?P.*)""") + +-FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups""") ++FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups$""") + + FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") + diff --git a/extra/denyhosts/regex-fixes.diff b/extra/denyhosts/regex-fixes.diff new file mode 100644 index 000000000..3b5780675 --- /dev/null +++ b/extra/denyhosts/regex-fixes.diff @@ -0,0 +1,22 @@ +--- DenyHosts-2.6/DenyHosts/regex-old.py 2008-01-29 03:07:51.000000000 +0100 ++++ DenyHosts-2.6/DenyHosts/regex.py 2008-01-29 03:07:53.000000000 +0100 +@@ -17,7 +17,7 @@ + + FAILED_ENTRY_REGEX4 = re.compile(r"""Authentication failure for (?P.*) .*from (?P.*)""") + +-FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups""") ++FAILED_ENTRY_REGEX5 = re.compile(r"""User (?P.*) .*from (?P.*) not allowed because none of user's groups are listed in AllowGroups$""") + + FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") + +--- DenyHosts-2.6/DenyHosts/regex.py 2007-04-23 17:22:21.000000000 +0100 ++++ DenyHosts-2.6/DenyHosts/regex.py 2007-04-23 17:24:35.000000000 +0100 +@@ -21,7 +21,7 @@ + + FAILED_ENTRY_REGEX6 = re.compile(r"""Did not receive identification string .*from (::ffff:)?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})""") + +-FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P.*) not allowed because not listed in AllowUsers""") ++FAILED_ENTRY_REGEX7 = re.compile(r"""User (?P.*) .*from (::ffff:)?(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) not allowed because not listed in AllowUsers""") + + + # these are reserved for future versions diff --git a/extra/deskbar-applet/PKGBUILD b/extra/deskbar-applet/PKGBUILD new file mode 100644 index 000000000..7f0a36c27 --- /dev/null +++ b/extra/deskbar-applet/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 39846 2009-05-21 15:00:09Z jgc $ +# Maintainer: Jan de Groot + +pkgname=deskbar-applet +pkgver=2.26.2 +pkgrel=1 +pkgdesc="An all-in-one search bar for the GNOME panel" +arch=(i686 x86_64) +url="http://raphael.slinckx.net/deskbar/" +license=('GPL') +depends=('gnome-desktop>=2.26.1' 'gnome-python-desktop>=2.26.0' 'gnome-panel>=2.26.1' 'libbonoboui>=2.24.1' 'dbus-python>=0.83.0') +makedepends=('evolution-data-server>=2.26.1.1' 'gettext' 'intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0') +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +install="deskbar-applet.install" +source=(http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.26/${pkgname}-${pkgver}.tar.bz2) +md5sums=('82bca281838b38b3d9c682ab839b7b6b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + LD_PRELOAD="" ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-scrollkeeper \ + --enable-evolution || return 1 + + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain deskbar-applet ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/deskbar-applet/deskbar-applet.install b/extra/deskbar-applet/deskbar-applet.install new file mode 100644 index 000000000..a97eaf8f2 --- /dev/null +++ b/extra/deskbar-applet/deskbar-applet.install @@ -0,0 +1,22 @@ +pkgname=deskbar-applet + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove () { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/desktop-file-utils/ChangeLog b/extra/desktop-file-utils/ChangeLog new file mode 100644 index 000000000..8941e4825 --- /dev/null +++ b/extra/desktop-file-utils/ChangeLog @@ -0,0 +1,7 @@ +2008-07-22 Alexander Fehr + + * desktop-file-utils-0.15-1: + New upstream release. + New maintainer. + Changed url. + Added ChangeLog. diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD new file mode 100644 index 000000000..aa92c330f --- /dev/null +++ b/extra/desktop-file-utils/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 6468 2008-07-24 13:00:42Z alexanderf $ +# Maintainer: Alexander Fehr + +pkgname=desktop-file-utils +pkgver=0.15 +pkgrel=1 +pkgdesc="Command line utilities for working with desktop entries" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" +license=('GPL') +depends=('glib2') +source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.gz) +md5sums=('2fe8ebe222fc33cd4a959415495b7eed') + +build() { + cd "$srcdir/desktop-file-utils-$pkgver" + ./configure --prefix=/usr || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 +} diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD new file mode 100644 index 000000000..04bc62e95 --- /dev/null +++ b/extra/devhelp/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 50382 2009-08-25 20:26:50Z jgc $ +# Maintainer: Jan de Groot +# Contributor: Link Dupont + +pkgname=devhelp +pkgver=0.23.1 +pkgrel=1 +pkgdesc="API documentation browser for GNOME" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/devhelp/" +depends=('gconf>=2.26.2-2' 'libwnck>=2.26.2' 'libwebkit>=1.1.10' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'intltool') +options=('!libtool' '!emptydirs') +install="devhelp.install" +source=(http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.23/devhelp-${pkgver}.tar.bz2) +sha256sums=('186d6e658d9da31e0fdb51b42ccdd65cf535b3afc136a0191057cfffc48e6714') + +build() { + cd "${srcdir}/devhelp-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/extra/devhelp/devhelp.install b/extra/devhelp/devhelp.install new file mode 100644 index 000000000..4db5f6e5c --- /dev/null +++ b/extra/devhelp/devhelp.install @@ -0,0 +1,22 @@ +pkgname=devhelp + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/extra/devicekit-power/PKGBUILD b/extra/devicekit-power/PKGBUILD new file mode 100644 index 000000000..513093802 --- /dev/null +++ b/extra/devicekit-power/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: $ +# Maintainer: Jan de Groot +# Contributor: Denis Zawada + +pkgname=devicekit-power +pkgver=009 +pkgrel=1 +pkgdesc="DeviceKit-power is an abstraction for enumerating power devices, listening to device events and querying history and statistics" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/DeviceKit" +license=('GPL') +depends=('devicekit>=003' 'libusb>=0.1.12' 'policykit>=0.9') +makedepends=('gtk-doc' 'pkgconfig' 'intltool' 'docbook-xsl') +options=('!emptydirs' '!libtool') +source=("http://hal.freedesktop.org/releases/DeviceKit-power-${pkgver}.tar.gz") +md5sums=('535703fa7b9c323d6388b5aff28cfeeb') + +build() { + cd "${srcdir}/DeviceKit-power-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/DeviceKit --disable-static || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/devicekit/PKGBUILD b/extra/devicekit/PKGBUILD new file mode 100644 index 000000000..581ea7bd5 --- /dev/null +++ b/extra/devicekit/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: $ +# Maintainer: Jan de Groot +# Contributor: Denis Zawada +# Contributor: Gerardo Exequiel Pozzi + +pkgname=devicekit +pkgver=003 +pkgrel=2 +pkgdesc="DeviceKit is an abstraction for enumerating devices and listening to device events" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/DeviceKit" +license=('LGPL') +depends=('dbus-glib>=0.80' 'udev>=141') +makedepends=('gtk-doc' 'pkgconfig' 'docbook-xsl') +options=('!libtool') +install= +source=("http://hal.freedesktop.org/releases/DeviceKit-${pkgver}.tar.gz") +md5sums=('8b311547f4a2c8c6b6598e3318d66cd7') + +build() { + cd "${srcdir}/DeviceKit-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/DeviceKit --disable-static + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/devil/00_endian_and_ILvoid_fixes.diff b/extra/devil/00_endian_and_ILvoid_fixes.diff new file mode 100644 index 000000000..ac51c6cdd --- /dev/null +++ b/extra/devil/00_endian_and_ILvoid_fixes.diff @@ -0,0 +1,17 @@ + +# Fixes FTBFS with GCC 4.2: '' has incomplete type +# Fixes FTBFS on big endian architectures. +Index: devil/src-IL/include/il_endian.h +=================================================================== +--- devil.orig/src-IL/include/il_endian.h 2008-12-30 21:05:37.000000000 +0000 ++++ devil/src-IL/include/il_endian.h 2008-12-30 21:08:10.000000000 +0000 +@@ -17,7 +17,7 @@ + + #ifdef WORDS_BIGENDIAN //this is defined by ./configure + #ifndef __BIG_ENDIAN__ +- #define __BIG_ENDIAN__ ++ #define __BIG_ENDIAN__ 1 + #endif + #endif + + diff --git a/extra/devil/01_fix_as-needed.diff b/extra/devil/01_fix_as-needed.diff new file mode 100644 index 000000000..38e802304 --- /dev/null +++ b/extra/devil/01_fix_as-needed.diff @@ -0,0 +1,34 @@ + +Index: devil/build-aux/ltmain.sh +=================================================================== +--- devil.orig/build-aux/ltmain.sh 2008-12-30 21:05:37.000000000 +0000 ++++ devil/build-aux/ltmain.sh 2008-12-30 21:09:12.000000000 +0000 +@@ -4189,6 +4189,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -4543,6 +4548,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + diff --git a/extra/devil/02_add_missing_files.diff b/extra/devil/02_add_missing_files.diff new file mode 100644 index 000000000..288e155a9 --- /dev/null +++ b/extra/devil/02_add_missing_files.diff @@ -0,0 +1,896 @@ + +Index: devil/lib/Makefile.am +=================================================================== +--- devil.orig/lib/Makefile.am 2009-01-10 20:43:26.000000000 +0000 ++++ devil/lib/Makefile.am 2009-01-10 20:54:27.000000000 +0000 +@@ -69,8 +69,8 @@ + + libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include) + libIL_la_CFLAGS = $(CFLAGS) @IL_CFLAGS@ +-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c +-libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h ++libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_vtf.c ++libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h $(il_include)/il_vtf.h + libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS) + + libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include) +Index: devil/src-IL/include/il_vtf.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ devil/src-IL/include/il_vtf.h 2009-01-10 20:54:27.000000000 +0000 +@@ -0,0 +1,130 @@ ++//----------------------------------------------------------------------------- ++// ++// ImageLib Sources ++// Copyright (C) 2000-2008 by Denton Woods ++// Last modified: 12/27/2008 ++// ++// Filename: src-IL/include/il_vtf.h ++// ++// Description: Reads from and writes to a Valve Texture Format (.vtf) file. ++// These are used in Valve's Source games. VTF specs available ++// from http://developer.valvesoftware.com/wiki/VTF. ++// ++//----------------------------------------------------------------------------- ++ ++ ++#ifndef VTF_H ++#define VTF_H ++ ++#include "il_internal.h" ++ ++#ifdef _MSC_VER ++#pragma pack(push, vtf_struct, 1) ++#elif defined(MACOSX) || defined(__GNUC__) ++#pragma pack(1) ++#endif ++ ++typedef struct VTFHEAD ++{ ++ ILubyte Signature[4]; // File signature ("VTF\0"). ++ ILuint Version[2]; // version[0].version[1] (currently 7.2). ++ ILuint HeaderSize; // Size of the header struct (16 byte aligned; currently 80 bytes). ++ ILushort Width; // Width of the largest mipmap in pixels. Must be a power of 2. ++ ILushort Height; // Height of the largest mipmap in pixels. Must be a power of 2. ++ ILuint Flags; // VTF flags. ++ ILushort Frames; // Number of frames, if animated (1 for no animation). ++ ILushort FirstFrame; // First frame in animation (0 based). ++ ILubyte Padding0[4]; // reflectivity padding (16 byte alignment). ++ ILfloat Reflectivity[3]; // reflectivity vector. ++ ILubyte Padding1[4]; // reflectivity padding (8 byte packing). ++ ILfloat BumpmapScale; // Bumpmap scale. ++ ILuint HighResImageFormat; // High resolution image format. ++ ILubyte MipmapCount; // Number of mipmaps. ++ ILint LowResImageFormat; // Low resolution image format (always DXT1). ++ ILubyte LowResImageWidth; // Low resolution image width. ++ ILubyte LowResImageHeight; // Low resolution image height. ++ ILushort Depth; // Depth of the largest mipmap in pixels. ++ // Must be a power of 2. Can be 0 or 1 for a 2D texture (v7.2 only). ++} IL_PACKSTRUCT VTFHEAD; ++ ++#if defined(MACOSX) || defined(__GNUC__) ++#pragma pack() ++#elif _MSC_VER ++#pragma pack(pop, vtf_struct) ++#endif ++ ++enum ++{ ++ IMAGE_FORMAT_NONE = -1, ++ IMAGE_FORMAT_RGBA8888 = 0, ++ IMAGE_FORMAT_ABGR8888, ++ IMAGE_FORMAT_RGB888, ++ IMAGE_FORMAT_BGR888, ++ IMAGE_FORMAT_RGB565, ++ IMAGE_FORMAT_I8, ++ IMAGE_FORMAT_IA88, ++ IMAGE_FORMAT_P8, ++ IMAGE_FORMAT_A8, ++ IMAGE_FORMAT_RGB888_BLUESCREEN, ++ IMAGE_FORMAT_BGR888_BLUESCREEN, ++ IMAGE_FORMAT_ARGB8888, ++ IMAGE_FORMAT_BGRA8888, ++ IMAGE_FORMAT_DXT1, ++ IMAGE_FORMAT_DXT3, ++ IMAGE_FORMAT_DXT5, ++ IMAGE_FORMAT_BGRX8888, ++ IMAGE_FORMAT_BGR565, ++ IMAGE_FORMAT_BGRX5551, ++ IMAGE_FORMAT_BGRA4444, ++ IMAGE_FORMAT_DXT1_ONEBITALPHA, ++ IMAGE_FORMAT_BGRA5551, ++ IMAGE_FORMAT_UV88, ++ IMAGE_FORMAT_UVWQ8888, ++ IMAGE_FORMAT_RGBA16161616F, ++ IMAGE_FORMAT_RGBA16161616, ++ IMAGE_FORMAT_UVLX8888 ++}; ++ ++enum ++{ ++ TEXTUREFLAGS_POINTSAMPLE = 0x00000001, ++ TEXTUREFLAGS_TRILINEAR = 0x00000002, ++ TEXTUREFLAGS_CLAMPS = 0x00000004, ++ TEXTUREFLAGS_CLAMPT = 0x00000008, ++ TEXTUREFLAGS_ANISOTROPIC = 0x00000010, ++ TEXTUREFLAGS_HINT_DXT5 = 0x00000020, ++ TEXTUREFLAGS_NOCOMPRESS = 0x00000040, ++ TEXTUREFLAGS_NORMAL = 0x00000080, ++ TEXTUREFLAGS_NOMIP = 0x00000100, ++ TEXTUREFLAGS_NOLOD = 0x00000200, ++ TEXTUREFLAGS_MINMIP = 0x00000400, ++ TEXTUREFLAGS_PROCEDURAL = 0x00000800, ++ TEXTUREFLAGS_ONEBITALPHA = 0x00001000, ++ TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000, ++ TEXTUREFLAGS_ENVMAP = 0x00004000, ++ TEXTUREFLAGS_RENDERTARGET = 0x00008000, ++ TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000, ++ TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000, ++ TEXTUREFLAGS_SINGLECOPY = 0x00040000, ++ TEXTUREFLAGS_ONEOVERMIPLEVELINALPHA = 0x00080000, ++ TEXTUREFLAGS_PREMULTCOLORBYONEOVERMIPLEVEL = 0x00100000, ++ TEXTUREFLAGS_NORMALTODUDV = 0x00200000, ++ TEXTUREFLAGS_ALPHATESTMIPGENERATION = 0x00400000, ++ TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000, ++ TEXTUREFLAGS_NICEFILTERED = 0x01000000, ++ TEXTUREFLAGS_CLAMPU = 0x02000000 ++}; ++ ++ ++ ++// Internal functions ++ILboolean iIsValidVtf(void); ++ILboolean iGetVtfHead(VTFHEAD *Header); ++ILboolean iCheckVtf(VTFHEAD *Header); ++ILboolean iLoadVtfInternal(void); ++ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header); ++ILboolean VtfReadData(void); ++ILboolean VtfDecompressDXT1(ILimage *Image); ++ILboolean VtfDecompressDXT5(ILimage *Image); ++ ++#endif//VTF_H +Index: devil/src-IL/src/il_vtf.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ devil/src-IL/src/il_vtf.c 2009-01-10 20:54:27.000000000 +0000 +@@ -0,0 +1,612 @@ ++//----------------------------------------------------------------------------- ++// ++// ImageLib Sources ++// Copyright (C) 2000-2008 by Denton Woods ++// Last modified: 12/29/2008 ++// ++// Filename: src-IL/src/il_vtf.c ++// ++// Description: Reads from and writes to a Valve Texture Format (.vtf) file. ++// These are used in Valve's Source games. VTF specs available ++// from http://developer.valvesoftware.com/wiki/VTF. ++// ++//----------------------------------------------------------------------------- ++ ++ ++#include "il_internal.h" ++#ifndef IL_NO_VTF ++#include "il_vtf.h" ++#include "il_dds.h" ++ ++// the max and min functions are not present, at least not on unixes ++#ifndef max ++ #define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) ++#endif ++ ++#ifndef min ++ #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) ++#endif ++ ++//@TODO: Get rid of these globals. ++//static VTFHEAD Head; ++ ++ ++//! Checks if the file specified in FileName is a valid VTF file. ++ILboolean ilIsValidVtf(ILconst_string FileName) ++{ ++ ILHANDLE VtfFile; ++ ILboolean bVtf = IL_FALSE; ++ ++ if (!iCheckExtension(FileName, IL_TEXT("vtf"))) { ++ ilSetError(IL_INVALID_EXTENSION); ++ return bVtf; ++ } ++ ++ VtfFile = iopenr(FileName); ++ if (VtfFile == NULL) { ++ ilSetError(IL_COULD_NOT_OPEN_FILE); ++ return bVtf; ++ } ++ ++ bVtf = ilIsValidVtfF(VtfFile); ++ icloser(VtfFile); ++ ++ return bVtf; ++} ++ ++ ++//! Checks if the ILHANDLE contains a valid VTF file at the current position. ++ILboolean ilIsValidVtfF(ILHANDLE File) ++{ ++ ILuint FirstPos; ++ ILboolean bRet; ++ ++ iSetInputFile(File); ++ FirstPos = itell(); ++ bRet = iIsValidVtf(); ++ iseek(FirstPos, IL_SEEK_SET); ++ ++ return bRet; ++} ++ ++ ++//! Checks if Lump is a valid VTF lump. ++ILboolean ilIsValidVtfL(const void *Lump, ILuint Size) ++{ ++ iSetInputLump(Lump, Size); ++ return iIsValidVtf(); ++} ++ ++ ++// Internal function used to get the VTF header from the current file. ++ILboolean iGetVtfHead(VTFHEAD *Header) ++{ ++ iread(Header->Signature, 1, 4); ++ Header->Version[0] = GetLittleUInt(); ++ Header->Version[1] = GetLittleUInt(); ++ Header->HeaderSize = GetLittleUInt(); ++ Header->Width = GetLittleUShort(); ++ Header->Height = GetLittleUShort(); ++ Header->Flags = GetLittleUInt(); ++ Header->Frames = GetLittleUShort(); ++ Header->FirstFrame = GetLittleUShort(); ++ iseek(4, IL_SEEK_CUR); // Padding ++ Header->Reflectivity[0] = GetLittleFloat(); ++ Header->Reflectivity[1] = GetLittleFloat(); ++ Header->Reflectivity[2] = GetLittleFloat(); ++ iseek(4, IL_SEEK_CUR); // Padding ++ Header->BumpmapScale = GetLittleFloat(); ++ Header->HighResImageFormat = GetLittleUInt(); ++ Header->MipmapCount = (ILubyte)igetc(); ++ Header->LowResImageFormat = GetLittleInt(); ++ Header->LowResImageWidth = (ILubyte)igetc(); ++ Header->LowResImageHeight = (ILubyte)igetc(); ++ Header->Depth = GetLittleUShort(); ++ ++ iseek(Header->HeaderSize - sizeof(VTFHEAD), IL_SEEK_CUR); ++ ++ return IL_TRUE; ++} ++ ++ ++// Internal function to get the header and check it. ++ILboolean iIsValidVtf() ++{ ++ VTFHEAD Head; ++ ++ if (!iGetVtfHead(&Head)) ++ return IL_FALSE; ++ iseek(-(ILint)sizeof(VTFHEAD), IL_SEEK_CUR); ++ ++ return iCheckVtf(&Head); ++} ++ ++ ++//@TODO: Add more checks. ++// Should we check for Frames, MipmapCount and Depth != 0? ++ ++// Internal function used to check if the HEADER is a valid VTF header. ++ILboolean iCheckVtf(VTFHEAD *Header) ++{ ++ // The file signature is "VTF\0". ++ if ((Header->Signature[0] != 'V') || (Header->Signature[1] != 'T') || (Header->Signature[2] != 'F') ++ || (Header->Signature[3] != 0)) ++ return IL_FALSE; ++ // Are there other versions available yet? ++ if (Header->Version[0] != 7) ++ return IL_FALSE; ++ // We have 7.0 through 7.4 as of 12/27/2008. ++ if (Header->Version[1] > 4) ++ return IL_FALSE; ++ // May change in future version of the specifications. ++ // 80 is through version 7.2, and 96/104 are through 7.4. ++ // This must be 16-byte aligned, but something is outputting headers with 104. ++ if ((Header->HeaderSize != 80) && (Header->HeaderSize != 96) && (Header->HeaderSize != 104)) ++ return IL_FALSE; ++ ++ // 0 is an invalid dimension ++ if (Header->Width == 0 || Header->Height == 0) ++ return IL_FALSE; ++ // Width and Height must be powers of 2. ++ if ((ilNextPower2(Header->Width) != Header->Width) || (ilNextPower2(Header->Height) != Header->Height)) ++ return IL_FALSE; ++ if ((ilNextPower2(Header->LowResImageWidth) != Header->LowResImageWidth) ++ || (ilNextPower2(Header->LowResImageHeight) != Header->LowResImageHeight)) ++ return IL_FALSE; ++ // In addition, the LowResImage has to have dimensions no greater than 16. ++ if ((Header->LowResImageWidth > 16) || (Header->LowResImageHeight > 16) ++ || (Header->LowResImageWidth == 0) || (Header->LowResImageHeight == 0)) ++ return IL_FALSE; ++ // And the LowResImage has to have dimensions less than or equal to the main image. ++ if ((Header->LowResImageWidth > Header->Width) || (Header->LowResImageHeight > Header->Height)) ++ return IL_FALSE; ++ // The LowResImage must be in DXT1 format. ++ if (Header->LowResImageFormat != IMAGE_FORMAT_DXT1) ++ return IL_FALSE; ++ ++ return IL_TRUE; ++} ++ ++ ++//! Reads a VTF file ++ILboolean ilLoadVtf(ILconst_string FileName) ++{ ++ ILHANDLE VtfFile; ++ ILboolean bVtf = IL_FALSE; ++ ++ VtfFile = iopenr(FileName); ++ if (VtfFile == NULL) { ++ ilSetError(IL_COULD_NOT_OPEN_FILE); ++ return bVtf; ++ } ++ ++ bVtf = ilLoadVtfF(VtfFile); ++ icloser(VtfFile); ++ ++ return bVtf; ++} ++ ++ ++//! Reads an already-opened VTF file ++ILboolean ilLoadVtfF(ILHANDLE File) { ++ ILuint FirstPos; ++ ILboolean bRet; ++ ++ iSetInputFile(File); ++ FirstPos = itell(); ++ bRet = iLoadVtfInternal(); ++ iseek(FirstPos, IL_SEEK_SET); ++ ++ return bRet; ++} ++ ++ ++//! Reads from a memory "lump" that contains a VTF ++ILboolean ilLoadVtfL(const void *Lump, ILuint Size) ++{ ++ iSetInputLump(Lump, Size); ++ return iLoadVtfInternal(); ++} ++ ++ ++// Internal function used to load the VTF. ++ILboolean iLoadVtfInternal() ++{ ++ ILboolean bVtf = IL_TRUE; ++ ILimage *Image, *BaseImage; ++ ILenum Format, Type; ++ ILint Frame, Mipmap; ++ ILuint SizeOfData, Channels, k; ++ ILubyte *CompData = NULL, SwapVal, *Data16Bit, *Temp; ++ VTFHEAD Head; ++ ILuint CurName; ++ ++ if (iCurImage == NULL) { ++ ilSetError(IL_ILLEGAL_OPERATION); ++ return IL_FALSE; ++ } ++ CurName = ilGetCurName(); ++ ++ if (!iGetVtfHead(&Head)) ++ return IL_FALSE; ++ if (!iCheckVtf(&Head)) { ++ ilSetError(IL_INVALID_FILE_HEADER); ++ return IL_FALSE; ++ } ++ ++ //@TODO: Take care of animation chains soon. ++ //if (Head.Frames > 1) { ++ // ilSetError(IL_FORMAT_NOT_SUPPORTED); ++ // return IL_FALSE; ++ //} ++ //@TODO: Find out how to tell whether the environment map is cubic or spherical. ++ if (Head.Flags & TEXTUREFLAGS_ENVMAP) { ++ ilSetError(IL_FORMAT_NOT_SUPPORTED); ++ return IL_FALSE; ++ } ++ ++ // Skip the low resolution image. This is just a thumbnail. ++ // The block size is 8, and the compression ratio is 6:1. ++ SizeOfData = max(Head.LowResImageWidth * Head.LowResImageHeight / 2, 8); ++ iseek(SizeOfData, IL_SEEK_CUR); ++ ++ //@TODO: Make this a helper function that set channels, bpc and format. ++ switch (Head.HighResImageFormat) ++ { ++ case IMAGE_FORMAT_DXT1: //@TODO: Should we make DXT1 channels = 3? ++ case IMAGE_FORMAT_DXT1_ONEBITALPHA: ++ case IMAGE_FORMAT_DXT3: ++ case IMAGE_FORMAT_DXT5: ++ Channels = 4; ++ Format = IL_RGBA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGR888: ++ case IMAGE_FORMAT_BGR888_BLUESCREEN: ++ Channels = 3; ++ Format = IL_BGR; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGRA8888: ++ Channels = 4; ++ Format = IL_BGRA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGRX8888: ++ Channels = 3; ++ Format = IL_BGR; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_RGB888: ++ case IMAGE_FORMAT_RGB888_BLUESCREEN: ++ Channels = 3; ++ Format = IL_RGB; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_RGBA8888: ++ Channels = 4; ++ Format = IL_RGBA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_RGBA16161616: // 16-bit shorts ++ Channels = 4; ++ Format = IL_RGBA; ++ Type = IL_UNSIGNED_SHORT; ++ break; ++ case IMAGE_FORMAT_RGBA16161616F: // 16-bit floats ++ Channels = 4; ++ Format = IL_RGBA; ++ Type = IL_FLOAT; ++ break; ++ case IMAGE_FORMAT_I8: // 8-bit luminance data ++ Channels = 1; ++ Format = IL_LUMINANCE; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_IA88: // 8-bit luminance and alpha data ++ Channels = 2; ++ Format = IL_LUMINANCE_ALPHA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_A8: // 8-bit alpha data ++ Channels = 1; ++ Format = IL_ALPHA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_ARGB8888: ++ Channels = 4; ++ Format = IL_BGRA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_ABGR8888: ++ Channels = 4; ++ Format = IL_RGBA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_RGB565: ++ Channels = 3; ++ Format = IL_RGB; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGR565: ++ Channels = 3; ++ Format = IL_BGR; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGRA5551: ++ Channels = 4; ++ Format = IL_BGRA; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ case IMAGE_FORMAT_BGRX5551: // Unused alpha channel ++ Channels = 3; ++ Format = IL_BGR; ++ Type = IL_UNSIGNED_BYTE; ++ break; ++ ++ default: ++ ilSetError(IL_FORMAT_NOT_SUPPORTED); ++ return IL_FALSE; ++ } ++ ++ if (!ilTexImage(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL)) ++ return IL_FALSE; ++ // The origin should be in the upper left. ++ iCurImage->Origin = IL_ORIGIN_UPPER_LEFT; ++ // Create any mipmaps. ++ VtfInitMipmaps(iCurImage, &Head); ++ ++ // Create our animation chain ++ BaseImage = Image = iCurImage; // Top-level image ++ for (Frame = 1; Frame < Head.Frames; Frame++) { ++ Image->Next = ilNewImageFull(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL); ++ if (Image->Next == NULL) ++ return IL_FALSE; ++ Image = Image->Next; ++ // The origin should be in the upper left. ++ Image->Origin = IL_ORIGIN_UPPER_LEFT; ++ ++ // Create our mipmaps for each frame. ++ VtfInitMipmaps(Image, &Head); ++ } ++ ++ // We want to put the smallest mipmap at the end, but it is first in the file, so we count backwards. ++ for (Mipmap = Head.MipmapCount - 1; Mipmap >= 0; Mipmap--) { ++ // Frames are in the normal order. ++ for (Frame = 0; Frame < Head.Frames; Frame++) { ++ //@TODO: Would probably be quicker to do the linked list traversal manually here. ++ ilBindImage(CurName); ++ ilActiveImage(Frame); ++ ilActiveMipmap(Mipmap); ++ Image = iCurImage; ++ ++ switch (Head.HighResImageFormat) ++ { ++ // DXT1 compression ++ case IMAGE_FORMAT_DXT1: ++ case IMAGE_FORMAT_DXT1_ONEBITALPHA: ++ // The block size is 8. ++ SizeOfData = max(Image->Width * Image->Height * Image->Depth / 2, 8); ++ CompData = ialloc(SizeOfData); // Gives a 6:1 compression ratio (or 8:1 for DXT1 with alpha) ++ iread(CompData, 1, SizeOfData); ++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { ++ Image->DxtcSize = SizeOfData; ++ Image->DxtcData = CompData; ++ Image->DxtcFormat = IL_DXT5; ++ CompData = NULL; ++ } ++ bVtf = DecompressDXT1(Image, CompData); ++ break; ++ ++ // DXT3 compression ++ case IMAGE_FORMAT_DXT3: ++ // The block size is 16. ++ SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16); ++ CompData = ialloc(SizeOfData); // Gives a 4:1 compression ratio ++ iread(CompData, 1, SizeOfData); ++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { ++ Image->DxtcSize = SizeOfData; ++ Image->DxtcData = CompData; ++ Image->DxtcFormat = IL_DXT3; ++ CompData = NULL; ++ } ++ bVtf = DecompressDXT3(Image, CompData); ++ break; ++ ++ // DXT5 compression ++ case IMAGE_FORMAT_DXT5: ++ // The block size is 16. ++ SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16); ++ CompData = ialloc(SizeOfData); // Gives a 4:1 compression ratio ++ iread(CompData, 1, SizeOfData); ++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { ++ Image->DxtcSize = SizeOfData; ++ Image->DxtcData = CompData; ++ Image->DxtcFormat = IL_DXT5; ++ CompData = NULL; ++ } ++ bVtf = DecompressDXT5(Image, CompData); ++ break; ++ ++ // Uncompressed BGR(A) data (24-bit and 32-bit) ++ case IMAGE_FORMAT_BGR888: ++ case IMAGE_FORMAT_BGRA8888: ++ // Uncompressed RGB(A) data (24-bit and 32-bit) ++ case IMAGE_FORMAT_RGB888: ++ case IMAGE_FORMAT_RGBA8888: ++ // Uncompressed 16-bit shorts ++ case IMAGE_FORMAT_RGBA16161616: ++ // Luminance data only ++ case IMAGE_FORMAT_I8: ++ // Luminance and alpha data ++ case IMAGE_FORMAT_IA88: ++ // Alpha data only ++ case IMAGE_FORMAT_A8: ++ // We will ignore the part about the bluescreen right now. ++ // I could not find any information about it. ++ case IMAGE_FORMAT_RGB888_BLUESCREEN: ++ case IMAGE_FORMAT_BGR888_BLUESCREEN: ++ // Just copy the data over - no compression. ++ if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) ++ bVtf = IL_FALSE; ++ else ++ bVtf = IL_TRUE; ++ break; ++ ++ // Uncompressed 24-bit data with an unused alpha channel (we discard it) ++ case IMAGE_FORMAT_BGRX8888: ++ SizeOfData = Image->Width * Image->Height * Image->Depth * 3; ++ Temp = CompData = ialloc(SizeOfData / 3 * 4); // Not compressed data ++ if (iread(CompData, 1, SizeOfData / 3 * 4) != SizeOfData / 3 * 4) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ for (k = 0; k < SizeOfData; k += 3) { ++ Image->Data[k] = Temp[0]; ++ Image->Data[k+1] = Temp[1]; ++ Image->Data[k+2] = Temp[2]; ++ Temp += 4; ++ } ++ ++ break; ++ ++ // Uncompressed 16-bit floats (must be converted to 32-bit) ++ case IMAGE_FORMAT_RGBA16161616F: ++ SizeOfData = Image->Width * Image->Height * Image->Depth * Image->Bpp * 2; ++ CompData = ialloc(SizeOfData); // Not compressed data ++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ bVtf = iConvFloat16ToFloat32((ILuint*)Image->Data, (ILushort*)CompData, SizeOfData / 2); ++ break; ++ ++ // Uncompressed 32-bit ARGB and ABGR data. DevIL does not handle this ++ // internally, so we have to swap values. ++ case IMAGE_FORMAT_ARGB8888: ++ case IMAGE_FORMAT_ABGR8888: ++ if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ else { ++ bVtf = IL_TRUE; ++ } ++ // Swap the data ++ for (k = 0; k < Image->SizeOfData; k += 4) { ++ SwapVal = Image->Data[k]; ++ Image->Data[k] = Image->Data[k+3]; ++ Image->Data[k+3] = SwapVal; ++ SwapVal = Image->Data[k+1]; ++ Image->Data[k+1] = Image->Data[k+2]; ++ Image->Data[k+2] = SwapVal; ++ } ++ break; ++ ++ // Uncompressed 16-bit RGB and BGR data. We have to expand this to 24-bit, since ++ // DevIL does not handle this internally. ++ // The data is in the file as: gggbbbbb rrrrrrggg ++ case IMAGE_FORMAT_RGB565: ++ case IMAGE_FORMAT_BGR565: ++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; ++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data ++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ for (k = 0; k < Image->SizeOfData; k += 3) { ++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; ++ Image->Data[k+1] = ((Data16Bit[1] & 0x07) << 5) | ((Data16Bit[0] & 0xE0) >> 3); ++ Image->Data[k+2] = Data16Bit[1] & 0xF8; ++ Data16Bit += 2; ++ } ++ break; ++ ++ // Uncompressed 16-bit BGRA data (1-bit alpha). We have to expand this to 32-bit, ++ // since DevIL does not handle this internally. ++ // Something seems strange with this one, but this is how VTFEdit outputs. ++ // The data is in the file as: gggbbbbb arrrrrgg ++ case IMAGE_FORMAT_BGRA5551: ++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; ++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data ++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ for (k = 0; k < Image->SizeOfData; k += 4) { ++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; ++ Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6); ++ Image->Data[k+2] = (Data16Bit[1] & 0x7C) << 1; ++ // 1-bit alpha is either off or on. ++ Image->Data[k+3] = ((Data16Bit[0] & 0x80) == 0x80) ? 0xFF : 0x00; ++ Data16Bit += 2; ++ } ++ break; ++ ++ // Same as above, but the alpha channel is unused. ++ case IMAGE_FORMAT_BGRX5551: ++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; ++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data ++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { ++ bVtf = IL_FALSE; ++ break; ++ } ++ for (k = 0; k < Image->SizeOfData; k += 3) { ++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; ++ Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6); ++ Image->Data[k+2] = (Data16Bit[1] & 0x7C) << 1; ++ Data16Bit += 2; ++ } ++ break; ++ } ++ ++ ifree(CompData); ++ CompData = NULL; ++ if (bVtf == IL_FALSE) //@TODO: Do we need to do any cleanup here? ++ return IL_FALSE; ++ } ++ } ++ ++ ilBindImage(CurName); // Set to parent image first. ++ return ilFixImage(); ++} ++ ++ ++ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header) ++{ ++ ILimage *Image; ++ ILuint Width, Height, Depth, Mipmap; ++ ++ Image = BaseImage; ++ Width = BaseImage->Width; Height = BaseImage->Height; Depth = BaseImage->Depth; ++ ++ for (Mipmap = 1; Mipmap < Header->MipmapCount; Mipmap++) { ++ // 1 is the smallest dimension possible. ++ Width = (Width >> 1) == 0 ? 1 : (Width >> 1); ++ Height = (Height >> 1) == 0 ? 1 : (Height >> 1); ++ Depth = (Depth >> 1) == 0 ? 1 : (Depth >> 1); ++ ++ if (Mipmap == 1) { // Our first mipmap is at Mipmap. ++ Image->Mipmaps = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc); ++ if (Image->Mipmaps == NULL) ++ return IL_FALSE; ++ Image = Image->Mipmaps; ++ } ++ else { // The other mipmaps are at Mipmap->Next. ++ Image->Next = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc); ++ if (Image->Next == NULL) ++ return IL_FALSE; ++ Image = Image->Next; ++ } ++ ++ // ilNewImage does not set these. ++ Image->Format = BaseImage->Format; ++ Image->Type = BaseImage->Type; ++ // The origin should be in the upper left. ++ Image->Origin = IL_ORIGIN_UPPER_LEFT; ++ } ++ ++ return IL_TRUE; ++} ++ ++#endif//IL_NO_VTF +Index: devil/lib/Makefile.in +=================================================================== +--- devil.orig/lib/Makefile.in 2009-01-10 20:54:50.000000000 +0000 ++++ devil/lib/Makefile.in 2009-01-10 20:55:39.000000000 +0000 +@@ -111,7 +111,7 @@ + $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \ + $(il_src)/il_icns.c $(il_src)/il_jp2.c \ + $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \ +- $(il_include)/altivec_common.h \ ++ $(il_src)/il_vtf.c $(il_include)/altivec_common.h \ + $(il_include)/altivec_typeconversion.h \ + $(il_include)/il_alloc.h $(il_include)/il_bits.h \ + $(il_include)/il_bmp.h $(il_include)/il_dcx.h \ +@@ -131,18 +131,19 @@ + $(il_include)/il_states.h $(il_include)/il_targa.h \ + $(il_include)/il_wdp.h \ + $(all_include)/IL/devil_internal_exports.h \ +- $(ilu_src)/ilu_alloc.c $(ilu_src)/ilu_internal.c \ +- $(ilu_src)/ilu_noise.c $(ilu_src)/ilu_scale.c \ +- $(ilu_src)/ilu_error.c $(ilu_src)/ilu_main.c \ +- $(ilu_src)/ilu_rotate.c $(ilu_src)/ilu_scaling.c \ +- $(ilu_src)/ilu_filter.c $(ilu_src)/ilu_manip.c \ +- $(ilu_src)/ilu_scale2d.c $(ilu_src)/ilu_states.c \ +- $(ilu_src)/ilu_filter_rcg.c $(ilu_src)/ilu_mipmap.c \ +- $(ilu_src)/ilu_scale3d.c $(ilu_src)/ilu_utilities.c \ +- $(ilu_src)/ilu_region.c $(ilu_include)/ilu_alloc.h \ +- $(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h \ +- $(ilu_include)/ilu_mipmap.h $(ilu_include)/ilu_region.h \ +- $(ilu_include)/ilu_states.h $(all_include)/IL/ilu_region.h \ ++ $(il_include)/il_vtf.h $(ilu_src)/ilu_alloc.c \ ++ $(ilu_src)/ilu_internal.c $(ilu_src)/ilu_noise.c \ ++ $(ilu_src)/ilu_scale.c $(ilu_src)/ilu_error.c \ ++ $(ilu_src)/ilu_main.c $(ilu_src)/ilu_rotate.c \ ++ $(ilu_src)/ilu_scaling.c $(ilu_src)/ilu_filter.c \ ++ $(ilu_src)/ilu_manip.c $(ilu_src)/ilu_scale2d.c \ ++ $(ilu_src)/ilu_states.c $(ilu_src)/ilu_filter_rcg.c \ ++ $(ilu_src)/ilu_mipmap.c $(ilu_src)/ilu_scale3d.c \ ++ $(ilu_src)/ilu_utilities.c $(ilu_src)/ilu_region.c \ ++ $(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h \ ++ $(ilu_include)/ilu_internal.h $(ilu_include)/ilu_mipmap.h \ ++ $(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h \ ++ $(all_include)/IL/ilu_region.h \ + $(ilu_include)/ilu_error/ilu_err-arabic.h \ + $(ilu_include)/ilu_error/ilu_err-dutch.h \ + $(ilu_include)/ilu_error/ilu_err-english.h \ +@@ -184,7 +185,7 @@ + libDevIL_la-il_pxr.lo libDevIL_la-il_xpm.lo \ + libDevIL_la-il_hdr.lo libDevIL_la-il_icns.lo \ + libDevIL_la-il_jp2.lo libDevIL_la-altivec_common.lo \ +- libDevIL_la-altivec_typeconversion.lo ++ libDevIL_la-altivec_typeconversion.lo libDevIL_la-il_vtf.lo + @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@am__objects_2 = \ + @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@ $(am__objects_1) + am__objects_3 = libDevIL_la-ilu_alloc.lo libDevIL_la-ilu_internal.lo \ +@@ -240,7 +241,8 @@ + libIL_la-il_dds-save.lo libIL_la-il_psp.lo libIL_la-il_pix.lo \ + libIL_la-il_pxr.lo libIL_la-il_xpm.lo libIL_la-il_hdr.lo \ + libIL_la-il_icns.lo libIL_la-il_jp2.lo \ +- libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo ++ libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo \ ++ libIL_la-il_vtf.lo + libIL_la_OBJECTS = $(am_libIL_la_OBJECTS) + libIL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(libIL_la_CFLAGS) $(CFLAGS) \ +@@ -505,7 +507,7 @@ + $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \ + $(il_src)/il_icns.c $(il_src)/il_jp2.c \ + $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \ +- $(il_include)/altivec_common.h \ ++ $(il_src)/il_vtf.c $(il_include)/altivec_common.h \ + $(il_include)/altivec_typeconversion.h \ + $(il_include)/il_alloc.h $(il_include)/il_bits.h \ + $(il_include)/il_bmp.h $(il_include)/il_dcx.h \ +@@ -524,7 +526,8 @@ + $(il_include)/il_sgi.h $(il_include)/il_stack.h \ + $(il_include)/il_states.h $(il_include)/il_targa.h \ + $(il_include)/il_wdp.h \ +- $(all_include)/IL/devil_internal_exports.h ++ $(all_include)/IL/devil_internal_exports.h \ ++ $(il_include)/il_vtf.h + libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS) + libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include) + libILU_la_CFLAGS = $(CFLAGS) @ILU_CFLAGS@ +@@ -689,6 +692,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_targa.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_tiff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_utility.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_vtf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_wal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_wdp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_xpm.Plo@am__quote@ +@@ -800,6 +804,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_targa.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_tiff.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_utility.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_vtf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_wal.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_wdp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_xpm.Plo@am__quote@ +@@ -1224,6 +1229,13 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c + ++libDevIL_la-il_vtf.lo: $(il_src)/il_vtf.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-il_vtf.Tpo -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDevIL_la-il_vtf.Tpo $(DEPDIR)/libDevIL_la-il_vtf.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(il_src)/il_vtf.c' object='libDevIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c ++ + libDevIL_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo -c -o libDevIL_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo $(DEPDIR)/libDevIL_la-ilu_alloc.Plo +@@ -1812,6 +1824,13 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c + ++libIL_la-il_vtf.lo: $(il_src)/il_vtf.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -MT libIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libIL_la-il_vtf.Tpo -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libIL_la-il_vtf.Tpo $(DEPDIR)/libIL_la-il_vtf.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(il_src)/il_vtf.c' object='libIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c ++ + libILU_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libILU_la_CPPFLAGS) $(CPPFLAGS) $(libILU_la_CFLAGS) $(CFLAGS) -MT libILU_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libILU_la-ilu_alloc.Tpo -c -o libILU_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c + @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libILU_la-ilu_alloc.Tpo $(DEPDIR)/libILU_la-ilu_alloc.Plo + diff --git a/extra/devil/03_CVE-2008-5262.diff b/extra/devil/03_CVE-2008-5262.diff new file mode 100644 index 000000000..260c352d4 --- /dev/null +++ b/extra/devil/03_CVE-2008-5262.diff @@ -0,0 +1,38 @@ + +Index: devil/src-IL/src/il_hdr.c +=================================================================== +--- devil.orig/src-IL/src/il_hdr.c 2009-01-15 18:47:34.000000000 +0000 ++++ devil/src-IL/src/il_hdr.c 2009-01-15 18:47:46.000000000 +0000 +@@ -85,7 +85,7 @@ + if (iread(&a, 1, 1) != 1) + return IL_FALSE; + +- while(!done) { ++ while (!done) { + if (iread(&b, 1, 1) != 1) + return IL_FALSE; + if (b == '\n' && a == '\n') +@@ -98,6 +98,10 @@ + if (iread(&a, 1, 1) != 1) + return IL_FALSE; + while (a != '\n') { ++ if (count >= sizeof(buff) - 1) { // Line shouldn't be this long at all. ++ ilSetError(IL_INVALID_FILE_HEADER); ++ return IL_FALSE; ++ } + buff[count] = a; + if (iread(&a, 1, 1) != 1) + return IL_FALSE; +@@ -113,8 +117,9 @@ + //nothing that really changes the appearance of the loaded image... + //(The code as it is now assumes that y contains "-Y" and x contains + //"+X" after the following line) +- //Furthermore, this crashes if the read strings are longer than 2 chars o_O +- sscanf(buff, "%s %d %s %d", y, &Header->Height, x, &Header->Width); ++ ++ // The 2 has to be in the %s format specifier to prevent buffer overruns. ++ sscanf(buff, "%2s %d %2s %d", y, &Header->Height, x, &Header->Width); + + return IL_TRUE; + } + diff --git a/extra/devil/1.7.5-4 b/extra/devil/1.7.5-4 new file mode 100644 index 000000000..ae107366d --- /dev/null +++ b/extra/devil/1.7.5-4 @@ -0,0 +1,1408 @@ + +--- devil-1.7.5.orig/debian/control ++++ devil-1.7.5/debian/control +@@ -0,0 +1,39 @@ ++Source: devil ++Section: devel ++Priority: optional ++Maintainer: Bradley Smith ++Build-Depends: debhelper (>= 7), libpng12-dev, zlib1g-dev, libjpeg62-dev, libtiff4-dev, libmng-dev, liblcms1-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, quilt ++Standards-Version: 3.8.0 ++Homepage: http://openil.sourceforge.net/ ++Vcs-Git: http://git.brad-smith.co.uk/git/debian/pkg-devil.git ++Vcs-Browser: http://git.brad-smith.co.uk/?p=debian/pkg-devil.git ++ ++Package: libdevil1c2 ++Section: libs ++Architecture: any ++Replaces: libdevil1 ++Conflicts: libdevil1 ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: Cross-platform image loading and manipulation toolkit ++ Developer's Image Library (DevIL) is a programmer's toolkit which can load, ++ save and convert a wide variety of image formats. It also offers basic ++ manipulation and filtering capabilities. ++ . ++ DevIL presents a simple programming interface similar to OpenGL's, which is ++ easy for a developer to learn and use. Ultimate control of the images is ++ left to the developer. ++ ++Package: libdevil-dev ++Section: libdevel ++Architecture: any ++Depends: libdevil1c2 (= ${binary:Version}), ${misc:Depends} ++Description: Cross-platform image loading and manipulation toolkit ++ Developer's Image Library (DevIL) is a programmer's toolkit which can ++ load, save and convert a wide variety of image formats. It also offers ++ basic manipulation and filtering capabilities. ++ . ++ DevIL presents a simple programming interface similar to OpenGL's, which is ++ easy for a developer to learn and use. Ultimate control of the images is ++ left to the developer. ++ . ++ This package contains the development files. +--- devil-1.7.5.orig/debian/libdevil1c2.install ++++ devil-1.7.5/debian/libdevil1c2.install +@@ -0,0 +1 @@ ++debian/tmp/usr/lib/*.so.* +--- devil-1.7.5.orig/debian/compat ++++ devil-1.7.5/debian/compat +@@ -0,0 +1 @@ ++7 +--- devil-1.7.5.orig/debian/copyright ++++ devil-1.7.5/debian/copyright +@@ -0,0 +1,38 @@ ++Author: Denton Woods ++Download: http://openil.sf.net/ ++ ++Files: * ++Copyright: (C) 2000-2002 by Denton Woods ++License: LGPL-2+ ++ This package is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ . ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++Files: debian/* ++Copyright: (C) 2008 Bradley Smith ++License: GPL-2+. ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ . ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++On Debian systems, the complete text of the GNU General Public License ++can be found in `/usr/share/common-licenses/GPL-2'. ++ ++On Debian GNU/Linux systems, the complete text of the GNU Lesser General ++Public License can be found in `/usr/share/common-licenses/LGPL-2'. +--- devil-1.7.5.orig/debian/libdevil1c2.lintian-overrides ++++ devil-1.7.5/debian/libdevil1c2.lintian-overrides +@@ -0,0 +1,3 @@ ++# There are multiple libraries in this package, and I don't think we would ++# gain anything by splitting them up. ++libdevil1c2: package-name-doesnt-match-sonames libIL1 libILU1 libILUT1 +--- devil-1.7.5.orig/debian/watch ++++ devil-1.7.5/debian/watch +@@ -0,0 +1,2 @@ ++version=3 ++http://sf.net/openil/DevIL-([\d.]+)\.tar.gz +--- devil-1.7.5.orig/debian/libdevil-dev.docs ++++ devil-1.7.5/debian/libdevil-dev.docs +@@ -0,0 +1,4 @@ ++Libraries.txt ++NEWS ++README ++README.unix +--- devil-1.7.5.orig/debian/changelog ++++ devil-1.7.5/debian/changelog +@@ -0,0 +1,206 @@ ++devil (1.7.5-4) unstable; urgency=low ++ ++ * Actually fix CVE-2008-5262. Closes: #512122. ++ ++ -- Bradley Smith Sat, 17 Jan 2009 15:01:18 +0000 ++ ++devil (1.7.5-3) unstable; urgency=low ++ ++ * 03_CVE-2008-5262.diff - Backport fix for CVE-2008-5262. ++ Closes: #511844. ++ ++ -- Bradley Smith Thu, 15 Jan 2009 18:50:11 +0000 ++ ++devil (1.7.5-2) unstable; urgency=low ++ ++ * add_missing_files.diff - Add files missed from tarball. Closes: #511297 ++ ++ -- Bradley Smith Sat, 10 Jan 2009 20:47:32 +0000 ++ ++devil (1.7.5-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ -- Bradley Smith Wed, 31 Dec 2008 12:38:16 +0000 ++ ++devil (1.7.4-1) experimental; urgency=low ++ ++ * New upstream release. ++ * Update maintainer email. ++ * 00_endian_and_ILvoid_fixes.diff - Refresh. ++ * 01_fix_as-needed.diff - Refresh. ++ ++ -- Bradley Smith Tue, 30 Dec 2008 21:16:58 +0000 ++ ++devil (1.7.2-1) experimental; urgency=low ++ ++ * New upstream release. Closes: #499626 ++ * Refresh 00_misc_fixes.diff and rename to 00_endian_and_ILvoid_fixes.diff ++ * Refresh 01_fix_as-needed.diff ++ * Re-add debian/watch file. ++ * Add Homepage field. ++ * Add Vcs-* fields. ++ * Adjust descriptions to make the -dev package match the non-dev package. ++ * Convert copyright to machine readable format. ++ * Update compat version to 7 and upgrade debhelper build-depend to (>= 7). ++ * Remove unneeded docs from installation. ++ * Add descriptions to lintian override and patches. ++ ++ -- Bradley Smith Fri, 26 Sep 2008 15:25:45 +0100 ++ ++devil (1.6.8-rc2-3) unstable; urgency=low ++ ++ * Fix typo in 00_misc_fixes.diff. ++ * Remove broken watch file. Not adding a new one since upstreams ++ repository is full of broken versioning. ++ ++ -- Bradley Smith Wed, 23 Jul 2008 21:45:53 +0100 ++ ++devil (1.6.8-rc2-2) unstable; urgency=low ++ ++ * Build with -DGLX_GLXEXT_LEGACY to avoid implicit pointer conversion. ++ Closes: #490975 ++ * Fix il_endian.h patch to fix FTBFS's on big endian machines. ++ ++ -- Bradley Smith Sun, 20 Jul 2008 14:21:18 +0100 ++ ++devil (1.6.8-rc2-1) unstable; urgency=low ++ ++ * New Upstream Release. ++ * New Maintainer. Closes: #471982. ++ * Overhaul Packaging. ++ - Update Standards-Version to 3.8.0. ++ + Support parallel=N in DEB_BUILD_OPTIONS. ++ - Correct section for libdevil-dev. ++ - Remove autotools dependency, not longer needed. ++ - Add quilt patch system. ++ + 00_misc_fixes.diff - Move changes to top srcdir to patch. ++ + 01_fix_as-needed.diff - Fix --as-needed flag in libtool. ++ - Correct debian/copyright ++ - Add watch file. ++ - Replace obsolete dependency (libglut3-dev). Closes: #394488. ++ ++ -- Bradley Smith Sun, 06 Jul 2008 19:27:50 +0100 ++ ++devil (1.6.7-5.2) unstable; urgency=low ++ ++ * NMU. ++ * debian/control: Build-Depend on automake1.9 instead of automake1.8, to ++ stop blocking the removal of automake1.8. (Closes: #472594) ++ ++ -- Eric Dorland Sat, 03 May 2008 00:23:33 -0400 ++ ++devil (1.6.7-5.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Turned the ILvoid type into the void type, as suggested by tbm (thanks to ++ Per Hansen as well for the proposed patch). Closes: #376620. ++ * Made the package binNMu-safe by using binary:Version instead of ++ Source-Version. ++ ++ -- Cyril Brulebois Sat, 29 Sep 2007 14:37:27 +0200 ++ ++devil (1.6.7-5) unstable; urgency=low ++ ++ * Ack NMU ++ * debian/compat, debian/control: use debhelper 5 ++ * debian/control: build-depend on libpng12-dev ++ * debian/control: build-depend on automake1.8 ++ * debian/control: build-depend on libgl1-mesa-dev ++ * We are getting exceedingly good at handling changes in the worst ++ possible way ever. I want back to 1999! See all the above entries. ++ closes: bug#358089 ++ * src-IL/src/il_png.c: Fix AMD64 problems. Thanks Mike McLean. closes: ++ bug#314829 ++ * debian/control: standards version 3.7.2; no other changes seem to be ++ required ++ * debian/control: add Section to source package ++ * debian/rules: funny... move code that copies autofoo stuff AFTER the line ++ that removes it ++ * src-IL/src/Makefile.am: remove @LIBGIF@; autoconf test does not exist, so ++ it never actually worked, methinks. ++ ++ -- Marcelo E. Magallon Fri, 05 May 2006 08:27:12 -0600 ++ ++devil (1.6.7-4.1) unstable; urgency=medium ++ ++ * NMU (with maintainer permission.) ++ * Recompiled with gcc 4.0 and changed library package name to ++ libdevil1c2 (the big C++ ABI change.) ++ ++ -- Federico Di Gregorio Thu, 21 Jul 2005 11:50:41 +0200 ++ ++devil (1.6.7-4) unstable; urgency=medium ++ ++ * dinstall is being a jerk. ++ ++ -- Marcelo E. Magallon Mon, 24 Jan 2005 21:25:22 -0600 ++ ++devil (1.6.7-3) unstable; urgency=medium ++ ++ * src-IL/include/il_endian.h: patch from Federico Di Gregorio to fix ++ endianess issues. Sorry about the delay and misunderstandings! Thanks ++ Federico. (closes: bug#288314) ++ ++ -- Marcelo E. Magallon Sun, 23 Jan 2005 21:06:34 -0600 ++ ++devil (1.6.7-2) unstable; urgency=medium ++ ++ * debian/rules: hideous hack to work around the fact that the upstream ++ tarball is dirty. Thanks Federico Di Gregorio (closes: bug#288314) ++ ++ -- Marcelo E. Magallon Mon, 03 Jan 2005 19:57:42 -0600 ++ ++devil (1.6.7-1) unstable; urgency=medium ++ ++ * New upstream release ++ * debian/rules: very fscked up hack to get libtool working. ++ ++ -- Marcelo E. Magallon Tue, 02 Nov 2004 16:53:45 -0600 ++ ++devil (1.6.5-5.1) unstable; urgency=medium ++ ++ * Non-Maintainer Upload. ++ * debian/control: switch to libtiff4-dev (closes: #262795). ++ * src-IL/include/il_endian.h: patch from Michel Dänzer to fix ++ endianness detection (closes: #222608). ++ ++ -- Jordi Mallach Thu, 5 Aug 2004 01:42:43 +0200 ++ ++devil (1.6.5-5) unstable; urgency=low ++ ++ * build and install libIL_wrap.a (closes: bug#192633) ++ * debian/rules: strip out -L flags from dependency_libs in .la files (-L ++ flags should not be needed at all) (closes: bug#192554) ++ ++ -- Marcelo E. Magallon Sun, 11 May 2003 22:47:23 +0200 ++ ++devil (1.6.5-4) unstable; urgency=low ++ ++ * rebuild, for some reason OpenGL support is missing from -3 on i386. ++ ++ -- Marcelo E. Magallon Wed, 12 Mar 2003 22:41:52 +0100 ++ ++devil (1.6.5-3) unstable; urgency=low ++ ++ * src-IL/src/il_pal.c, src-IL/src/il_psd.c: fixed signedness related ++ warnings. ++ * include/IL/il.h: typedef ILbyte as 'signed char' (closes: bug#181226) ++ ++ -- Marcelo E. Magallon Mon, 17 Feb 2003 13:10:16 +0100 ++ ++devil (1.6.5-2) unstable; urgency=low ++ ++ * debian/control: changed description (closes: bug#177997) ++ ++ -- Marcelo E. Magallon Sun, 09 Feb 2003 17:34:30 +0100 ++ ++devil (1.6.5-1) unstable; urgency=low ++ ++ * Initial Release. ++ * src-ILU/include/ilu_region.h: fetched out of CVS, missing in upstream ++ tarball ++ * src-ILU/src/Makefile.am: it's top_builddir, not top_srcdir ++ ++ -- Marcelo E. Magallon Sun, 19 Jan 2003 13:18:49 +0100 ++ +--- devil-1.7.5.orig/debian/libdevil-dev.install ++++ devil-1.7.5/debian/libdevil-dev.install +@@ -0,0 +1,4 @@ ++debian/tmp/usr/lib/*.so ++debian/tmp/usr/lib/*.la ++debian/tmp/usr/lib/*.a ++debian/tmp/usr/include/ +--- devil-1.7.5.orig/debian/rules ++++ devil-1.7.5/debian/rules +@@ -0,0 +1,82 @@ ++#!/usr/bin/make -f ++ ++include /usr/share/quilt/quilt.make ++ ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++ ++ ++CFLAGS = -Wall -g -DGLX_GLXEXT_LEGACY ++LDFLAGS = -lm -lGL -Wl,--as-needed ++ ++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ++ CFLAGS += -O0 ++else ++ CFLAGS += -O2 ++endif ++ ++ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ++ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ++MAKEFLAGS += -j$(NUMJOBS) ++endif ++ ++ ++ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) ++DEBUG_FLAGS = --disable-release ++endif ++ ++configure: configure-stamp ++configure-stamp: $(QUILT_STAMPFN) ++ dh_testdir ++ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ++ ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ ++ --infodir=\$${prefix}/share/info --enable-static=yes \ ++ --enable-shared=yes --host=$(DEB_HOST_GNU_TYPE) \ ++ --build=$(DEB_BUILD_GNU_TYPE) $(DEBUG_FLAGS) \ ++ --enable-IL=yes --enable-ILU=yes --enable-ILUT=yes ++ touch "$@" ++ ++build: build-stamp ++build-stamp: configure ++ dh_testdir ++ $(MAKE) ++ touch "$@" ++ ++clean: unpatch ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp configure-stamp ++ [ ! -f Makefile ] || $(MAKE) distclean ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_prep ++ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp ++ rm debian/tmp/usr/share/info/DevIL_manual.info ++ mkdir -p debian/libdevil1c2/usr/share/lintian/overrides/ ++ cp -a debian/libdevil1c2.lintian-overrides \ ++ debian/libdevil1c2/usr/share/lintian/overrides/libdevil1c2 ++ ++binary-indep: build install ++ ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installchangelogs ChangeLog ++ dh_installdocs ++ dh_install --fail-missing ++ dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++ dh_makeshlibs ++ dh_installdeb ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install configure +--- devil-1.7.5.orig/debian/patches/00_endian_and_ILvoid_fixes.diff ++++ devil-1.7.5/debian/patches/00_endian_and_ILvoid_fixes.diff +@@ -0,0 +1,15 @@ ++# Fixes FTBFS with GCC 4.2: '' has incomplete type ++# Fixes FTBFS on big endian architectures. ++Index: devil/src-IL/include/il_endian.h ++=================================================================== ++--- devil.orig/src-IL/include/il_endian.h 2008-12-30 21:05:37.000000000 +0000 +++++ devil/src-IL/include/il_endian.h 2008-12-30 21:08:10.000000000 +0000 ++@@ -17,7 +17,7 @@ ++ ++ #ifdef WORDS_BIGENDIAN //this is defined by ./configure ++ #ifndef __BIG_ENDIAN__ ++- #define __BIG_ENDIAN__ +++ #define __BIG_ENDIAN__ 1 ++ #endif ++ #endif ++ +--- devil-1.7.5.orig/debian/patches/02_add_missing_files.diff ++++ devil-1.7.5/debian/patches/02_add_missing_files.diff +@@ -0,0 +1,894 @@ ++Index: devil/lib/Makefile.am ++=================================================================== ++--- devil.orig/lib/Makefile.am 2009-01-10 20:43:26.000000000 +0000 +++++ devil/lib/Makefile.am 2009-01-10 20:54:27.000000000 +0000 ++@@ -69,8 +69,8 @@ ++ ++ libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include) ++ libIL_la_CFLAGS = $(CFLAGS) @IL_CFLAGS@ ++-libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c ++-libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h +++libIL_la_SOURCES = $(il_src)/il_alloc.c $(il_src)/il_doom.c $(il_src)/il_stack.c $(il_src)/il_pcx.c $(il_src)/il_rle.c $(il_src)/il_bits.c $(il_src)/il_endian.c $(il_src)/il_jpeg.c $(il_src)/il_pic.c $(il_src)/il_sgi.c $(il_src)/il_bmp.c $(il_src)/il_error.c $(il_src)/il_lif.c $(il_src)/il_png.c $(il_src)/il_states.c $(il_src)/il_convbuff.c $(il_src)/il_files.c $(il_src)/il_main.c $(il_src)/il_pnm.c $(il_src)/il_targa.c $(il_src)/il_wdp.c $(il_src)/il_convert.c $(il_src)/il_gif.c $(il_src)/il_manip.c $(il_src)/il_profiles.c $(il_src)/il_tiff.c $(il_src)/il_cut.c $(il_src)/il_header.c $(il_src)/il_mdl.c $(il_src)/il_quantizer.c $(il_src)/il_utility.c $(il_src)/il_dcx.c $(il_src)/il_icon.c $(il_src)/il_mng.c $(il_src)/il_raw.c $(il_src)/il_wal.c $(il_src)/il_dds.c $(il_src)/il_internal.c $(il_src)/il_pal.c $(il_src)/il_rawdata.c $(il_src)/il_devil.c $(il_src)/il_io.c $(il_src)/il_pcd.c $(il_src)/il_register.c $(il_src)/il_psd.c $(il_src)/il_fastconv.c $(il_src)/il_neuquant.c $(il_src)/il_dds-save.c $(il_src)/il_psp.c $(il_src)/il_pix.c $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c $(il_src)/il_icns.c $(il_src)/il_jp2.c $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c $(il_src)/il_vtf.c +++libIL_la_SOURCES += $(il_include)/altivec_common.h $(il_include)/altivec_typeconversion.h $(il_include)/il_alloc.h $(il_include)/il_bits.h $(il_include)/il_bmp.h $(il_include)/il_dcx.h $(il_include)/il_dds.h $(il_include)/il_doompal.h $(il_include)/il_endian.h $(il_include)/il_exr.h $(il_include)/il_files.h $(il_include)/il_gif.h $(il_include)/il_hdr.h $(il_include)/il_icns.h $(il_include)/il_icon.h $(il_include)/il_internal.h $(il_include)/il_jp2.h $(il_include)/il_jpeg.h $(il_include)/il_lif.h $(il_include)/il_manip.h $(il_include)/il_mdl.h $(il_include)/il_pal.h $(il_include)/il_pcx.h $(il_include)/il_pic.h $(il_include)/il_pnm.h $(il_include)/il_psd.h $(il_include)/il_psp.h $(il_include)/il_q2pal.h $(il_include)/il_register.h $(il_include)/il_rle.h $(il_include)/il_sgi.h $(il_include)/il_stack.h $(il_include)/il_states.h $(il_include)/il_targa.h $(il_include)/il_wdp.h $(all_include)/IL/devil_internal_exports.h $(il_include)/il_vtf.h ++ libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS) ++ ++ libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include) ++Index: devil/src-IL/include/il_vtf.h ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ devil/src-IL/include/il_vtf.h 2009-01-10 20:54:27.000000000 +0000 ++@@ -0,0 +1,130 @@ +++//----------------------------------------------------------------------------- +++// +++// ImageLib Sources +++// Copyright (C) 2000-2008 by Denton Woods +++// Last modified: 12/27/2008 +++// +++// Filename: src-IL/include/il_vtf.h +++// +++// Description: Reads from and writes to a Valve Texture Format (.vtf) file. +++// These are used in Valve's Source games. VTF specs available +++// from http://developer.valvesoftware.com/wiki/VTF. +++// +++//----------------------------------------------------------------------------- +++ +++ +++#ifndef VTF_H +++#define VTF_H +++ +++#include "il_internal.h" +++ +++#ifdef _MSC_VER +++#pragma pack(push, vtf_struct, 1) +++#elif defined(MACOSX) || defined(__GNUC__) +++#pragma pack(1) +++#endif +++ +++typedef struct VTFHEAD +++{ +++ ILubyte Signature[4]; // File signature ("VTF\0"). +++ ILuint Version[2]; // version[0].version[1] (currently 7.2). +++ ILuint HeaderSize; // Size of the header struct (16 byte aligned; currently 80 bytes). +++ ILushort Width; // Width of the largest mipmap in pixels. Must be a power of 2. +++ ILushort Height; // Height of the largest mipmap in pixels. Must be a power of 2. +++ ILuint Flags; // VTF flags. +++ ILushort Frames; // Number of frames, if animated (1 for no animation). +++ ILushort FirstFrame; // First frame in animation (0 based). +++ ILubyte Padding0[4]; // reflectivity padding (16 byte alignment). +++ ILfloat Reflectivity[3]; // reflectivity vector. +++ ILubyte Padding1[4]; // reflectivity padding (8 byte packing). +++ ILfloat BumpmapScale; // Bumpmap scale. +++ ILuint HighResImageFormat; // High resolution image format. +++ ILubyte MipmapCount; // Number of mipmaps. +++ ILint LowResImageFormat; // Low resolution image format (always DXT1). +++ ILubyte LowResImageWidth; // Low resolution image width. +++ ILubyte LowResImageHeight; // Low resolution image height. +++ ILushort Depth; // Depth of the largest mipmap in pixels. +++ // Must be a power of 2. Can be 0 or 1 for a 2D texture (v7.2 only). +++} IL_PACKSTRUCT VTFHEAD; +++ +++#if defined(MACOSX) || defined(__GNUC__) +++#pragma pack() +++#elif _MSC_VER +++#pragma pack(pop, vtf_struct) +++#endif +++ +++enum +++{ +++ IMAGE_FORMAT_NONE = -1, +++ IMAGE_FORMAT_RGBA8888 = 0, +++ IMAGE_FORMAT_ABGR8888, +++ IMAGE_FORMAT_RGB888, +++ IMAGE_FORMAT_BGR888, +++ IMAGE_FORMAT_RGB565, +++ IMAGE_FORMAT_I8, +++ IMAGE_FORMAT_IA88, +++ IMAGE_FORMAT_P8, +++ IMAGE_FORMAT_A8, +++ IMAGE_FORMAT_RGB888_BLUESCREEN, +++ IMAGE_FORMAT_BGR888_BLUESCREEN, +++ IMAGE_FORMAT_ARGB8888, +++ IMAGE_FORMAT_BGRA8888, +++ IMAGE_FORMAT_DXT1, +++ IMAGE_FORMAT_DXT3, +++ IMAGE_FORMAT_DXT5, +++ IMAGE_FORMAT_BGRX8888, +++ IMAGE_FORMAT_BGR565, +++ IMAGE_FORMAT_BGRX5551, +++ IMAGE_FORMAT_BGRA4444, +++ IMAGE_FORMAT_DXT1_ONEBITALPHA, +++ IMAGE_FORMAT_BGRA5551, +++ IMAGE_FORMAT_UV88, +++ IMAGE_FORMAT_UVWQ8888, +++ IMAGE_FORMAT_RGBA16161616F, +++ IMAGE_FORMAT_RGBA16161616, +++ IMAGE_FORMAT_UVLX8888 +++}; +++ +++enum +++{ +++ TEXTUREFLAGS_POINTSAMPLE = 0x00000001, +++ TEXTUREFLAGS_TRILINEAR = 0x00000002, +++ TEXTUREFLAGS_CLAMPS = 0x00000004, +++ TEXTUREFLAGS_CLAMPT = 0x00000008, +++ TEXTUREFLAGS_ANISOTROPIC = 0x00000010, +++ TEXTUREFLAGS_HINT_DXT5 = 0x00000020, +++ TEXTUREFLAGS_NOCOMPRESS = 0x00000040, +++ TEXTUREFLAGS_NORMAL = 0x00000080, +++ TEXTUREFLAGS_NOMIP = 0x00000100, +++ TEXTUREFLAGS_NOLOD = 0x00000200, +++ TEXTUREFLAGS_MINMIP = 0x00000400, +++ TEXTUREFLAGS_PROCEDURAL = 0x00000800, +++ TEXTUREFLAGS_ONEBITALPHA = 0x00001000, +++ TEXTUREFLAGS_EIGHTBITALPHA = 0x00002000, +++ TEXTUREFLAGS_ENVMAP = 0x00004000, +++ TEXTUREFLAGS_RENDERTARGET = 0x00008000, +++ TEXTUREFLAGS_DEPTHRENDERTARGET = 0x00010000, +++ TEXTUREFLAGS_NODEBUGOVERRIDE = 0x00020000, +++ TEXTUREFLAGS_SINGLECOPY = 0x00040000, +++ TEXTUREFLAGS_ONEOVERMIPLEVELINALPHA = 0x00080000, +++ TEXTUREFLAGS_PREMULTCOLORBYONEOVERMIPLEVEL = 0x00100000, +++ TEXTUREFLAGS_NORMALTODUDV = 0x00200000, +++ TEXTUREFLAGS_ALPHATESTMIPGENERATION = 0x00400000, +++ TEXTUREFLAGS_NODEPTHBUFFER = 0x00800000, +++ TEXTUREFLAGS_NICEFILTERED = 0x01000000, +++ TEXTUREFLAGS_CLAMPU = 0x02000000 +++}; +++ +++ +++ +++// Internal functions +++ILboolean iIsValidVtf(void); +++ILboolean iGetVtfHead(VTFHEAD *Header); +++ILboolean iCheckVtf(VTFHEAD *Header); +++ILboolean iLoadVtfInternal(void); +++ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header); +++ILboolean VtfReadData(void); +++ILboolean VtfDecompressDXT1(ILimage *Image); +++ILboolean VtfDecompressDXT5(ILimage *Image); +++ +++#endif//VTF_H ++Index: devil/src-IL/src/il_vtf.c ++=================================================================== ++--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++++ devil/src-IL/src/il_vtf.c 2009-01-10 20:54:27.000000000 +0000 ++@@ -0,0 +1,612 @@ +++//----------------------------------------------------------------------------- +++// +++// ImageLib Sources +++// Copyright (C) 2000-2008 by Denton Woods +++// Last modified: 12/29/2008 +++// +++// Filename: src-IL/src/il_vtf.c +++// +++// Description: Reads from and writes to a Valve Texture Format (.vtf) file. +++// These are used in Valve's Source games. VTF specs available +++// from http://developer.valvesoftware.com/wiki/VTF. +++// +++//----------------------------------------------------------------------------- +++ +++ +++#include "il_internal.h" +++#ifndef IL_NO_VTF +++#include "il_vtf.h" +++#include "il_dds.h" +++ +++// the max and min functions are not present, at least not on unixes +++#ifndef max +++ #define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) +++#endif +++ +++#ifndef min +++ #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) +++#endif +++ +++//@TODO: Get rid of these globals. +++//static VTFHEAD Head; +++ +++ +++//! Checks if the file specified in FileName is a valid VTF file. +++ILboolean ilIsValidVtf(ILconst_string FileName) +++{ +++ ILHANDLE VtfFile; +++ ILboolean bVtf = IL_FALSE; +++ +++ if (!iCheckExtension(FileName, IL_TEXT("vtf"))) { +++ ilSetError(IL_INVALID_EXTENSION); +++ return bVtf; +++ } +++ +++ VtfFile = iopenr(FileName); +++ if (VtfFile == NULL) { +++ ilSetError(IL_COULD_NOT_OPEN_FILE); +++ return bVtf; +++ } +++ +++ bVtf = ilIsValidVtfF(VtfFile); +++ icloser(VtfFile); +++ +++ return bVtf; +++} +++ +++ +++//! Checks if the ILHANDLE contains a valid VTF file at the current position. +++ILboolean ilIsValidVtfF(ILHANDLE File) +++{ +++ ILuint FirstPos; +++ ILboolean bRet; +++ +++ iSetInputFile(File); +++ FirstPos = itell(); +++ bRet = iIsValidVtf(); +++ iseek(FirstPos, IL_SEEK_SET); +++ +++ return bRet; +++} +++ +++ +++//! Checks if Lump is a valid VTF lump. +++ILboolean ilIsValidVtfL(const void *Lump, ILuint Size) +++{ +++ iSetInputLump(Lump, Size); +++ return iIsValidVtf(); +++} +++ +++ +++// Internal function used to get the VTF header from the current file. +++ILboolean iGetVtfHead(VTFHEAD *Header) +++{ +++ iread(Header->Signature, 1, 4); +++ Header->Version[0] = GetLittleUInt(); +++ Header->Version[1] = GetLittleUInt(); +++ Header->HeaderSize = GetLittleUInt(); +++ Header->Width = GetLittleUShort(); +++ Header->Height = GetLittleUShort(); +++ Header->Flags = GetLittleUInt(); +++ Header->Frames = GetLittleUShort(); +++ Header->FirstFrame = GetLittleUShort(); +++ iseek(4, IL_SEEK_CUR); // Padding +++ Header->Reflectivity[0] = GetLittleFloat(); +++ Header->Reflectivity[1] = GetLittleFloat(); +++ Header->Reflectivity[2] = GetLittleFloat(); +++ iseek(4, IL_SEEK_CUR); // Padding +++ Header->BumpmapScale = GetLittleFloat(); +++ Header->HighResImageFormat = GetLittleUInt(); +++ Header->MipmapCount = (ILubyte)igetc(); +++ Header->LowResImageFormat = GetLittleInt(); +++ Header->LowResImageWidth = (ILubyte)igetc(); +++ Header->LowResImageHeight = (ILubyte)igetc(); +++ Header->Depth = GetLittleUShort(); +++ +++ iseek(Header->HeaderSize - sizeof(VTFHEAD), IL_SEEK_CUR); +++ +++ return IL_TRUE; +++} +++ +++ +++// Internal function to get the header and check it. +++ILboolean iIsValidVtf() +++{ +++ VTFHEAD Head; +++ +++ if (!iGetVtfHead(&Head)) +++ return IL_FALSE; +++ iseek(-(ILint)sizeof(VTFHEAD), IL_SEEK_CUR); +++ +++ return iCheckVtf(&Head); +++} +++ +++ +++//@TODO: Add more checks. +++// Should we check for Frames, MipmapCount and Depth != 0? +++ +++// Internal function used to check if the HEADER is a valid VTF header. +++ILboolean iCheckVtf(VTFHEAD *Header) +++{ +++ // The file signature is "VTF\0". +++ if ((Header->Signature[0] != 'V') || (Header->Signature[1] != 'T') || (Header->Signature[2] != 'F') +++ || (Header->Signature[3] != 0)) +++ return IL_FALSE; +++ // Are there other versions available yet? +++ if (Header->Version[0] != 7) +++ return IL_FALSE; +++ // We have 7.0 through 7.4 as of 12/27/2008. +++ if (Header->Version[1] > 4) +++ return IL_FALSE; +++ // May change in future version of the specifications. +++ // 80 is through version 7.2, and 96/104 are through 7.4. +++ // This must be 16-byte aligned, but something is outputting headers with 104. +++ if ((Header->HeaderSize != 80) && (Header->HeaderSize != 96) && (Header->HeaderSize != 104)) +++ return IL_FALSE; +++ +++ // 0 is an invalid dimension +++ if (Header->Width == 0 || Header->Height == 0) +++ return IL_FALSE; +++ // Width and Height must be powers of 2. +++ if ((ilNextPower2(Header->Width) != Header->Width) || (ilNextPower2(Header->Height) != Header->Height)) +++ return IL_FALSE; +++ if ((ilNextPower2(Header->LowResImageWidth) != Header->LowResImageWidth) +++ || (ilNextPower2(Header->LowResImageHeight) != Header->LowResImageHeight)) +++ return IL_FALSE; +++ // In addition, the LowResImage has to have dimensions no greater than 16. +++ if ((Header->LowResImageWidth > 16) || (Header->LowResImageHeight > 16) +++ || (Header->LowResImageWidth == 0) || (Header->LowResImageHeight == 0)) +++ return IL_FALSE; +++ // And the LowResImage has to have dimensions less than or equal to the main image. +++ if ((Header->LowResImageWidth > Header->Width) || (Header->LowResImageHeight > Header->Height)) +++ return IL_FALSE; +++ // The LowResImage must be in DXT1 format. +++ if (Header->LowResImageFormat != IMAGE_FORMAT_DXT1) +++ return IL_FALSE; +++ +++ return IL_TRUE; +++} +++ +++ +++//! Reads a VTF file +++ILboolean ilLoadVtf(ILconst_string FileName) +++{ +++ ILHANDLE VtfFile; +++ ILboolean bVtf = IL_FALSE; +++ +++ VtfFile = iopenr(FileName); +++ if (VtfFile == NULL) { +++ ilSetError(IL_COULD_NOT_OPEN_FILE); +++ return bVtf; +++ } +++ +++ bVtf = ilLoadVtfF(VtfFile); +++ icloser(VtfFile); +++ +++ return bVtf; +++} +++ +++ +++//! Reads an already-opened VTF file +++ILboolean ilLoadVtfF(ILHANDLE File) { +++ ILuint FirstPos; +++ ILboolean bRet; +++ +++ iSetInputFile(File); +++ FirstPos = itell(); +++ bRet = iLoadVtfInternal(); +++ iseek(FirstPos, IL_SEEK_SET); +++ +++ return bRet; +++} +++ +++ +++//! Reads from a memory "lump" that contains a VTF +++ILboolean ilLoadVtfL(const void *Lump, ILuint Size) +++{ +++ iSetInputLump(Lump, Size); +++ return iLoadVtfInternal(); +++} +++ +++ +++// Internal function used to load the VTF. +++ILboolean iLoadVtfInternal() +++{ +++ ILboolean bVtf = IL_TRUE; +++ ILimage *Image, *BaseImage; +++ ILenum Format, Type; +++ ILint Frame, Mipmap; +++ ILuint SizeOfData, Channels, k; +++ ILubyte *CompData = NULL, SwapVal, *Data16Bit, *Temp; +++ VTFHEAD Head; +++ ILuint CurName; +++ +++ if (iCurImage == NULL) { +++ ilSetError(IL_ILLEGAL_OPERATION); +++ return IL_FALSE; +++ } +++ CurName = ilGetCurName(); +++ +++ if (!iGetVtfHead(&Head)) +++ return IL_FALSE; +++ if (!iCheckVtf(&Head)) { +++ ilSetError(IL_INVALID_FILE_HEADER); +++ return IL_FALSE; +++ } +++ +++ //@TODO: Take care of animation chains soon. +++ //if (Head.Frames > 1) { +++ // ilSetError(IL_FORMAT_NOT_SUPPORTED); +++ // return IL_FALSE; +++ //} +++ //@TODO: Find out how to tell whether the environment map is cubic or spherical. +++ if (Head.Flags & TEXTUREFLAGS_ENVMAP) { +++ ilSetError(IL_FORMAT_NOT_SUPPORTED); +++ return IL_FALSE; +++ } +++ +++ // Skip the low resolution image. This is just a thumbnail. +++ // The block size is 8, and the compression ratio is 6:1. +++ SizeOfData = max(Head.LowResImageWidth * Head.LowResImageHeight / 2, 8); +++ iseek(SizeOfData, IL_SEEK_CUR); +++ +++ //@TODO: Make this a helper function that set channels, bpc and format. +++ switch (Head.HighResImageFormat) +++ { +++ case IMAGE_FORMAT_DXT1: //@TODO: Should we make DXT1 channels = 3? +++ case IMAGE_FORMAT_DXT1_ONEBITALPHA: +++ case IMAGE_FORMAT_DXT3: +++ case IMAGE_FORMAT_DXT5: +++ Channels = 4; +++ Format = IL_RGBA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGR888: +++ case IMAGE_FORMAT_BGR888_BLUESCREEN: +++ Channels = 3; +++ Format = IL_BGR; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGRA8888: +++ Channels = 4; +++ Format = IL_BGRA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGRX8888: +++ Channels = 3; +++ Format = IL_BGR; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_RGB888: +++ case IMAGE_FORMAT_RGB888_BLUESCREEN: +++ Channels = 3; +++ Format = IL_RGB; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_RGBA8888: +++ Channels = 4; +++ Format = IL_RGBA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_RGBA16161616: // 16-bit shorts +++ Channels = 4; +++ Format = IL_RGBA; +++ Type = IL_UNSIGNED_SHORT; +++ break; +++ case IMAGE_FORMAT_RGBA16161616F: // 16-bit floats +++ Channels = 4; +++ Format = IL_RGBA; +++ Type = IL_FLOAT; +++ break; +++ case IMAGE_FORMAT_I8: // 8-bit luminance data +++ Channels = 1; +++ Format = IL_LUMINANCE; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_IA88: // 8-bit luminance and alpha data +++ Channels = 2; +++ Format = IL_LUMINANCE_ALPHA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_A8: // 8-bit alpha data +++ Channels = 1; +++ Format = IL_ALPHA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_ARGB8888: +++ Channels = 4; +++ Format = IL_BGRA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_ABGR8888: +++ Channels = 4; +++ Format = IL_RGBA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_RGB565: +++ Channels = 3; +++ Format = IL_RGB; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGR565: +++ Channels = 3; +++ Format = IL_BGR; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGRA5551: +++ Channels = 4; +++ Format = IL_BGRA; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ case IMAGE_FORMAT_BGRX5551: // Unused alpha channel +++ Channels = 3; +++ Format = IL_BGR; +++ Type = IL_UNSIGNED_BYTE; +++ break; +++ +++ default: +++ ilSetError(IL_FORMAT_NOT_SUPPORTED); +++ return IL_FALSE; +++ } +++ +++ if (!ilTexImage(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL)) +++ return IL_FALSE; +++ // The origin should be in the upper left. +++ iCurImage->Origin = IL_ORIGIN_UPPER_LEFT; +++ // Create any mipmaps. +++ VtfInitMipmaps(iCurImage, &Head); +++ +++ // Create our animation chain +++ BaseImage = Image = iCurImage; // Top-level image +++ for (Frame = 1; Frame < Head.Frames; Frame++) { +++ Image->Next = ilNewImageFull(Head.Width, Head.Height, Head.Depth, Channels, Format, Type, NULL); +++ if (Image->Next == NULL) +++ return IL_FALSE; +++ Image = Image->Next; +++ // The origin should be in the upper left. +++ Image->Origin = IL_ORIGIN_UPPER_LEFT; +++ +++ // Create our mipmaps for each frame. +++ VtfInitMipmaps(Image, &Head); +++ } +++ +++ // We want to put the smallest mipmap at the end, but it is first in the file, so we count backwards. +++ for (Mipmap = Head.MipmapCount - 1; Mipmap >= 0; Mipmap--) { +++ // Frames are in the normal order. +++ for (Frame = 0; Frame < Head.Frames; Frame++) { +++ //@TODO: Would probably be quicker to do the linked list traversal manually here. +++ ilBindImage(CurName); +++ ilActiveImage(Frame); +++ ilActiveMipmap(Mipmap); +++ Image = iCurImage; +++ +++ switch (Head.HighResImageFormat) +++ { +++ // DXT1 compression +++ case IMAGE_FORMAT_DXT1: +++ case IMAGE_FORMAT_DXT1_ONEBITALPHA: +++ // The block size is 8. +++ SizeOfData = max(Image->Width * Image->Height * Image->Depth / 2, 8); +++ CompData = ialloc(SizeOfData); // Gives a 6:1 compression ratio (or 8:1 for DXT1 with alpha) +++ iread(CompData, 1, SizeOfData); +++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { +++ Image->DxtcSize = SizeOfData; +++ Image->DxtcData = CompData; +++ Image->DxtcFormat = IL_DXT5; +++ CompData = NULL; +++ } +++ bVtf = DecompressDXT1(Image, CompData); +++ break; +++ +++ // DXT3 compression +++ case IMAGE_FORMAT_DXT3: +++ // The block size is 16. +++ SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16); +++ CompData = ialloc(SizeOfData); // Gives a 4:1 compression ratio +++ iread(CompData, 1, SizeOfData); +++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { +++ Image->DxtcSize = SizeOfData; +++ Image->DxtcData = CompData; +++ Image->DxtcFormat = IL_DXT3; +++ CompData = NULL; +++ } +++ bVtf = DecompressDXT3(Image, CompData); +++ break; +++ +++ // DXT5 compression +++ case IMAGE_FORMAT_DXT5: +++ // The block size is 16. +++ SizeOfData = max(Image->Width * Image->Height * Image->Depth, 16); +++ CompData = ialloc(SizeOfData); // Gives a 4:1 compression ratio +++ iread(CompData, 1, SizeOfData); +++ if (ilGetInteger(IL_KEEP_DXTC_DATA) == IL_TRUE) { +++ Image->DxtcSize = SizeOfData; +++ Image->DxtcData = CompData; +++ Image->DxtcFormat = IL_DXT5; +++ CompData = NULL; +++ } +++ bVtf = DecompressDXT5(Image, CompData); +++ break; +++ +++ // Uncompressed BGR(A) data (24-bit and 32-bit) +++ case IMAGE_FORMAT_BGR888: +++ case IMAGE_FORMAT_BGRA8888: +++ // Uncompressed RGB(A) data (24-bit and 32-bit) +++ case IMAGE_FORMAT_RGB888: +++ case IMAGE_FORMAT_RGBA8888: +++ // Uncompressed 16-bit shorts +++ case IMAGE_FORMAT_RGBA16161616: +++ // Luminance data only +++ case IMAGE_FORMAT_I8: +++ // Luminance and alpha data +++ case IMAGE_FORMAT_IA88: +++ // Alpha data only +++ case IMAGE_FORMAT_A8: +++ // We will ignore the part about the bluescreen right now. +++ // I could not find any information about it. +++ case IMAGE_FORMAT_RGB888_BLUESCREEN: +++ case IMAGE_FORMAT_BGR888_BLUESCREEN: +++ // Just copy the data over - no compression. +++ if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) +++ bVtf = IL_FALSE; +++ else +++ bVtf = IL_TRUE; +++ break; +++ +++ // Uncompressed 24-bit data with an unused alpha channel (we discard it) +++ case IMAGE_FORMAT_BGRX8888: +++ SizeOfData = Image->Width * Image->Height * Image->Depth * 3; +++ Temp = CompData = ialloc(SizeOfData / 3 * 4); // Not compressed data +++ if (iread(CompData, 1, SizeOfData / 3 * 4) != SizeOfData / 3 * 4) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ for (k = 0; k < SizeOfData; k += 3) { +++ Image->Data[k] = Temp[0]; +++ Image->Data[k+1] = Temp[1]; +++ Image->Data[k+2] = Temp[2]; +++ Temp += 4; +++ } +++ +++ break; +++ +++ // Uncompressed 16-bit floats (must be converted to 32-bit) +++ case IMAGE_FORMAT_RGBA16161616F: +++ SizeOfData = Image->Width * Image->Height * Image->Depth * Image->Bpp * 2; +++ CompData = ialloc(SizeOfData); // Not compressed data +++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ bVtf = iConvFloat16ToFloat32((ILuint*)Image->Data, (ILushort*)CompData, SizeOfData / 2); +++ break; +++ +++ // Uncompressed 32-bit ARGB and ABGR data. DevIL does not handle this +++ // internally, so we have to swap values. +++ case IMAGE_FORMAT_ARGB8888: +++ case IMAGE_FORMAT_ABGR8888: +++ if (iread(Image->Data, 1, Image->SizeOfData) != Image->SizeOfData) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ else { +++ bVtf = IL_TRUE; +++ } +++ // Swap the data +++ for (k = 0; k < Image->SizeOfData; k += 4) { +++ SwapVal = Image->Data[k]; +++ Image->Data[k] = Image->Data[k+3]; +++ Image->Data[k+3] = SwapVal; +++ SwapVal = Image->Data[k+1]; +++ Image->Data[k+1] = Image->Data[k+2]; +++ Image->Data[k+2] = SwapVal; +++ } +++ break; +++ +++ // Uncompressed 16-bit RGB and BGR data. We have to expand this to 24-bit, since +++ // DevIL does not handle this internally. +++ // The data is in the file as: gggbbbbb rrrrrrggg +++ case IMAGE_FORMAT_RGB565: +++ case IMAGE_FORMAT_BGR565: +++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; +++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data +++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ for (k = 0; k < Image->SizeOfData; k += 3) { +++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; +++ Image->Data[k+1] = ((Data16Bit[1] & 0x07) << 5) | ((Data16Bit[0] & 0xE0) >> 3); +++ Image->Data[k+2] = Data16Bit[1] & 0xF8; +++ Data16Bit += 2; +++ } +++ break; +++ +++ // Uncompressed 16-bit BGRA data (1-bit alpha). We have to expand this to 32-bit, +++ // since DevIL does not handle this internally. +++ // Something seems strange with this one, but this is how VTFEdit outputs. +++ // The data is in the file as: gggbbbbb arrrrrgg +++ case IMAGE_FORMAT_BGRA5551: +++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; +++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data +++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ for (k = 0; k < Image->SizeOfData; k += 4) { +++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; +++ Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6); +++ Image->Data[k+2] = (Data16Bit[1] & 0x7C) << 1; +++ // 1-bit alpha is either off or on. +++ Image->Data[k+3] = ((Data16Bit[0] & 0x80) == 0x80) ? 0xFF : 0x00; +++ Data16Bit += 2; +++ } +++ break; +++ +++ // Same as above, but the alpha channel is unused. +++ case IMAGE_FORMAT_BGRX5551: +++ SizeOfData = Image->Width * Image->Height * Image->Depth * 2; +++ Data16Bit = CompData = ialloc(SizeOfData); // Not compressed data +++ if (iread(CompData, 1, SizeOfData) != SizeOfData) { +++ bVtf = IL_FALSE; +++ break; +++ } +++ for (k = 0; k < Image->SizeOfData; k += 3) { +++ Image->Data[k] = (Data16Bit[0] & 0x1F) << 3; +++ Image->Data[k+1] = ((Data16Bit[0] & 0xE0) >> 2) | ((Data16Bit[1] & 0x03) << 6); +++ Image->Data[k+2] = (Data16Bit[1] & 0x7C) << 1; +++ Data16Bit += 2; +++ } +++ break; +++ } +++ +++ ifree(CompData); +++ CompData = NULL; +++ if (bVtf == IL_FALSE) //@TODO: Do we need to do any cleanup here? +++ return IL_FALSE; +++ } +++ } +++ +++ ilBindImage(CurName); // Set to parent image first. +++ return ilFixImage(); +++} +++ +++ +++ILboolean VtfInitMipmaps(ILimage *BaseImage, VTFHEAD *Header) +++{ +++ ILimage *Image; +++ ILuint Width, Height, Depth, Mipmap; +++ +++ Image = BaseImage; +++ Width = BaseImage->Width; Height = BaseImage->Height; Depth = BaseImage->Depth; +++ +++ for (Mipmap = 1; Mipmap < Header->MipmapCount; Mipmap++) { +++ // 1 is the smallest dimension possible. +++ Width = (Width >> 1) == 0 ? 1 : (Width >> 1); +++ Height = (Height >> 1) == 0 ? 1 : (Height >> 1); +++ Depth = (Depth >> 1) == 0 ? 1 : (Depth >> 1); +++ +++ if (Mipmap == 1) { // Our first mipmap is at Mipmap. +++ Image->Mipmaps = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc); +++ if (Image->Mipmaps == NULL) +++ return IL_FALSE; +++ Image = Image->Mipmaps; +++ } +++ else { // The other mipmaps are at Mipmap->Next. +++ Image->Next = ilNewImage(Width, Height, Depth, BaseImage->Bpp, BaseImage->Bpc); +++ if (Image->Next == NULL) +++ return IL_FALSE; +++ Image = Image->Next; +++ } +++ +++ // ilNewImage does not set these. +++ Image->Format = BaseImage->Format; +++ Image->Type = BaseImage->Type; +++ // The origin should be in the upper left. +++ Image->Origin = IL_ORIGIN_UPPER_LEFT; +++ } +++ +++ return IL_TRUE; +++} +++ +++#endif//IL_NO_VTF ++Index: devil/lib/Makefile.in ++=================================================================== ++--- devil.orig/lib/Makefile.in 2009-01-10 20:54:50.000000000 +0000 +++++ devil/lib/Makefile.in 2009-01-10 20:55:39.000000000 +0000 ++@@ -111,7 +111,7 @@ ++ $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \ ++ $(il_src)/il_icns.c $(il_src)/il_jp2.c \ ++ $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \ ++- $(il_include)/altivec_common.h \ +++ $(il_src)/il_vtf.c $(il_include)/altivec_common.h \ ++ $(il_include)/altivec_typeconversion.h \ ++ $(il_include)/il_alloc.h $(il_include)/il_bits.h \ ++ $(il_include)/il_bmp.h $(il_include)/il_dcx.h \ ++@@ -131,18 +131,19 @@ ++ $(il_include)/il_states.h $(il_include)/il_targa.h \ ++ $(il_include)/il_wdp.h \ ++ $(all_include)/IL/devil_internal_exports.h \ ++- $(ilu_src)/ilu_alloc.c $(ilu_src)/ilu_internal.c \ ++- $(ilu_src)/ilu_noise.c $(ilu_src)/ilu_scale.c \ ++- $(ilu_src)/ilu_error.c $(ilu_src)/ilu_main.c \ ++- $(ilu_src)/ilu_rotate.c $(ilu_src)/ilu_scaling.c \ ++- $(ilu_src)/ilu_filter.c $(ilu_src)/ilu_manip.c \ ++- $(ilu_src)/ilu_scale2d.c $(ilu_src)/ilu_states.c \ ++- $(ilu_src)/ilu_filter_rcg.c $(ilu_src)/ilu_mipmap.c \ ++- $(ilu_src)/ilu_scale3d.c $(ilu_src)/ilu_utilities.c \ ++- $(ilu_src)/ilu_region.c $(ilu_include)/ilu_alloc.h \ ++- $(ilu_include)/ilu_filter.h $(ilu_include)/ilu_internal.h \ ++- $(ilu_include)/ilu_mipmap.h $(ilu_include)/ilu_region.h \ ++- $(ilu_include)/ilu_states.h $(all_include)/IL/ilu_region.h \ +++ $(il_include)/il_vtf.h $(ilu_src)/ilu_alloc.c \ +++ $(ilu_src)/ilu_internal.c $(ilu_src)/ilu_noise.c \ +++ $(ilu_src)/ilu_scale.c $(ilu_src)/ilu_error.c \ +++ $(ilu_src)/ilu_main.c $(ilu_src)/ilu_rotate.c \ +++ $(ilu_src)/ilu_scaling.c $(ilu_src)/ilu_filter.c \ +++ $(ilu_src)/ilu_manip.c $(ilu_src)/ilu_scale2d.c \ +++ $(ilu_src)/ilu_states.c $(ilu_src)/ilu_filter_rcg.c \ +++ $(ilu_src)/ilu_mipmap.c $(ilu_src)/ilu_scale3d.c \ +++ $(ilu_src)/ilu_utilities.c $(ilu_src)/ilu_region.c \ +++ $(ilu_include)/ilu_alloc.h $(ilu_include)/ilu_filter.h \ +++ $(ilu_include)/ilu_internal.h $(ilu_include)/ilu_mipmap.h \ +++ $(ilu_include)/ilu_region.h $(ilu_include)/ilu_states.h \ +++ $(all_include)/IL/ilu_region.h \ ++ $(ilu_include)/ilu_error/ilu_err-arabic.h \ ++ $(ilu_include)/ilu_error/ilu_err-dutch.h \ ++ $(ilu_include)/ilu_error/ilu_err-english.h \ ++@@ -184,7 +185,7 @@ ++ libDevIL_la-il_pxr.lo libDevIL_la-il_xpm.lo \ ++ libDevIL_la-il_hdr.lo libDevIL_la-il_icns.lo \ ++ libDevIL_la-il_jp2.lo libDevIL_la-altivec_common.lo \ ++- libDevIL_la-altivec_typeconversion.lo +++ libDevIL_la-altivec_typeconversion.lo libDevIL_la-il_vtf.lo ++ @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@am__objects_2 = \ ++ @BUILD_IL_TRUE@@BUILD_MONOLITHIC_TRUE@ $(am__objects_1) ++ am__objects_3 = libDevIL_la-ilu_alloc.lo libDevIL_la-ilu_internal.lo \ ++@@ -240,7 +241,8 @@ ++ libIL_la-il_dds-save.lo libIL_la-il_psp.lo libIL_la-il_pix.lo \ ++ libIL_la-il_pxr.lo libIL_la-il_xpm.lo libIL_la-il_hdr.lo \ ++ libIL_la-il_icns.lo libIL_la-il_jp2.lo \ ++- libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo +++ libIL_la-altivec_common.lo libIL_la-altivec_typeconversion.lo \ +++ libIL_la-il_vtf.lo ++ libIL_la_OBJECTS = $(am_libIL_la_OBJECTS) ++ libIL_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(libIL_la_CFLAGS) $(CFLAGS) \ ++@@ -505,7 +507,7 @@ ++ $(il_src)/il_pxr.c $(il_src)/il_xpm.c $(il_src)/il_hdr.c \ ++ $(il_src)/il_icns.c $(il_src)/il_jp2.c \ ++ $(il_src)/altivec_common.c $(il_src)/altivec_typeconversion.c \ ++- $(il_include)/altivec_common.h \ +++ $(il_src)/il_vtf.c $(il_include)/altivec_common.h \ ++ $(il_include)/altivec_typeconversion.h \ ++ $(il_include)/il_alloc.h $(il_include)/il_bits.h \ ++ $(il_include)/il_bmp.h $(il_include)/il_dcx.h \ ++@@ -524,7 +526,8 @@ ++ $(il_include)/il_sgi.h $(il_include)/il_stack.h \ ++ $(il_include)/il_states.h $(il_include)/il_targa.h \ ++ $(il_include)/il_wdp.h \ ++- $(all_include)/IL/devil_internal_exports.h +++ $(all_include)/IL/devil_internal_exports.h \ +++ $(il_include)/il_vtf.h ++ libIL_la_LDFLAGS = @IL_LIBS@ $(AM_LDFLAGS) ++ libILU_la_CPPFLAGS = -I $(ilu_include) -I $(all_include) ++ libILU_la_CFLAGS = $(CFLAGS) @ILU_CFLAGS@ ++@@ -689,6 +692,7 @@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_targa.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_tiff.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_utility.Plo@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_vtf.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_wal.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_wdp.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDevIL_la-il_xpm.Plo@am__quote@ ++@@ -800,6 +804,7 @@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_targa.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_tiff.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_utility.Plo@am__quote@ +++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_vtf.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_wal.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_wdp.Plo@am__quote@ ++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libIL_la-il_xpm.Plo@am__quote@ ++@@ -1224,6 +1229,13 @@ ++ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c ++ +++libDevIL_la-il_vtf.lo: $(il_src)/il_vtf.c +++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-il_vtf.Tpo -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c +++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDevIL_la-il_vtf.Tpo $(DEPDIR)/libDevIL_la-il_vtf.Plo +++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(il_src)/il_vtf.c' object='libDevIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@ +++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -c -o libDevIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c +++ ++ libDevIL_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c ++ @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libDevIL_la_CPPFLAGS) $(CPPFLAGS) $(libDevIL_la_CFLAGS) $(CFLAGS) -MT libDevIL_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo -c -o libDevIL_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c ++ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDevIL_la-ilu_alloc.Tpo $(DEPDIR)/libDevIL_la-ilu_alloc.Plo ++@@ -1812,6 +1824,13 @@ ++ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-altivec_typeconversion.lo `test -f '$(il_src)/altivec_typeconversion.c' || echo '$(srcdir)/'`$(il_src)/altivec_typeconversion.c ++ +++libIL_la-il_vtf.lo: $(il_src)/il_vtf.c +++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -MT libIL_la-il_vtf.lo -MD -MP -MF $(DEPDIR)/libIL_la-il_vtf.Tpo -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c +++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libIL_la-il_vtf.Tpo $(DEPDIR)/libIL_la-il_vtf.Plo +++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(il_src)/il_vtf.c' object='libIL_la-il_vtf.lo' libtool=yes @AMDEPBACKSLASH@ +++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libIL_la_CPPFLAGS) $(CPPFLAGS) $(libIL_la_CFLAGS) $(CFLAGS) -c -o libIL_la-il_vtf.lo `test -f '$(il_src)/il_vtf.c' || echo '$(srcdir)/'`$(il_src)/il_vtf.c +++ ++ libILU_la-ilu_alloc.lo: $(ilu_src)/ilu_alloc.c ++ @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libILU_la_CPPFLAGS) $(CPPFLAGS) $(libILU_la_CFLAGS) $(CFLAGS) -MT libILU_la-ilu_alloc.lo -MD -MP -MF $(DEPDIR)/libILU_la-ilu_alloc.Tpo -c -o libILU_la-ilu_alloc.lo `test -f '$(ilu_src)/ilu_alloc.c' || echo '$(srcdir)/'`$(ilu_src)/ilu_alloc.c ++ @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libILU_la-ilu_alloc.Tpo $(DEPDIR)/libILU_la-ilu_alloc.Plo +--- devil-1.7.5.orig/debian/patches/01_fix_as-needed.diff ++++ devil-1.7.5/debian/patches/01_fix_as-needed.diff +@@ -0,0 +1,32 @@ ++Index: devil/build-aux/ltmain.sh ++=================================================================== ++--- devil.orig/build-aux/ltmain.sh 2008-12-30 21:05:37.000000000 +0000 +++++ devil/build-aux/ltmain.sh 2008-12-30 21:09:12.000000000 +0000 ++@@ -4189,6 +4189,11 @@ ++ arg=$func_stripname_result ++ ;; ++ +++ -Wl,--as-needed) +++ deplibs="$deplibs $arg" +++ continue +++ ;; +++ ++ -Wl,*) ++ func_stripname '-Wl,' '' "$arg" ++ args=$func_stripname_result ++@@ -4543,6 +4548,15 @@ ++ lib= ++ found=no ++ case $deplib in +++ -Wl,--as-needed) +++ if test "$linkmode,$pass" = "prog,link"; then +++ compile_deplibs="$deplib $compile_deplibs" +++ finalize_deplibs="$deplib $finalize_deplibs" +++ else +++ deplibs="$deplib $deplibs" +++ fi +++ continue +++ ;; ++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" +--- devil-1.7.5.orig/debian/patches/series ++++ devil-1.7.5/debian/patches/series +@@ -0,0 +1,4 @@ ++00_endian_and_ILvoid_fixes.diff ++01_fix_as-needed.diff ++02_add_missing_files.diff ++03_CVE-2008-5262.diff +--- devil-1.7.5.orig/debian/patches/03_CVE-2008-5262.diff ++++ devil-1.7.5/debian/patches/03_CVE-2008-5262.diff +@@ -0,0 +1,36 @@ ++Index: devil/src-IL/src/il_hdr.c ++=================================================================== ++--- devil.orig/src-IL/src/il_hdr.c 2009-01-15 18:47:34.000000000 +0000 +++++ devil/src-IL/src/il_hdr.c 2009-01-15 18:47:46.000000000 +0000 ++@@ -85,7 +85,7 @@ ++ if (iread(&a, 1, 1) != 1) ++ return IL_FALSE; ++ ++- while(!done) { +++ while (!done) { ++ if (iread(&b, 1, 1) != 1) ++ return IL_FALSE; ++ if (b == '\n' && a == '\n') ++@@ -98,6 +98,10 @@ ++ if (iread(&a, 1, 1) != 1) ++ return IL_FALSE; ++ while (a != '\n') { +++ if (count >= sizeof(buff) - 1) { // Line shouldn't be this long at all. +++ ilSetError(IL_INVALID_FILE_HEADER); +++ return IL_FALSE; +++ } ++ buff[count] = a; ++ if (iread(&a, 1, 1) != 1) ++ return IL_FALSE; ++@@ -113,8 +117,9 @@ ++ //nothing that really changes the appearance of the loaded image... ++ //(The code as it is now assumes that y contains "-Y" and x contains ++ //"+X" after the following line) ++- //Furthermore, this crashes if the read strings are longer than 2 chars o_O ++- sscanf(buff, "%s %d %s %d", y, &Header->Height, x, &Header->Width); +++ +++ // The 2 has to be in the %s format specifier to prevent buffer overruns. +++ sscanf(buff, "%2s %d %2s %d", y, &Header->Height, x, &Header->Width); ++ ++ return IL_TRUE; ++ } + diff --git a/extra/devil/PKGBUILD b/extra/devil/PKGBUILD new file mode 100644 index 000000000..c1adf9317 --- /dev/null +++ b/extra/devil/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 44484 2009-07-02 07:12:03Z allan $ +# Maintainer: damir +# Contributor: TheHoff + +pkgname=devil +pkgver=1.7.8 +pkgrel=2 +pkgdesc="Library for reading several different image formats" +arch=(i686 x86_64) +url="http://openil.sourceforge.net/" +depends=('allegro>=4.2.2' 'sdl' 'libpng' 'libmng>=1.0.10-2' 'freeglut' + 'jasper>=1.900.1-3' 'lcms>=1.18-2' 'openexr') +makedepends=('bash') +options=('!libtool' '!docs') +license=('GPL') +source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz) + +build() { + cd $startdir/src/devil-$pkgver + + # configure and build + ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl + make || return 1 + make prefix=$startdir/pkg/usr install +} +md5sums=('7918f215524589435e5ec2e8736d5e1d') diff --git a/extra/devilspie/PKGBUILD b/extra/devilspie/PKGBUILD new file mode 100644 index 000000000..bd16e5a88 --- /dev/null +++ b/extra/devilspie/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 21738 2008-12-15 19:52:00Z giovanni $ +# Maintainer: Aaron Griffin +# Contributor: Travis Willard +# Contributor: William Rea + +pkgname=devilspie +pkgver=0.22 +pkgrel=3 +pkgdesc="x11 window matching utility" +arch=('i686' 'x86_64') +url="http://www.burtonini.com/blog/computers/devilspie" +license=('GPL') +depends=('libwnck>=2.24') +makedepends=('perlxml' 'pkgconfig') +source=("http://www.burtonini.com/computing/$pkgname-$pkgver.tar.gz") +md5sums=('4190e12f99ab92c0427e457d9fbfe231') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make || return 1 + make prefix=$pkgdir/usr install + # Make and install blank config + mkdir -p $pkgdir/etc/devilspie + echo '(debug)' > $pkgdir/etc/devilspie/example.ds +} diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD new file mode 100644 index 000000000..443359616 --- /dev/null +++ b/extra/devtools/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 50871 2009-09-02 07:51:02Z allan $ +# Maintainer: Jason Chu + +pkgname=devtools +pkgver=0.7.0 +pkgrel=1 +pkgdesc="A few tools to help Arch Linux developers" +arch=('any') +license=('GPL') +url="http://projects.archlinux.org/git/?p=devtools.git" +depends=('namcap') +conflicts=('aurtools') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('d098ac71248a7a30b3bc700b1087bc78') + +build() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/extra/dgen-sdl/PKGBUILD b/extra/dgen-sdl/PKGBUILD new file mode 100644 index 000000000..3591a78f3 --- /dev/null +++ b/extra/dgen-sdl/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 42087 2009-06-10 20:03:48Z andrea $ +# Contributor: Tom Newsom +# Maintainer: Jason Chu + +pkgname=dgen-sdl +pkgver=1.23 +pkgrel=23 +pkgdesc=" DGen/SDL is a free, open source emulator for Sega Genesis/MegaDrive systems" +arch=(i686 x86_64) +url="http://tamentis.com/projects/dgen/" +license=('custom') +depends=('sdl' 'nasm') +options=('!makeflags') +source=(http://tamentis.com/projects/dgen/files/$pkgname-$pkgver.tar.gz gcc4-dgen-sdl-1.23.patch dgen-permission \ + fm-do-not-use-long.patch mz80-pbPC-pointer-subtract.patch mz80-stdint.patch mz80init.patch \ + ras-emulate-pointer-wraparound.patch sdl-use-stdint.patch) +md5sums=('b1896c1b21ddb152626aec2e8a157a3a' '34cc77565fc8926c05e9f89f93ea2688'\ + '92e51193d1ed7e7e200b83f116e85a33' '013b040833696fa8ca48d5fba090e957'\ + '9ae6adbf7223f072d82ce109407aa342' '1d09f336238d596d3667ccea4aa70dfc'\ + '590a85e8b3942f6a8a711971fcc8f696' '9dbf5c24b305f06a1361a1193078d10e'\ + 'ddaf65edfa87ff78a4bbdf4498b210f2') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 < ../gcc4-dgen-sdl-1.23.patch || return 1 + patch -p1 < ../fm-do-not-use-long.patch || return 1 + patch -p1 < ../mz80-pbPC-pointer-subtract.patch || return 1 + patch -p1 < ../mz80-stdint.patch || return 1 + patch -p1 < ../mz80init.patch || return 1 + patch -p1 < ../ras-emulate-pointer-wraparound.patch || return 1 + patch -p1 < ../sdl-use-stdint.patch || return 1 + + ./configure --prefix=/usr --mandir=/usr/share/man --without-extra-opt || return 1 + make || return 1 + make DESTDIR="$pkgdir" install || return 1 + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 star/stardoc.txt "${pkgdir}/usr/share/licenses/${pkgname}/stardoc.txt" + install -D -m644 mz80/mz80.txt "${pkgdir}/usr/share/licenses/${pkgname}/mz80.txt" + install -D -m644 "$srcdir/dgen-permission" "${pkgdir}/usr/share/licenses/${pkgname}/dgen-permission" +} diff --git a/extra/dgen-sdl/dgen-permission b/extra/dgen-sdl/dgen-permission new file mode 100644 index 000000000..998bf431c --- /dev/null +++ b/extra/dgen-sdl/dgen-permission @@ -0,0 +1,26 @@ +From: Neil Bradley +To: James Rayner +Subject: Re: Distribute modified MZ80 for x86_64 architecture as part of + dgen-sdl +> I package dgen-sdl for Arch Linux and want to include a functioning +> version in our x86_64 port. However your MZ80 code does not work on +> x86_64 without patches, and your license does not allow redistribution +> of modified versions without your permission. +> +> The patches I intend to use are here: +> https://bugs.launchpad.net/ubuntu/+source/dgen/+bug/131281/comments/9 +> +> May Arch Linux redistribute a version of your MZ80 code modified so +> that it runs on x86_64? +> +> Thanks in advance, +> James + +Sure thing, James. Glad it's still usable/worthwhile for someone. I +haven't had an MZ80 contact in a few years now. Let me know when you have +a link to the project. I'd love to see it. Hope things are well! + +-->Neil + +---------------------------------------------------------------------------- +C. Neil Bradley - EVERYBODY KERNEL PANIC! diff --git a/extra/dgen-sdl/fm-do-not-use-long.patch b/extra/dgen-sdl/fm-do-not-use-long.patch new file mode 100644 index 000000000..b5de580f5 --- /dev/null +++ b/extra/dgen-sdl/fm-do-not-use-long.patch @@ -0,0 +1,30 @@ +Index: dgen-1.23/fm.h +=================================================================== +--- dgen-1.23.orig/fm.h 2007-12-09 20:27:27.000000000 -0200 ++++ dgen-1.23/fm.h 2007-12-09 20:27:44.000000000 -0200 +@@ -5,6 +5,8 @@ + #ifndef _H_FM_FM_ + #define _H_FM_FM_ + ++#include ++ + ////// starshine - one chip 4 me! + #define HAS_YM2612 1 + #define BUILD_YM2612 (HAS_YM2612) // build YM2612 emulator +@@ -35,12 +37,12 @@ + #endif + + #if (FM_OUTPUT_BIT==16) +-typedef unsigned short FMSAMPLE; +-typedef unsigned long FMSAMPLE_MIX; ++typedef uint16_t FMSAMPLE; ++typedef uint32_t FMSAMPLE_MIX; + #endif + #if (FM_OUTPUT_BIT==8) +-typedef unsigned char FMSAMPLE; +-typedef unsigned short FMSAMPLE_MIX; ++typedef uint8_t FMSAMPLE; ++typedef uint16_t FMSAMPLE_MIX; + #endif + + /* For YM2151/YM2608/YM2612 option */ diff --git a/extra/dgen-sdl/gcc4-dgen-sdl-1.23.patch b/extra/dgen-sdl/gcc4-dgen-sdl-1.23.patch new file mode 100644 index 000000000..c83e0815f --- /dev/null +++ b/extra/dgen-sdl/gcc4-dgen-sdl-1.23.patch @@ -0,0 +1,24 @@ +--- dgen-sdl-1.23/musa/m68kmake.c 2006-01-08 01:13:20.000000000 +0100 ++++ dgen-sdl-1.23/musa/m68kmake.c.new 2006-01-08 01:14:15.000000000 +0100 +@@ -1029,9 +1029,9 @@ + fprintf(filep, "/* ========================= OPCODE TABLE BUILDER ========================= */\n"); + fprintf(filep, "/* ======================================================================== */\n\n"); + ++ fprintf(filep, "#include \n\n"); + fprintf(filep, "#include \"m68kops.h\"\n"); + fprintf(filep, "#include \"m68kcpu.h\"\n"); +- fprintf(filep, "#include \n\n"); + fprintf(filep, "#include \n\n"); + + fprintf(filep, "extern void (*m68k_instruction_jump_table[])(void); /* opcode handler jump table */\n\n"); +--- dgen-sdl-1.23/star/star.c 2007-04-15 00:13:10.000000000 +1000 ++++ dgen-sdl-1.23/star/star.c2 2007-04-15 00:15:27.000000000 +1000 +@@ -1931,7 +1931,7 @@ + case aind: case ainc: case adec: + case adsp: case axdp: + usereg(); +- default: ++ default: ; + } + } + diff --git a/extra/dgen-sdl/mz80-pbPC-pointer-subtract.patch b/extra/dgen-sdl/mz80-pbPC-pointer-subtract.patch new file mode 100644 index 000000000..976201596 --- /dev/null +++ b/extra/dgen-sdl/mz80-pbPC-pointer-subtract.patch @@ -0,0 +1,2567 @@ +In several places mz80 converts two pointers to UINT32s and subtracts them. +Subtract the pointers directly and then convert the result instead. + +Index: dgen-1.23/mz80/makez80.c +=================================================================== +--- dgen-1.23.orig/mz80/makez80.c 2007-12-09 20:27:36.000000000 -0200 ++++ dgen-1.23/mz80/makez80.c 2007-12-09 20:27:38.000000000 -0200 +@@ -1657,7 +1657,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psMemWrite->lowAddr) && (%s <= psMemWrite->highAddr))\n", pszAddress, pszAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " if (psMemWrite->memoryCall)\n"); + fprintf(fp, " {\n"); + fprintf(fp, " psMemWrite->memoryCall(%s, %s, psMemWrite);\n", pszAddress, pszValue); +@@ -1765,7 +1765,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psMemWrite->lowAddr) && (%s <= psMemWrite->highAddr))\n", pszAddress, pszAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + + fprintf(fp, " if (psMemWrite->memoryCall)\n"); + fprintf(fp, " {\n"); +@@ -1838,7 +1838,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psIoWrite->lowIoAddr) && (%s <= psIoWrite->highIoAddr))\n", pszIoAddress, pszIoAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " psIoWrite->IOCall(%s, %s, psIoWrite);\n", pszIoAddress, pszValue); + fprintf(fp, " psIoWrite = NULL;\n"); + fprintf(fp, " break;\n"); +@@ -1919,7 +1919,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psMemRead->lowAddr) && (%s <= psMemRead->highAddr))\n", pszAddress, pszAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " if (psMemRead->memoryCall)\n"); + fprintf(fp, " {\n"); + fprintf(fp, " %s = psMemRead->memoryCall(%s, psMemRead);\n", pszTarget, pszAddress); +@@ -2030,7 +2030,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psMemRead->lowAddr) && (%s <= psMemRead->highAddr))\n", pszAddress, pszAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " if (psMemRead->memoryCall)\n"); + fprintf(fp, " {\n"); + fprintf(fp, " %s = psMemRead->memoryCall(%s, psMemRead);\n", pszTarget, pszAddress); +@@ -2127,7 +2127,7 @@ + fprintf(fp, " {\n"); + fprintf(fp, " if ((%s >= psIoRead->lowIoAddr) && (%s <= psIoRead->highIoAddr))\n", pszIoAddress, pszIoAddress); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " %s = psIoRead->IOCall(%s, psIoRead);\n", pszTarget, pszIoAddress); + fprintf(fp, " psIoRead = NULL;\n"); + fprintf(fp, " break;\n"); +@@ -2416,7 +2416,7 @@ + fprintf(fp, " if (--cpu.z80B)\n"); + fprintf(fp, " {\n"); + fprintf(fp, " dwElapsedTicks += 5; /* 5 More for jump taken */\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff;\n"); + fprintf(fp, " pbPC = cpu.z80Base + sdwAddr; /* Normalize the address */\n"); + fprintf(fp, " }\n"); +@@ -3199,7 +3199,7 @@ + if (MZ80_C == bWhat) + { + fprintf(fp, " sdwAddr = (INT8) *pbPC++; /* Get LSB first */\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff;\n"); + + if (0x18 != dwOpcode) +@@ -3280,7 +3280,7 @@ + { + fprintf(fp, " if %s\n", pbFlagsC[(dwOpcode >> 3) & 0x07]); + fprintf(fp, " {\n"); +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */\n"); + fprintf(fp, " *pbSP-- = cpu.z80pc >> 8; /* MSB */\n"); + fprintf(fp, " *pbSP = (UINT8) cpu.z80pc; /* LSB */\n"); +@@ -3290,7 +3290,7 @@ + } + else // Just a regular call + { +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */\n"); + fprintf(fp, " *pbSP-- = cpu.z80pc >> 8; /* LSB */\n"); + fprintf(fp, " *pbSP = (UINT8) cpu.z80pc; /* MSB */\n"); +@@ -3410,7 +3410,7 @@ + else + if (MZ80_C == bWhat) + { +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */\n"); + fprintf(fp, " *pbSP-- = cpu.z80pc >> 8; /* LSB */\n"); + fprintf(fp, " *pbSP = (UINT8) cpu.z80pc; /* MSB */\n"); +@@ -7084,7 +7084,7 @@ + fprintf(fp, "{\n"); + + fprintf(fp, " pbPC -= dwCount; /* Invalid instruction - back up */\n"); +- fprintf(fp, " dwReturnCode = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " dwReturnCode = (UINT32) (pbPC - cpu.z80Base);\n"); + fprintf(fp, " dwOriginalCycles -= sdwCyclesRemaining;\n"); + fprintf(fp, " sdwCyclesRemaining = 0;\n"); + +@@ -7203,7 +7203,7 @@ + + fprintf(fp, " dwElapsedTicks += (dwOriginalCycles - sdwCyclesRemaining);\n\n"); + +- fprintf(fp, " cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base;\n"); ++ fprintf(fp, " cpu.z80pc = (UINT32) (pbPC - cpu.z80Base);\n"); + + fprintf(fp, " return(dwReturnCode); /* Indicate success */\n"); + fprintf(fp, "}\n\n"); +Index: dgen-1.23/zz80.c +=================================================================== +--- dgen-1.23.orig/zz80.c 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/zz80.c 2007-12-09 20:27:38.000000000 -0200 +@@ -424,7 +424,7 @@ + static void InvalidInstruction(UINT32 dwCount) + { + pbPC -= dwCount; /* Invalid instruction - back up */ +- dwReturnCode = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ dwReturnCode = (UINT32) (pbPC - cpu.z80Base); + dwOriginalCycles -= sdwCyclesRemaining; + sdwCyclesRemaining = 0; + } +@@ -495,7 +495,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -524,7 +524,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -617,7 +617,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -646,7 +646,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -745,7 +745,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -775,7 +775,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -875,7 +875,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -905,7 +905,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -999,7 +999,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1028,7 +1028,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -1121,7 +1121,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1150,7 +1150,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -1243,7 +1243,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1272,7 +1272,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -1365,7 +1365,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1394,7 +1394,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -1499,7 +1499,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1612,7 +1612,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1725,7 +1725,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1838,7 +1838,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -1951,7 +1951,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2064,7 +2064,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2177,7 +2177,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2290,7 +2290,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2373,7 +2373,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2399,7 +2399,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2471,7 +2471,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2497,7 +2497,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2569,7 +2569,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2595,7 +2595,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2667,7 +2667,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2693,7 +2693,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2765,7 +2765,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2791,7 +2791,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2863,7 +2863,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2889,7 +2889,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -2961,7 +2961,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -2987,7 +2987,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3059,7 +3059,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3085,7 +3085,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3157,7 +3157,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3183,7 +3183,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3255,7 +3255,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3281,7 +3281,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3353,7 +3353,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3379,7 +3379,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3451,7 +3451,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3477,7 +3477,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3549,7 +3549,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3575,7 +3575,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3647,7 +3647,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3673,7 +3673,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3745,7 +3745,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3771,7 +3771,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -3843,7 +3843,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -3869,7 +3869,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -4232,7 +4232,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80B = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4258,7 +4258,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80B, psIoWrite); + psIoWrite = NULL; + break; +@@ -4294,7 +4294,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, (cpu.z80BC & 0xff), psMemWrite); +@@ -4361,7 +4361,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80C = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4387,7 +4387,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80C, psIoWrite); + psIoWrite = NULL; + break; +@@ -4423,7 +4423,7 @@ + { + if ((dwTemp >= psMemRead->lowAddr) && (dwTemp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80BC = psMemRead->memoryCall(dwTemp, psMemRead); +@@ -4485,7 +4485,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80D = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4511,7 +4511,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80D, psIoWrite); + psIoWrite = NULL; + break; +@@ -4547,7 +4547,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, (cpu.z80DE & 0xff), psMemWrite); +@@ -4609,7 +4609,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80E = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4635,7 +4635,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80E, psIoWrite); + psIoWrite = NULL; + break; +@@ -4671,7 +4671,7 @@ + { + if ((dwTemp >= psMemRead->lowAddr) && (dwTemp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80DE = psMemRead->memoryCall(dwTemp, psMemRead); +@@ -4734,7 +4734,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80H = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4760,7 +4760,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80H, psIoWrite); + psIoWrite = NULL; + break; +@@ -4796,7 +4796,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, (cpu.z80HL & 0xff), psMemWrite); +@@ -4847,7 +4847,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -4875,7 +4875,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -4908,7 +4908,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80L = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -4934,7 +4934,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80L, psIoWrite); + psIoWrite = NULL; + break; +@@ -4992,7 +4992,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5020,7 +5020,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -5082,7 +5082,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, (cpu.z80sp & 0xff), psMemWrite); +@@ -5139,7 +5139,7 @@ + { + if ((dwAddr >= psIoRead->lowIoAddr) && (dwAddr <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80A = psIoRead->IOCall(dwAddr, psIoRead); + psIoRead = NULL; + break; +@@ -5165,7 +5165,7 @@ + { + if ((dwAddr >= psIoWrite->lowIoAddr) && (dwAddr <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwAddr, cpu.z80A, psIoWrite); + psIoWrite = NULL; + break; +@@ -5201,7 +5201,7 @@ + { + if ((dwTemp >= psMemRead->lowAddr) && (dwTemp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80sp = psMemRead->memoryCall(dwTemp, psMemRead); +@@ -5417,7 +5417,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5442,7 +5442,7 @@ + { + if ((cpu.z80DE >= psMemWrite->lowAddr) && (cpu.z80DE <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80DE, bTemp, psMemWrite); +@@ -5484,7 +5484,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5526,7 +5526,7 @@ + { + if ((cpu.z80B >= psIoRead->lowIoAddr) && (cpu.z80B <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + bTemp = psIoRead->IOCall(cpu.z80B, psIoRead); + psIoRead = NULL; + break; +@@ -5544,7 +5544,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -5587,7 +5587,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5612,7 +5612,7 @@ + { + if ((cpu.z80BC >= psIoWrite->lowIoAddr) && (cpu.z80BC <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(cpu.z80BC, bTemp, psIoWrite); + psIoWrite = NULL; + break; +@@ -5661,7 +5661,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5686,7 +5686,7 @@ + { + if ((cpu.z80DE >= psMemWrite->lowAddr) && (cpu.z80DE <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80DE, bTemp, psMemWrite); +@@ -5728,7 +5728,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5770,7 +5770,7 @@ + { + if ((cpu.z80B >= psIoRead->lowIoAddr) && (cpu.z80B <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + bTemp = psIoRead->IOCall(cpu.z80B, psIoRead); + psIoRead = NULL; + break; +@@ -5788,7 +5788,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -5831,7 +5831,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5856,7 +5856,7 @@ + { + if ((cpu.z80BC >= psIoWrite->lowIoAddr) && (cpu.z80BC <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(cpu.z80BC, bTemp, psIoWrite); + psIoWrite = NULL; + break; +@@ -5907,7 +5907,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -5932,7 +5932,7 @@ + { + if ((cpu.z80DE >= psMemWrite->lowAddr) && (cpu.z80DE <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80DE, bTemp, psMemWrite); +@@ -5979,7 +5979,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -6027,7 +6027,7 @@ + { + if ((cpu.z80B >= psIoRead->lowIoAddr) && (cpu.z80B <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + bTemp = psIoRead->IOCall(cpu.z80B, psIoRead); + psIoRead = NULL; + break; +@@ -6045,7 +6045,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -6089,7 +6089,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -6114,7 +6114,7 @@ + { + if ((cpu.z80BC >= psIoWrite->lowIoAddr) && (cpu.z80BC <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(cpu.z80BC, bTemp, psIoWrite); + psIoWrite = NULL; + break; +@@ -6165,7 +6165,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -6190,7 +6190,7 @@ + { + if ((cpu.z80DE >= psMemWrite->lowAddr) && (cpu.z80DE <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80DE, bTemp, psMemWrite); +@@ -6237,7 +6237,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -6285,7 +6285,7 @@ + { + if ((cpu.z80B >= psIoRead->lowIoAddr) && (cpu.z80B <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + bTemp = psIoRead->IOCall(cpu.z80B, psIoRead); + psIoRead = NULL; + break; +@@ -6303,7 +6303,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -6347,7 +6347,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -6372,7 +6372,7 @@ + { + if ((cpu.z80BC >= psIoWrite->lowIoAddr) && (cpu.z80BC <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(cpu.z80BC, bTemp, psIoWrite); + psIoWrite = NULL; + break; +@@ -6930,7 +6930,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, (cpu.z80IX & 0xff), psMemWrite); +@@ -7011,7 +7011,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80IX = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -7098,7 +7098,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -7125,7 +7125,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -7157,7 +7157,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -7184,7 +7184,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -7216,7 +7216,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, *pbPC++, psMemWrite); +@@ -7329,7 +7329,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80B = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7398,7 +7398,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80C = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7467,7 +7467,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80D = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7536,7 +7536,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80E = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7608,7 +7608,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80H = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7681,7 +7681,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80L = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -7719,7 +7719,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80B, psMemWrite); +@@ -7751,7 +7751,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80C, psMemWrite); +@@ -7783,7 +7783,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80D, psMemWrite); +@@ -7815,7 +7815,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80E, psMemWrite); +@@ -7847,7 +7847,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80H, psMemWrite); +@@ -7879,7 +7879,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80L, psMemWrite); +@@ -7917,7 +7917,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80A, psMemWrite); +@@ -7981,7 +7981,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -8058,7 +8058,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8139,7 +8139,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8221,7 +8221,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8302,7 +8302,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8384,7 +8384,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8465,7 +8465,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8546,7 +8546,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8625,7 +8625,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -8828,7 +8828,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80IX = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -8868,7 +8868,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + dwAddr = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -8896,7 +8896,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80IX & 0xff), psMemWrite); +@@ -8937,7 +8937,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80IX & 0xff), psMemWrite); +@@ -9112,7 +9112,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -9176,7 +9176,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9245,7 +9245,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9315,7 +9315,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9385,7 +9385,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9454,7 +9454,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9523,7 +9523,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -9633,7 +9633,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10115,7 +10115,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10181,7 +10181,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10247,7 +10247,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10313,7 +10313,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10379,7 +10379,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10445,7 +10445,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10511,7 +10511,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10577,7 +10577,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10643,7 +10643,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10709,7 +10709,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10775,7 +10775,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10841,7 +10841,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10907,7 +10907,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -10973,7 +10973,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -11039,7 +11039,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -11105,7 +11105,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -11328,7 +11328,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, (cpu.z80IY & 0xff), psMemWrite); +@@ -11409,7 +11409,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80IY = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -11496,7 +11496,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -11523,7 +11523,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -11555,7 +11555,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -11582,7 +11582,7 @@ + { + if ((dwAddr >= psMemWrite->lowAddr) && (dwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwAddr, bTemp, psMemWrite); +@@ -11614,7 +11614,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, *pbPC++, psMemWrite); +@@ -11727,7 +11727,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80B = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -11796,7 +11796,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80C = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -11865,7 +11865,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80D = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -11934,7 +11934,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80E = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -12006,7 +12006,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80H = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -12079,7 +12079,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80L = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -12117,7 +12117,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80B, psMemWrite); +@@ -12149,7 +12149,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80C, psMemWrite); +@@ -12181,7 +12181,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80D, psMemWrite); +@@ -12213,7 +12213,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80E, psMemWrite); +@@ -12245,7 +12245,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80H, psMemWrite); +@@ -12277,7 +12277,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80L, psMemWrite); +@@ -12315,7 +12315,7 @@ + { + if ((sdwAddr >= psMemWrite->lowAddr) && (sdwAddr <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(sdwAddr, cpu.z80A, psMemWrite); +@@ -12379,7 +12379,7 @@ + { + if ((sdwAddr >= psMemRead->lowAddr) && (sdwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(sdwAddr, psMemRead); +@@ -12456,7 +12456,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12537,7 +12537,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12619,7 +12619,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12700,7 +12700,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12782,7 +12782,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12863,7 +12863,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -12944,7 +12944,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -13023,7 +13023,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -13226,7 +13226,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80IY = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -13266,7 +13266,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + dwAddr = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -13294,7 +13294,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80IY & 0xff), psMemWrite); +@@ -13335,7 +13335,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80IY & 0xff), psMemWrite); +@@ -13537,7 +13537,7 @@ + { + if ((cpu.z80BC >= psMemWrite->lowAddr) && (cpu.z80BC <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80BC, cpu.z80A, psMemWrite); +@@ -13619,7 +13619,7 @@ + { + if ((cpu.z80BC >= psMemRead->lowAddr) && (cpu.z80BC <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(cpu.z80BC, psMemRead); +@@ -13683,7 +13683,7 @@ + if (--cpu.z80B) + { + dwElapsedTicks += 5; /* 5 More for jump taken */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + pbPC = cpu.z80Base + sdwAddr; /* Normalize the address */ + } +@@ -13704,7 +13704,7 @@ + { + if ((cpu.z80DE >= psMemWrite->lowAddr) && (cpu.z80DE <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80DE, cpu.z80A, psMemWrite); +@@ -13765,7 +13765,7 @@ + { + sdwCyclesRemaining -= 12; + sdwAddr = (INT8) *pbPC++; /* Get LSB first */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + { + sdwCyclesRemaining -= 5; +@@ -13790,7 +13790,7 @@ + { + if ((cpu.z80DE >= psMemRead->lowAddr) && (cpu.z80DE <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(cpu.z80DE, psMemRead); +@@ -13851,7 +13851,7 @@ + { + sdwCyclesRemaining -= 7; + sdwAddr = (INT8) *pbPC++; /* Get LSB first */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + if (!(cpu.z80F & Z80_FLAG_ZERO)) + { +@@ -13877,7 +13877,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, (cpu.z80HL & 0xff), psMemWrite); +@@ -13944,7 +13944,7 @@ + { + sdwCyclesRemaining -= 7; + sdwAddr = (INT8) *pbPC++; /* Get LSB first */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + if (cpu.z80F & Z80_FLAG_ZERO) + { +@@ -13972,7 +13972,7 @@ + { + if ((dwAddr >= psMemRead->lowAddr) && (dwAddr <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80HL = psMemRead->memoryCall(dwAddr, psMemRead); +@@ -14035,7 +14035,7 @@ + { + sdwCyclesRemaining -= 7; + sdwAddr = (INT8) *pbPC++; /* Get LSB first */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + if (!(cpu.z80F & Z80_FLAG_CARRY)) + { +@@ -14061,7 +14061,7 @@ + { + if ((dwTemp >= psMemWrite->lowAddr) && (dwTemp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(dwTemp, cpu.z80A, psMemWrite); +@@ -14098,7 +14098,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14126,7 +14126,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -14156,7 +14156,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14184,7 +14184,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, bTemp, psMemWrite); +@@ -14214,7 +14214,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, *pbPC++, psMemWrite); +@@ -14247,7 +14247,7 @@ + { + sdwCyclesRemaining -= 7; + sdwAddr = (INT8) *pbPC++; /* Get LSB first */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + sdwAddr = (sdwAddr + (INT32) cpu.z80pc) & 0xffff; + if (cpu.z80F & Z80_FLAG_CARRY) + { +@@ -14275,7 +14275,7 @@ + { + if ((dwTemp >= psMemRead->lowAddr) && (dwTemp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(dwTemp, psMemRead); +@@ -14375,7 +14375,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80B = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14446,7 +14446,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80C = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14517,7 +14517,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80D = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14588,7 +14588,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80E = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14659,7 +14659,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80H = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14730,7 +14730,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80L = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -14766,7 +14766,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80B, psMemWrite); +@@ -14796,7 +14796,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80C, psMemWrite); +@@ -14826,7 +14826,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80D, psMemWrite); +@@ -14856,7 +14856,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80E, psMemWrite); +@@ -14886,7 +14886,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80H, psMemWrite); +@@ -14916,7 +14916,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80L, psMemWrite); +@@ -14954,7 +14954,7 @@ + { + if ((cpu.z80HL >= psMemWrite->lowAddr) && (cpu.z80HL <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80HL, cpu.z80A, psMemWrite); +@@ -15020,7 +15020,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80A = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15115,7 +15115,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15220,7 +15220,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15325,7 +15325,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15430,7 +15430,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15529,7 +15529,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15626,7 +15626,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15723,7 +15723,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15814,7 +15814,7 @@ + { + if ((cpu.z80HL >= psMemRead->lowAddr) && (cpu.z80HL <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + bTemp = psMemRead->memoryCall(cpu.z80HL, psMemRead); +@@ -15869,7 +15869,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80BC = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -15922,7 +15922,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (!(cpu.z80F & Z80_FLAG_ZERO)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -15941,7 +15941,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80BC & 0xff), psMemWrite); +@@ -15979,7 +15979,7 @@ + case 0xc7: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16034,7 +16034,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (cpu.z80F & Z80_FLAG_ZERO) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16048,7 +16048,7 @@ + sdwCyclesRemaining -= 17; + dwAddr = *pbPC++; /* Get LSB first */ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16069,7 +16069,7 @@ + case 0xcf: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16099,7 +16099,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80DE = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -16146,7 +16146,7 @@ + { + if ((dwTemp >= psIoWrite->lowIoAddr) && (dwTemp <= psIoWrite->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + psIoWrite->IOCall(dwTemp, cpu.z80A, psIoWrite); + psIoWrite = NULL; + break; +@@ -16163,7 +16163,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (!(cpu.z80F & Z80_FLAG_CARRY)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16182,7 +16182,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80DE & 0xff), psMemWrite); +@@ -16220,7 +16220,7 @@ + case 0xd7: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16276,7 +16276,7 @@ + { + if ((dwTemp >= psIoRead->lowIoAddr) && (dwTemp <= psIoRead->highIoAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + cpu.z80A = psIoRead->IOCall(dwTemp, psIoRead); + psIoRead = NULL; + break; +@@ -16298,7 +16298,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (cpu.z80F & Z80_FLAG_CARRY) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16325,7 +16325,7 @@ + case 0xdf: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16355,7 +16355,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80HL = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -16401,7 +16401,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + dwAddr = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -16429,7 +16429,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80HL & 0xff), psMemWrite); +@@ -16462,7 +16462,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (!(cpu.z80F & Z80_FLAG_OVERFLOW_PARITY)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16481,7 +16481,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80HL & 0xff), psMemWrite); +@@ -16518,7 +16518,7 @@ + case 0xe7: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16572,7 +16572,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (cpu.z80F & Z80_FLAG_OVERFLOW_PARITY) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16598,7 +16598,7 @@ + case 0xef: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16628,7 +16628,7 @@ + { + if ((cpu.z80sp >= psMemRead->lowAddr) && (cpu.z80sp <= psMemRead->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemRead->memoryCall) + { + cpu.z80AF = psMemRead->memoryCall(cpu.z80sp, psMemRead); +@@ -16679,7 +16679,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (!(cpu.z80F & Z80_FLAG_SIGN)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16698,7 +16698,7 @@ + { + if ((cpu.z80sp >= psMemWrite->lowAddr) && (cpu.z80sp <= psMemWrite->highAddr)) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + if (psMemWrite->memoryCall) + { + psMemWrite->memoryCall(cpu.z80sp, (cpu.z80AF & 0xff), psMemWrite); +@@ -16735,7 +16735,7 @@ + case 0xf7: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16787,7 +16787,7 @@ + dwAddr |= ((UINT32) *pbPC++ << 8); /* Get MSB last */ + if (cpu.z80F & Z80_FLAG_SIGN) + { +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* MSB */ + *pbSP = (UINT8) cpu.z80pc; /* LSB */ +@@ -16812,7 +16812,7 @@ + case 0xff: + { + sdwCyclesRemaining -= 11; +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + pbSP = (cpu.z80Base + cpu.z80sp - 1); /* Normalize the stack pointer */ + *pbSP-- = cpu.z80pc >> 8; /* LSB */ + *pbSP = (UINT8) cpu.z80pc; /* MSB */ +@@ -16825,7 +16825,7 @@ + + dwElapsedTicks += (dwOriginalCycles - sdwCyclesRemaining); + +- cpu.z80pc = (UINT32) pbPC - (UINT32) cpu.z80Base; ++ cpu.z80pc = (UINT32) (pbPC - cpu.z80Base); + return(dwReturnCode); /* Indicate success */ + } + diff --git a/extra/dgen-sdl/mz80-stdint.patch b/extra/dgen-sdl/mz80-stdint.patch new file mode 100644 index 000000000..d4b618367 --- /dev/null +++ b/extra/dgen-sdl/mz80-stdint.patch @@ -0,0 +1,67 @@ +mz80 uses unsigned long as UINT32 by default, which is 64 bits on LP64. Use +stdint.h instead. + +Index: dgen-1.23/mz80.h +=================================================================== +--- dgen-1.23.orig/mz80.h 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/mz80.h 2007-12-09 20:27:36.000000000 -0200 +@@ -46,28 +46,30 @@ + #ifndef _MZ80_H_ + #define _MZ80_H_ + ++#include ++ + #ifndef UINT32 +-#define UINT32 unsigned long int ++#define UINT32 uint32_t + #endif + + #ifndef UINT16 +-#define UINT16 unsigned short int ++#define UINT16 uint16_t + #endif + + #ifndef UINT8 +-#define UINT8 unsigned char ++#define UINT8 uint8_t + #endif + + #ifndef INT32 +-#define INT32 signed long int ++#define INT32 int32_t + #endif + + #ifndef INT16 +-#define INT16 signed short int ++#define INT16 int16_t + #endif + + #ifndef INT8 +-#define INT8 signed char ++#define INT8 int8_t + #endif + + #ifdef __cplusplus +Index: dgen-1.23/mz80/makez80.c +=================================================================== +--- dgen-1.23.orig/mz80/makez80.c 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/mz80/makez80.c 2007-12-09 20:27:36.000000000 -0200 +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + #define VERSION "3.4" + +@@ -57,8 +58,8 @@ + #define FALSE 0x0 + #define INVALID 0xff + +-#define UINT32 unsigned long int +-#define UINT8 unsigned char ++#define UINT32 uint32_t ++#define UINT8 uint8_t + + #define TIMING_REGULAR 0x00 + #define TIMING_XXCB 0x01 diff --git a/extra/dgen-sdl/mz80init.patch b/extra/dgen-sdl/mz80init.patch new file mode 100644 index 000000000..cf28a9ddf --- /dev/null +++ b/extra/dgen-sdl/mz80init.patch @@ -0,0 +1,14 @@ +Index: dgen-1.23/main.cpp +=================================================================== +--- dgen-1.23.orig/main.cpp 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/main.cpp 2007-12-09 20:27:30.000000000 -0200 +@@ -334,6 +334,9 @@ + if(optind >= argc) + help(); + ++ extern void mz80init(void); ++ mz80init(); ++ + // Initialize the platform-dependent stuff. + if(!pd_graphics_init(dgen_sound, pal_mode)) + { diff --git a/extra/dgen-sdl/ras-emulate-pointer-wraparound.patch b/extra/dgen-sdl/ras-emulate-pointer-wraparound.patch new file mode 100644 index 000000000..402fc3398 --- /dev/null +++ b/extra/dgen-sdl/ras-emulate-pointer-wraparound.patch @@ -0,0 +1,52 @@ +The raster effects engine in some places multiplied a negative number by the +unsigned Bpp value, and added it to a pointer. The intention was probably to +subtract, which doesn't happen because of the implicit conversion to unsigned. +However, with 32-bit pointers the value wrapped around, leading to the intended +result. + +Convert the result to a signed integer so it will subtract when intended. + +Index: dgen-1.23/ras-drawplane.h +=================================================================== +--- dgen-1.23.orig/ras-drawplane.h 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/ras-drawplane.h 2007-12-09 20:27:41.000000000 -0200 +@@ -67,7 +67,7 @@ + tile_line = tiles + xsize * yoff; + scan = yscroll & 7; + +- where = dest + (xstart + (xscroll & 7)) * Bpp; ++ where = dest + (signed)((xstart + (xscroll & 7)) * Bpp); + + for(x = -1; x < w; ++x) + { +Index: dgen-1.23/ras.cpp +=================================================================== +--- dgen-1.23.orig/ras.cpp 2007-12-09 20:27:28.000000000 -0200 ++++ dgen-1.23/ras.cpp 2007-12-09 20:27:41.000000000 -0200 +@@ -546,7 +546,7 @@ + start = 24; + } + add = -2; +- where = dest + (start * Bpp); ++ where = dest + (signed)(start * Bpp); + for(x=-1; x= x; tx -= 8) + { + if(tx > -8 && tx < 320) +@@ -620,7 +620,7 @@ + where -= Bpp_times8; + } + } else { +- where = dest + (x * Bpp); ++ where = dest + (signed)(x * Bpp); + for(tx = x; tx <= xend; tx += 8) + { + if(tx > -8 && tx < 320) diff --git a/extra/dgen-sdl/sdl-use-stdint.patch b/extra/dgen-sdl/sdl-use-stdint.patch new file mode 100644 index 000000000..f657f7c5f --- /dev/null +++ b/extra/dgen-sdl/sdl-use-stdint.patch @@ -0,0 +1,36 @@ +Index: dgen-1.23/sdl/sdl.cpp +=================================================================== +--- dgen-1.23.orig/sdl/sdl.cpp 2007-12-09 20:27:27.000000000 -0200 ++++ dgen-1.23/sdl/sdl.cpp 2007-12-09 20:27:46.000000000 -0200 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -576,12 +577,12 @@ + break; + case 4: + { +- long *pp = (long*)p, *qq = (long*)q; ++ int32_t *pp = (int32_t*)p, *qq = (int32_t*)q; + for(j = 0; j < 320; ++j, ++qq) + for(k = 0; k < x_scale; ++k) + *(pp++) = *qq; + if(y_scale != 1) +- for(pp = (long*)p, j = 1; j < y_scale; ++j) ++ for(pp = (int32_t*)p, j = 1; j < y_scale; ++j) + { + p += screen->pitch; + memcpy(p, pp, xs*4); +@@ -1085,7 +1086,7 @@ + inline void pd_clear_message() + { + int i, j; +- long *p = (long*)((char*)screen->pixels + (screen->pitch * ys)); ++ int32_t *p = (int32_t*)((char*)screen->pixels + (screen->pitch * ys)); + #ifdef SDL_OPENGL_SUPPORT + if(opengl) + { diff --git a/extra/dhclient/PKGBUILD b/extra/dhclient/PKGBUILD new file mode 100644 index 000000000..3ade78d55 --- /dev/null +++ b/extra/dhclient/PKGBUILD @@ -0,0 +1,46 @@ +#$Id: PKGBUILD 46906 2009-07-21 15:28:15Z daniel $ +# Maintainer: Daniel Isenmann +# Contributor: Mirko Messer +pkgname=dhclient +pkgver=3.1.2p1 +pkgrel=3 +pkgdesc="dhclient is standalone client from the dhcp package" +arch=(i686 x86_64) +url="http://www.isc.org/index.pl?/sw/dhcp/" +license=('custom') +depends=('bash') +options=('!makeflags') +source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \ + fix-mac80211-wireless.patch + site.conf) +md5sums=('787b2924a1965f0d8558521b36dca73d' + 'c7b3e5e4e7a5ece9b4f351f00092e240' + '2e6a845b18bcd188caeead3e47e91151') + +build() { + cd ${startdir}/src/dhcp-${pkgver} + patch -Np1 -i ${startdir}/src/fix-mac80211-wireless.patch || return 1 + + cp ${srcdir}/site.conf . + ./configure + + #only building dhclient, no server + sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile + + make || return 1 + make DESTDIR=${startdir}/pkg install + mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname} + install -m644 ${startdir}/src/dhcp-${pkgver}/LICENSE \ + ${startdir}/pkg/usr/share/licenses/${pkgname}/ + + install -m755 -d ${startdir}/pkg/var/lib/dhclient + + #not needed after fresh install + rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases + #deleting file conflicts to dhcpd + rm -rf ${pkgdir}/usr/{include,lib} + rm -rf ${pkgdir}/usr/share/man/man3 + rm -rf ${pkgdir}/usr/share/man/man5/dhcp-eval.5 + rm -rf ${pkgdir}/usr/share/man/man5/dhcp-options.5 + +} diff --git a/extra/dhclient/arch-nm.patch b/extra/dhclient/arch-nm.patch new file mode 100644 index 000000000..26813d48f --- /dev/null +++ b/extra/dhclient/arch-nm.patch @@ -0,0 +1,377 @@ +diff -urN dhcp-3.0.3/client/dhclient.8 dhcp-3.0.3-work/client/dhclient.8 +--- dhcp-3.0.3/client/dhclient.8 2004-09-30 01:01:46.000000000 +0200 ++++ dhcp-3.0.3-work/client/dhclient.8 2005-10-19 18:43:28.000000000 +0200 +@@ -78,6 +78,9 @@ + .B -w + ] + [ ++.B -x ++] ++[ + .I if0 + [ + .I ...ifN +diff -urN dhcp-3.0.3/client/dhclient.c dhcp-3.0.3-work/client/dhclient.c +--- dhcp-3.0.3/client/dhclient.c 2005-03-03 17:55:22.000000000 +0100 ++++ dhcp-3.0.3-work/client/dhclient.c 2005-10-19 18:48:42.000000000 +0200 +@@ -74,7 +74,9 @@ + int onetry=0; + int quiet=0; + int nowait=0; +- ++#ifdef EXTENDED_NEW_OPTION_INFO ++int extended_option_environment = 0; ++#endif + static void usage PROTO ((void)); + + void do_release(struct client_state *); +@@ -204,6 +206,11 @@ + } else if (!strcmp (argv [i], "--version")) { + log_info ("isc-dhclient-%s", DHCP_VERSION); + exit (0); ++#ifdef EXTENDED_NEW_OPTION_INFO ++ } else if (!strcmp (argv [i], "-x")) { ++ extended_option_environment = 1; ++ new_option_info_tree = GENERATE_NEW_OPTION_INFO; ++#endif + } else if (argv [i][0] == '-') { + usage (); + } else { +@@ -241,7 +248,7 @@ + } + + /* first kill of any currently running client */ +- if (release_mode) { ++ if (1) { + FILE *pidfd; + pid_t oldpid; + long temp; +@@ -251,11 +258,17 @@ + if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) { + e = fscanf(pidfd, "%ld\n", &temp); + oldpid = (pid_t)temp; ++ log_info ("There is already a pid file %s with pid %i", path_dhclient_pid, oldpid); + + if (e != 0 && e != EOF) { + if (oldpid) { +- if (kill(oldpid, SIGTERM) == 0) +- unlink(path_dhclient_pid); ++ if (kill(oldpid, SIGTERM) == 0) { ++ log_info ("killed old client process, removed PID file"); ++ unlink(path_dhclient_pid); ++ } else if (errno == ESRCH) { ++ log_info ("removed stale PID file"); ++ unlink(path_dhclient_pid); ++ } + } + } + fclose(pidfd); +@@ -476,7 +489,11 @@ + log_info (arr); + log_info (url); + ++#ifdef EXTENDED_NEW_OPTION_INFO ++ log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] %s", ++#else + log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] %s", ++#endif + "[-s server]"); + log_error (" [-cf config-file] [-lf lease-file]%s", + "[-pf pid-file] [-e VAR=val]"); +@@ -869,7 +886,7 @@ + /* If the BOUND/RENEW code detects another machine using the + offered address, it exits nonzero. We need to send a + DHCPDECLINE and toss the lease. */ +- if (script_go (client)) { ++ if (script_go (client) == 2) { + make_decline (client, client -> new); + send_decline (client); + destroy_client_lease (client -> new); +@@ -2433,8 +2450,28 @@ + struct envadd_state { + struct client_state *client; + const char *prefix; ++ struct universe *universe; + }; + ++#ifdef EXTENDED_NEW_OPTION_INFO ++static ++void build_universe_info_envvar ++( struct option_cache *oc, ++ struct packet *p, struct lease *l, ++ struct client_state *client, ++ struct option_state *in_o, ++ struct option_state *cf_o, ++ struct binding_scope **scope, ++ struct universe *u, void *es ++) ++{ ++ char info_name[512], info_data[512]; ++ snprintf(info_name, 512, "%s._universe_.", oc->option->universe->name); ++ snprintf(info_data, 512, "%u:%s", oc->option->code,oc->option->format); ++ client_envadd( client, info_name, oc->option->name, info_data ); ++} ++#endif ++ + void client_option_envadd (struct option_cache *oc, + struct packet *packet, struct lease *lease, + struct client_state *client_state, +@@ -2451,6 +2488,31 @@ + in_options, cfg_options, scope, oc, MDL)) { + if (data.len) { + char name [256]; ++#ifdef EXTENDED_NEW_OPTION_INFO ++ if ( extended_option_environment ) ++ { ++ if( ( oc->option->universe != &dhcp_universe ) ++ &&( oc->option->universe->index > fqdn_universe.index ) ++ &&( es->universe != oc->option->universe ) ++ ) ++ { ++ es->universe = oc->option->universe; ++ (*(es->universe->foreach)) ++ ( (struct packet *)0, (struct lease *)0, ++ client_state, ++ in_options, cfg_options, ++ scope, es->universe, es, ++ build_universe_info_envvar ++ ); ++ }else ++ if ( lookup_new_option_info(oc->option) != 0L ) ++ build_universe_info_envvar ++ ( oc, packet, lease, client_state, ++ in_options, cfg_options, scope, ++ oc->option->universe, es ++ ); ++ } ++#endif + if (dhcp_option_ev_name (name, sizeof name, + oc -> option)) { + client_envadd (es -> client, es -> prefix, +@@ -2479,6 +2541,7 @@ + + es.client = client; + es.prefix = prefix; ++ es.universe = 0L; + + client_envadd (client, + prefix, "ip_address", "%s", piaddr (lease -> address)); +@@ -2690,7 +2760,14 @@ + s = option -> name; + if (j + 1 == buflen) + return 0; ++#ifdef EXTENDED_NEW_OPTION_INFO ++ if ( ! extended_option_environment ) ++ buf [j++] = '_'; ++ else ++ buf [j++] = '.'; ++#else + buf [j++] = '_'; ++#endif + } + ++i; + } while (i != 2); +diff -urN dhcp-3.0.3/client/scripts/linux dhcp-3.0.3-work/client/scripts/linux +--- dhcp-3.0.3/client/scripts/linux 2002-11-15 02:09:09.000000000 +0100 ++++ dhcp-3.0.3-work/client/scripts/linux 2005-10-19 18:46:52.000000000 +0200 +@@ -22,6 +22,19 @@ + # 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious + # of the $1 in its args. + ++if [ -n "${dhc_dbus}" ]; then ++ /usr/bin/dbus-send \ ++ --system \ ++ --dest=com.redhat.dhcp \ ++ --type=method_call \ ++ /com/redhat/dhcp/$interface \ ++ com.redhat.dhcp.set \ ++ 'string:'"`env | /bin/egrep -v '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"; ++ if (( ( dhc_dbus & 31 ) == 31 )); then ++ exit 0; ++ fi; ++fi; ++ + make_resolv_conf() { + if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then + echo search $new_domain_name >/etc/resolv.conf +@@ -80,6 +93,7 @@ + fi + + if [ x$reason = xPREINIT ]; then ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + if [ x$alias_ip_address != x ]; then + # Bring down alias interface. Its routes will disappear too. + ifconfig $interface:0- inet 0 +@@ -98,6 +112,7 @@ + sleep 1 + + exit_with_hooks 0 ++ fi + fi + + if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then +@@ -115,6 +130,7 @@ + fi + fi + ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ + [ x$alias_ip_address != x$old_ip_address ]; then + # Possible new alias. Remove old alias. +@@ -124,13 +140,18 @@ + # IP address changed. Bringing down the interface will delete all routes, + # and clear the ARP cache. + ifconfig $interface inet 0 down +- + fi ++ fi ++ + if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ + [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then + ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + ifconfig $interface inet $new_ip_address $new_subnet_arg \ + $new_broadcast_arg ++ fi ++ ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then + # Add a network route to the computed network address. + if [ $relmajor -lt 2 ] || \ + ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then +@@ -140,13 +161,18 @@ + route add default gw $router + done + fi ++ fi ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; + then + ifconfig $interface:0- inet 0 + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address $interface:0 + fi ++ fi ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then + make_resolv_conf ++ fi + exit_with_hooks 0 + fi + +@@ -168,19 +194,24 @@ + fi + + if [ x$reason = xTIMEOUT ]; then ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + if [ x$alias_ip_address != x ]; then + ifconfig $interface:0- inet 0 + fi + ifconfig $interface inet $new_ip_address $new_subnet_arg \ + $new_broadcast_arg ++ fi + set $new_routers + ############## what is -w in ping? + if ping -q -c 1 $1; then ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg + route add -host $alias_ip_address dev $interface:0 + fi ++ fi ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 4 ) != 4 )); then + if [ $relmajor -lt 2 ] || \ + ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then + route add -net $new_network_number +@@ -188,10 +219,16 @@ + for router in $new_routers; do + route add default gw $router + done ++ fi ++ ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 1 ) != 1 )); then + make_resolv_conf ++ fi + exit_with_hooks 0 + fi ++ if [ -z "${dhc_dbus}" ] || (( ( dhc_dbus & 2 ) != 2 )); then + ifconfig $interface inet 0 down ++ fi + exit_with_hooks 1 + fi + +diff -urN dhcp-3.0.3/common/parse.c dhcp-3.0.3-work/common/parse.c +--- dhcp-3.0.3/common/parse.c 2005-03-03 17:55:23.000000000 +0100 ++++ dhcp-3.0.3-work/common/parse.c 2005-10-19 18:43:28.000000000 +0200 +@@ -1270,6 +1270,10 @@ + option_hash_add (option -> universe -> hash, + (const char *)option -> name, + 0, option, MDL); ++#ifdef EXTENDED_NEW_OPTION_INFO ++ if ( new_option_info_tree != 0L ) ++ add_new_option_info( option ); ++#endif + return 1; + } + +diff -urN dhcp-3.0.3/common/tables.c dhcp-3.0.3-work/common/tables.c +--- dhcp-3.0.3/common/tables.c 2004-09-01 19:06:35.000000000 +0200 ++++ dhcp-3.0.3-work/common/tables.c 2005-10-19 18:43:28.000000000 +0200 +@@ -1238,3 +1238,40 @@ + fqdn_universe.name, 0, + &fqdn_universe, MDL); + } ++ ++#ifdef EXTENDED_NEW_OPTION_INFO ++#include ++ ++void *new_option_info_tree = 0L; ++ ++static int new_option_info_comparator( const void* p1, const void *p2 ) ++{ ++ uint32_t ocode1 = (((const struct option*)p1)->universe->index << 8) ++ |(((const struct option*)p1)->code), ++ ocode2 = (((const struct option*)p2)->universe->index << 8) ++ |(((const struct option*)p2)->code); ++ return( (ocode1 == ocode2) ++ ? 0 ++ :( ( ocode1 > ocode2 ) ++ ? 1 ++ : -1 ++ ) ++ ); ++} ++ ++void *add_new_option_info( struct option *option ) ++{ ++ if ( option->universe->index >= fqdn_universe.index ) ++ return 0L; ++ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO ) ++ new_option_info_tree = (void*)0L; ++ return tsearch( option, &(new_option_info_tree), new_option_info_comparator ); ++} ++ ++void *lookup_new_option_info( struct option *option ) ++{ ++ if ( new_option_info_tree == GENERATE_NEW_OPTION_INFO ) ++ return 0L; ++ return tfind( option, &(new_option_info_tree), new_option_info_comparator ); ++} ++#endif +diff -urN dhcp-3.0.3/includes/dhcpd.h dhcp-3.0.3-work/includes/dhcpd.h +--- dhcp-3.0.3/includes/dhcpd.h 2005-04-30 01:10:57.000000000 +0200 ++++ dhcp-3.0.3-work/includes/dhcpd.h 2005-10-19 18:43:28.000000000 +0200 +@@ -1799,6 +1799,14 @@ + void initialize_common_option_spaces PROTO ((void)); + struct universe *config_universe; + ++#define EXTENDED_NEW_OPTION_INFO ++#ifdef EXTENDED_NEW_OPTION_INFO ++#define GENERATE_NEW_OPTION_INFO ((void*)1) ++extern void *new_option_info_tree; ++extern void *add_new_option_info( struct option*); ++extern void *lookup_new_option_info( struct option *); ++#endif ++ + /* stables.c */ + #if defined (FAILOVER_PROTOCOL) + extern failover_option_t null_failover_option; diff --git a/extra/dhclient/fix-broken-resolvconf.patch b/extra/dhclient/fix-broken-resolvconf.patch new file mode 100644 index 000000000..5f73167c8 --- /dev/null +++ b/extra/dhclient/fix-broken-resolvconf.patch @@ -0,0 +1,15 @@ +diff -Nur dhcp-3.0.6.orig/client/scripts/linux dhcp-3.0.6/client/scripts/linux +--- dhcp-3.0.6.orig/client/scripts/linux 2008-03-29 18:44:07.000000000 +0100 ++++ dhcp-3.0.6/client/scripts/linux 2008-03-29 18:45:06.000000000 +0100 +@@ -36,8 +36,9 @@ + fi; + + make_resolv_conf() { +- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then +- echo search $new_domain_name >/etc/resolv.conf ++ if [ -n "$new_domain_name_servers" ]; then ++ : > /etc/resolv.conf ++ [ -n "$new_domain_name" ] && echo search $new_domain_name >/etc/resolv.conf + chmod 644 /etc/resolv.conf + for nameserver in $new_domain_name_servers; do + echo nameserver $nameserver >>/etc/resolv.conf diff --git a/extra/dhclient/fix-mac80211-wireless.patch b/extra/dhclient/fix-mac80211-wireless.patch new file mode 100644 index 000000000..dcbde9510 --- /dev/null +++ b/extra/dhclient/fix-mac80211-wireless.patch @@ -0,0 +1,29 @@ +--- dhcp-3.1.2p1/client/scripts/linux_orig 2006-07-22 04:24:16.000000000 +0200 ++++ dhcp-3.1.2p1/client/scripts/linux 2009-07-20 18:20:54.000000000 +0200 +@@ -133,7 +133,7 @@ + if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then + # IP address changed. Bringing down the interface will delete all routes, + # and clear the ARP cache. +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0 + + fi + if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ +@@ -168,7 +168,7 @@ + fi + if [ x$old_ip_address != x ]; then + # Shut down interface, which will delete routes and clear arp cache. +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0 + fi + if [ x$alias_ip_address != x ]; then + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +@@ -201,7 +201,7 @@ + make_resolv_conf + exit_with_hooks 0 + fi +- ifconfig $interface inet 0 down ++ ifconfig $interface inet 0 + exit_with_hooks 1 + fi + diff --git a/extra/dhclient/site.conf b/extra/dhclient/site.conf new file mode 100644 index 000000000..c1081709c --- /dev/null +++ b/extra/dhclient/site.conf @@ -0,0 +1,12 @@ +LIBDIR = /usr/lib +INCDIR = /usr/include +VARDB = /var/lib/dhclient +ADMMANDIR = /usr/share/man/man8 +ADMMANEXT = .8 +FFMANDIR = /usr/share/man/man5 +FFMANEXT = .5 +LIBMANDIR = /usr/share/man/man3 +LIBMANEXT = .3 +USRMANDIR = /usr/share/man/man1 +USRMANEXT = .1 +MANCAT = man diff --git a/extra/dhcp/ChangeLog b/extra/dhcp/ChangeLog new file mode 100644 index 000000000..7b9cb474a --- /dev/null +++ b/extra/dhcp/ChangeLog @@ -0,0 +1,8 @@ + +2009-07-19 K. Piche + * dhcp 4.1.0.p1-1 + * Adopted RedHat patch to fix bug where dhcpd won't start if ipv6 module + is not loaded. Fixes FS#12792. + * Added /etc/conf.d/dhcp feature contributed by Fabiano Furtado Pessoa + Coelho + diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD new file mode 100644 index 000000000..b5c70dfa8 --- /dev/null +++ b/extra/dhcp/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 46754 2009-07-20 03:16:44Z kevin $ +# Maintainer: judd +pkgname=dhcp +# separate patch levels with a period to maintain proper versioning. +pkgver=4.1.0.p1 +_pkgver=4.1.0p1 +pkgrel=1 +pkgdesc="A DHCP server, client, and relay agent" +arch=(i686 x86_64) +license=('custom:isc-dhcp') +url="https://www.isc.org/software/dhcp" +depends=('openssl>=0.9.8a') +backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp') +install=dhcp.install +source=(http://ftp.isc.org/isc/${pkgname}/${pkgname}-${_pkgver}.tar.gz +dhcpd dhcp.conf.d dhcp-4.1.0-missing-ipv6-not-fatal.patch) +md5sums=('325ff8338c5a21f89d5304ac13ffebdf' 'df22cffa7d7415ece7bb025b7bf774dd' + '49da3192e5c885e3c7d02f447c2dea5e' '401eb8819fc1d10fda3f8e02ad9fe421') + +build() { + cd ${srcdir}/${pkgname}-${_pkgver} + # Define _GNU_SOURCE to fix IPV6. + sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure + # Make not having ipv6 non-fatal. + patch -Np1 -i ${srcdir}/dhcp-4.1.0-missing-ipv6-not-fatal.patch + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ + --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases + make || return 1 + make DESTDIR=${pkgdir} install + + install -D -m755 ${srcdir}/dhcpd ${pkgdir}/etc/rc.d/dhcpd + install -D -m644 ${srcdir}/dhcp.conf.d ${pkgdir}/etc/conf.d/${pkgname} + mkdir -p ${pkgdir}/var/state/dhcp + rm -f ${pkgdir}/etc/dhclient.conf + rm -f ${pkgdir}/usr/sbin/dhclient + rm -f ${pkgdir}/usr/share/man/man{5,8}/dhclient* + # install licenses + install -m644 -D ${srcdir}/${pkgname}-${_pkgver}/LICENSE \ + ${pkgdir}/usr/share/licenses/dhcp/LICENSE +} diff --git a/extra/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch b/extra/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch new file mode 100644 index 000000000..346efd69a --- /dev/null +++ b/extra/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch @@ -0,0 +1,54 @@ +Based on patch from redhat: http://cvs.fedoraproject.org/viewvc/devel/dhcp/dhcp-4.1.0-missing-ipv6-not-fatal.patch?revision=1.2 + +--- common/discover.c.orig 2008-08-29 13:48:57.000000000 -0400 ++++ common/discover.c 2009-09-08 23:32:45.000000000 -0400 +@@ -443,16 +443,20 @@ + } + + #ifdef DHCPv6 +- ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); +- if (ifaces->fp6 == NULL) { +- log_error("Error opening '/proc/net/if_inet6' to " +- "list IPv6 interfaces; %m"); +- close(ifaces->sock); +- ifaces->sock = -1; +- fclose(ifaces->fp); +- ifaces->fp = NULL; +- return 0; +- } ++ if (!access("/proc/net/if_inet6", R_OK)) { ++ ifaces->fp6 = fopen("/proc/net/if_inet6", "r"); ++ if (ifaces->fp6 == NULL) { ++ log_error("Error opening '/proc/net/if_inet6' to " ++ "list IPv6 interfaces; %m"); ++ close(ifaces->sock); ++ ifaces->sock = -1; ++ fclose(ifaces->fp); ++ ifaces->fp = NULL; ++ return 0; ++ } ++ } else { ++ ifaces->fp6 = NULL; ++ } + #endif + + return 1; +@@ -719,7 +723,7 @@ + return 1; + } + #ifdef DHCPv6 +- if (!(*err)) { ++ if (!(*err) && ifaces->fp6) { + return next_iface6(info, err, ifaces); + } + #endif +@@ -736,7 +740,8 @@ + close(ifaces->sock); + ifaces->sock = -1; + #ifdef DHCPv6 +- fclose(ifaces->fp6); ++ if (ifaces->fp6) ++ fclose(ifaces->fp6); + ifaces->fp6 = NULL; + #endif + } diff --git a/extra/dhcp/dhcp.conf.d b/extra/dhcp/dhcp.conf.d new file mode 100644 index 000000000..99ba6d13d --- /dev/null +++ b/extra/dhcp/dhcp.conf.d @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP server daemon +# + +DHCP_ARGS="-q" + diff --git a/extra/dhcp/dhcp.install b/extra/dhcp/dhcp.install new file mode 100644 index 000000000..edb84b1cb --- /dev/null +++ b/extra/dhcp/dhcp.install @@ -0,0 +1,15 @@ +# arg 1: the new package version +post_install() { + [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases + echo "If dhcpd doesn' start ensure the ipv6 kernel module is loaded." +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +op=$1 +shift +$op $* diff --git a/extra/dhcp/dhcpd b/extra/dhcp/dhcpd new file mode 100755 index 000000000..1fbb31e7c --- /dev/null +++ b/extra/dhcp/dhcpd @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/dhcp + +PIDFILE="/var/run/dhcpd.pid" +PID=`cat $PIDFILE 2>/dev/null` +case "$1" in + start) + stat_busy "Starting DHCP Server" + if [ "$PID" = "" ]; then + /usr/sbin/dhcpd $DHCP_ARGS + fi + if [ "$PID" != "" -o $? -gt 0 ]; then + stat_fail + else + add_daemon dhcpd + stat_done + fi + ;; + stop) + stat_busy "Stopping DHCP Server" + [ ! -z "$PID" ] && kill $PID &> /dev/null + rm -f $PIDFILE + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon dhcpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/extra/di/ChangeLog b/extra/di/ChangeLog new file mode 100644 index 000000000..adca95c73 --- /dev/null +++ b/extra/di/ChangeLog @@ -0,0 +1,19 @@ +2009-09-20 Eric Belanger + + * di 4.16-1 + * Upstream update + +2009-09-18 Eric Belanger + + * di 4.15-1 + * Upstream update + +2009-02-08 Eric Belanger + + * di 4.13-1 + * Upstream update + * Corrected license + * FHS man pages + * Added locales + * Disabled SMP build + * Added ChangeLog diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD new file mode 100644 index 000000000..a522d0b2a --- /dev/null +++ b/extra/di/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 52498 2009-09-21 03:12:37Z eric $ +# Maintainer: Eric Belanger +# Contributor: Tom Newsom + +pkgname=di +pkgver=4.16 +pkgrel=1 +pkgdesc="A disk information utility, displaying everything (and more) that your df command does" +arch=('i686' 'x86_64') +url="http://www.gentoo.com/di/" +license=('ZLIB') +depends=('glibc') +options=('!makeflags') +source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) +md5sums=('a035972d3f90bc8390b19461156ee4ea') +sha1sums=('51e5c8745353f6673690b60a755e30e6fced764f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make || return 1 + make prefix="${pkgdir}/usr" install || return 1 + ln -sf di "${pkgdir}/usr/bin/mi" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 LICENSE.iffe "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.iffe" +} diff --git a/extra/dia/PKGBUILD b/extra/dia/PKGBUILD new file mode 100644 index 000000000..8f1616210 --- /dev/null +++ b/extra/dia/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 40215 2009-05-28 21:56:51Z jgc $ +# Maintainer: Juergen Hoetzel +# Contributor: Gregor Ibic + +pkgname=dia +pkgver=0.97 +pkgrel=2 +pkgdesc="DIAgram editor" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/Dia" +install=dia.install +depends=('libxslt>=1.1.24' 'desktop-file-utils' 'libart-lgpl>=2.3.20' 'gtk2>=2.16.1') +makedepends=('intltool' 'python') +options=('!libtool') +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3d11f9aaa5a4923f0a5533962c87bdfb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-db2html --with-cairo --with-python --disable-gnome || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 +} diff --git a/extra/dia/dia.install b/extra/dia/dia.install new file mode 100644 index 000000000..a49438e1f --- /dev/null +++ b/extra/dia/dia.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD new file mode 100644 index 000000000..2bd34856d --- /dev/null +++ b/extra/diffstat/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 50909 2009-09-02 23:49:37Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Matthias-Christian Ott + +pkgname=diffstat +pkgver=1.49 +pkgrel=1 +pkgdesc="Display a histogram of diff changes" +arch=('i686' 'x86_64') +url="http://invisible-island.net/diffstat" +depends=('glibc') +license=('GPL') +source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz) +md5sums=('63fa6d90f137f5d839e94aa93882db98') + +build () { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --mandir=/usr/share/man + make || return 1 + make DESTDIR=$pkgdir/ install +} + diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD new file mode 100644 index 000000000..98305c77d --- /dev/null +++ b/extra/digikam/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 47501 2009-07-23 21:48:39Z pierre $ +# Maintainer: Tobias Powalowski + +pkgname=digikam +pkgver=0.10.0 +pkgrel=4 +pkgdesc="Digital photo management application for kde" +arch=(i686 x86_64) +license=('GPL') +url="http://digikam.sourceforge.net" +depends=('kdebase-runtime' 'kdegraphics-libs' 'kdepimlibs' 'lensfun') +makedepends=('pkgconfig' 'cmake' 'automoc4') +source=(http://downloads.sourceforge.net/digikam/${pkgname}-0.10.0.tar.bz2) +replaces=('digikamimageplugins') +optdepends=('kipi-plugins: for more extras and plugins') +md5sums=('6c6daf958ff4fe93974f1074ba967cd9') + +build() { + cd ${srcdir}/${pkgname}-0.10.0 + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MARBLEWIDGET=no -DWITH_MarbleWidget=no \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' + make all|| return 1 + make DESTDIR=${pkgdir} install || return 1 + } diff --git a/extra/ding/PKGBUILD b/extra/ding/PKGBUILD new file mode 100644 index 000000000..653c8953b --- /dev/null +++ b/extra/ding/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 49858 2009-08-16 19:07:52Z jgc $ +# Contributor: Roman Kreisel +# Maintainer: damir + +pkgname=ding +pkgver=1.6 +pkgrel=1 +pkgdesc="A Dictionary Lookup program and EN<->DE Dictionary" +arch=('any') +license=('GPL') +url="http://www-user.tu-chemnitz.de/~fri/ding" +depends=('sh' 'tk' 'grep') +source=(http://wftp.tu-chemnitz.de/pub/Local/urz/${pkgname}/${pkgname}-${pkgver}.tar.gz + ding.desktop) +md5sums=('6f336c9b66f37c99b98e13659b493d54' + '9f1a22cd58ee95eda9fd434e34a50f62') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -m755 -d "${pkgdir}/usr/bin" + install -m755 -d "${pkgdir}/usr/share/dict" + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m755 -d "${pkgdir}/usr/share/applications" + install -m755 -d "${pkgdir}/usr/share/pixmaps" + + sed -i -e 's/ger-en.txt/de-en.txt/g' ding || return 1 + + install -m755 ding "${pkgdir}/usr/bin/" || return 1 + install -m644 ding.1 "${pkgdir}/usr/share/man/man1/" || return 1 + install -m644 de-en.txt "${pkgdir}/usr/share/dict/" || return 1 + install -m644 ding.png "${pkgdir}/usr/share/pixmaps/" || return 1 + + install -m644 "${srcdir}/ding.desktop" "${pkgdir}/usr/share/applications/" || return 1 +} diff --git a/extra/ding/ding.desktop b/extra/ding/ding.desktop new file mode 100644 index 000000000..99cde496b --- /dev/null +++ b/extra/ding/ding.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Categories=Office; +Comment=A Dictionary Lookup program and EN<->DE Dictionary +Exec=ding +Icon=ding +Name=ding +StartupNotify=false +Terminal=false +Type=Application diff --git a/extra/dirmngr/PKGBUILD b/extra/dirmngr/PKGBUILD new file mode 100644 index 000000000..32827ba0f --- /dev/null +++ b/extra/dirmngr/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 52262 2009-09-17 05:05:09Z allan $ +# Maintainer: Tobias Powalowski + +pkgname=dirmngr +pkgver=1.0.2 +pkgrel=2 +pkgdesc="A daemon to handle CRL and certificate requests" +arch=('i686' 'x86_64') +license=('GPL') +url="ftp://ftp.gnupg.org/gcrypt/dirmngr" +depends=('libgcrypt' 'libldap' 'libksba' 'libgpg-error' 'libassuan' 'pth') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib + make || return 1 + make DESTDIR=$pkgdir install +} +md5sums=('88d62a348903009cbc96212e4684c89c') diff --git a/extra/distcc/PKGBUILD b/extra/distcc/PKGBUILD new file mode 100644 index 000000000..5c65aebe9 --- /dev/null +++ b/extra/distcc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 28174 2009-02-28 02:44:41Z eric $ +# Maintainer: Judd Vinet +pkgname=distcc +pkgver=3.1 +pkgrel=1 +pkgdesc="A distributed C, C++, Obj C compiler" +arch=(i686 x86_64) +url="http://code.google.com/p/distcc/" +license=('GPL') +depends=(popt gcc) +makedepends=(gtk2 pkgconfig) +backup=(etc/conf.d/distccd) +source=(http://distcc.googlecode.com/files/$pkgname-$pkgver.tar.bz2 distccd distccd.conf.d) +md5sums=('a1a9d3853df7133669fffec2a9aab9f3' '1c918474372c09304772c20c4de484fa'\ + '89aaf6e9072092e283465a14e83f0f94') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --with-gtk --sysconfdir=/etc --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + install -D -m644 ../distccd.conf.d $pkgdir/etc/conf.d/distccd + install -D -m755 ../distccd $pkgdir/etc/rc.d/distccd + + mkdir -p $pkgdir/usr/lib/${pkgname}/bin + ln -sf /usr/bin/${pkgname} $pkgdir/usr/lib/${pkgname}/bin/cc + ln -sf /usr/bin/${pkgname} $pkgdir/usr/lib/${pkgname}/bin/gcc + ln -sf /usr/bin/${pkgname} $pkgdir/usr/lib/${pkgname}/bin/g++ + ln -sf /usr/bin/${pkgname} $pkgdir/usr/lib/${pkgname}/bin/cpp +} diff --git a/extra/distcc/distccd b/extra/distcc/distccd new file mode 100755 index 000000000..4702d6820 --- /dev/null +++ b/extra/distcc/distccd @@ -0,0 +1,38 @@ +#!/bin/bash + +[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/distccd` +case "$1" in + start) + stat_busy "Starting distcc Daemon" + [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon distccd + stat_done + fi + ;; + stop) + stat_busy "Stopping distcc Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon distccd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/distcc/distccd.conf.d b/extra/distcc/distccd.conf.d new file mode 100644 index 000000000..8f90cb503 --- /dev/null +++ b/extra/distcc/distccd.conf.d @@ -0,0 +1,8 @@ +# +# Parameters to be passed to distccd +# +# You must explicitly add IPs (or subnets) that are allowed to connect, +# using the --allow switch. See the distccd manpage for more info. +# +DISTCC_ARGS="--user nobody --allow 127.0.0.1" + diff --git a/extra/django/PKGBUILD b/extra/django/PKGBUILD new file mode 100644 index 000000000..23d26fd11 --- /dev/null +++ b/extra/django/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 47928 2009-07-29 16:48:51Z giovanni $ +# Contributor: Shahar Weiss +# Contributor: simo +# Maintainer: Douglas Soares de Andrade + +pkgname=django +pkgver=1.1 +pkgrel=1 +pkgdesc="A high-level Python Web framework." +arch=('i686' 'x86_64') +license=('BSD') +url="http://www.djangoproject.com" +depends=('setuptools') +source=("http://media.djangoproject.com/releases/$pkgver/Django-$pkgver.tar.gz") + +build() { + cd $startdir/src/Django-$pkgver + python setup.py install --root=$startdir/pkg || return 1 + install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE +} +md5sums=('b2d75b4457a39c405fa2b36bf826bf6b') diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD new file mode 100644 index 000000000..ad02a02e0 --- /dev/null +++ b/extra/djvulibre/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 44489 2009-07-02 07:30:49Z allan $ +# Maintainer: Jan de Groot +# Contributor: mgushee + +pkgname=djvulibre +pkgver=3.5.22 +pkgrel=2 +pkgdesc="Suite to create, manipulate and view DjVu ('dĂ©jĂ  vu') documents" +arch=("i686" "x86_64") +license=('GPL') +url="http://djvu.sourceforge.net/" +depends=('libtiff>=3.8.2-5' 'hicolor-icon-theme' 'qt3>=3.3.8-12' 'desktop-file-utils' + "libdjvu>=${pkgver}-2" 'shared-mime-info') +makedepends=('pkgconfig') +options=(!makeflags) +install=djvulibre.install +source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz) + +build() { + [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools || return 1 + make LIBDJVU="`pkg-config --libs ddjvuapi`" SUBDIRS_FIRST=tools \ + DESTDIR="${pkgdir}" plugindir=/usr/lib/mozilla/plugins \ + install-utils install-gui install-i18n || return 1 + + #Install icons, launcher files, mime-types. + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48}/mimetypes + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps + install -m755 -d ${pkgdir}/usr/share/mime/packages/ + install -m755 -d ${pkgdir}/usr/share/applications + + install -m644 desktopfiles/hi22-djvu.png "${pkgdir}/usr/share/icons/hicolor/22x22/mimetypes/image-vnd.djvu.mime.png" || return 1 + install -m644 desktopfiles/hi32-djvu.png "${pkgdir}/usr/share/icons/hicolor/32x32/mimetypes/image-vnd.djvu.mime.png" || return 1 + install -m644 desktopfiles/hi48-djvu.png "${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/image-vnd.djvu.mime.png" || return 1 + + install -m644 desktopfiles/djvulibre-mime.xml "${pkgdir}/usr/share/mime/packages/" || return 1 + + install -m644 desktopfiles/hi32-djview3.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/djvulibre-djview3.png" || return 1 + install -m644 desktopfiles/djvulibre-djview3.desktop "${pkgdir}/usr/share/applications/" || return 1 +} diff --git a/extra/djvulibre/djvulibre.install b/extra/djvulibre/djvulibre.install new file mode 100644 index 000000000..46c63f253 --- /dev/null +++ b/extra/djvulibre/djvulibre.install @@ -0,0 +1,15 @@ +post_install() { + if [ -x usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q -f usr/share/icons/hicolor + fi + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD new file mode 100644 index 000000000..7b909633d --- /dev/null +++ b/extra/dmapi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 47579 2009-07-24 05:47:49Z tpowa $ +# Maintainer: Tobias Powalowski +pkgname=dmapi +pkgver=2.2.10 +pkgrel=2 +pkgdesc="Data migration API" +arch=(i686 x86_64) +url="http://oss.sgi.com/projects/xfs/" +license=('GPL') +depends=('glibc') +makedepends=('xfsprogs') +provides=('xfsdmapi') +conflicts=('xfsdmapi') +replaces=('xfsdmapi') +options=('!libtool') +source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz) +md5sums=('c6e4ace10c446bbb92576e5dd19aec24') + +build() { + cd $startdir/src/dmapi-$pkgver + [ "$CARCH" = "x86_64" ] && export CFLAGS="$CLFAGS -fPIC" + autoconf + ./configure --prefix=$pkgdir/usr + make || return 1 + make prefix=$pkgdir/usr/ install install-dev || return 1 + # the static lib + install -D -m644 libdm/.libs/libdm.a $pkgdir/usr/lib/libdm.a + # and the header file, please + install -D -m644 include/dmapi.h $pkgdir/usr/include/xfs/dmapi.h + # kill libexec dir + rm -rf $pkgdir/usr/libexec +} diff --git a/extra/dmenu/PKGBUILD b/extra/dmenu/PKGBUILD new file mode 100644 index 000000000..7615989f6 --- /dev/null +++ b/extra/dmenu/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 38665 2009-05-10 01:23:23Z thayer $ +# Contributor: Jeff 'codemac' Mickey +# Maintainer: Thayer Williams + +pkgname=dmenu +pkgver=4.0 +pkgrel=1 +pkgdesc="Dynamic X menu" +url="http://www.suckless.org/programs/dmenu.html" +arch=('i686' 'x86_64') +license=('MIT') +depends=('libx11' 'libxinerama') +makedepends=('xineramaproto') +source=(http://code.suckless.org/dl/tools/$pkgname-$pkgver.tar.gz + dmenu.patch) +md5sums=('66e761a653930cc8a21614ba9fedf903' + 'd74a6665a19cb0403720f1f3abcd280d') + +build() +{ + cd $srcdir/$pkgname-$pkgver + patch -p1 < $srcdir/dmenu.patch || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + + #install license + mkdir -p $pkgdir/usr/share/licenses/$pkgname + cp LICENSE $pkgdir/usr/share/licenses/$pkgname/ +} + diff --git a/extra/dmenu/dmenu.patch b/extra/dmenu/dmenu.patch new file mode 100644 index 000000000..9df36527d --- /dev/null +++ b/extra/dmenu/dmenu.patch @@ -0,0 +1,17 @@ +--- dmenu-3.9.orig/config.mk 2008-09-13 20:45:32.000000000 -0300 ++++ dmenu-3.9/config.mk 2008-09-13 20:46:42.000000000 -0300 +@@ -4,11 +4,11 @@ VERSION = 3.9 + # Customize below to fit your system + + # paths +-PREFIX = /usr/local ++PREFIX = /usr + MANPREFIX = ${PREFIX}/share/man + +-X11INC = /usr/X11R6/include +-X11LIB = /usr/X11R6/lib ++X11INC = /usr/include/X11 ++X11LIB = /usr/lib/X11 + + # Xinerama, comment if you don't want it + XINERAMALIBS = -L${X11LIB} -lXinerama diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD new file mode 100644 index 000000000..cb42b0324 --- /dev/null +++ b/extra/dmidecode/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 19464 2008-11-23 22:53:14Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Jan de Groot + +pkgname=dmidecode +pkgver=2.10 +pkgrel=1 +pkgdesc="Desktop Management Interface table related utilities" +arch=('i686' 'x86_64') +url="http://www.nongnu.org/dmidecode" +license=('GPL') +depends=('glibc') +source=(http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('3c9c4d55a40b78600f3b43bfa64616f9') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + make prefix=/usr || return 1 + make prefix=/usr DESTDIR=${startdir}/pkg install +} diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD new file mode 100644 index 000000000..6d4620663 --- /dev/null +++ b/extra/dnsmasq/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 50876 2009-09-02 15:23:44Z paul $ +# Maintainer: Paul Mattal +# Contributor: Tom Newsom + +pkgname=dnsmasq +pkgver=2.50 +pkgrel=1 +pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" +url="http://www.thekelleys.org.uk/dnsmasq/doc.html" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc' 'bash') +makedepends=('libcap>=2.16') +backup=('etc/dnsmasq.conf') +install=$pkgname.install +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" \ + 'rc.dnsmasq' "$pkgname-capability-config.patch") +md5sums=('f7b1e17c590e493039537434c57c9de7' 'e956eee1ec24212a3254d2b168187495'\ + 'ef61cd6c3ce1fd0767a98b02975c9c9c') + +build() { + cd $srcdir/$pkgname-$pkgver + + # Patch to add a Note about Capability Module in the Config File + patch -Np0 -i ../$pkgname-capability-config.patch || return 1 + + # Build + make || return 1 + + # Install + install -d $pkgdir/etc/rc.d || return 1 + make PREFIX=/usr DESTDIR=$pkgdir install || return 1 + + install -D -m755 \ + $srcdir/rc.dnsmasq $pkgdir/etc/rc.d/dnsmasq || return 1 + install -D -m644 \ + dnsmasq.conf.example $pkgdir/etc/dnsmasq.conf || return 1 + + # Make the Required Directories for DHCP Server Default Directories + install -d $pkgdir/var/db || return 1 + install -d $pkgdir/var/lib/misc || return 1 +} + +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dnsmasq/dnsmasq-capability-config.patch b/extra/dnsmasq/dnsmasq-capability-config.patch new file mode 100644 index 000000000..d8dbb8230 --- /dev/null +++ b/extra/dnsmasq/dnsmasq-capability-config.patch @@ -0,0 +1,14 @@ +diff -urN dnsmasq.conf.example dnsmasq.conf.example.fixed +--- dnsmasq.conf.example 2006-10-18 16:24:50.000000000 -0400 ++++ dnsmasq.conf.example.fixed 2006-11-20 22:07:12.000000000 -0500 +@@ -58,7 +58,9 @@ + #address=/doubleclick.net/127.0.0.1 + + # If you want dnsmasq to change uid and gid to something other +-# than the default, edit the following lines. ++# than root, you will need to have CONFIG_SECURITY_CAPABILITIES ++# enabled in your kernel. The default uid and gid of nobody will ++# be used if capability is available and this is not set. + #user= + #group= + diff --git a/extra/dnsmasq/dnsmasq.install b/extra/dnsmasq/dnsmasq.install new file mode 100644 index 000000000..9f3326994 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.install @@ -0,0 +1,28 @@ +# arg 1: the new package version +post_install() { + echo "==========================================================" + echo "| IMPORTANT: Unless you want to run dnsmasq as root, you |" + echo "| must either enable CONFIG_SECURITY_CAPABILITIES in |" + echo "| your kernel or add capability to the MODULES array |" + echo "| in /etc/rc.conf. |" + echo "| For more details on configuring dnsmasq, visit: |" + echo "| http://www.thekelleys.org.uk/dnsmasq/doc.html |" + echo "==========================================================" + /bin/true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + /bin/true +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq new file mode 100755 index 000000000..167607294 --- /dev/null +++ b/extra/dnsmasq/rc.dnsmasq @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/dnsmasq` +case "$1" in + start) + stat_busy "Starting DNS/DHCP daemon" + [ -z "$PID" ] && /usr/sbin/dnsmasq + if [ $? -gt 0 ] ; then + stat_fail + else + add_daemon dnsmasq # create the 'state' dir + stat_done + fi + ;; + stop) + stat_busy "Stopping DNS/DHCP daemon" + [ "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon dnsmasq # remove the 'state' dir + stat_done + fi + ;; + restart) + $0 stop + sleep 5 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/docbook-xml/LICENSE b/extra/docbook-xml/LICENSE new file mode 100644 index 000000000..e3482f014 --- /dev/null +++ b/extra/docbook-xml/LICENSE @@ -0,0 +1,24 @@ + Copyright 1992-2006 HaL Computer Systems, Inc., + O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software + Corporation, Norman Walsh, Sun Microsystems, Inc., and the + Organization for the Advancement of Structured Information + Standards (OASIS). + + See also http://docbook.org/specs/ + + Permission to use, copy, modify and distribute the DocBook XML DTD + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the DTD for + any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook DTD in any way, except for declaring and + referencing additional sets of general entities and declaring + additional notations, label your DTD as a variant of DocBook. See + the maintenance documentation for more information. + + Please direct all questions, bug reports, or suggestions for + changes to the docbook@lists.oasis-open.org mailing list. For more + information, see http://www.oasis-open.org/docbook/. diff --git a/extra/docbook-xml/PKGBUILD b/extra/docbook-xml/PKGBUILD new file mode 100644 index 000000000..ea4b28af2 --- /dev/null +++ b/extra/docbook-xml/PKGBUILD @@ -0,0 +1,271 @@ +# $Id: PKGBUILD 40055 2009-05-24 21:56:23Z eric $ +# Maintainer: dorphell +# Committer: Judd Vinet + +pkgname=docbook-xml +pkgver=4.5 +pkgrel=2 +pkgdesc="A widely used XML scheme for writing documentation and help" +arch=(i686 x86_64) +url="http://scrollkeeper.sourceforge.net/docbook.shtml" +license=('MIT') +depends=('libxml2') +makedepends=('unzip') +install=docbook-xml.install +source=(http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip + http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip + http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip + http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip + http://www.docbook.org/xml/4.1.2/docbkx412.zip + LICENSE) +md5sums=('03083e288e87a7e829e437358da7ef9e' 'cbb04e9a700955d88c50962ef22c1634'\ + 'ab200202b9e136a144db1e0864c45074' '73fe50dfe74ca631c1602f558ed8961f'\ + '900d7609fb7e6d78901b357e4acfbc17' '50e1eea70bc071b812e963e65af6707e') +noextract=('docbook-xml-4.5.zip' 'docbook-xml-4.4.zip' 'docbook-xml-4.3.zip' 'docbook-xml-4.2.zip' 'docbkx412.zip') + +build() { + for ver in 4.2 4.3 4.4 4.5; do + mkdir docbook-xml-${ver} + pushd docbook-xml-${ver} + unzip ${startdir}/src/docbook-xml-${ver}.zip + mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver} + cp -af docbook.cat *.dtd ent/ *.mod \ + ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-${ver}/ + popd + done + mkdir docbook-xml-4.1.2 + pushd docbook-xml-4.1.2 + unzip ${startdir}/src/docbkx412.zip + mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2 + cp -af docbook.cat *.dtd ent/ *.mod \ + ${startdir}/pkg/usr/share/xml/docbook/xml-dtd-4.1.2/ + popd + + mkdir -p ${startdir}/pkg/etc/xml + xmlcatalog --noout --create ${startdir}/pkg/etc/xml/docbook-xml + + # V4.1.2 + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.1.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ + ${startdir}/pkg/etc/xml/docbook-xml + + # V4.2 + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \ + "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.2" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.2" \ + "file:///usr/share/xml/docbook/xml-dtd-4.2" \ + ${startdir}/pkg/etc/xml/docbook-xml + + # V4.3 + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \ + "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.3" \ + "file:///usr/share/xml/docbook/xml-dtd-4.3" \ + ${startdir}/pkg/etc/xml/docbook-xml + + # V4.4 + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \ + "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.4" \ + "file:///usr/share/xml/docbook/xml-dtd-4.4" \ + ${startdir}/pkg/etc/xml/docbook-xml + + # V4.5 + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V4.5//EN" \ + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + ${startdir}/pkg/etc/xml/docbook-xml + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/4.5" \ + "file:///usr/share/xml/docbook/xml-dtd-4.5" \ + ${startdir}/pkg/etc/xml/docbook-xml + +# license + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/docbook-xml/docbook-xml.install b/extra/docbook-xml/docbook-xml.install new file mode 100644 index 000000000..c62f65fa1 --- /dev/null +++ b/extra/docbook-xml/docbook-xml.install @@ -0,0 +1,46 @@ +post_install() { + if [ -e etc/xml/catalog.preserve ]; then + mv etc/xml/catalog.preserve etc/xml/catalog + elif [ ! -e etc/xml/catalog ]; then + xmlcatalog --noout --create etc/xml/catalog + fi + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file:///etc/xml/docbook-xml" \ + etc/xml/catalog +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + if [ $(vercmp $2 4.5) -lt 0 ]; then + xmlcatalog --del "file:///etc/xml/docbook" etc/xml/catalog > etc/xml/catalog.preserve + fi +} + +post_upgrade() { + if [ $(vercmp $2 4.5) -ge 0 ]; then + post_remove + fi + post_install +} + +post_remove() { + xmlcatalog --noout --del file:///etc/xml/docbook-xml etc/xml/catalog +} + +op=$1 +shift +$op $* diff --git a/extra/docbook-xsl/PKGBUILD b/extra/docbook-xsl/PKGBUILD new file mode 100644 index 000000000..cedcfa8ef --- /dev/null +++ b/extra/docbook-xsl/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 20950 2008-12-08 05:32:07Z allan $ +# Maintainer: Jan de Groot +# Contributer: Sean Middleditch + +pkgname=docbook-xsl +pkgver=1.74.0 +pkgrel=1 +pkgdesc="XML stylesheets for Docbook-xml transformations." +arch=(i686 x86_64) +license=('custom') +url="http://scrollkeeper.sourceforge.net/docbook.shtml" +depends=('libxml2' 'libxslt' 'docbook-xml') +source=(http://downloads.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2) +install=docbook-xsl.install +md5sums=('a56b598decd006d5d39e4544c0bfbc6a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common + install -m644 common/*.{xml,xsl,dtd,ent} ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common/ + + mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params + install -m644 params/*.xml ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params/ + + for fn in fo highlighting html roundtrip; do + mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn} + install -m644 ${fn}/*.{xml,xsl} ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}/ + done + for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml; do + mkdir -p ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn} + install -m644 ${fn}/*.xsl ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}/ + done + mkdir -p ${pkgdir}/etc/xml + install -m644 VERSION ${pkgdir}/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/ + + install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/extra/docbook-xsl/docbook-xsl.install b/extra/docbook-xsl/docbook-xsl.install new file mode 100644 index 000000000..a8ea3e72b --- /dev/null +++ b/extra/docbook-xsl/docbook-xsl.install @@ -0,0 +1,47 @@ +post_install() { + if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog + fi + _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog && + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + etc/xml/catalog +} + +post_upgrade() { + post_remove $2 + post_install $1 +} + +post_remove() { + _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog + + if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then + xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog + xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog + fi +} + +op=$1 +shift + +$op $* + diff --git a/extra/docker/PKGBUILD b/extra/docker/PKGBUILD new file mode 100644 index 000000000..823096e4f --- /dev/null +++ b/extra/docker/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 36980 2009-04-29 06:48:31Z eric $ +# Contributor: Jochem Kossen + +pkgname=docker +pkgver=1.5 +pkgrel=4 +pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2." +arch=(i686 x86_64) +url="http://icculus.org/openbox/2/docker/" +license=('GPL') +depends=('glibc' 'glib2' 'libx11') +source=(http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('349320bebd43babb8b43e11c7aae0293') + +build() { + cd $srcdir/$pkgname-$pkgver + install -d $pkgdir/usr/bin || return 1 + make || return 1 + make PREFIX=$pkgdir/usr install || return 1 +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dopewars/PKGBUILD b/extra/dopewars/PKGBUILD new file mode 100644 index 000000000..5bf0c9648 --- /dev/null +++ b/extra/dopewars/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 19597 2008-11-28 02:08:49Z thayer $ +# Contributor: Tom Newsom +# Contributor: Jeff Mickey +# Maintainer: Thayer Williams + +pkgname=dopewars +pkgver=1.5.12 +pkgrel=4 +pkgdesc="dopewars is a Drug dealing game set in New York" +url="http://dopewars.sourceforge.net/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gtk2>=2.12.11' 'alsa-lib' 'audiofile' 'esd' 'sdl_mixer' 'ncurses>=5.6-7') +install='dopewars.install' +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('debf749de9053dc2fb2e74c37ae06206') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr --localstatedir=/var/games \ + --mandir=/usr/share/man || return 1 + make || return 1 + make DESTDIR=$pkgdir install || return 1 + + # setup shortcut menu entries + mkdir -p $pkgdir/usr/share/applications + mv $pkgdir/usr/share/gnome/apps/Games/dopewars.desktop \ + $pkgdir/usr/share/applications + rm -r $pkgdir/usr/share/gnome + + # set appropriate permissions and destinations + chown root:games $pkgdir/usr/bin/dopewars + chmod 2755 $pkgdir/usr/bin/dopewars + chown root:games $pkgdir/var/games + chmod 775 $pkgdir/var/games + + # Handle the scores file creation in the install script + rm $pkgdir/var/games/dopewars.sco +} + diff --git a/extra/dopewars/dopewars.install b/extra/dopewars/dopewars.install new file mode 100644 index 000000000..2801fc338 --- /dev/null +++ b/extra/dopewars/dopewars.install @@ -0,0 +1,20 @@ +post_install() { + if [ ! -e /var/games/dopewars.sco ]; then + mkdir -p /var/games + touch /var/games/dopewars.sco + chown root:games /var/games/dopewars.sco + chmod 664 /var/games/dopewars.sco + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + if [ -e /var/games/dopewars.sco ]; then + rm /var/games/dopewars.sco + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/dosbox/PKGBUILD b/extra/dosbox/PKGBUILD new file mode 100644 index 000000000..35307852d --- /dev/null +++ b/extra/dosbox/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 46388 2009-07-17 11:51:23Z james $ +# Maintainer: eric +# Contributor: Ben + +pkgname=dosbox +pkgver=0.73 +pkgrel=1 +pkgdesc="An emulator with builtin DOS for running DOS Games" +arch=(i686 x86_64) +url="http://dosbox.sourceforge.net/" +license=('GPL') +depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') +source=(http://downloads.sourceforge.net/sourceforge/dosbox/$pkgname-$pkgver.tar.gz ) +md5sums=('262939cc28966c1f9b07c2bc472b699f' 'd0cf64f78ba1a4a85981c421ee04fd22') + +build() +{ + cd $startdir/src/$pkgname-$pkgver + #patch -p1 -i $startdir/src/dosbox-0.72+gcc-4.3.patch || return 1 + ./configure --prefix=/usr --sysconfdir=/etc/dosbox + # Fix invalid permissions FS#10732 + chmod 755 $startdir/pkg/usr/man/man1 + make || return 1 + make prefix=$startdir/pkg/usr install +} +# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dosbox/dosbox-0.72+gcc-4.3.patch b/extra/dosbox/dosbox-0.72+gcc-4.3.patch new file mode 100644 index 000000000..bacefd420 --- /dev/null +++ b/extra/dosbox/dosbox-0.72+gcc-4.3.patch @@ -0,0 +1,45 @@ +diff -ur /tmp/dosbox-0.72/src/dos/cdrom_image.cpp dosbox-0.72/src/dos/cdrom_image.cpp +--- /tmp/dosbox-0.72/src/dos/cdrom_image.cpp 2007-08-22 13:54:35.000000000 +0200 ++++ dosbox-0.72/src/dos/cdrom_image.cpp 2008-03-06 21:30:00.000000000 +0100 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -ur /tmp/dosbox-0.72/src/hardware/gameblaster.cpp dosbox-0.72/src/hardware/gameblaster.cpp +--- /tmp/dosbox-0.72/src/hardware/gameblaster.cpp 2007-01-10 11:17:37.000000000 +0100 ++++ dosbox-0.72/src/hardware/gameblaster.cpp 2008-03-06 21:31:32.000000000 +0100 +@@ -24,6 +24,7 @@ + #include "hardware.h" + #include "setup.h" + #include "pic.h" ++#include + + #define LEFT 0x00 + #define RIGHT 0x01 +diff -ur /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp dosbox-0.72/src/hardware/tandy_sound.cpp +--- /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp 2007-06-29 20:21:12.000000000 +0200 ++++ dosbox-0.72/src/hardware/tandy_sound.cpp 2008-03-06 21:32:02.000000000 +0100 +@@ -28,6 +28,7 @@ + #include "setup.h" + #include "pic.h" + #include "dma.h" ++#include + + #define DAC_CLOCK 3570000 + #define MAX_OUTPUT 0x7fff +diff -ur /tmp/dosbox-0.72/src/shell/shell_cmds.cpp dosbox-0.72/src/shell/shell_cmds.cpp +--- /tmp/dosbox-0.72/src/shell/shell_cmds.cpp 2007-08-17 19:58:46.000000000 +0200 ++++ dosbox-0.72/src/shell/shell_cmds.cpp 2008-03-06 21:32:47.000000000 +0100 +@@ -27,6 +27,7 @@ + #include "regs.h" + #include "../dos/drives.h" + #include "support.h" ++#include + + static SHELL_Cmd cmd_list[]={ + { "CHDIR", 1, &DOS_Shell::CMD_CHDIR, "SHELL_CMD_CHDIR_HELP"}, diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD new file mode 100644 index 000000000..7e6891837 --- /dev/null +++ b/extra/dosfstools/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 48141 2009-07-31 20:00:08Z tpowa $ +# Maintainer: dorphell +# Committer: Judd Vinet +pkgname=dosfstools +pkgver=3.0.5 +pkgrel=1 +pkgdesc="DOS filesystem utilities" +arch=(i686 x86_64) +depends=('glibc') +source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.bz2) +url="http://www.daniel-baumann.ch/software/dosfstools/" +license=('GPL2') + +build() { + cd $srcdir/$pkgname-$pkgver + make || return 1 + make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install +} +md5sums=('0ac8c2119d2288958f4e2fd3dd942657') diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD new file mode 100644 index 000000000..1f90e742b --- /dev/null +++ b/extra/dovecot/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 54331 2009-10-08 21:12:45Z andyrtr $ +# +# Contributor: Paul Mattal +# Contributor: Federico Quagliata (quaqo) +# Contributor: GARETTE Emmanuel +# Maintainer: Andreas Radke + +pkgname=dovecot +pkgver=1.2.6 +pkgrel=1 +pkgdesc="An IMAP and POP3 server written with security primarily in mind" +arch=('i686' 'x86_64') +url="http://dovecot.org/" +license=("LGPL") +depends=("pam>=1.0.4" "libmysqlclient>=5.1.38" "postgresql-libs>=8.4.1-1" "sqlite3>=3.6.18" "db>=4.8" + "heimdal>=1.2.1-6" 'libcap>=2.17' 'bzip2') +optdepends=('libldap: ldap plugin') +makedepends=('libldap>=2.4.18-1') +provides=('imap-server' 'pop3-server') +options=('!libtool') +install=$pkgname.install +source=(http://dovecot.org/releases/1.2/${pkgname}-${pkgver}.tar.gz dovecot.sh) +md5sums=('807666f1a112e7379c4dbb57c9ce4899' + 'd020d43eab4ded6fb379dadc570a9490') + +build() { + cd ${srcdir}/$pkgname-$pkgver || return 1 + + # configure with openssl, mysql, and postgresql support + ./configure --prefix=/usr --sysconfdir=/etc/dovecot --localstatedir=/var \ + --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ + --with-db --with-mysql --with-pgsql --with-sqlite \ + --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \ + --with-gssapi --with-ldap=plugin --enable-header-install --with-docs || return 1 + + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + + # install the launch script + install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname || return 1 + + # fix paths in the config example file where we have a different layout + sed -i 's|/usr/lib/dovecot|/usr/lib/dovecot/modules|g; + s|libexec|lib|g; + s|lib/sendmail|sbin/sendmail|g' $pkgdir/etc/dovecot/dovecot-example.conf || return 1 +} diff --git a/extra/dovecot/dovecot.install b/extra/dovecot/dovecot.install new file mode 100644 index 000000000..51757346c --- /dev/null +++ b/extra/dovecot/dovecot.install @@ -0,0 +1,26 @@ +# arg 1: the new package version +post_install() { + if [ -z "`grep '^dovecot:' /etc/group`" ]; then + groupadd -g 76 dovecot >& /dev/null + fi + if [ -z "`grep '^dovecot:' /etc/passwd`" ]; then + useradd -u 76 -d /var/run/dovecot/login -g dovecot -s /bin/false dovecot + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + userdel dovecot &> /dev/null + groupdel dovecot &> /dev/null +} + +op=$1 +shift + +$op $* diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh new file mode 100755 index 000000000..b7555fe50 --- /dev/null +++ b/extra/dovecot/dovecot.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/dovecot` +case "$1" in + start) + stat_busy "Starting Dovecot" + [ -z "$PID" ] && /usr/sbin/dovecot + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon dovecot + stat_done + fi + ;; + stop) + stat_busy "Stopping Dovecot" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon dovecot + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD new file mode 100644 index 000000000..4a6a533d3 --- /dev/null +++ b/extra/doxygen/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 52067 2009-09-15 01:32:37Z eric $ +# Maintainer: Dan McGee +pkgname=doxygen +pkgver=1.6.1 +pkgrel=1 +pkgdesc="A documentation system for C++, C, Java, IDL and PHP" +license=('GPL') +arch=(i686 x86_64) +url="http://www.doxygen.org/" +depends=('gcc-libs') +# qt required to build and run doxywizard, but don't want to drag it in +makedepends=('flex' 'qt') +optdepends=('graphviz: for caller/callee graph generation' + 'qt: for doxywizard') +source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + QTDIR=/usr ./configure --prefix /usr --with-doxywizard + make || return 1 + make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install +} + +md5sums=('2ec343643e134f0d3ce2069420bcb4f0') diff --git a/extra/drscheme/ChangeLog b/extra/drscheme/ChangeLog new file mode 100644 index 000000000..b8c5ac942 --- /dev/null +++ b/extra/drscheme/ChangeLog @@ -0,0 +1,58 @@ +2009-07-31 Eric Belanger + + * drscheme 4.2.1-1 + * Upstream update + +2009-07-01 Eric Belanger + + * drscheme 4.2-2 + * Rebuilt against libjpeg 7 + +2009-06-04 Eric Belanger + + * drscheme 4.2-1 + * Upstream update + +2009-03-22 Eric Belanger + + * drscheme 4.1.5-1 + * Upstream update + +2009-01-21 Eric Belanger + + * drscheme 4.1.4-1 + * Upstream update + +2008-12-03 Eric Belanger + + * drscheme 4.1.3-1 + * Upstream update + +2008-11-11 Eric Belanger + + * drscheme 4.1.2-1 + * Upstream update + +2008-11-08 Jan de Groot + + * drscheme 4.1.1-2 + * Rebuild for libxaw + +2008-10-09 Eric Belanger + + * drscheme 4.1.1-1 + * Upstream update + +2008-08-19 Eric Belanger + + * drscheme 4.1-1 + * Upstream update + +2008-07-13 Eric Belanger + + * drscheme 4.0.2-1 + * Upstream update + * Added patches (nonstandard-install.patch, paths-fix.patch) + to remove build directory path hard-coded in executables + * Updated openssl versioned dependency + * Added ChangeLog diff --git a/extra/drscheme/PKGBUILD b/extra/drscheme/PKGBUILD new file mode 100644 index 000000000..cfa396ba6 --- /dev/null +++ b/extra/drscheme/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 48240 2009-08-01 07:36:50Z eric $ +# Maintainer: Eric Belanger +# Contributor: John Proctor + +pkgname=drscheme +pkgver=4.2.1 +pkgrel=1 +pkgdesc="PLT Scheme Environment" +arch=('i686' 'x86_64') +url="http://www.drscheme.org/" +license=('LGPL') +depends=('gcc-libs' 'cairo' 'desktop-file-utils' 'libjpeg>=7' 'mesa' 'openssl>=0.9.8h' 'libxaw' 'libxmu' 'libxft') +options=('!makeflags') +install=${pkgname}.install +source=(http://download.plt-scheme.org/bundles/${pkgver}/plt/plt-${pkgver}-src-unix.tgz drscheme.desktop) +md5sums=('d448aa8b579682687a8748100a901274' '41ba9c74aa541308aa6f67b262387c6c') +sha1sums=('5b4e2d720675c9f0ec249a4db7a7a93bfd6f60dc' '6b8247da9ce5f1e83f35bc14f90e8c34aae0e0d5') + +build() { + cd "${srcdir}/plt-${pkgver}/src" + ./configure --prefix=/usr --enable-noopt || return 1 + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drscheme.xpm" || return 1 + install -D -m644 "${srcdir}/drscheme.desktop" "${pkgdir}/usr/share/applications/drscheme.desktop" || return 1 +} diff --git a/extra/drscheme/drscheme.desktop b/extra/drscheme/drscheme.desktop new file mode 100644 index 000000000..9030dcb69 --- /dev/null +++ b/extra/drscheme/drscheme.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=DrScheme +GenericName=IDE for Scheme +Comment=DrScheme is an interactive, integrated, graphical programming environment for the Scheme, MzScheme, and MrEd programming Languages. +Exec=drscheme +Terminal=false +Type=Application +Categories=Education;Development; +Icon=drscheme diff --git a/extra/drscheme/drscheme.install b/extra/drscheme/drscheme.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/extra/drscheme/drscheme.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/dssi/LICENSE b/extra/dssi/LICENSE new file mode 100644 index 000000000..ddef4f23b --- /dev/null +++ b/extra/dssi/LICENSE @@ -0,0 +1,77 @@ +Licensing +--------- + +The DSSI API itself (dssi.h) is licensed under the GNU Lesser General +Public License. See COPYING for details. + +The jack-dssi-host is provided under a BSD-style license. This means +you can do anything you want with it so long as you retain the +copyright attribution and license information. See the source files +for details. + +Licensing for the files in the examples directory may vary: please +check the individual files for details. Most of them are in the +public domain, which means you can use them for anything you want. + + + +/* jack-dssi-host.c + * + * DSSI Soft Synth Interface + * + * This is a host for DSSI plugins. It listens for MIDI events on an + * ALSA sequencer port, delivers them to DSSI synths and outputs the + * result via JACK. + * + * This program expects the names of up to 16 DSSI synth plugins, in + * the form ':