diff options
| -rw-r--r-- | devel/glib/Makefile | 3 | ||||
| -rw-r--r-- | graphics/gle/Makefile | 3 | ||||
| -rw-r--r-- | graphics/tiff/Makefile | 7 | ||||
| -rw-r--r-- | graphics/tiff/files/config.site | 10 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 6 | ||||
| -rw-r--r-- | wm/wmx-current/Makefile | 4 | ||||
| -rw-r--r-- | www/links/Makefile | 7 | ||||
| -rw-r--r-- | x11/gtk/Makefile | 3 |
8 files changed, 24 insertions, 19 deletions
diff --git a/devel/glib/Makefile b/devel/glib/Makefile index 4ac60091991..d0a53721cba 100644 --- a/devel/glib/Makefile +++ b/devel/glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/06/18 20:33:09 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/06/18 21:34:02 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp # @@ -15,6 +15,7 @@ COMMENT= Some useful routines for C programming CONFLICTS= gtk+-1.0.* +USE_BUILDINK_ONLY= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index 1f050053d03..16d35d50ce6 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/18 21:20:36 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/18 21:32:24 jlam Exp $ # DISTNAME= gle-3.0.3 @@ -15,6 +15,7 @@ COMMENT= GL subroutines for drawing tubing and extrusions USE_X11BASE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES +USE_BUILDLINK_ONLY= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 85e33fc02cc..caab854d6b0 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/06/11 02:05:11 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2001/06/18 21:32:24 jlam Exp $ DISTNAME= tiff-v3.5.5 PKGNAME= tiff-3.5.5 @@ -22,8 +22,7 @@ CONFIGURE_ENV+= CC="${CC}" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" -ZLIBDIR_DEFAULT= /usr/lib -EVAL_PREFIX+= ZLIBDIR=zlib +USE_BUILDLINK_ONLY= # defined .if defined(USE_GIF) DISTFILES+= libtiff-lzw-compression-kit-1.1.tar.gz @@ -38,9 +37,7 @@ post-patch: CPPFLAGS+= -Dunix CONFIGURE_ENV+= PREFIX="${PREFIX}" -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= ZLIBDIR="${ZLIBDIR}" CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" pre-patch: diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site index 655f521a935..8aafed35fa6 100644 --- a/graphics/tiff/files/config.site +++ b/graphics/tiff/files/config.site @@ -1,4 +1,4 @@ -# $NetBSD: config.site,v 1.7 2001/06/11 02:05:11 jlam Exp $ +# $NetBSD: config.site,v 1.8 2001/06/18 21:32:24 jlam Exp $ DIR_BIN=${PREFIX}/bin # destination for applications DIR_LIB=${PREFIX}/lib # destination for library @@ -10,14 +10,14 @@ DIRS_LIBINC=${BUILDLINK_DIR}/include # dirs to search for ancillary includes # JPEG support # JPEG=yes -DIR_JPEGLIB=${LOCALBASE}/lib -LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_DIR}/lib -ljpeg" +DIR_JPEGLIB=${BUILDLINK_DIR}/lib +LIBJPEG="${LDFLAGS} -ljpeg" # ZLIB compression support # ZIP=yes -DIR_GZLIB=${ZLIBDIR} -LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_DIR}/lib -lz" +DIR_GZLIB=${BUILDLINK_DIR}/lib +LIBGZ="${LDFLAGS} -lz" DSO=no # don't use libtiff's shared lib mechanism diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 638e7741e10..bc422b79bfd 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/18 10:26:47 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/18 21:32:24 jlam Exp $ DISTNAME= rpm2pkg-1.2 CATEGORIES= pkgtools @@ -18,7 +18,9 @@ WRKSRC= ${WRKDIR} .include "../../devel/zlib/buildlink.mk" .include "../../misc/rpm/buildlink.mk" -#USE_LIBINTL= YES +USE_BUILDLINK_ONLY= YES +#USE_LIBINTL= YES + RPMLIB= ${BUILDLINK_DIR}/lib/librpm.a CFLAGS+= -I${BUILDLINK_DIR}/include/rpm diff --git a/wm/wmx-current/Makefile b/wm/wmx-current/Makefile index 2366c9e6572..6749fa477af 100644 --- a/wm/wmx-current/Makefile +++ b/wm/wmx-current/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:21:55 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/06/18 21:32:23 jlam Exp $ PKGNAME= wmx-${WMX_VERS} COMMENT= another X11 window manager based on wm2 +USE_BUILDLINK_ONLY= # defined + .include "../../wm/wmx-current/Makefile.common" diff --git a/www/links/Makefile b/www/links/Makefile index a48cf24abd4..a124172e9a8 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/18 05:56:45 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/18 21:32:24 jlam Exp $ # DISTNAME= links-0.95 @@ -13,8 +13,9 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://artax.karlin.mff.cuni.cz/~mikulas/links/ COMMENT= Lynx-like text WWW browser -GNU_CONFIGURE= YES -#USE_SSL= YES +GNU_CONFIGURE= YES +#USE_SSL= YES +USE_BUILDLINK_ONLY= YES .include "../../security/openssl/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 50450ab1208..c1f8e68827a 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2001/06/18 20:49:02 jlam Exp $ +# $NetBSD: Makefile,v 1.61 2001/06/18 21:34:02 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -14,6 +14,7 @@ COMMENT= Gimp toolkit. Libraries for building X11 user interfaces BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 BUILD_USES_MSGFMT= yes +USE_BUILDLINK_ONLY= yes #USE_LIBINTL= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig |