[arch-commits] Commit in (13 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Feb 4 14:16:06 UTC 2013


    Date: Monday, February 4, 2013 @ 15:16:06
  Author: spupykin
Revision: 83696

remove pkgdir from build()

Modified:
  ecb/trunk/PKGBUILD
  ejabberd-mod_archive-svn/trunk/PKGBUILD
  ejabberd-mod_mysql-svn/trunk/PKGBUILD
  ejabberd-mod_pgsql-svn/trunk/PKGBUILD
  emacs-apel/trunk/PKGBUILD
  emacs-haskell-mode/trunk/PKGBUILD
  emacs-muse/trunk/PKGBUILD
  emacs-php-mode/trunk/PKGBUILD
  emacs-python-mode/trunk/PKGBUILD
  emacs-w3m-cvs/trunk/PKGBUILD
  emacs-w3m/trunk/PKGBUILD
  emms/trunk/PKGBUILD
  enter/trunk/PKGBUILD

-----------------------------------------+
 ecb/trunk/PKGBUILD                      |   12 +++++-------
 ejabberd-mod_archive-svn/trunk/PKGBUILD |    4 ++++
 ejabberd-mod_mysql-svn/trunk/PKGBUILD   |    4 ++++
 ejabberd-mod_pgsql-svn/trunk/PKGBUILD   |    5 ++++-
 emacs-apel/trunk/PKGBUILD               |    4 ++++
 emacs-haskell-mode/trunk/PKGBUILD       |    3 ++-
 emacs-muse/trunk/PKGBUILD               |    4 ++++
 emacs-php-mode/trunk/PKGBUILD           |    4 ++++
 emacs-python-mode/trunk/PKGBUILD        |    2 +-
 emacs-w3m-cvs/trunk/PKGBUILD            |    4 ++++
 emacs-w3m/trunk/PKGBUILD                |    4 ++++
 emms/trunk/PKGBUILD                     |    4 ++++
 enter/trunk/PKGBUILD                    |    4 ++++
 13 files changed, 48 insertions(+), 10 deletions(-)

Modified: ecb/trunk/PKGBUILD
===================================================================
--- ecb/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ ecb/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -11,25 +11,23 @@
 license=('GPL')
 install=ecb.install
 #source=(http://downloads.sourceforge.net/ecb/$pkgname-$pkgver.tar.gz)
-source=(http://ecb.sourceforge.net/cvs_snapshots/ecb.tar.gz)
+source=(ecb-$pkgver.tar.gz::http://ecb.sourceforge.net/cvs_snapshots/ecb.tar.gz)
 md5sums=('cd5f6594773e2abc9bfebac422ccaa79')
 
 build() {
-  local _emacsver=`pacman -Q emacs | cut -d- -f 1 | cut -d\  -f2`
-
-#  cd $srcdir/$pkgname-$pkgver
   cd $srcdir/$pkgname-snap
-  mkdir -p $pkgdir/usr/share/emacs/site-lisp/ecb
   sed -i "s|1 0 4 9|1 2 0 0|" ecb-cedet-wrapper.el
-
   patch -p0 ecb.el <<EOF
 1219c1219
 <     (let ((stack-trace-on-error stack-trace-on-error))
 ---
 >     (let ((debug-on-error debug-on-error))
 EOF
+}
 
-#  make CEDET=/usr/share/emacs/${_emacsver}/lisp/cedet ecb
+package() {
+  cd $srcdir/$pkgname-snap
+  mkdir -p $pkgdir/usr/share/emacs/site-lisp/ecb
   make CEDET=/usr/share/emacs/site-lisp/cedet ecb
   cp -R $srcdir/$pkgname-snap/* $pkgdir/usr/share/emacs/site-lisp/ecb
   find $pkgdir/usr/share -type f -exec chmod 0644 {} \;

Modified: ejabberd-mod_archive-svn/trunk/PKGBUILD
===================================================================
--- ejabberd-mod_archive-svn/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ ejabberd-mod_archive-svn/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -43,6 +43,10 @@
   ./build.sh
 
   rm -rf ebin/.svn
+}
+
+package() {
+  cd $srcdir/${_svnmod}-build
   install -d -m 0755 $pkgdir/usr/lib/ejabberd
   cp -r ebin $pkgdir/usr/lib/ejabberd/ebin
   install -d -m0755 $pkgdir/usr/share/ejabberd-mod_archive

Modified: ejabberd-mod_mysql-svn/trunk/PKGBUILD
===================================================================
--- ejabberd-mod_mysql-svn/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ ejabberd-mod_mysql-svn/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -41,6 +41,10 @@
   ./build.sh
 
   rm -rf ebin/.svn
+}
+
+package() {
+  cd $srcdir/${_svnmod}-build
   install -d -m 0755 $pkgdir/usr/lib/ejabberd
   cp -r ebin $pkgdir/usr/lib/ejabberd/ebin
 }

Modified: ejabberd-mod_pgsql-svn/trunk/PKGBUILD
===================================================================
--- ejabberd-mod_pgsql-svn/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ ejabberd-mod_pgsql-svn/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -16,7 +16,6 @@
 _svntrunk=https://svn.process-one.net/ejabberd-modules
 _svnmod=ejabberd-modules
 md5sums=()
-md5sums=()
 
 build() {
   cd $srcdir
@@ -42,6 +41,10 @@
   ./build.sh
 
   rm -rf ebin/.svn
+}
+
+package() {
+  cd $srcdir/${_svnmod}-build
   install -d -m 0755 $pkgdir/usr/lib/ejabberd
   cp -r ebin $pkgdir/usr/lib/ejabberd/ebin
 }

Modified: emacs-apel/trunk/PKGBUILD
===================================================================
--- emacs-apel/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-apel/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -16,5 +16,9 @@
 build() {
   cd $srcdir/jeffgran-APEL-*
   make
+}
+
+package() {
+  cd $srcdir/jeffgran-APEL-*
   make install PREFIX=$pkgdir/usr
 }

Modified: emacs-haskell-mode/trunk/PKGBUILD
===================================================================
--- emacs-haskell-mode/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-haskell-mode/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -16,12 +16,13 @@
 md5sums=('64435a26bd070e56481b8d0ad826ac63')
 
 build() {
-  # remove unnecessary files
   rm -f $srcdir/haskell-mode-$pkgver/ChangeLog
   rm -f $srcdir/haskell-mode-$pkgver/Makefile
   rm -f $srcdir/haskell-mode-$pkgver/NEWS
   rm -f $srcdir/haskell-mode-$pkgver/README
+}
 
+package() {
   install -d $pkgdir/usr/share/emacs/site-lisp/haskell-mode
   install -m644 $srcdir/haskell-mode-$pkgver/* -t $pkgdir/usr/share/emacs/site-lisp/haskell-mode
   emacs -batch --eval '(setq load-path (cons "." load-path))' -f batch-byte-compile $pkgdir/usr/share/emacs/site-lisp/haskell-mode/*.el

Modified: emacs-muse/trunk/PKGBUILD
===================================================================
--- emacs-muse/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-muse/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -23,5 +23,9 @@
   cp Makefile.defs.default Makefile.defs
   sed -i -e "s|\(PREFIX.*= \)/usr/local|\1/usr|" Makefile.defs
   make
+}
+
+package() {
+  cd $srcdir/muse-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: emacs-php-mode/trunk/PKGBUILD
===================================================================
--- emacs-php-mode/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-php-mode/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -18,6 +18,10 @@
 build() {
   cd $srcdir/php-mode-$pkgver
   make php-mode.info.gz
+}
+
+package() {
+  cd $srcdir/php-mode-$pkgver
   install -D -m644 php-mode.el $pkgdir/usr/share/emacs/site-lisp/php-mode.el
   install -D -m644 php-mode.info.gz $pkgdir/usr/share/info/php-mode.info.gz
 }

Modified: emacs-python-mode/trunk/PKGBUILD
===================================================================
--- emacs-python-mode/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-python-mode/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -14,7 +14,7 @@
 source=("http://launchpad.net/python-mode/trunk/$pkgver/+download/python-mode.el-$pkgver.tar.gz")
 md5sums=('980de2df6a314d49cd61ae764f757339')
 
-build() {
+package() {
   cd $srcdir/python-mode.el-$pkgver
   install -dm755 $pkgdir/usr/share/emacs/site-lisp/
   install -Dm644 *.el $pkgdir/usr/share/emacs/site-lisp/

Modified: emacs-w3m/trunk/PKGBUILD
===================================================================
--- emacs-w3m/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-w3m/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -17,6 +17,10 @@
   cd $srcdir/emacs-w3m-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/emacs-w3m-$pkgver
   make prefix=$pkgdir/usr install
   mv $pkgdir/usr/info $pkgdir/usr/share/
 }

Modified: emacs-w3m-cvs/trunk/PKGBUILD
===================================================================
--- emacs-w3m-cvs/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emacs-w3m-cvs/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -34,5 +34,9 @@
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir"/${_cvsmod}-build
   make prefix="$pkgdir/usr" install
 }

Modified: emms/trunk/PKGBUILD
===================================================================
--- emms/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ emms/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -23,5 +23,9 @@
   sed -i -e "s|\(for p in \$(MAN1PAGES).*\)| mkdir -p \$(MAN1DIR); \1|" Makefile
   sed -i -e "s|\$(INSTALLINFO) emms.info||" Makefile
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }

Modified: enter/trunk/PKGBUILD
===================================================================
--- enter/trunk/PKGBUILD	2013-02-04 14:11:57 UTC (rev 83695)
+++ enter/trunk/PKGBUILD	2013-02-04 14:16:06 UTC (rev 83696)
@@ -19,5 +19,9 @@
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt"
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }




More information about the arch-commits mailing list