Changes 1.0.1:

- fixed security hole in config file (02/11/24 M.S.)
- removed the 'phtread'-stuff from the configure file
- restart key added

4 files changed, 8 insertions, 220 deletions

diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index f33a80be4d8..f99a6dc35f4 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:14:45 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/12 16:01:07 adam Exp $
 
-DISTNAME=	lpairs-1.0
-PKGREVISION=	3
+DISTNAME=	lpairs-1.0.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lgames/}
 
@@ -9,9 +8,9 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	Memory game matching pairs of cards
 
-USE_BUILDLINK3=	YES
-USE_X11=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK3=		yes
+USE_X11=		yes
+GNU_CONFIGURE=		yes
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lpairs/distinfo b/games/lpairs/distinfo
index c28e4aa2c34..2bb9bd67ff9 100644
--- a/games/lpairs/distinfo
+++ b/games/lpairs/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/05 22:37:41 rh Exp $
+$NetBSD: distinfo,v 1.2 2005/01/12 16:01:07 adam Exp $
 
-SHA1 (lpairs-1.0.tar.gz) = 6b49034ba1af2468034921ea46473267f82ac672
-Size (lpairs-1.0.tar.gz) = 415321 bytes
-SHA1 (patch-aa) = a86973e5cb69750fc8d3ed90c945aefbcc230aac
-SHA1 (patch-ab) = 1ca6c292d1b1cfcaf6dcc6d5c52a299e5e431c4c
+SHA1 (lpairs-1.0.1.tar.gz) = 4094c77bee155f1e32c87886f772aae9ca04e1fd
+Size (lpairs-1.0.1.tar.gz) = 418431 bytes
diff --git a/games/lpairs/patches/patch-aa b/games/lpairs/patches/patch-aa
deleted file mode 100644
index c1833b106d8..00000000000
--- a/games/lpairs/patches/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/05 22:37:41 rh Exp $
-
---- configure.in.orig	Fri Apr 19 16:47:41 2002
-+++ configure.in
-@@ -17,29 +17,30 @@
- LIBS="$LIBS $SDL_LIBS"
- AM_PATH_SDL(1.1.5, CFLAGS="$CFLAGS -DSDL_1_1_5",)
- 
--dnl check for pthread
--ac_save_LIBS="$LIBS"
--thread_flag=""
--dnl first look for -pthread
--LIBS="$LIBS -pthread"
--AC_TRY_LINK(
--        [#include <pthread.h>],
--        [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
--        AC_MSG_RESULT("-pthread used...")
--        thread_flag="-pthread",
--        dnl now look for -lpthread
--        AC_MSG_RESULT("checking for -lpthread...")
--        LIBS="$ac_save_LIBS"
--        AC_CHECK_LIB(
--                pthread,
--                pthread_create,
--                thread_flag="-lpthread"
--		AC_MSG_RESULT(yes),
--                AC_MSG_ERROR([lib pthread is needed])
--        )
--)
--LIBS="$ac_save_LIBS"
--AC_SUBST(thread_flag)
-+dnl SDL picks all this stuff up
-+dnl dnl check for pthread
-+dnl ac_save_LIBS="$LIBS"
-+dnl thread_flag=""
-+dnl dnl first look for -pthread
-+dnl LIBS="$LIBS -pthread"
-+dnl AC_TRY_LINK(
-+dnl         [#include <pthread.h>],
-+dnl         [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
-+dnl         AC_MSG_RESULT("-pthread used...")
-+dnl         thread_flag="-pthread",
-+dnl         dnl now look for -lpthread
-+dnl         AC_MSG_RESULT("checking for -lpthread...")
-+dnl         LIBS="$ac_save_LIBS"
-+dnl         AC_CHECK_LIB(
-+dnl                 pthread,
-+dnl                 pthread_create,
-+dnl                 thread_flag="-lpthread"
-+dnl 		AC_MSG_RESULT(yes),
-+dnl                 AC_MSG_ERROR([lib pthread is needed])
-+dnl         )
-+dnl )
-+dnl LIBS="$ac_save_LIBS"
-+dnl AC_SUBST(thread_flag)
- 
- dnl check sound
- sound_flag="-DSOUND"
diff --git a/games/lpairs/patches/patch-ab b/games/lpairs/patches/patch-ab
deleted file mode 100644
index 9837b183a64..00000000000
--- a/games/lpairs/patches/patch-ab
+++ /dev/null
@@ -1,151 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/05 22:37:41 rh Exp $
-
---- configure.orig	Fri Apr 19 16:47:41 2002
-+++ configure
-@@ -1515,76 +1515,76 @@
-   
-   rm -f conf.sdltest
- 
--
--ac_save_LIBS="$LIBS"
--thread_flag=""
--LIBS="$LIBS -pthread"
--cat > conftest.$ac_ext <<EOF
--#line 1524 "configure"
--#include "confdefs.h"
--#include <pthread.h>
--int main() {
-- pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
--; return 0; }
--EOF
--if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  echo "$ac_t"""-pthread used..."" 1>&6
--        thread_flag="-pthread"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--          echo "$ac_t"""checking for -lpthread..."" 1>&6
--        LIBS="$ac_save_LIBS"
--        echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:1542: checking for pthread_create in -lpthread" >&5
--ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1550 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char pthread_create();
--
--int main() {
--pthread_create()
--; return 0; }
--EOF
--if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  thread_flag="-lpthread"
--		echo "$ac_t""yes" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--{ echo "configure: error: lib pthread is needed" 1>&2; exit 1; }
--        
--fi
--
--
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
-+# unneeded
-+#ac_save_LIBS="$LIBS"
-+#thread_flag=""
-+#LIBS="$LIBS -pthread"
-+#cat > conftest.$ac_ext <<EOF
-+##line 1524 "configure"
-+##include "confdefs.h"
-+##include <pthread.h>
-+#int main() {
-+# pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); 
-+#; return 0; }
-+#EOF
-+#if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+#  rm -rf conftest*
-+#  echo "$ac_t"""-pthread used..."" 1>&6
-+#        thread_flag="-pthread"
-+#else
-+#  echo "configure: failed program was:" >&5
-+#  cat conftest.$ac_ext >&5
-+#  rm -rf conftest*
-+#          echo "$ac_t"""checking for -lpthread..."" 1>&6
-+#        LIBS="$ac_save_LIBS"
-+#        echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-+#echo "configure:1542: checking for pthread_create in -lpthread" >&5
-+#ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-+#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+#  echo $ac_n "(cached) $ac_c" 1>&6
-+#else
-+#  ac_save_LIBS="$LIBS"
-+#LIBS="-lpthread  $LIBS"
-+#cat > conftest.$ac_ext <<EOF
-+##line 1550 "configure"
-+##include "confdefs.h"
-+#/* Override any gcc2 internal prototype to avoid an error.  */
-+#/* We use char because int might match the return type of a gcc2
-+#    builtin and then its argument prototype would still apply.  */
-+#char pthread_create();
-+#
-+#int main() {
-+#pthread_create()
-+#; return 0; }
-+#EOF
-+#if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+#  rm -rf conftest*
-+#  eval "ac_cv_lib_$ac_lib_var=yes"
-+#else
-+#  echo "configure: failed program was:" >&5
-+#  cat conftest.$ac_ext >&5
-+#  rm -rf conftest*
-+#  eval "ac_cv_lib_$ac_lib_var=no"
-+#fi
-+#rm -f conftest*
-+#LIBS="$ac_save_LIBS"
-+#
-+#fi
-+#if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+#  echo "$ac_t""yes" 1>&6
-+#  thread_flag="-lpthread"
-+#		echo "$ac_t""yes" 1>&6
-+#else
-+#  echo "$ac_t""no" 1>&6
-+#{ echo "configure: error: lib pthread is needed" 1>&2; exit 1; }
-+#        
-+#fi
-+#
-+#
-+#fi
-+#rm -f conftest*
-+#LIBS="$ac_save_LIBS"
-+#
- 
- sound_flag="-DSOUND"
- # Check whether --enable-sound or --disable-sound was given.