diff options
| author | joerg <joerg@pkgsrc.org> | 2007-02-20 00:54:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-02-20 00:54:01 +0000 |
| commit | 66da9fde8b2ca70bf0fe23029c9f84b36c4370ae (patch) | |
| tree | e2866e13c101f09a6a3609cdb9427fabccbcfddc | |
| parent | 3f7321d4d9aea6926f2a703260fe8775d85f4f11 (diff) | |
| download | pkgsrc-66da9fde8b2ca70bf0fe23029c9f84b36c4370ae.tar.gz | |
Fix pthread detection and handle modular Xorg.
| -rw-r--r-- | games/blokus/Makefile | 9 | ||||
| -rw-r--r-- | games/blokus/distinfo | 3 | ||||
| -rw-r--r-- | games/blokus/patches/patch-aa | 30 |
3 files changed, 39 insertions, 3 deletions
diff --git a/games/blokus/Makefile b/games/blokus/Makefile index c5a35a05c75..3f395eb7e4e 100644 --- a/games/blokus/Makefile +++ b/games/blokus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/02/19 09:52:17 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2007/02/20 00:54:01 joerg Exp $ # DISTNAME= blokus-1.0 @@ -23,6 +23,11 @@ USE_LANGUAGES= c c++ # specified. #LIBS.SunOS+= -lGLU +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../graphics/glu/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/blokus/distinfo b/games/blokus/distinfo index ad08d4e1dd5..5ffaf9aa3eb 100644 --- a/games/blokus/distinfo +++ b/games/blokus/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.4 2007/02/19 09:52:17 rillig Exp $ +$NetBSD: distinfo,v 1.5 2007/02/20 00:54:02 joerg Exp $ SHA1 (blokus-1.0/blokus-1.0.tar.gz) = 163fddab255bb684509b12a564d3366f6dac5ff1 RMD160 (blokus-1.0/blokus-1.0.tar.gz) = 4f339d193b34ed804f1d6bddfac77b145ec4c1e0 Size (blokus-1.0/blokus-1.0.tar.gz) = 530394 bytes +SHA1 (patch-aa) = 6081587206b69271f22b2d472bd32d7f2fe579ac diff --git a/games/blokus/patches/patch-aa b/games/blokus/patches/patch-aa new file mode 100644 index 00000000000..7a7dc7f5bf8 --- /dev/null +++ b/games/blokus/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1 2007/02/20 00:54:02 joerg Exp $ + +--- configure.orig 2007-02-20 00:30:17.000000000 +0000 ++++ configure +@@ -5733,13 +5733,13 @@ _ACEOF + fi + + +-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; } + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5815,7 +5815,7 @@ if test $ac_cv_lib_pthread_pthread_creat + #define HAVE_LIBPTHREAD 1 + _ACEOF + +- LIBS="-lpthread $LIBS" ++ LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS" + + fi + |