diff options
| -rw-r--r-- | print/xpp/Makefile | 12 | ||||
| -rw-r--r-- | x11/fltk/Makefile | 14 | ||||
| -rw-r--r-- | x11/fltk/buildlink3.mk | 19 |
3 files changed, 32 insertions, 13 deletions
diff --git a/print/xpp/Makefile b/print/xpp/Makefile index 2e2b8ae3c37..620eb7e7b3f 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/18 10:21:43 jlam Exp $ DISTNAME= xpp-1.1 PKGREVISION= 2 @@ -9,10 +9,10 @@ MAINTAINER= jlam@NetBSD.org HOMEPAGE= http://cups.sourceforge.net/xpp/index.html COMMENT= X Printing Panel -USE_BUILDLINK2= # defined -USE_X11= # defined +USE_BUILDLINK3= yes +USE_X11= yes USE_GNU_TOOLS+= make -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes DOCDIR= ${PREFIX}/share/doc/xpp @@ -20,7 +20,7 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR} -.include "../../print/cups/buildlink2.mk" -.include "../../x11/fltk/buildlink2.mk" +.include "../../print/cups/buildlink3.mk" +.include "../../x11/fltk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index df934d7999d..333a367e0a1 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/02/18 05:07:34 ben Exp $ +# $NetBSD: Makefile,v 1.37 2004/02/18 10:21:15 jlam Exp $ # DISTNAME= fltk-1.1.4-source @@ -18,16 +18,16 @@ HOMEPAGE= http://www.fltk.org/ COMMENT= Fast Light Tool Kit for graphical user interfaces WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} -USE_BUILDLINK2= # defined +USE_BUILDLINK3= yes USE_LANGUAGES= c c++ USE_GNU_TOOLS+= make -USE_LIBTOOL= # defined -USE_X11BASE= # defined +USE_LIBTOOL= yes +USE_X11BASE= yes TEST_TARGET= test -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/glu/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk new file mode 100644 index 00000000000..5b71b3cb04f --- /dev/null +++ b/x11/fltk/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/18 10:21:15 jlam Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +FLTK_BUILDLINK3_MK:= ${FLTK_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= fltk +.endif + +.if !empty(FLTK_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= fltk +BUILDLINK_DEPENDS.fltk+= fltk>=1.0.9 +BUILDLINK_PKGSRCDIR.fltk?= ../../x11/fltk + +. include "../../graphics/MesaLib/buildlink3.mk" +. include "../../graphics/glu/buildlink3.mk" +.endif # FLTK_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |