diff options
| -rw-r--r-- | devel/glib2/Makefile | 24 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 23 |
2 files changed, 25 insertions, 22 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 6d40622a7ae..f85d319f511 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:39 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/11 11:31:40 jlam Exp $ # DISTNAME= glib-2.0.6 @@ -15,12 +15,14 @@ HOMEPAGE= http://www.gtk.org/docs/glib_toc.html COMMENT= Some useful routines for C programming BUILD_USES_MSGFMT= yes -GNU_CONFIGURE= yes -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_GMAKE= yes +USE_PERL5= yes + USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -USE_PERL5= yes + +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" @@ -28,17 +30,17 @@ MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" PTHREAD_OPTS+= native test: build - cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ + cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \ tee ${WRKDIR}/check.log -.include "../../converters/libiconv/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/pkgconfig/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" +.include "../../converters/libiconv/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CPPFLAGS+= -I${BUILDLINK_DIR}/PTL/include -. include "../../devel/ptl2/buildlink.mk" +CPPFLAGS+= -I${BUILDLINK_PREFIX.ptl2}/PTL/include +. include "../../devel/ptl2/buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 44f3f4f41ae..1548734aead 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2002/08/29 15:11:06 taya Exp $ +# $NetBSD: Makefile,v 1.103 2002/09/11 11:34:21 jlam Exp $ MOZ_VER= 1.1 DISTNAME= mozilla-source-${MOZ_VER} @@ -16,29 +16,30 @@ COMMENT= Open-source version of the Netscape browser BUILD_DEPENDS+= zip>=2.3:../../archivers/zip BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +USE_BUILDLINK2= yes USE_PERL5= build USE_GMAKE= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-debug \ - --with-system-jpeg=${BUILDLINK_DIR} \ - --with-system-png=${BUILDLINK_DIR} \ + --with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \ + --with-system-png=${BUILDLINK_PREFIX.png} \ --enable-mathml \ --enable-crypto \ --enable-svg SHAREMODE?= 644 -ALL_TARGET= +ALL_TARGET= # empty UNLIMIT_RESOURCES= datasize memorysize stacksize -.include "../../x11/gtk/buildlink.mk" -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../graphics/gdk-pixbuf/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" # NetBSD-*-m68k builds, but "regchrome" dumps core. NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k @@ -101,7 +102,7 @@ post-build: do-install: ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install -.include "../../mk/pthread.buildlink.mk" +.include "../../mk/pthread.buildlink2.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") CONFIGURE_ARGS+= --without-pthreads |