diff options
-rw-r--r-- | devel/pwlib/Makefile | 6 | ||||
-rw-r--r-- | devel/pwlib/buildlink2.mk | 25 | ||||
-rw-r--r-- | devel/pwlib/buildlink3.mk | 18 | ||||
-rw-r--r-- | net/openh323/Makefile | 8 |
4 files changed, 25 insertions, 32 deletions
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index ec3f1da9e17..81edeef801d 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/05/08 06:41:33 snj Exp $ # DISTNAME= pwlib_1.4.4 @@ -18,7 +18,7 @@ COMMENT= Portable Windows Libary BUILD_DEPENDS= bison-[0-9]*:../../devel/bison WRKSRC= ${WRKDIR}/pwlib -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes @@ -56,5 +56,5 @@ do-install: ${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; \ done -.include "../../mk/pthread.buildlink2.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pwlib/buildlink2.mk b/devel/pwlib/buildlink2.mk deleted file mode 100644 index fb4e39a7103..00000000000 --- a/devel/pwlib/buildlink2.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:54:41 wiz Exp $ -# - -.if !defined(PWLIB_BUILDLINK2_MK) -PWLIB_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= pwlib -BUILDLINK_DEPENDS.pwlib?= pwlib>=1.4.4nb3 -BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib - -EVAL_PREFIX+= BUILDLINK_PREFIX.pwlib=pwlib -BUILDLINK_PREFIX.pwlib_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.pwlib+= include/ptclib/*.h -BUILDLINK_FILES.pwlib+= include/ptlib/unix/ptlib/*.h -BUILDLINK_FILES.pwlib+= include/ptlib/unix/ptlib/*.inl -BUILDLINK_FILES.pwlib+= include/ptlib/*.h -BUILDLINK_FILES.pwlib+= include/ptlib/*.inl -BUILDLINK_FILES.pwlib+= include/ptlib.h -BUILDLINK_FILES.pwlib+= lib/libpt.* - -BUILDLINK_TARGETS+= pwlib-buildlink - -pwlib-buildlink: _BUILDLINK_USE - -.endif # PWLIB_BUILDLINK2_MK diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk new file mode 100644 index 00000000000..a96f86fa610 --- /dev/null +++ b/devel/pwlib/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 06:41:33 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PWLIB_BUILDLINK3_MK:= ${PWLIB_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pwlib +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npwlib} +BUILDLINK_PACKAGES+= pwlib + +.if !empty(PWLIB_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.pwlib+= pwlib>=1.4.4nb3 +BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib +.endif # PWLIB_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/openh323/Makefile b/net/openh323/Makefile index f269691f1b0..4f4a3758718 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/24 14:50:06 grant Exp $ +# $NetBSD: Makefile,v 1.22 2004/05/08 06:41:33 snj Exp $ # DISTNAME= openh323_1.10.4 @@ -19,7 +19,7 @@ COMMENT= Open H.323 library MAKE_ENV+= PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC} WRKSRC= ${WRKDIR}/openh323 -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes @@ -45,6 +45,6 @@ do-install: -${INSTALL_DATA_DIR} ${PREFIX}/share/openh323 cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323 -.include "../../devel/pwlib/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../devel/pwlib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |