[arch-commits] Commit in liquidwar/repos (14 files)
Eric Bélanger
eric at nymeria.archlinux.org
Wed Mar 19 03:53:19 UTC 2014
Date: Wednesday, March 19, 2014 @ 04:53:19
Author: eric
Revision: 208212
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
liquidwar/repos/extra-i686/PKGBUILD
(from rev 208211, liquidwar/trunk/PKGBUILD)
liquidwar/repos/extra-i686/liquidwar-5.6.4-ovflfix.patch
(from rev 208211, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch)
liquidwar/repos/extra-i686/liquidwar-5.6.4-underlink.patch
(from rev 208211, liquidwar/trunk/liquidwar-5.6.4-underlink.patch)
liquidwar/repos/extra-i686/liquidwar.install
(from rev 208211, liquidwar/trunk/liquidwar.install)
liquidwar/repos/extra-x86_64/PKGBUILD
(from rev 208211, liquidwar/trunk/PKGBUILD)
liquidwar/repos/extra-x86_64/liquidwar-5.6.4-ovflfix.patch
(from rev 208211, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch)
liquidwar/repos/extra-x86_64/liquidwar-5.6.4-underlink.patch
(from rev 208211, liquidwar/trunk/liquidwar-5.6.4-underlink.patch)
liquidwar/repos/extra-x86_64/liquidwar.install
(from rev 208211, liquidwar/trunk/liquidwar.install)
Deleted:
liquidwar/repos/extra-i686/PKGBUILD
liquidwar/repos/extra-i686/liquidwar-5.6.4-ovflfix.patch
liquidwar/repos/extra-i686/liquidwar.install
liquidwar/repos/extra-x86_64/PKGBUILD
liquidwar/repos/extra-x86_64/liquidwar-5.6.4-ovflfix.patch
liquidwar/repos/extra-x86_64/liquidwar.install
----------------------------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++
/liquidwar-5.6.4-ovflfix.patch | 36 +++++++++++
/liquidwar.install | 32 ++++++++++
extra-i686/PKGBUILD | 32 ----------
extra-i686/liquidwar-5.6.4-ovflfix.patch | 18 -----
extra-i686/liquidwar-5.6.4-underlink.patch | 11 +++
extra-i686/liquidwar.install | 16 -----
extra-x86_64/PKGBUILD | 32 ----------
extra-x86_64/liquidwar-5.6.4-ovflfix.patch | 18 -----
extra-x86_64/liquidwar-5.6.4-underlink.patch | 11 +++
extra-x86_64/liquidwar.install | 16 -----
11 files changed, 168 insertions(+), 132 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-i686/PKGBUILD 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
-
-pkgname=liquidwar
-pkgver=5.6.4
-pkgrel=6
-pkgdesc="A unique multiplayer wargame"
-arch=('i686' 'x86_64')
-url="http://www.ufoot.org/liquidwar/"
-license=('GPL')
-depends=('allegro4')
-makedepends=('python2')
-install=liquidwar.install
-source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
- http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
-sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
- 'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
- 'e2102792c54a01b7cd14adb6d72404044175ec7e')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
- sed -i 's/python/python2/' doc/Makefile.in
- [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
- LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
- make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
-}
Copied: liquidwar/repos/extra-i686/PKGBUILD (from rev 208211, liquidwar/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:
+
+pkgname=liquidwar
+pkgver=5.6.4
+pkgrel=7
+pkgdesc="A unique multiplayer wargame"
+arch=('i686' 'x86_64')
+url="http://www.ufoot.org/liquidwar/"
+license=('GPL')
+depends=('allegro4')
+makedepends=('python2')
+install=liquidwar.install
+source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
+ http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig
+ liquidwar-5.6.4-ovflfix.patch liquidwar-5.6.4-underlink.patch)
+sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
+ 'SKIP'
+ 'e2102792c54a01b7cd14adb6d72404044175ec7e'
+ '442097d99402890ed27ea1de6b7ae984baa2676a')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
+ patch -p0 -i "$srcdir/liquidwar-5.6.4-underlink.patch"
+ sed -i 's/python/python2/' doc/Makefile.in
+}
+
+build() {
+ cd $pkgname-$pkgver
+ [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
+ PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+ make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
+}
Deleted: extra-i686/liquidwar-5.6.4-ovflfix.patch
===================================================================
--- extra-i686/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-i686/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,18 +0,0 @@
---- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
-+++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
-@@ -100,12 +100,12 @@
-
- data->privacy = privacy;
- data->log = log;
-- strncpy (data->metaserver, metaserver, URL_SIZE);
-+ strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
- data->port = port;
- data->busy_players = busy_players;
- data->max_players = max_players;
-- strncpy (data->password, password, URL_SIZE);
-- strncpy (data->comment, comment, URL_SIZE);
-+ strncpy (data->password, password, sizeof(data->password));
-+ strncpy (data->comment, comment, sizeof(data->comment));
- }
-
- /*------------------------------------------------------------------*/
Copied: liquidwar/repos/extra-i686/liquidwar-5.6.4-ovflfix.patch (from rev 208211, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch)
===================================================================
--- extra-i686/liquidwar-5.6.4-ovflfix.patch (rev 0)
+++ extra-i686/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,18 @@
+--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
+@@ -100,12 +100,12 @@
+
+ data->privacy = privacy;
+ data->log = log;
+- strncpy (data->metaserver, metaserver, URL_SIZE);
++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
+ data->port = port;
+ data->busy_players = busy_players;
+ data->max_players = max_players;
+- strncpy (data->password, password, URL_SIZE);
+- strncpy (data->comment, comment, URL_SIZE);
++ strncpy (data->password, password, sizeof(data->password));
++ strncpy (data->comment, comment, sizeof(data->comment));
+ }
+
+ /*------------------------------------------------------------------*/
Copied: liquidwar/repos/extra-i686/liquidwar-5.6.4-underlink.patch (from rev 208211, liquidwar/trunk/liquidwar-5.6.4-underlink.patch)
===================================================================
--- extra-i686/liquidwar-5.6.4-underlink.patch (rev 0)
+++ extra-i686/liquidwar-5.6.4-underlink.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
++++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+ EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+ LINK_OPTIONS =
+- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+
+ CONFIG_OPTIONS = \
Deleted: extra-i686/liquidwar.install
===================================================================
--- extra-i686/liquidwar.install 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-i686/liquidwar.install 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=(liquidwar.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
Copied: liquidwar/repos/extra-i686/liquidwar.install (from rev 208211, liquidwar/trunk/liquidwar.install)
===================================================================
--- extra-i686/liquidwar.install (rev 0)
+++ extra-i686/liquidwar.install 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=(liquidwar.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-x86_64/PKGBUILD 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jeff Mickey <jeff at archlinux.org>
-
-pkgname=liquidwar
-pkgver=5.6.4
-pkgrel=6
-pkgdesc="A unique multiplayer wargame"
-arch=('i686' 'x86_64')
-url="http://www.ufoot.org/liquidwar/"
-license=('GPL')
-depends=('allegro4')
-makedepends=('python2')
-install=liquidwar.install
-source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
- http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
-sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
- 'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
- 'e2102792c54a01b7cd14adb6d72404044175ec7e')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
- sed -i 's/python/python2/' doc/Makefile.in
- [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
- LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
- make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
-}
Copied: liquidwar/repos/extra-x86_64/PKGBUILD (from rev 208211, liquidwar/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer:
+
+pkgname=liquidwar
+pkgver=5.6.4
+pkgrel=7
+pkgdesc="A unique multiplayer wargame"
+arch=('i686' 'x86_64')
+url="http://www.ufoot.org/liquidwar/"
+license=('GPL')
+depends=('allegro4')
+makedepends=('python2')
+install=liquidwar.install
+source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
+ http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig
+ liquidwar-5.6.4-ovflfix.patch liquidwar-5.6.4-underlink.patch)
+sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
+ 'SKIP'
+ 'e2102792c54a01b7cd14adb6d72404044175ec7e'
+ '442097d99402890ed27ea1de6b7ae984baa2676a')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
+ patch -p0 -i "$srcdir/liquidwar-5.6.4-underlink.patch"
+ sed -i 's/python/python2/' doc/Makefile.in
+}
+
+build() {
+ cd $pkgname-$pkgver
+ [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
+ PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+ make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
+}
Deleted: extra-x86_64/liquidwar-5.6.4-ovflfix.patch
===================================================================
--- extra-x86_64/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-x86_64/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,18 +0,0 @@
---- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
-+++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
-@@ -100,12 +100,12 @@
-
- data->privacy = privacy;
- data->log = log;
-- strncpy (data->metaserver, metaserver, URL_SIZE);
-+ strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
- data->port = port;
- data->busy_players = busy_players;
- data->max_players = max_players;
-- strncpy (data->password, password, URL_SIZE);
-- strncpy (data->comment, comment, URL_SIZE);
-+ strncpy (data->password, password, sizeof(data->password));
-+ strncpy (data->comment, comment, sizeof(data->comment));
- }
-
- /*------------------------------------------------------------------*/
Copied: liquidwar/repos/extra-x86_64/liquidwar-5.6.4-ovflfix.patch (from rev 208211, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch)
===================================================================
--- extra-x86_64/liquidwar-5.6.4-ovflfix.patch (rev 0)
+++ extra-x86_64/liquidwar-5.6.4-ovflfix.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,18 @@
+--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200
++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200
+@@ -100,12 +100,12 @@
+
+ data->privacy = privacy;
+ data->log = log;
+- strncpy (data->metaserver, metaserver, URL_SIZE);
++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
+ data->port = port;
+ data->busy_players = busy_players;
+ data->max_players = max_players;
+- strncpy (data->password, password, URL_SIZE);
+- strncpy (data->comment, comment, URL_SIZE);
++ strncpy (data->password, password, sizeof(data->password));
++ strncpy (data->comment, comment, sizeof(data->comment));
+ }
+
+ /*------------------------------------------------------------------*/
Copied: liquidwar/repos/extra-x86_64/liquidwar-5.6.4-underlink.patch (from rev 208211, liquidwar/trunk/liquidwar-5.6.4-underlink.patch)
===================================================================
--- extra-x86_64/liquidwar-5.6.4-underlink.patch (rev 0)
+++ extra-x86_64/liquidwar-5.6.4-underlink.patch 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200
++++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+ EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+ LINK_OPTIONS =
+- EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++ EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+
+ CONFIG_OPTIONS = \
Deleted: extra-x86_64/liquidwar.install
===================================================================
--- extra-x86_64/liquidwar.install 2014-03-19 03:52:25 UTC (rev 208211)
+++ extra-x86_64/liquidwar.install 2014-03-19 03:53:19 UTC (rev 208212)
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=(liquidwar.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
Copied: liquidwar/repos/extra-x86_64/liquidwar.install (from rev 208211, liquidwar/trunk/liquidwar.install)
===================================================================
--- extra-x86_64/liquidwar.install (rev 0)
+++ extra-x86_64/liquidwar.install 2014-03-19 03:53:19 UTC (rev 208212)
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=(liquidwar.info.gz)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+}
More information about the arch-commits
mailing list