diff options
| -rw-r--r-- | comms/pilotmgr/Makefile | 8 | ||||
| -rw-r--r-- | comms/xtel/Makefile | 10 | ||||
| -rw-r--r-- | databases/gtksql/Makefile | 10 | ||||
| -rw-r--r-- | databases/gtksql/distinfo | 4 | ||||
| -rw-r--r-- | databases/gtksql/patches/patch-aa | 18 | ||||
| -rw-r--r-- | databases/tcl-postgresql/Makefile | 15 | ||||
| -rw-r--r-- | databases/tk-postgresql/Makefile | 21 |
7 files changed, 41 insertions, 45 deletions
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile index 8a7000dd58b..d33ca99c5b4 100644 --- a/comms/pilotmgr/Makefile +++ b/comms/pilotmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/07/24 19:45:22 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/09/21 07:56:28 jlam Exp $ DISTNAME= pilotmgr-1.107p2 PKGNAME= pilotmgr-1.107.2 @@ -16,7 +16,8 @@ DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk DEPENDS+= p5-pilot-link-[0-9]*:../p5-pilot-link -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES HAS_CONFIGURE= YES NO_BUILD= YES @@ -53,6 +54,5 @@ do-install: done ${LN} -fs ${PM_DOC_DIR} ${PM_PERL_DIR}/docs -.include "../../lang/perl5/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile index 5f36e2908a9..4d8d30fd94d 100644 --- a/comms/xtel/Makefile +++ b/comms/xtel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/01/24 18:20:06 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/21 07:57:29 jlam Exp $ # DISTNAME= xtel-3.3.0 @@ -9,10 +9,10 @@ MAINTAINER= bouyer@netbsd.org HOMEPAGE= http://pficheux.free.fr/xtel/ COMMENT= Minitel(r) emulator -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_IMAKE= YES -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index c7abf256ecd..aec65a257fc 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/10/24 22:10:50 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2002/09/21 08:10:55 jlam Exp $ # DISTNAME= gtksql-0.3 @@ -12,11 +12,11 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/ COMMENT= Query tool for PostgreSQL written with GTK +USE_BUILDLINK2= # defined USE_X11BASE= # defined -USE_BUILDLINK_ONLY= # defined MAKE_ENV+= MCFLAGS="${CFLAGS}" -.include "../../databases/postgresql-lib/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/databases/gtksql/distinfo b/databases/gtksql/distinfo index 457b10e083d..6e9f25d86ac 100644 --- a/databases/gtksql/distinfo +++ b/databases/gtksql/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/04/05 01:49:46 hubertf Exp $ +$NetBSD: distinfo,v 1.7 2002/09/21 08:10:56 jlam Exp $ SHA1 (gtksql-0.3.tar.gz) = b2d078cb0eb8816b26f3e0369fc440085071fc0c Size (gtksql-0.3.tar.gz) = 50557 bytes -SHA1 (patch-aa) = b5b4fef7202f76796429e36dac4e4ef718c09deb +SHA1 (patch-aa) = 6ec9ce239bcf5516e47aca39942168b16549f0a1 diff --git a/databases/gtksql/patches/patch-aa b/databases/gtksql/patches/patch-aa index a45011e0f2b..c0db304508c 100644 --- a/databases/gtksql/patches/patch-aa +++ b/databases/gtksql/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ +$NetBSD: patch-aa,v 1.10 2002/09/21 08:10:57 jlam Exp $ ---- Makefile.orig Sat Jun 5 15:05:36 1999 +--- Makefile.orig Sat Jun 5 06:05:36 1999 +++ Makefile @@ -1,17 +1,17 @@ # Your favorite compilation options here :-) @@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ # Here, what you need for PostgreSQL -PGSQLIBS = -L/usr/local/pgsql/lib -lpq -PGSQLCFLAGS = -I/usr/local/pgsql/include -DUSE_POSTGRESQL -+PGSQLIBS = -L${BUILDLINK_DIR}/lib -lpq -+PGSQLCFLAGS = -I${BUILDLINK_DIR}/include/pgsql/server -I${BUILDLINK_DIR}/include/pgsql -DUSE_POSTGRESQL ++PGSQLIBS = -L${LOCALBASE}/lib -lpq ++PGSQLCFLAGS = -I${LOCALBASE}/include/pgsql/server -I${LOCALBASE}/include/pgsql -DUSE_POSTGRESQL PGSQLOBJS = postgres.o # Here, what you need for MySQL @@ -27,14 +27,8 @@ $NetBSD: patch-aa,v 1.9 2002/04/05 01:49:47 hubertf Exp $ # Nothing to change below this point... DBSQLIBS = $(PGSQLIBS) $(MYSQLIBS) -@@ -24,17 +24,17 @@ - OBJS = $(MOBJS) $(DBSQLOBJS) - CFLAGS = $(MCFLAGS) $(DBSQLFLAGS) - --GTKLIBS = `gtk-config --libs` --GTKCFLAGS = `gtk-config --cflags` -+GTKLIBS = `${GTK_CONFIG} --libs` -+GTKCFLAGS = `${GTK_CONFIG} --cflags` +@@ -28,13 +28,13 @@ GTKLIBS = `gtk-config --libs` + GTKCFLAGS = `gtk-config --cflags` all: $(OBJS) - gcc -o gtksql $(OBJS) $(DBSQLIBS) $(GTKLIBS) $(CFLAGS) $(LDFLAGS) diff --git a/databases/tcl-postgresql/Makefile b/databases/tcl-postgresql/Makefile index 577f251ed2b..ecc498ce898 100644 --- a/databases/tcl-postgresql/Makefile +++ b/databases/tcl-postgresql/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.11 2002/04/04 07:41:05 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/09/21 08:05:06 jlam Exp $ PKGNAME= tcl-postgresql-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES .include "../../databases/postgresql/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl -CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_DIR}/lib" +CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ENV+= TCLSH="${TCLSH}" -TCLSH= ${LOCALBASE}/bin/tclsh +TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 DIRS_TO_BUILD= src/interfaces/libpgtcl src/bin/pgtclsh @@ -32,6 +32,7 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl` -.include "../../databases/postgresql-lib/buildlink.mk" -.include "../../lang/tcl/buildlink.mk" +.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../../lang/tcl/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/databases/tk-postgresql/Makefile b/databases/tk-postgresql/Makefile index 3b0833836c2..e4db0bbc0fc 100644 --- a/databases/tk-postgresql/Makefile +++ b/databases/tk-postgresql/Makefile @@ -1,19 +1,20 @@ -# $NetBSD: Makefile,v 1.12 2002/04/04 07:41:07 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/21 08:08:18 jlam Exp $ PKGNAME= tk-postgresql-${BASE_VERS} COMMENT= Tk interface to PostgreSQL -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +USE_X11= YES .include "../../databases/postgresql/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk -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 CONFIGURE_ENV+= TCLSH="${TCLSH}" -TCLSH= ${LOCALBASE}/bin/tclsh +TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1 DIRS_TO_BUILD= src/bin/pgtclsh @@ -36,8 +37,8 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tk` -.include "../../databases/postgresql-lib/buildlink.mk" -.include "../../databases/tcl-postgresql/buildlink.mk" -.include "../../x11/tk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../databases/postgresql-lib/buildlink2.mk" +.include "../../databases/tcl-postgresql/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |