diff options
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/Makefile | 21 | ||||
| -rw-r--r-- | print/cups/buildlink2.mk | 20 | ||||
| -rw-r--r-- | print/cups/distinfo | 2 | ||||
| -rw-r--r-- | print/cups/patches/patch-aa | 2 |
4 files changed, 33 insertions, 12 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 068f908bd06..66f2964b73f 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2002/07/16 13:14:04 fredb Exp $ +# $NetBSD: Makefile,v 1.50 2002/08/25 18:39:41 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} @@ -22,7 +22,7 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} -CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}" +CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL}" CONFIGURE_ARGS+= --enable-slp CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" @@ -40,7 +40,7 @@ CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" .include "../../mk/bsd.prefs.mk" .if defined(USE_PAM) -.include "../../security/PAM/buildlink.mk" +.include "../../security/PAM/buildlink2.mk" BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --enable-pam PLIST_SRC= ${PKGDIR}/PLIST.pam @@ -103,11 +103,12 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR} .endif -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../net/openslp/buildlink.mk" -.include "../../security/openssl/buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/tiff/buildlink2.mk" +.include "../../net/openslp/buildlink2.mk" +.include "../../security/openssl/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/buildlink2.mk b/print/cups/buildlink2.mk new file mode 100644 index 00000000000..bec7024b546 --- /dev/null +++ b/print/cups/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:42 jlam Exp $ + +.if !defined(CUPS_BUILDLINK2_MK) +CUPS_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= cups +BUILDLINK_DEPENDS.cups?= cups>=1.1.14nb1 +BUILDLINK_PKGSRCDIR.cups?= ../../print/cups + +EVAL_PREFIX+= BUILDLINK_PREFIX.cups=cups +BUILDLINK_PREFIX.cups_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.cups= include/cups/* +BUILDLINK_FILES.cups+= lib/libcups.* +BUILDLINK_FILES.cups+= lib/libcupsimage.* + +BUILDLINK_TARGETS+= cups-buildlink + +cups-buildlink: _BUILDLINK_USE + +.endif # CUPS_BUILDLINK2_MK diff --git a/print/cups/distinfo b/print/cups/distinfo index dcc32e8bb93..f279fed1741 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2002/06/09 20:59:34 jlam Exp $ +$NetBSD: distinfo,v 1.15 2002/08/25 18:39:42 jlam Exp $ SHA1 (cups-1.1.14-source.tar.bz2) = b1a940af5f27cebb8bef340aa6a3552c887ad67d Size (cups-1.1.14-source.tar.bz2) = 5408714 bytes diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index 51d6dc7a737..c2b5f9871dc 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2002/06/09 20:59:35 jlam Exp $ +$NetBSD: patch-aa,v 1.13 2002/08/25 18:39:42 jlam Exp $ --- scheduler/main.c.orig Wed Feb 13 12:21:36 2002 +++ scheduler/main.c |