diff options
-rw-r--r-- | devel/librsync/Makefile | 12 | ||||
-rw-r--r-- | devel/librsync/buildlink3.mk | 23 | ||||
-rw-r--r-- | sysutils/rdiff-backup/Makefile | 6 |
3 files changed, 32 insertions, 9 deletions
diff --git a/devel/librsync/Makefile b/devel/librsync/Makefile index 0ff89097a7c..c1156b01f8d 100644 --- a/devel/librsync/Makefile +++ b/devel/librsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2004/04/18 23:31:34 snj Exp $ # DISTNAME= librsync-0.9.6 @@ -13,11 +13,11 @@ COMMENT= Checksum-based differencing library GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --without-included-popt USE_LIBTOOL= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes -.include "../../archivers/bzip2/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/popt/buildlink2.mk" -.include "../../devel/zlib/buildlink2.mk" +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/librsync/buildlink3.mk b/devel/librsync/buildlink3.mk new file mode 100644 index 00000000000..4ee2eb5a67e --- /dev/null +++ b/devel/librsync/buildlink3.mk @@ -0,0 +1,23 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 23:31:34 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBRSYNC_BUILDLINK3_MK:= ${LIBRSYNC_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= librsync +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibrsync} +BUILDLINK_PACKAGES+= librsync + +.if !empty(LIBRSYNC_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.librsync+= librsync>=0.9.6nb2 +BUILDLINK_PKGSRCDIR.librsync?= ../../devel/librsync +.endif # LIBRSYNC_BUILDLINK3_MK + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile index beddf9c58fe..f668c0ac905 100644 --- a/sysutils/rdiff-backup/Makefile +++ b/sysutils/rdiff-backup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/12/12 21:58:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/04/18 23:31:59 snj Exp $ # DISTNAME= rdiff-backup-0.12.6 @@ -11,7 +11,7 @@ COMMENT= Remote incremental backup utility PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 22 22pth 23 23pth -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes post-patch: ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @@ -20,7 +20,7 @@ post-patch: BUILDLINK_DEPENDS.librsync= librsync>=0.9.6 -.include "../../devel/librsync/buildlink2.mk" +.include "../../devel/librsync/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" |