buildlink1 -> buildlink2

This commit is contained in:
jlam 2002-09-23 10:21:19 +00:00
parent 86f38a9ffb
commit e11234801c
9 changed files with 37 additions and 34 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.16 2002/01/24 12:21:35 skrll Exp $
# $NetBSD: Makefile,v 1.17 2002/09/23 10:26:22 jlam Exp $
DISTNAME= quake-v6-bsd-kame
PKGNAME= quake6-0.0
@ -13,7 +13,8 @@ DEPENDS= quakedata-[0-9]*:../../games/quakedata
WRKSRC= ${WRKDIR}/quakeforge
USE_BUILDLINK_ONLY= yes
USE_BUILDLINK2= yes
USE_X11= yes
post-extract:
cd ${WRKSRC}; ${FIND} . -name \*.o -exec ${RM} {} \;
@ -32,6 +33,5 @@ IGNORE= "${PKGNAME} requires IPv6 support"
# "bindir" setting is very non-standard for GNU autoconf
CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin
.include "../../graphics/Mesa/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../graphics/Mesa/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2002/07/15 09:01:42 wiz Exp $
# $NetBSD: Makefile,v 1.10 2002/09/23 10:21:19 jlam Exp $
#
DISTNAME= xboing2.4
@ -11,6 +11,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.techrescue.org/xboing/
COMMENT= Breakout style game for X11
USE_BUILDLINK2= YES
USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
@ -21,6 +22,7 @@ post-install:
${CHMOD} 2755 ${X11PREFIX}/bin/xboing
${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11PREFIX}/man/man6/xboing.6
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.4 2002/08/10 02:27:46 dmcmahill Exp $
$NetBSD: distinfo,v 1.5 2002/09/23 10:21:19 jlam Exp $
SHA1 (xboing2.4.tar.gz) = 57fad37ab99e6a3ff87ff814d0de1baad3b93b91
Size (xboing2.4.tar.gz) = 588811 bytes
SHA1 (patch-aa) = 7e7d88a2e0173eb7d1eb4b813af517dc15abe6e7
SHA1 (patch-aa) = 7236098cd0f15f38e6d20947ecb5efe8c8e6c1b0
SHA1 (patch-ab) = 94b232e173ad7bb39e37d4287669bd0842ef5610
SHA1 (patch-ac) = c8b7d1b323be04c2456768eabf24da43707c4b98
SHA1 (patch-ad) = 1bb064fda1baebd314e0d65703e7775e9072f43b

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.5 2002/08/10 02:27:47 dmcmahill Exp $
$NetBSD: patch-aa,v 1.6 2002/09/23 10:21:19 jlam Exp $
--- Imakefile.orig Fri Nov 22 02:28:46 1996
+++ Imakefile
@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.5 2002/08/10 02:27:47 dmcmahill Exp $
- XPMLIB = -L/usr/X11/lib -lXpm
- XPMINCLUDE = -I/usr/X11/include/X11
+ XPMLIB = -L$(BUILDLINK_DIR)/lib -lXpm
+ XPMINCLUDE = -I$(BUILDLINK_DIR)/include/X11
+ XPMLIB = -L$(X11BASE)/lib -lXpm
+ XPMINCLUDE = -I$(X11BASE)/include/X11
XBOINGINCLUDE = -I./include
- LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
+ LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.5 2002/08/10 02:27:47 dmcmahill Exp $
AUDIO_SRC = audio/LINUXaudio.c
AUDIO_INCLUDE =
- AUDIO_LIB =
+ AUDIO_LIB = -lossaudio
+ AUDIO_LIB = $(LIBOSSAUDIO)
#endif /* linux */
#if defined(svr4) && defined(COMPILE_IN_AUDIO)

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:19 seb Exp $
# $NetBSD: Makefile,v 1.14 2002/09/23 10:28:26 jlam Exp $
DISTNAME= xconq-7.4.1
CATEGORIES= games x11
@ -8,13 +8,13 @@ MAINTAINER= kleink@netbsd.org
HOMEPAGE= http://sources.redhat.com/xconq/
COMMENT= Xconq is a general strategy game system
USE_BUILDLINK_ONLY= YES
USE_BUILDLINK2= YES
USE_X11BASE= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-alternate-scoresdir=/var/games/xconq/scores
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_DIR}/lib"
CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_DIR}/lib"
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib"
MAKE_ENV+= LOCALBASE="${LOCALBASE}"
@ -22,12 +22,12 @@ INFO_FILES= hacking.info xcdesign.info xconq.info
TEXINFO_OVERRIDE= YES
post-build:
cd ${WRKSRC}/doc && ${MAKE_PROGRAM} info
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} info
post-install:
cd ${WRKSRC}/doc && ${MAKE_PROGRAM} install-info
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-info
.include "../../x11/tk/buildlink2.mk"
.include "../../x11/tk/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.3 2001/10/23 13:25:30 jlam Exp $
$NetBSD: distinfo,v 1.4 2002/09/23 10:28:26 jlam Exp $
SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7
Size (xconq-7.4.1.tar.gz) = 3402832 bytes
SHA1 (patch-aa) = 71ca2de62949a33068d145fd8d41246bf97a889d
SHA1 (patch-ab) = 05442c0ed0e07ec8d4d4d2b12365c7492ab63018
SHA1 (patch-ac) = e254692358a983ddb4b97f71bac562a37741a842
SHA1 (patch-ab) = 8c7c69b453d128f9a1bf816b8946bd39b090f86e
SHA1 (patch-ac) = 2afc0dc030c8e04c4292d6842700e57f6bb5cc23
SHA1 (patch-ad) = 2e20bd999e935eaccd2c569ca6712ff28187c244
SHA1 (patch-ae) = fc440492eac9aa6feafb31dc6ba6bfceeb5408a4
SHA1 (patch-af) = 420a6702dd189058873da4a5353ebad020bec018

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.4 2001/10/23 13:25:31 jlam Exp $
$NetBSD: patch-ab,v 1.5 2002/09/23 10:28:27 jlam Exp $
--- tcltk/Makefile.in.orig Wed Jun 14 17:02:05 2000
+++ tcltk/Makefile.in
@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2001/10/23 13:25:31 jlam Exp $
X11_INCLUDE_FLAGS = @XINCLUDES@
-ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(srcdir)/../tcl/generic -I$(srcdir)/../tk/generic $(X11_INCLUDE_FLAGS)
+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(BUILDLINK_DIR)/include/tcl/generic -I$(BUILDLINK_DIR)/include/tk/generic $(X11_INCLUDE_FLAGS)
+ALL_CFLAGS = $(CFLAGS) $(HFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(krnsrcdir) -I$(LOCALBASE)/include/tcl/generic -I$(LOCALBASE)/include/tk/generic $(X11_INCLUDE_FLAGS)
.c.o:
$(CC) -c $(ALL_CFLAGS) $<

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.5 2001/10/23 13:25:31 jlam Exp $
$NetBSD: patch-ac,v 1.6 2002/09/23 10:28:27 jlam Exp $
--- x11/Makefile.in.orig Mon Jun 19 17:36:18 2000
+++ x11/Makefile.in
@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.5 2001/10/23 13:25:31 jlam Exp $
LIB_RUNTIME_DIR = $(libdir)
TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_LIB_SPEC@
-TCL_CFLAGS = @TCLHDIR@
+TCL_CFLAGS = -I${BUILDLINK_DIR}/include
+TCL_CFLAGS = -I${LOCALBASE}/include
TCL_DEPS =
TCL_DL_LIBS = @TCL_DL_LIBS@
@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.5 2001/10/23 13:25:31 jlam Exp $
# Tk stuff.
TK = @TK_LIB_SPEC@
-TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@
+TK_CFLAGS = -I${BUILDLINK_DIR}/include @TK_BUILD_INCLUDES@
+TK_CFLAGS = -I${LOCALBASE}/include @TK_BUILD_INCLUDES@
TK_DEPS =
X11_CFLAGS = @TK_XINCLUDES@

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2002/02/08 00:12:38 jlam Exp $
# $NetBSD: Makefile,v 1.4 2002/09/23 10:28:41 jlam Exp $
#
DISTNAME= xgospel-1.12d
@ -9,7 +9,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://gailly.net/xgospel/
COMMENT= X11 based IGS client
USE_BUILDLINK_ONLY= yes
USE_BUILDLINK2= yes
USE_X11= yes
GNU_CONFIGURE= yes
XAW_TYPE= 3d
@ -24,7 +25,7 @@ CONFIGURE_ARGS+= --with-xaw3d
# Don't find libintl.a...it's only needed on SCO UNIX.
CONFIGURE_ENV+= ac_cv_lib_intl=no
.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/xaw.buildlink.mk"
.include "../../mk/x11.buildlink.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/xaw.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"