[arch-commits] Commit in (25 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Feb 4 16:30:56 UTC 2013


    Date: Monday, February 4, 2013 @ 17:30:55
  Author: spupykin
Revision: 83715

remove pkgdir from build()

Modified:
  mairix/trunk/PKGBUILD
  man-pages-ru/trunk/PKGBUILD
  matchbox-common/trunk/PKGBUILD
  matchbox-desktop/trunk/PKGBUILD
  matchbox-keyboard/trunk/PKGBUILD
  matchbox-panel/trunk/PKGBUILD
  matchbox-window-manager/trunk/PKGBUILD
  maven/trunk/PKGBUILD
  mediaproxy/trunk/PKGBUILD
  mediawiki/trunk/PKGBUILD
  metamail/trunk/PKGBUILD
  mftrace/trunk/PKGBUILD
  mg/trunk/PKGBUILD
  mimetex/trunk/PKGBUILD
  mingw32-binutils/trunk/PKGBUILD
  mingw32-gcc-base/trunk/PKGBUILD
  mingw32-gcc/trunk/PKGBUILD
  mingw32-runtime/trunk/PKGBUILD
  mingw32-w32api/trunk/PKGBUILD
  miredo/trunk/PKGBUILD
  mktorrent/trunk/PKGBUILD
  moinmoin/trunk/PKGBUILD
  mp3gain/trunk/PKGBUILD
  mp3info/trunk/PKGBUILD
  mytop/trunk/PKGBUILD

----------------------------------------+
 mairix/trunk/PKGBUILD                  |    5 ++++-
 man-pages-ru/trunk/PKGBUILD            |    2 +-
 matchbox-common/trunk/PKGBUILD         |    4 ++++
 matchbox-desktop/trunk/PKGBUILD        |    4 ++++
 matchbox-keyboard/trunk/PKGBUILD       |    4 ++++
 matchbox-panel/trunk/PKGBUILD          |    4 ++++
 matchbox-window-manager/trunk/PKGBUILD |    4 ++++
 maven/trunk/PKGBUILD                   |    2 +-
 mediaproxy/trunk/PKGBUILD              |    5 ++++-
 mediawiki/trunk/PKGBUILD               |    2 +-
 metamail/trunk/PKGBUILD                |    5 ++++-
 mftrace/trunk/PKGBUILD                 |    4 ++++
 mg/trunk/PKGBUILD                      |    4 ++++
 mimetex/trunk/PKGBUILD                 |    4 ++++
 mingw32-binutils/trunk/PKGBUILD        |    4 ++++
 mingw32-gcc-base/trunk/PKGBUILD        |    5 +++++
 mingw32-gcc/trunk/PKGBUILD             |    8 ++++++--
 mingw32-runtime/trunk/PKGBUILD         |    8 ++++++--
 mingw32-w32api/trunk/PKGBUILD          |    8 +++++---
 miredo/trunk/PKGBUILD                  |    5 +++++
 mktorrent/trunk/PKGBUILD               |    6 ++++++
 moinmoin/trunk/PKGBUILD                |    4 ++++
 mp3gain/trunk/PKGBUILD                 |    4 ++++
 mp3info/trunk/PKGBUILD                 |    4 ++++
 mytop/trunk/PKGBUILD                   |    5 +++++
 25 files changed, 101 insertions(+), 13 deletions(-)

Modified: mairix/trunk/PKGBUILD
===================================================================
--- mairix/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mairix/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -21,8 +21,11 @@
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-
   mkdir -p $pkgdir/usr/share/
   mv $pkgdir/usr/man $pkgdir/usr/share/
   install -D -m 644 dotmairixrc.eg $pkgdir/etc/mairixrc.sample

Modified: man-pages-ru/trunk/PKGBUILD
===================================================================
--- man-pages-ru/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ man-pages-ru/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,7 +17,7 @@
 install=man-pages-ru.install
 md5sums=('2d452b93a2731eac8bb1767f61ff7557')
 
-build() {
+package() {
   cd $srcdir/manpages-ru-$pkgver
   mkdir -p $pkgdir/usr/share/man/ru
   mv man* $pkgdir/usr/share/man/ru/

Modified: matchbox-common/trunk/PKGBUILD
===================================================================
--- matchbox-common/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ matchbox-common/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,5 +17,9 @@
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: matchbox-desktop/trunk/PKGBUILD
===================================================================
--- matchbox-desktop/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ matchbox-desktop/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -18,5 +18,9 @@
   cd $srcdir/$pkgname-$pkgver
   LDFLAGS=-lX11 ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: matchbox-keyboard/trunk/PKGBUILD
===================================================================
--- matchbox-keyboard/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ matchbox-keyboard/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,5 +17,9 @@
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: matchbox-panel/trunk/PKGBUILD
===================================================================
--- matchbox-panel/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ matchbox-panel/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,5 +17,9 @@
   cd $srcdir/$pkgname-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: matchbox-window-manager/trunk/PKGBUILD
===================================================================
--- matchbox-window-manager/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ matchbox-window-manager/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -19,5 +19,9 @@
 	--enable-startup-notification --enable-session \
 	--enable-alt-input-wins --enable-expat
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: maven/trunk/PKGBUILD
===================================================================
--- maven/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ maven/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,7 +17,7 @@
 md5sums=('17ca94d5be05a78c6ab12425b7a0ee10'
          '5ed0bddbf5c5375fe5032a76a9506426')
 
-build() {
+package() {
   cd $srcdir/apache-maven-$pkgver
 
   . /etc/profile.d/jre.sh

Modified: mediaproxy/trunk/PKGBUILD
===================================================================
--- mediaproxy/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mediaproxy/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -25,9 +25,12 @@
 
 build() {
   cd $srcdir/mediaproxy-$pkgver
-
   sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py
+}
 
+package() {
+  cd $srcdir/mediaproxy-$pkgver
+
   python2 setup.py install --root=$pkgdir
 
   install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy

Modified: mediawiki/trunk/PKGBUILD
===================================================================
--- mediawiki/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mediawiki/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -24,7 +24,7 @@
          '8a44b503eb91b2b78482985d249101ed'
          '99c25f04d4093f3333db1be7624fe4e7')
 
-build() {
+package() {
   cd $srcdir
 #  sed -i -e 's#is_executable#is_file#' -e 's#is_executable#is_file#' $pkgname-$pkgver/includes/Math.php
   install -vdm0755 $pkgdir/usr/share/webapps

Modified: metamail/trunk/PKGBUILD
===================================================================
--- metamail/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ metamail/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -29,7 +29,10 @@
   sh ./bootstrap
   sh ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/metamail-$pkgver.orig
   make DESTDIR=$pkgdir install
-
   install -D -m0644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
 }

Modified: mftrace/trunk/PKGBUILD
===================================================================
--- mftrace/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mftrace/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -17,5 +17,9 @@
   cd $srcdir/$pkgname-$pkgver
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: mg/trunk/PKGBUILD
===================================================================
--- mg/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mg/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -24,7 +24,11 @@
   patch -p1 <$srcdir/cleanup.patch
   ./configure
   make prefix=/usr
+}
 
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   mkdir -p $pkgdir/usr/bin
   make install INSTALL=/bin/install prefix=$pkgdir/usr
 

Modified: mimetex/trunk/PKGBUILD
===================================================================
--- mimetex/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mimetex/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -15,5 +15,9 @@
 build() {
   cd $srcdir
   gcc -DAA mimetex.c gifsave.c -lm -o mimetex.cgi
+}
+
+package() {
+  cd $srcdir
   install -D -m0755 mimetex.cgi $pkgdir/usr/bin/mimetex.cgi
 }

Modified: mingw32-binutils/trunk/PKGBUILD
===================================================================
--- mingw32-binutils/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mingw32-binutils/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -31,6 +31,10 @@
     --disable-nls \
     --enable-shared
   make
+}
+
+package() {
+  cd $srcdir/binutils-$pkgver
   make install DESTDIR=$pkgdir
   rm -rf $pkgdir/usr/lib
   rm -rf $pkgdir/usr/share/{info,man}

Modified: mingw32-gcc/trunk/PKGBUILD
===================================================================
--- mingw32-gcc/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mingw32-gcc/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -20,8 +20,7 @@
 md5sums=('bc2d1828dd6c53683600545ca6a901e1'
          '2407123c35c0aa92ee5ffc27decca9a7')
 
-build()
-{
+build() {
   [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
 
   patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch
@@ -51,6 +50,11 @@
      --enable-libgomp
 
   make
+}
+
+package() {
+  cd $srcdir/build
+
   make install DESTDIR=$pkgdir
 
   msg "libgcc"

Modified: mingw32-gcc-base/trunk/PKGBUILD
===================================================================
--- mingw32-gcc-base/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mingw32-gcc-base/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -68,6 +68,11 @@
   fi
 
   make
+}
+
+package() {
+  cd $srcdir/build
+
   make install DESTDIR=$pkgdir
 
   cd $pkgdir

Modified: mingw32-runtime/trunk/PKGBUILD
===================================================================
--- mingw32-runtime/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mingw32-runtime/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -14,8 +14,7 @@
 source=(http://downloads.sourceforge.net/mingw/mingwrt-$pkgver-mingw32-src.tar.gz)
 md5sums=('26c0886cc60729b94956cc6d81cd076c')
 
-build()
-{
+build() {
   cd $srcdir/mingwrt-$pkgver-mingw32
 
   sed -i "s%\r%%g" `find . -type f`
@@ -34,6 +33,11 @@
   sed -i "s|# include_next <float.h>|# include </usr/lib/gcc/i486-mingw32/${_mgccver}/include/float.h>|" include/float.h
 
   make
+}
+
+package() {
+  cd $srcdir/mingwrt-$pkgver-mingw32
+
   mkdir -p $pkgdir/usr/i486-mingw32/bin
   make install prefix=$pkgdir/usr/i486-mingw32
 

Modified: mingw32-w32api/trunk/PKGBUILD
===================================================================
--- mingw32-w32api/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mingw32-w32api/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -18,8 +18,7 @@
 md5sums=('89e5800096aa334009f98e7c1743d825'
          '26c0886cc60729b94956cc6d81cd076c')
 
-build()
-{
+build() {
   cd $srcdir/w32api-$pkgver-${_uprel}-mingw32
 
   mkdir -p $srcdir/include/
@@ -28,8 +27,11 @@
 
   ./configure --prefix=/usr/i486-mingw32 --target=i486-mingw32 --host=i486-mingw32 --build=$CHOST
   make
+}
+
+package() {
+  cd $srcdir/w32api-$pkgver-${_uprel}-mingw32
   make install prefix=$pkgdir/usr/i486-mingw32
-
   cd $pkgdir
   find . -name '*.a' | xargs -rtl1 i486-mingw32-strip -g
 }

Modified: miredo/trunk/PKGBUILD
===================================================================
--- miredo/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ miredo/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -35,6 +35,11 @@
 	--libexecdir=/usr/lib \
 	--with-Judy
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
 
   install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo

Modified: mktorrent/trunk/PKGBUILD
===================================================================
--- mktorrent/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mktorrent/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -14,6 +14,12 @@
 
 build() {
   cd ${srcdir}/mktorrent-${pkgver}
+  make PREFIX=/usr \
+      USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1 USE_LARGE_FILES=1
+}
+
+package() {
+  cd ${srcdir}/mktorrent-${pkgver}
   make DESTDIR=${pkgdir} PREFIX=/usr \
       USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1 USE_LARGE_FILES=1 \
       install

Modified: moinmoin/trunk/PKGBUILD
===================================================================
--- moinmoin/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ moinmoin/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -26,5 +26,9 @@
   done
 
   python2 setup.py build
+}
+
+package() {
+  cd $srcdir/${_xpkgname}-$pkgver
   python2 setup.py install --root=$pkgdir --record=INSTALLED_FILES
 }

Modified: mp3gain/trunk/PKGBUILD
===================================================================
--- mp3gain/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mp3gain/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -23,5 +23,9 @@
     patch -p0 Makefile <$srcdir/build-fix.patch
 
     make OSTYPE=linux
+}
+
+package() {
+    cd $srcdir
     make OSTYPE=linux INSTALL_PATH=$pkgdir/usr/bin install
 }

Modified: mp3info/trunk/PKGBUILD
===================================================================
--- mp3info/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mp3info/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -20,7 +20,11 @@
   sed -i "s:/usr/bin/install:/bin/install:" Makefile
 
   make
+}
 
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
   install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/man/man1
   make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man/man1 install
 }

Modified: mytop/trunk/PKGBUILD
===================================================================
--- mytop/trunk/PKGBUILD	2013-02-04 16:20:13 UTC (rev 83714)
+++ mytop/trunk/PKGBUILD	2013-02-04 16:30:55 UTC (rev 83715)
@@ -19,6 +19,11 @@
 
   perl Makefile.PL
   make
+}
+
+package() {
+  cd "`find $srcdir -type d -name 'jzawodn-mytop-*'`"
+
   make DESTDIR=$pkgdir install
   mv $pkgdir/usr/bin/site_perl/mytop $pkgdir/usr/bin/mytop
   sed -i 's#"long|!"#"long!"#' $pkgdir/usr/bin/mytop




More information about the arch-commits mailing list