diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /graphics/tiff | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/Makefile | 13 | ||||
| -rw-r--r-- | graphics/tiff/buildlink2.mk | 25 |
2 files changed, 30 insertions, 8 deletions
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 49f4bf427fe..fa336f4eb89 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2002/07/13 00:53:35 grant Exp $ +# $NetBSD: Makefile,v 1.41 2002/08/25 18:39:23 jlam Exp $ DISTNAME= tiff-v3.5.7 PKGNAME= tiff-3.5.7 @@ -17,9 +17,9 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --noninteractive --site=${FILESDIR} --prefix=${PREFIX} CONFIGURE_ENV+= CC="${CC}" -.include "../../mk/bsd.prefs.mk" +USE_BUILDLINK2= # defined -USE_BUILDLINK_ONLY= # defined +.include "../../mk/bsd.prefs.mk" .if defined(USE_GIF) LZW_VERSION= 1.3 @@ -33,9 +33,6 @@ post-patch: CPPFLAGS+= -Dunix CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}" -CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" - -.include "../../mk/bsd.prefs.mk" pre-patch: # reference correct relative man page when using .so @@ -66,6 +63,6 @@ pre-install: ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL .endif -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tiff/buildlink2.mk b/graphics/tiff/buildlink2.mk new file mode 100644 index 00000000000..4c025ad4f72 --- /dev/null +++ b/graphics/tiff/buildlink2.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:23 jlam Exp $ + +.if !defined(TIFF_BUILDLINK2_MK) +TIFF_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tiff +BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 +BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff + +EVAL_PREFIX+= BUILDLINK_PREFIX.tiff=tiff +BUILDLINK_PREFIX.tiff_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tiff= include/tiff.h +BUILDLINK_FILES.tiff+= include/tiffconf.h +BUILDLINK_FILES.tiff+= include/tiffio.h +BUILDLINK_FILES.tiff+= include/tiffvers.h +BUILDLINK_FILES.tiff+= lib/libtiff.* + +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" + +BUILDLINK_TARGETS+= tiff-buildlink + +tiff-buildlink: _BUILDLINK_USE + +.endif # TIFF_BUILDLINK2_MK |