[arch-commits] Commit in fortune-mod/trunk (3 files)

[Eric Bélanger]

    Date: Saturday, March 21, 2009 @ 18:48:59
  Author: eric
Revision: 30774

upgpkg: fortune-mod 1.99.1-4
    Added license, FHS man pages, Fixed 'fortune all' (close FS#8972)

Added:
  fortune-mod/trunk/01_all_fortune_all-fix.patch
  fortune-mod/trunk/LICENSE
Modified:
  fortune-mod/trunk/PKGBUILD

------------------------------+
 01_all_fortune_all-fix.patch |   21 +++++++++++++++++++++
 LICENSE                      |   35 +++++++++++++++++++++++++++++++++++
 PKGBUILD                     |   29 ++++++++++++++++-------------
 3 files changed, 72 insertions(+), 13 deletions(-)

Added: 01_all_fortune_all-fix.patch
===================================================================
--- 01_all_fortune_all-fix.patch	                        (rev 0)
+++ 01_all_fortune_all-fix.patch	2009-03-21 22:48:59 UTC (rev 30774)
@@ -0,0 +1,21 @@
+--- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
++++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
+@@ -974,7 +974,7 @@
+ 	  if (!ret)
+ 	    ret=add_file(percent, fullpathname, NULL, &File_list,
+ 			 &File_tail, NULL);
+-	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
++	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
+ 	    ret=add_file(percent, locpathname, NULL, &File_list,
+ 		         &File_tail, NULL);
+ 	  
+@@ -985,7 +985,8 @@
+ 	  }
+ 	  if (!ret)
+ 	    return FALSE;
+-	  
++	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
++	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
+ 	}
+ 	else
+ 	  if (!add_file(percent, fullpathname, NULL, &File_list,

Added: LICENSE
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2009-03-21 22:48:59 UTC (rev 30774)
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 1986, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Ken Arnold.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of
+ *      California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-21 22:47:51 UTC (rev 30773)
+++ PKGBUILD	2009-03-21 22:48:59 UTC (rev 30774)
@@ -4,26 +4,29 @@
 
 pkgname=fortune-mod
 pkgver=1.99.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The Fortune Cookie Program from BSD games"
 arch=('i686' 'x86_64')
 url="http://www.redellipse.net/code/fortune"
+license=('BSD')
 depends=('recode')
-force=y
-source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/$pkgname-$pkgver.tar.gz)
-md5sums=('f208805b3b712e32997d7667e0ec52d8')
+source=(ftp://ftp.archlinux.org/other/fortune-mod/$pkgname-$pkgver.tar.gz LICENSE 01_all_fortune_all-fix.patch)
+md5sums=('f208805b3b712e32997d7667e0ec52d8' '0217481ae93971296cfb7872157cabb7'\
+         'e85b073f16dc6f0e8f0ed90044797aa3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+  patch -p0 < ../01_all_fortune_all-fix.patch  || return 1
   make REGEXDEFS='-DHAVE_REGEX_H -DPOSIX_REGEX -DHAVE_STDBOOL'  \
        COOKIEDIR=/usr/share/fortune  \
        LOCALDIR=/usr/local/share/fortune || return 1
-  make COOKIEDIR=/usr/share/fortune fortune/fortune.man
-  make FORTDIR=$startdir/pkg/usr/bin  \
-       COOKIEDIR=$startdir/pkg/usr/share/fortune  \
-       BINDIR=$startdir/pkg/usr/sbin  \
-       BINMANDIR=$startdir/pkg/usr/man/man1  \
-       FORTMANDIR=$startdir/pkg/usr/man/man6 install
-  rm $startdir/pkg/usr/share/fortune/*.u8
-  rm $startdir/pkg/usr/share/fortune/off/*.u8
+  make COOKIEDIR=/usr/share/fortune fortune/fortune.man || return 1
+  make FORTDIR=$pkgdir/usr/bin  \
+       COOKIEDIR=$pkgdir/usr/share/fortune  \
+       BINDIR=$pkgdir/usr/sbin  \
+       BINMANDIR=$pkgdir/usr/share/man/man1  \
+       FORTMANDIR=$pkgdir/usr/share/man/man6 install || return 1
+  rm $pkgdir/usr/share/fortune/*.u8
+  rm $pkgdir/usr/share/fortune/off/*.u8
+  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }