[arch-commits] CVS update of extra/lib/libixp (PKGBUILD config.mk)

[Jeff Mickey]

    Date: Wednesday, December 19, 2007 @ 18:25:10
  Author: jeff
    Path: /home/cvs-extra/extra/lib/libixp

Modified: PKGBUILD (1.1 -> 1.2) config.mk (1.1 -> 1.2)

upgpkg: libixp 0.4-1


-----------+
 PKGBUILD  |   32 ++++++++++++++++++++++----------
 config.mk |   57 +++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 57 insertions(+), 32 deletions(-)


Index: extra/lib/libixp/PKGBUILD
diff -u extra/lib/libixp/PKGBUILD:1.1 extra/lib/libixp/PKGBUILD:1.2
--- extra/lib/libixp/PKGBUILD:1.1	Mon Jan  8 00:17:19 2007
+++ extra/lib/libixp/PKGBUILD	Wed Dec 19 18:25:09 2007
@@ -1,20 +1,32 @@
-# $Id: PKGBUILD,v 1.1 2007/01/08 05:17:19 jeff Exp $
+# $Id: PKGBUILD,v 1.2 2007/12/19 23:25:09 jeff Exp $
 # Maintainer: Jeff Mickey <jeff at archlinux.org>
+# Thanks to Alessio 'mOLOk' Bolognino
 
 pkgname=libixp
-pkgver=0.2
+pkgver=0.4
 pkgrel=1
 pkgdesc="A standalone client/server 9p library"
+arch=('i686' 'x86_64')
 url="http://libs.suckless.org"
-license="GPL"
-source=(http://libs.suckless.org/download/$pkgname-$pkgver.tar.gz \
-		config.mk )
-md5sums=('e50c613f7410bc1cff3a18926804202f' 'af95bf8d6770c50cf043bcf67c0990fa')
+license=('MIT')
+source=(http://libs.suckless.org/download/libixp-$pkgver.tar.gz) 
+options=(!makeflags)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  rm config.mk; mv ../config.mk .
+  cd $startdir/src/libixp-$pkgver
+  sed -i \
+        -e "/^PREFIX/s|=.*|= ${startdir}/pkg/usr|" \
+        -e "/^ETC/s|=.*|= ${startdir}/pkg/etc|" \
+        -e "/^CFLAGS/s|=|+=|" \
+        -e "/^LDFLAGS/s|=|+=|" \
+        config.mk || return 1
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install
+  make -j1 || return 1
+  make -j1 DESTDIR=$startdir/pkg install
+
+  install -m644 -D ./libixp/LICENSE \
+                   $startdir/pkg/usr/share/licenses/libixp/LICENSE
 }
+
+md5sums=('59d9e918adffaf4413b32ac4f66724fd')
+sha1sums=('ec1adfeb4c5f502dfcb1b99fcf440841ecee2f9a')
Index: extra/lib/libixp/config.mk
diff -u extra/lib/libixp/config.mk:1.1 extra/lib/libixp/config.mk:1.2
--- extra/lib/libixp/config.mk:1.1	Mon Jan  8 00:17:19 2007
+++ extra/lib/libixp/config.mk	Wed Dec 19 18:25:10 2007
@@ -1,31 +1,44 @@
-# Customized for Arch Linux <http://archlinux.org/>
-# libixp version
-VERSION = 0.2
-
 # Customize below to fit your system
 
+COMPONENTS = \
+	libixp \
+	libixp_pthread
+IGNORE = \
+	libixp_task \
+	libixp_rubythread
+
+RUBYINC = -I/usr/lib/ruby/1.8/i686-linux
+TASKINC = -I${HOME}/libtask
+
 # paths
 PREFIX = /usr
-MANPREFIX = ${PREFIX}/man
-
-# includes and libs
-INCS = -I. -I/usr/include
-LIBS = -L/usr/lib -lc -L.
-
-# flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
+BIN = ${PREFIX}/bin
+MAN = ${PREFIX}/share/man
+ETC = ${PREFIX}/etc
+LIBDIR = ${PREFIX}/lib
+INCLUDE = ${PREFIX}/include
+
+# Includes and libs
+INCPATH = .:${ROOT}/include:${INCLUDE}:/usr/include
+LIBS = -L/usr/lib -lc
+
+# Flags
+include ${ROOT}/mk/gcc.mk
+CFLAGS = -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
+LDFLAGS = -g ${LIBS}
+
+# Compiler
+CC = cc -c
+# Linker (Under normal circumstances, this should *not* be 'ld')
+LD = cc
+# Other
+AR = ar crs
+#AR = sh -c 'ar cr "$$@" && ranlib "$$@"'
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-#LIBS += -lsocket -lnsl
+#LDFLAGS = ${LIBS} -R${PREFIX}/lib
+#LDFLAGS += -lsocket -lnsl
 #CFLAGS += -xtarget=ultra
+FCALL_H_VERSION=.nounion
 
-# compiler and linker
-AR = ar cr
-CC = cc
-LD = ${CC}
-RANLIB = ranlib