[arch-commits] CVS update of extra/system/devtools (PKGBUILD makepkg3.patch)

Sun Sep 16 12:49:43 UTC 2007

Date: Sunday, September 16, 2007 @ 08:49:43
  Author: thomas
    Path: /home/cvs-extra/extra/system/devtools

Modified: PKGBUILD (1.16 -> 1.17) makepkg3.patch (1.3 -> 1.4)

upgpkg: devtools 0.3.4-6


----------------+
 PKGBUILD       |   10 ++--
 makepkg3.patch |  120 +++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 86 insertions(+), 44 deletions(-)


Index: extra/system/devtools/PKGBUILD
diff -u extra/system/devtools/PKGBUILD:1.16 extra/system/devtools/PKGBUILD:1.17

--- extra/system/devtools/PKGBUILD:1.16	Mon Sep  3 09:02:55 2007
+++ extra/system/devtools/PKGBUILD	Sun Sep 16 08:49:42 2007
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD,v 1.16 2007/09/03 13:02:55 paul Exp $
+# $Id: PKGBUILD,v 1.17 2007/09/16 12:49:42 thomas Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 
 pkgname=devtools
 pkgver=0.3.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A few tools to help Arch Linux developers"
 arch=(i686 x86_64)
 url=""
 depends=(namcap)
 makedepends=(subversion)
 source=('makepkg3.patch')
-md5sums=('1b8280b7c9bcfdcb7307b19c64adc763')
-sha1sums=('5f80c6813d8a2c041c6b2627c354d90985d69ee1')
+md5sums=('4e430daea48b0c59639a91da71eb5765')
+sha1sums=('0f31fedec738d3503c96e262932346a5107f21ba')
 
 build() {
   cd $startdir/src
@@ -20,7 +20,7 @@
   cd $pkgname
 
   # apply temp patch for pacman2 backwards compatibility
-  patch -p0 < $startdir/src/makepkg3.patch
+  patch -p1 < $startdir/src/makepkg3.patch
 
   [ "$CARCH" = "x86_64" ] && sed -i -e "s/CURRENT/CURRENT-64/g" extrapkg
   [ "$CARCH" = "x86_64" ] && sed -i -e "s/TESTING/TESTING-64/g" extrapkg
Index: extra/system/devtools/makepkg3.patch
diff -u extra/system/devtools/makepkg3.patch:1.3 extra/system/devtools/makepkg3.patch:1.4
--- extra/system/devtools/makepkg3.patch:1.3	Mon Sep  3 09:02:55 2007
+++ extra/system/devtools/makepkg3.patch	Sun Sep 16 08:49:42 2007
@@ -1,7 +1,17 @@
-Index: checkpkg
-===================================================================
---- checkpkg	(revision 227)
-+++ checkpkg	(working copy)
+diff -Nur devtools.orig/Makefile devtools/Makefile
+--- devtools.orig/Makefile	2004-07-19 07:26:30.000000000 +0200
++++ devtools/Makefile	2007-09-16 14:44:51.000000000 +0200
+@@ -4,6 +4,6 @@
+ 	mkdir -p $(DESTDIR)/usr/bin
+ 	install -m 755 checkpkg $(DESTDIR)/usr/bin
+ 	install -m 755 extrapkg $(DESTDIR)/usr/bin
+-	ln -s extrapkg $(DESTDIR)/usr/bin/currentpkg
++	ln -s extrapkg $(DESTDIR)/usr/bin/corepkg
+ 	ln -s extrapkg $(DESTDIR)/usr/bin/testingpkg
+ 	ln -s extrapkg $(DESTDIR)/usr/bin/unstablepkg
+diff -Nur devtools.orig/checkpkg devtools/checkpkg
+--- devtools.orig/checkpkg	2005-07-18 02:25:38.000000000 +0200
++++ devtools/checkpkg	2007-09-16 14:44:51.000000000 +0200
 @@ -1,5 +1,7 @@
  #!/bin/bash
  
@@ -10,28 +20,31 @@
  strip_url() {
  	echo $1 | sed 's|^.*://.*/||g'
  }
-@@ -10,12 +12,19 @@
- fi
+@@ -11,9 +13,20 @@
  
  source PKGBUILD
-+pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-+pkg3file=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
  
 -if [ ! -f $pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then
-+if [ ! -f $pkgfile -a ! -f $pkg3file ]; then
- 	echo "You must have a built package to check."
- 	exit 1
+-	echo "You must have a built package to check."
+-	exit 1
++pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
++oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
++
++if [ ! -f $pkgfile ]; then
++	if [ -f $PKGDEST/$pkgfile ]; then
++		pkgfile=$PKGDEST/$pkgfile
++	elif [ -f $oldstylepkgfile ]; then
++		pkgfile=$oldstylepkgfile
++	elif [ -f $PKGDEST/$oldstylepkgfile ]; then
++		pkgfile=$PKGDEST/$oldstylepkgfile
++	else
++		echo "You must have a built package to check."
++		exit 1
++	fi
  fi
  
-+if [ -f $pkg3file -a ! -f $pkgfile ]; then
-+	echo "Renaming makepkg3 package for compatability"
-+	mv $pkg3file $pkgfile
-+fi
-+
  tmp=`pacman -Spd --noconfirm $pkgname`
- 
- if [ $? -ne 0 ]; then
-@@ -27,7 +36,7 @@
+@@ -27,7 +40,7 @@
  
  oldpkg=`strip_url $pkgurl`
  
@@ -40,7 +53,7 @@
  	echo "The built package is the one in the repo right now!"
  	exit 1
  fi
-@@ -41,7 +50,7 @@
+@@ -41,7 +54,7 @@
  fi
  
  tar tzf $oldpkg > filelist-old
@@ -49,7 +62,7 @@
  
  sort -o filelist filelist
  sort -o filelist-old filelist-old
-@@ -51,7 +60,7 @@
+@@ -51,7 +64,7 @@
  if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
  	mkdir -p pkg
  	cd pkg
@@ -58,27 +71,56 @@
  	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
  		echo -n "${i}: "
  		objdump -p $i | grep SONAME
-Index: extrapkg
-===================================================================
---- extrapkg	(revision 227)
-+++ extrapkg	(working copy)
-@@ -11,11 +11,18 @@
+diff -Nur devtools.orig/extrapkg devtools/extrapkg
+--- devtools.orig/extrapkg	2006-04-28 04:42:45.000000000 +0200
++++ devtools/extrapkg	2007-09-16 14:46:06.000000000 +0200
+@@ -10,22 +10,28 @@
+ fi
  
  source PKGBUILD
- pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-+pkg3file=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+-pkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
++pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
++oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
  
+ if [ ! -f $pkgfile ]; then
+-	pkgfile=$PKGDEST/$pkgfile
+-fi
+-
 -if [ ! -f $pkgfile ]; then
-+if [ ! -f $pkgfile -a ! -f $pkg3file ]; then
- 	pkgfile=$PKGDEST/$pkgfile
-+	pkg3file=$PKGDEST/$pkg3file
+-	echo "File $pkgfile doesn't exist"
+-	exit 1
++	if [ -f $PKGDEST/$pkgfile ]; then
++		pkgfile=$PKGDEST/$pkgfile
++		oldstylepkgfile=$PKGDEST/$oldstylepkgfile
++	elif [ -f $oldstylepkgfile ]; then
++		pkgfile=$oldstylepkgfile
++	elif [ -f $PKGDEST/$oldstylepkgfile ]; then
++		pkgfile=$PKGDEST/$oldstylepkgfile
++	else
++		echo "File $pkgfile doesn't exist"
++		exit 1
++	fi
  fi
  
-+if [ -f $pkg3file -a ! -f $pkgfile ]; then
-+	echo "Renaming makepkg3 package for compatability"
-+	mv $pkg3file $pkgfile
-+fi
-+
- if [ ! -f $pkgfile ]; then
- 	echo "File $pkgfile doesn't exist"
- 	exit 1
+ if [ "$cmd" == "extrapkg" ]; then
+ 	repo="extra"
+ 	tag="CURRENT"
+-elif [ "$cmd" == "currentpkg" ]; then
+-	repo="arch"
++elif [ "$cmd" == "corepkg" ]; then
++	repo="core"
+ 	tag="CURRENT"
+ elif [ "$cmd" == "testingpkg" ]; then
+ 	repo="testing"
+@@ -45,6 +51,11 @@
+ 	   echo "Must configure tupkg via ~/.tupkg, cancelled"
+ 	   exit 1
+ 	fi
++	if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then
++		echo "Renaming makepkg3 package for compatability"
++		mv $pkgfile $oldstylepkgfile
++		pkgfile=$oldstylepkgfile
++	fi
+ 	tupkg $pkgfile
+ fi
+ if [ $? -ne 0 ]; then


