summaryrefslogtreecommitdiff
path: root/graphics/jpeg
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-25 18:38:05 +0000
committerjlam <jlam@pkgsrc.org>2002-08-25 18:38:05 +0000
commite2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch)
treed2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /graphics/jpeg
parente97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff)
downloadpkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.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/jpeg')
-rw-r--r--graphics/jpeg/Makefile4
-rw-r--r--graphics/jpeg/buildlink2.mk22
2 files changed, 24 insertions, 2 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index e033184ab5e..c3345a0a9bd 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/06/19 04:02:57 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 18:39:13 jlam Exp $
#
DISTNAME= jpegsrc.v6b
@@ -14,7 +14,7 @@ COMMENT= IJG's jpeg compression utilities
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-static
diff --git a/graphics/jpeg/buildlink2.mk b/graphics/jpeg/buildlink2.mk
new file mode 100644
index 00000000000..b6924822524
--- /dev/null
+++ b/graphics/jpeg/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:13 jlam Exp $
+
+.if !defined(JPEG_BUILDLINK2_MK)
+JPEG_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= jpeg
+BUILDLINK_DEPENDS.jpeg?= jpeg-6b
+BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.jpeg=jpeg
+BUILDLINK_PREFIX.jpeg_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.jpeg= include/jconfig.h
+BUILDLINK_FILES.jpeg+= include/jpeglib.h
+BUILDLINK_FILES.jpeg+= include/jmorecfg.h
+BUILDLINK_FILES.jpeg+= include/jerror.h
+BUILDLINK_FILES.jpeg+= lib/libjpeg.*
+
+BUILDLINK_TARGETS+= jpeg-buildlink
+
+jpeg-buildlink: _BUILDLINK_USE
+
+.endif # JPEG_BUILDLINK2_MK