summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--community/puzzles/PKGBUILD3
-rw-r--r--core/gcc/PKGBUILD102
-rw-r--r--libre/initscripts/PKGBUILD5
-rw-r--r--libre/kernel26-libre/PKGBUILD3
-rw-r--r--libre/p7zip-libre/PKGBUILD42
6 files changed, 70 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore
index 4b972ed8e..af14ee6fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ pkg/
*.pkg.tar.*
*.src.tar.*
*.log
+lastsync \ No newline at end of file
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index d85cfb8d2..b9dd0cec2 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: schuay <jakob.gruber@gmail.com>
pkgname=puzzles
-pkgver=9168
+pkgver=9175
pkgrel=1
pkgdesc="Simon Tatham's Portable Puzzle Collection"
arch=('i686' 'x86_64' 'mips64el')
@@ -34,3 +34,4 @@ package() {
mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube
mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox
}
+md5sums=('ec37a288c6c82c3d99d69f3a7c1f142a')
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 4a31b72f9..a2bd2ff46 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126413 2011-06-05 07:20:02Z allan $
+# $Id: PKGBUILD 123891 2011-05-14 08:26:23Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,22 +6,20 @@
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
pkgver=4.6.0
-pkgrel=6
-pkgrel=3 # Hold!
-_snapshot=4.6-20110603
+pkgrel=5
+_snapshot=4.6-20110513
_libstdcppmanver=20110201 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
-license=('GPL' 'LGPL' 'custom')
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL' 'custom')
url="http://gcc.gnu.org"
makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'dejagnu')
options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,testsuite}-${pkgver}.tar.bz2
+ ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,testsuite}-${_snapshot}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
gcc_pure64.patch
- gcc_mips64el_lib.patch
+ gcc_mips64el_lib.patch
gcc-hash-style-both.patch)
if [ -n "${_snapshot}" ]; then
@@ -49,23 +47,22 @@ build() {
echo ${pkgver} > gcc/BASE-VER
cd ${srcdir}
- mkdir gcc-build
- cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.parabolagnulinux.org/ \
- --enable-languages=c,c++,fortran,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --disable-multilib --disable-libstdcxx-pch \
- --enable-checking=release
+ mkdir gcc-build && cd gcc-build
+
+ ${_basedir}/configure --prefix=/usr \
+ --libdir=/usr/lib --libexecdir=/usr/lib \
+ --mandir=/usr/share/man --infodir=/usr/share/info \
+ --with-bugurl=https://bugs.parabolagnulinux.org/ \
+ --enable-languages=c,c++,fortran,lto,objc,obj-c++ \
+ --enable-shared --enable-threads=posix \
+ --with-system-zlib --enable-__cxa_atexit \
+ --disable-libunwind-exceptions --enable-clocale=gnu \
+ --enable-gnu-unique-object --enable-linker-build-id \
+ --with-ppl --enable-cloog-backend=isl \
+ --enable-lto --enable-gold --enable-ld=default \
+ --enable-plugin --with-plugin-ld=ld.gold \
+ --disable-multilib --disable-libstdcxx-pch \
+ --enable-checking=release
make
}
@@ -114,7 +111,7 @@ package_gcc-libs()
package_gcc()
{
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21' 'libmpc' 'cloog' 'ppl')
+ depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog' 'ppl')
groups=('base-devel')
install=gcc.install
@@ -122,17 +119,16 @@ package_gcc()
# unfortunately it is much, much easier to install the lot and clean-up the mess...
make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+ rm $pkgdir/usr/bin/{{$CHOST-,}gfortran}
rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+ rm $pkgdir/usr/lib/lib{ffi,gfortran,objc,quadmath}.a
rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+ rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{finclude,include/objc}
rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+ rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a}
+ rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp,libquadmath}.info
rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+ rm $pkgdir/usr/share/man/man1/{gfortran}.1
rm $pkgdir/usr/share/man/man3/ffi*
# many packages require these symlinks
@@ -219,33 +215,13 @@ package_gcc-objc()
${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
}
-package_gcc-ada()
-{
- pkgdesc="Ada front-end for GCC (GNAT)"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
- pkgdesc="Go front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
+md5sums=('2be769db16ac02f30fb62423b4c50145'
+ 'a310d230945f4b3093dd3ca72839c649'
+ '361a10c5a5545c80fd271b18036dd00c'
+ 'f7db2f6ed34398361de62cb6b8eb53d2'
+ '248e53b461078bf1c89528fb8e4ba051'
+ 'e15a01b0d02ff12e975e4c2649e71e55'
+ '1e9fd2eaf0ee47ea64e82c48998f1999'
+ '4030ee1c08dd1e843c0225b772360e76'
+ '67e337993d821d72fccacbed52d48c34'
+ '4df25b623799b148a0703eaeec8fdf3f')
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 7828e7eb4..999350dc8 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -22,11 +22,10 @@ optdepends=('bridge-utils: Network bridging support'
install=initscripts.install
source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
'wireless.conf.d')
-md5sums=('df73e4c4043d4eaf6502ca6738c549aa'
- '027576534885b8d5dded9be546057b12')
-
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
}
+md5sums=('cbd4320b6b1790f8c1fd80917650a566'
+ '027576534885b8d5dded9be546057b12')
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 2f4c7961d..0c57c0bfd 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -258,6 +258,7 @@ find $pkgdir -type d -exec chmod 755 {} \;
rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
}
md5sums=('923210b0c4190733bf314e48f588c112'
+<<<<<<< HEAD
'abad63eab1f9485f6b1af76f5109f1e4'
'5d40a23419b48f5b49f1f10be0e733c3'
'af5937ac06a78907ceb499351bdff7ab'
@@ -265,6 +266,8 @@ md5sums=('923210b0c4190733bf314e48f588c112'
'ba583747f515e51ec0f16d535e4be6e0')
md5sums=('8feab9fb6c177052cb79248a223fbf66'
'a480007d95472cc16825f5afe6e18e54'
+=======
+>>>>>>> 4aea7f1d98a7fba9a021ade4c9d475b180687fe8
'abad63eab1f9485f6b1af76f5109f1e4'
'5d40a23419b48f5b49f1f10be0e733c3'
'af5937ac06a78907ceb499351bdff7ab'
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index cbee2b234..28a900957 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=${pkgname%-libre}
pkgver=9.20
pkgrel=1
pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://p7zip.sourceforge.net/'
makedepends=('yasm' 'nasm')
@@ -22,30 +22,34 @@ replaces=('p7zip')
sha1sums=('c976df4543ea946a65bc3f5e3d4e9baa417e5f12'
'3a3333d4703955664fdd4023c624ab4828af0ab1')
build() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${_pkgname}_${pkgver}"
- msg "Removing unRar"
- sed -e '/Rar/d' -i makefile*
- rm -rf CPP/7zip/Compress/Rar
- patch -p1 -i $startdir/src/9.04-makefile.patch
+ msg "Removing unRar"
+ sed -e '/Rar/d' -i makefile*
+ rm -rf CPP/7zip/Compress/Rar
+ patch -p1 -i $startdir/src/9.04-makefile.patch
- [[ $CARCH = x86_64 ]] \
- && cp makefile.linux_amd64_asm makefile.machine \
- || cp makefile.linux_x86_asm_gcc_4.X makefile.machine
- sed -i "s|usr/local|usr|g" makefile
+ if [[ $CARCH = x86_64 ]] ; then
+ cp makefile.linux_amd64_asm makefile.machine
+ elif [ $CARCH = mips64el ]; then
+ cp makefile.linux_any_cpu_gcc_4.X makefile.machine
+ else
+ cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+ fi
+ sed -i "s|usr/local|usr|g" makefile
- make all3 OPTFLAGS="${CXXFLAGS}"
+ make all3 OPTFLAGS="${CXXFLAGS}"
}
package() {
- cd "${srcdir}/${_pkgname}_${pkgver}"
+ cd "${srcdir}/${_pkgname}_${pkgver}"
- make install \
- DEST_HOME="${pkgdir}/usr" \
- DEST_MAN="${pkgdir}/usr/share/man" \
- DEST_SHARE_DOC="http://www.bugaco.com/7zip"
+ make install \
+ DEST_HOME="${pkgdir}/usr" \
+ DEST_MAN="${pkgdir}/usr/share/man" \
+ DEST_SHARE_DOC="http://www.bugaco.com/7zip"
- install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
- sed "s|${pkgdir}/usr|/usr|g" -i "${pkgdir}"/usr/bin/7z{,a,r}
- install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
+ install -m555 bin/7z.so ${pkgdir}/usr/lib/p7zip/
+ sed "s|${pkgdir}/usr|/usr|g" -i "${pkgdir}"/usr/bin/7z{,a,r}
+ install -Dm755 contrib/VirtualFileSystemForMidnightCommander/u7z "${pkgdir}"/usr/lib/mc/extfs.d/u7z
}