diff options
author | joerg <joerg> | 2007-02-02 00:55:15 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-02-02 00:55:15 +0000 |
commit | 2a02ae1f44518f3f25623db876d9e1ed2f24f952 (patch) | |
tree | 1cd1439ee427a2fc168540bd9c33eb1e086485ac /games | |
parent | 8c6c2ddc5fd84a20c4551a1fded5de318e1e4306 (diff) | |
download | pkgsrc-2a02ae1f44518f3f25623db876d9e1ed2f24f952.tar.gz |
Modular Xorg support.
Diffstat (limited to 'games')
-rw-r--r-- | games/angband-x11/Makefile | 8 | ||||
-rw-r--r-- | games/xsc/Makefile | 8 | ||||
-rw-r--r-- | games/xsc/distinfo | 4 | ||||
-rw-r--r-- | games/xsc/patches/patch-ab | 22 | ||||
-rw-r--r-- | games/xtris/Makefile | 5 | ||||
-rw-r--r-- | games/xworm/Makefile | 5 | ||||
-rw-r--r-- | games/xzip/Makefile | 4 |
7 files changed, 36 insertions, 20 deletions
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 9a909bf8040..15e25bb5069 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2006/10/04 21:43:00 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2007/02/02 01:04:00 joerg Exp $ # DISTNAME= angband-3.0.3 @@ -36,6 +36,10 @@ post-install: ${CHOWN} -R bin:games ${PREFIX}/share/games/angband ${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \; +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/ncurses/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xsc/Makefile b/games/xsc/Makefile index 1b578d199a6..a0969db65dd 100644 --- a/games/xsc/Makefile +++ b/games/xsc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/07/22 04:46:15 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2007/02/02 01:13:57 joerg Exp $ # DISTNAME= xsc-1.5 @@ -14,11 +14,13 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ INSTALLATION_DIRS= bin -.include "../../mk/x11.buildlink3.mk" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xsc ${PREFIX}/bin/xsc ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xsc ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xsc +BUILDLINK_DEPMETHOD.libXt?= build + +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xsc/distinfo b/games/xsc/distinfo index 28abed2cf84..747927123f2 100644 --- a/games/xsc/distinfo +++ b/games/xsc/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2006/09/19 23:31:40 joerg Exp $ +$NetBSD: distinfo,v 1.5 2007/02/02 01:13:57 joerg Exp $ SHA1 (xsc-1.5.tar.gz) = 3b6b71c2e9d132c56e276896f4869dc08a0e43a3 RMD160 (xsc-1.5.tar.gz) = d2519f75ad3089215b4c89ee765d1585de37db33 Size (xsc-1.5.tar.gz) = 86015 bytes SHA1 (patch-aa) = 4da7181d8037d0d334fbd5330a91a45a50b59753 -SHA1 (patch-ab) = 5140c951066a672610799ae7fd1fc8b4c5f2876d +SHA1 (patch-ab) = 5512a83e5c35125513594d160c8b5de2bce0f48a diff --git a/games/xsc/patches/patch-ab b/games/xsc/patches/patch-ab index de296fb4e14..2adb3c30107 100644 --- a/games/xsc/patches/patch-ab +++ b/games/xsc/patches/patch-ab @@ -1,8 +1,20 @@ -$NetBSD: patch-ab,v 1.1 2006/09/19 23:31:40 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2007/02/02 01:13:57 joerg Exp $ ---- configure.orig 2006-09-20 01:23:24.000000000 +0000 +--- configure.orig 2005-01-02 19:10:05.000000000 +0000 +++ configure -@@ -2236,31 +2236,11 @@ if eval "test \"`echo '$''{'ac_cv_func_$ +@@ -1283,9 +1283,10 @@ if test "$ac_x_libraries" = NO; then + cat > conftest.$ac_ext <<EOF + #line 1285 "configure" + #include "confdefs.h" ++#include <X11/Intrinsic.h> + + int main() { +-${x_direct_test_function}() ++XtMalloc(0) + ; return 0; } + EOF + if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -2236,31 +2237,11 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -37,7 +49,7 @@ $NetBSD: patch-ab,v 1.1 2006/09/19 23:31:40 joerg Exp $ EOF if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -@@ -2354,55 +2334,71 @@ fi +@@ -2354,55 +2335,71 @@ fi done @@ -139,7 +151,7 @@ $NetBSD: patch-ab,v 1.1 2006/09/19 23:31:40 joerg Exp $ cat >> confdefs.h <<EOF #define $ac_tr_func 1 EOF -@@ -2411,8 +2407,6 @@ else +@@ -2411,8 +2408,6 @@ else echo "$ac_t""no" 1>&6 false fi diff --git a/games/xtris/Makefile b/games/xtris/Makefile index 298211bb596..02aa59eee0a 100644 --- a/games/xtris/Makefile +++ b/games/xtris/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/12/27 12:43:58 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2007/02/02 01:06:57 joerg Exp $ # DISTNAME= xtris-1.15 @@ -19,8 +19,6 @@ MAKE_ENV+= LIBS=${LIBS:Q} INSTALLATION_DIRS= bin ${PREFIX}/${PKGMANDIR}/man6 -.include "../../mk/x11.buildlink3.mk" - do-install: ${INSTALL_GAME} ${WRKSRC}/xtris ${PREFIX}/bin/xtris ${INSTALL_GAME} ${WRKSRC}/xtbot ${PREFIX}/bin/xtbot @@ -29,4 +27,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/xtbot.6 ${PREFIX}/${PKGMANDIR}/man6/xtbot.6 ${INSTALL_MAN} ${WRKSRC}/xtserv.6 ${PREFIX}/${PKGMANDIR}/man6/xtserv.6 +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 0f2cd982d66..1e0b697eb0e 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:26 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2007/02/02 01:08:01 joerg Exp $ DISTNAME= xworm102 PKGNAME= xworm-1.02 @@ -14,8 +14,6 @@ BUILD_TARGET= bsd INSTALLATION_DIRS= bin -.include "../../mk/x11.buildlink3.mk" - do-install: @ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin @ ${INSTALL_DATA_DIR} ${PREFIX}/share/xworm @@ -23,4 +21,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm .endfor +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xzip/Makefile b/games/xzip/Makefile index 42a75007808..60de4f331d0 100644 --- a/games/xzip/Makefile +++ b/games/xzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:26 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2007/02/02 01:05:20 joerg Exp $ DISTNAME= xzip180 PKGNAME= xzip-1.8 @@ -15,5 +15,5 @@ WRKSRC= ${WRKDIR}/xzip USE_X11BASE= yes BUILD_TARGET= xzip -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |