diff options
| author | joerg <joerg@pkgsrc.org> | 2006-09-25 14:15:25 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-09-25 14:15:25 +0000 |
| commit | 9de804302c911fc07fa0a20e595d502a9133414a (patch) | |
| tree | d9644732320e7a5dbc4e350ae5d4c68e19001924 /games/glaxium | |
| parent | 3c33a031547121084896427edeadcccd18094809 (diff) | |
| download | pkgsrc-9de804302c911fc07fa0a20e595d502a9133414a.tar.gz | |
Fix X11 linkage. Bump revision.
Diffstat (limited to 'games/glaxium')
| -rw-r--r-- | games/glaxium/Makefile | 6 | ||||
| -rw-r--r-- | games/glaxium/distinfo | 3 | ||||
| -rw-r--r-- | games/glaxium/patches/patch-ab | 31 |
3 files changed, 37 insertions, 3 deletions
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index 7e6c61d743c..75839791d15 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2006/06/12 16:28:09 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2006/09/25 14:15:25 joerg Exp $ # DISTNAME= glaxium_0.5 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= games MASTER_SITES= http://xhosxe.free.fr/glaxium/ @@ -14,6 +14,7 @@ COMMENT= Space-ship OpenGL shoot them up GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ +CONFIGURE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} BUILD_TARGET= glaxium @@ -28,4 +29,5 @@ SUBST_MESSAGE.bill= Fixing data path. .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/glaxium/distinfo b/games/glaxium/distinfo index edf755c6483..18045515424 100644 --- a/games/glaxium/distinfo +++ b/games/glaxium/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 23:11:58 agc Exp $ +$NetBSD: distinfo,v 1.3 2006/09/25 14:15:25 joerg Exp $ SHA1 (glaxium_0.5.tar.gz) = 42526a009a377a6fede7b7d343a0cd57c2f8e23e RMD160 (glaxium_0.5.tar.gz) = 5c988c53d4205ac80e0011a893a80daecf096c1f Size (glaxium_0.5.tar.gz) = 1692219 bytes SHA1 (patch-aa) = 9b8299ed10aaea1e862c929b6f20eef0811cae35 +SHA1 (patch-ab) = a7bb7f076f5ea92073ade0fa6c31029589d5c8e7 diff --git a/games/glaxium/patches/patch-ab b/games/glaxium/patches/patch-ab new file mode 100644 index 00000000000..2167f61e57b --- /dev/null +++ b/games/glaxium/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 2006/09/25 14:15:25 joerg Exp $ + +--- configure.orig 2002-10-20 18:32:19.000000000 +0000 ++++ configure +@@ -3411,7 +3411,7 @@ if test "${ac_cv_lib_X11_XDestroyWindow+ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lX11 $LIBS" ++LIBS="${X11_LDFLAGS} -lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" +@@ -3465,7 +3465,7 @@ if test $ac_cv_lib_X11_XDestroyWindow = + #define HAVE_LIBX11 1 + _ACEOF + +- LIBS="-lX11 $LIBS" ++ LIBS="${X11_LDFLAGS} -lX11 $LIBS" + + fi + +@@ -4723,6 +4723,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" + exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; + _ACEOF |