[arch-commits] Commit in (17 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Feb 4 13:58:54 UTC 2013


    Date: Monday, February 4, 2013 @ 14:58:54
  Author: spupykin
Revision: 83693

remove pkgdir from build()

Modified:
  cacti/trunk/PKGBUILD
  calc/trunk/PKGBUILD
  canorus/trunk/PKGBUILD
  catdvi/trunk/PKGBUILD
  cchost/trunk/PKGBUILD
  cdbxx/trunk/PKGBUILD
  cdcover/trunk/PKGBUILD
  cdfs/trunk/PKGBUILD
  cedet/trunk/PKGBUILD
  checkinstall/trunk/PKGBUILD
  chrootuid/trunk/PKGBUILD
  classpath/trunk/PKGBUILD
  clearsilver/trunk/PKGBUILD
  clewn/trunk/PKGBUILD
  cpuburn/trunk/PKGBUILD
  cpulimit/trunk/PKGBUILD
  cutter/trunk/PKGBUILD

-----------------------------+
 cacti/trunk/PKGBUILD        |    4 ++++
 calc/trunk/PKGBUILD         |    4 ++++
 canorus/trunk/PKGBUILD      |    5 ++++-
 catdvi/trunk/PKGBUILD       |    2 +-
 cchost/trunk/PKGBUILD       |    4 ++++
 cdbxx/trunk/PKGBUILD        |    4 ++++
 cdcover/trunk/PKGBUILD      |    3 +++
 cdfs/trunk/PKGBUILD         |    6 +++++-
 cedet/trunk/PKGBUILD        |    4 ++++
 checkinstall/trunk/PKGBUILD |    4 ++++
 chrootuid/trunk/PKGBUILD    |    4 ++++
 classpath/trunk/PKGBUILD    |    4 ++++
 clearsilver/trunk/PKGBUILD  |    4 ++++
 clewn/trunk/PKGBUILD        |    4 ++++
 cpuburn/trunk/PKGBUILD      |   13 +++++++------
 cpulimit/trunk/PKGBUILD     |    4 ++++
 cutter/trunk/PKGBUILD       |    6 +++++-
 17 files changed, 69 insertions(+), 10 deletions(-)

Modified: cacti/trunk/PKGBUILD
===================================================================
--- cacti/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cacti/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -16,6 +16,10 @@
 md5sums=('a4da682dab9a88a2e0edb1728bf531ae')
 
 build() {
+  true
+}
+
+package() {
   mkdir -p $pkgdir/usr/share/webapps/cacti $pkgdir/etc/webapps/cacti
   mv $srcdir/$pkgname-${pkgver/_/}/* $pkgdir/usr/share/webapps/cacti
   echo "deny from all" >> $pkgdir/etc/webapps/cacti/.htaccess

Modified: calc/trunk/PKGBUILD
===================================================================
--- calc/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ calc/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -53,6 +53,10 @@
 EOF
 
   make -j1
+}
+
+package() {
+  cd $srcdir/calc-$pkgver
   make T=$pkgdir install
   mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/
 }

Modified: canorus/trunk/PKGBUILD
===================================================================
--- canorus/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ canorus/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -23,8 +23,11 @@
   cmake . -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \
 	-DDEFAULT_DATA_DIR="/usr/share/canorus" \
 	-DNO_SWIG=ON
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make install
-
   install -d $pkgdir/usr/share/{applications,pixmaps}
   cp canorus.desktop $pkgdir/usr/share/applications
   cp $pkgdir/usr/share/{canorus/images/clogosm.png,pixmaps/canorus.png}

Modified: catdvi/trunk/PKGBUILD
===================================================================
--- catdvi/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ catdvi/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -24,7 +24,6 @@
 
   ./configure --prefix=/usr --mandir=/usr/share/man
 
-  install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1
   sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk
   sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk
 
@@ -33,5 +32,6 @@
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
+  install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1
   make DESTDIR="$pkgdir" install
 }

Modified: cchost/trunk/PKGBUILD
===================================================================
--- cchost/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cchost/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -23,7 +23,11 @@
 
   # python2 fix
   sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' bin/publishcchost
+}
 
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   mkdir -p $pkgdir/usr/share/webapps
   mkdir -p $pkgdir/etc/webapps/cchost
   cp -a $srcdir/$pkgname-$pkgver $pkgdir/usr/share/webapps/cchost

Modified: cdbxx/trunk/PKGBUILD
===================================================================
--- cdbxx/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cdbxx/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -21,5 +21,9 @@
   sed -i '1,2i#include <string.h>' src/db.cc
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: cdcover/trunk/PKGBUILD
===================================================================
--- cdcover/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cdcover/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -26,7 +26,10 @@
 ---
 > IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
 EOF
+}
 
+package() {
+  cd $srcdir/$pkgname
   make target=/usr prefix=$pkgdir/usr install
   rm -rf $pkgdir/usr/doc
 }

Modified: cdfs/trunk/PKGBUILD
===================================================================
--- cdfs/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cdfs/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -30,6 +30,10 @@
   patch -p1 <$srcdir/cdfs-3.2.patch
   patch -p1 <$srcdir/cdfs-3.4.patch
   make KDIR=/usr/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
   sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
+}

Modified: cedet/trunk/PKGBUILD
===================================================================
--- cedet/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cedet/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -16,6 +16,10 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/share/emacs/site-lisp/cedet
   cp -R $srcdir/$pkgname-$pkgver/* $pkgdir/usr/share/emacs/site-lisp/cedet
 }

Modified: checkinstall/trunk/PKGBUILD
===================================================================
--- checkinstall/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ checkinstall/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -19,5 +19,9 @@
   cd $srcdir/$pkgname-$pkgver
   patch -Np1 <../build-fix.patch
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: chrootuid/trunk/PKGBUILD
===================================================================
--- chrootuid/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ chrootuid/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -20,6 +20,10 @@
 build() {
   cd $srcdir/$pkgname$pkgver
   make
+}
+
+package() {
+  cd $srcdir/$pkgname$pkgver
   install -D -m755 $srcdir/$pkgname$pkgver/chrootuid $pkgdir/usr/sbin/chrootuid
   install -D -m644 $srcdir/$pkgname$pkgver/chrootuid.1 $pkgdir/usr/share/man/man1/chrootuid.1
   install -D -m644 $srcdir/chrootuid_license $pkgdir/usr/share/licenses/$pkgname/license

Modified: classpath/trunk/PKGBUILD
===================================================================
--- classpath/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ classpath/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -30,6 +30,10 @@
 
   ./configure --prefix=/usr --disable-Werror --disable-plugin
   make EXAMPLESDIR=
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make EXAMPLESDIR= DESTDIR=$pkgdir install
 
   rm -f $pkgdir/usr/bin/gappletviewer

Modified: clearsilver/trunk/PKGBUILD
===================================================================
--- clearsilver/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ clearsilver/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -38,6 +38,10 @@
 EOF
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make PREFIX=$pkgdir DESTDIR=$pkgdir install
 
   install -Dm644 CS_LICENSE $pkgdir/usr/share/licenses/clearsilver/license.txt

Modified: clewn/trunk/PKGBUILD
===================================================================
--- clewn/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ clewn/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -18,6 +18,10 @@
   cd $srcdir/$pkgname-$pkgver
   vimdir=/usr/share/vim/vimfiles ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   rm -f $pkgdir/usr/share/vim/vimfiles/doc/tags
 }

Modified: cpuburn/trunk/PKGBUILD
===================================================================
--- cpuburn/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cpuburn/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -19,12 +19,13 @@
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i ../cpuburn.patch
   make
-  install -Dm755 burnBX $pkgdir/usr/bin/burnBX
-  install -Dm755 burnK6 $pkgdir/usr/bin/burnK6
-  install -Dm755 burnK7 $pkgdir/usr/bin/burnK7
-  install -Dm755 burnMMX $pkgdir/usr/bin/burnMMX
-  install -Dm755 burnP5 $pkgdir/usr/bin/burnP5
-  install -Dm755 burnP6 $pkgdir/usr/bin/burnP6
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  for i in burn{BX,K6,K7,MMX,P5,P6}; do
+    install -Dm755 $i $pkgdir/usr/bin/$i
+  done
   install -Dm644 README $pkgdir/usr/share/doc/$pkgname/README
   install -Dm644 Design $pkgdir/usr/share/doc/$pkgname/Design
 }

Modified: cpulimit/trunk/PKGBUILD
===================================================================
--- cpulimit/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cpulimit/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -16,6 +16,10 @@
 build() {
   cd $srcdir/opsengine-cpulimit-*
   make
+}
+
+package() {
+  cd $srcdir/opsengine-cpulimit-*
   install -Dm0755 src/cpulimit $pkgdir/usr/bin/cpulimit
   install -Dm0644 README $pkgdir/usr/share/doc/$pkgname/README
 }

Modified: cutter/trunk/PKGBUILD
===================================================================
--- cutter/trunk/PKGBUILD	2013-02-04 13:50:23 UTC (rev 83692)
+++ cutter/trunk/PKGBUILD	2013-02-04 13:58:54 UTC (rev 83693)
@@ -17,5 +17,9 @@
   cd $srcdir/$pkgname-$pkgver
   sed -i 's|/proc/net/ip_conntrack|/proc/net/nf_conntrack|g' cutter.c
   make
-  install -D -m 0755 ./cutter $pkgdir/usr/bin/tcp-cutter
 }
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -D -m 0755 cutter $pkgdir/usr/bin/tcp-cutter
+}




More information about the arch-commits mailing list