From cb132b7d728b940add975f9ff6c54dbf7367dead Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 21 Jun 2001 05:06:15 +0000 Subject: Don't include bsd.pkg.mk in Makefile.common, so force all files that include it to include bsd.pkg.mk themselves. Convert to use buildlink.mk files and mark freeciv packages as USE_BUILDLINK_ONLY. Include zlib's buildlink.mk file in server and clients as -lz is used. --- games/freeciv-client-gtk/Makefile | 16 ++++++++++------ games/freeciv-client/Makefile | 17 +++++++++++------ games/freeciv-server/Makefile | 13 +++++++------ games/freeciv-share/Makefile | 9 ++++++--- games/freeciv-share/Makefile.common | 6 +++--- 5 files changed, 37 insertions(+), 24 deletions(-) diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index c21a638bde7..844066317b8 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.7 2001/05/02 16:32:41 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/21 05:06:16 jlam Exp $ -PKGNAME= ${DISTNAME:S/-/-client-gtk-/}nb1 +.include "../../games/freeciv-share/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-client-gtk-/}nb1 COMMENT= Freeciv client with GTK+ interface -BUILD_USES_MSGFMT= yes +BUILD_USES_MSGFMT= # defined DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share -DEPENDS+= gtk+-1.2.*:../../x11/gtk -DEPENDS+= imlib-*:../../graphics/imlib USE_X11= # defined +USE_BUILDLINK_ONLY= # defined +USE_CONFIG_WRAPPER= # defined CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data @@ -20,4 +21,7 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../games/freeciv-share/Makefile.common" +.include "../../devel/zlib/buildlink.mk" +.include "../../graphics/imlib/buildlink.mk" +.include "../../x11/gtk/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index b32391959ab..4324a3a970d 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,24 +1,27 @@ -# $NetBSD: Makefile,v 1.8 2001/05/02 16:31:09 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/21 05:06:15 jlam Exp $ -PKGNAME= ${DISTNAME:S/-/-client-/} +.include "../../games/freeciv-share/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share CONFLICTS= freeciv-client-gtk<=1.11.4 -USE_X11= YES -USE_XAW= YES -USE_XPM= YES +USE_X11= # defined +USE_XAW= # defined .include "../../mk/bsd.prefs.mk" +USE_BUILDLINK_ONLY= # defined + CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --enable-client=xaw .if defined(XAW_TYPE) && (${XAW_TYPE} == "3d") +.include "../../x11/Xaw3d/buildlink.mk" CONFIGURE_ARGS+= --with-xaw3d .endif @@ -26,4 +29,6 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../games/freeciv-share/Makefile.common" +.include "../../devel/zlib/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 6938b8e64f5..997b9256b64 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2001/06/12 20:33:03 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/21 05:06:17 jlam Exp $ -PKGNAME= ${DISTNAME:S/-/-server-/} +.include "../../games/freeciv-share/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-server-/} COMMENT= Freeciv game server DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share @@ -10,14 +11,14 @@ CONFIGURE_ARGS+= --enable-client=no CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --with-readline +USE_BUILDLINK_ONLY= # defined USE_GNU_READLINE= # uses callback interface of GNU readline - -.include "../../devel/readline/buildlink.mk" - LIBS+= -ltermcap do-install: cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../games/freeciv-share/Makefile.common" +.include "../../devel/readline/buildlink.mk" +.include "../../devel/zlib/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile index 379a5488970..486664370b8 100644 --- a/games/freeciv-share/Makefile +++ b/games/freeciv-share/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:49 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/21 05:06:17 jlam Exp $ -PKGNAME= ${DISTNAME:S/-/-share-/} +.include "../../games/freeciv-share/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-share-/} COMMENT= Machine independent files for Freeciv +USE_BUILDLINK_ONLY= # defined + CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --enable-client=no -.include "../../games/freeciv-share/Makefile.common" +.include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 6c7501c2d64..d7f1e2cd655 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2001/06/11 06:34:33 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2001/06/21 05:06:17 jlam Exp $ DISTNAME= freeciv-${FC_VERS} FC_VERS= 1.11.4 @@ -16,6 +16,6 @@ DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches GNU_CONFIGURE= # defined -USE_LIBINTL= # defined +#USE_LIBINTL= # defined -.include "../../mk/bsd.pkg.mk" +.include "../../devel/gettext-lib/buildlink.mk" -- cgit v1.2.3