diff options
| author | wiz <wiz@pkgsrc.org> | 2004-02-19 15:00:38 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2004-02-19 15:00:38 +0000 |
| commit | 97a4918772ab032bc65df421f98a033527a33637 (patch) | |
| tree | eda5398746f11f64d6f69ab6b151aa83cddc50dd | |
| parent | b2f9fd1837c619e0b7c137190a7017dfdc7721dc (diff) | |
| download | pkgsrc-97a4918772ab032bc65df421f98a033527a33637.tar.gz | |
Convert to buildlink3.
| -rw-r--r-- | x11/xmms-osd/Makefile | 10 | ||||
| -rw-r--r-- | x11/xosd/Makefile.common | 8 | ||||
| -rw-r--r-- | x11/xosd/buildlink3.mk | 22 |
3 files changed, 31 insertions, 9 deletions
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile index eb62ded0242..9f7b18c14cb 100644 --- a/x11/xmms-osd/Makefile +++ b/x11/xmms-osd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/09/26 11:23:43 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/19 15:00:38 wiz Exp $ # .include "../xosd/Makefile.common" @@ -14,8 +14,8 @@ CONFIGURE_ARGS+= --enable-new-plugin BUILD_DIRS= ${WRKSRC}/src/xmms_plugin INSTALL_DIRS= ${WRKSRC}/src/xmms_plugin -.include "../../audio/xmms/buildlink2.mk" -.include "../../graphics/gdk-pixbuf/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" -.include "../../x11/xosd/buildlink2.mk" +.include "../../audio/xmms/buildlink3.mk" +.include "../../graphics/gdk-pixbuf/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" +.include "../../x11/xosd/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 3b0361a4447..16549214a80 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2004/02/14 17:21:56 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2004/02/19 15:00:38 wiz Exp $ # DISTNAME= xosd-2.2.5 @@ -12,7 +12,7 @@ DISTINFO_FILE= ${.CURDIR}/../../x11/xosd/distinfo PATCHDIR= ${.CURDIR}/../../x11/xosd/patches GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_LIBTOOL= yes USE_X11= yes @@ -23,6 +23,6 @@ CONFIGURE_ARGS+= --disable-xinerama SUBST_CLASSES= fixme SUBST_STAGE.fixme= post-patch SUBST_FILES.fixme= configure -SUBST_SED.fixme= -e s,-lpthread,${PTHREAD_LDFLAGS},g +SUBST_SED.fixme= -e "s|-lpthread|${PTHREAD_LDFLAGS}|g" -.include "../../mk/pthread.buildlink2.mk" +.include "../../mk/pthread.buildlink3.mk" diff --git a/x11/xosd/buildlink3.mk b/x11/xosd/buildlink3.mk new file mode 100644 index 00000000000..ea601c3f1f3 --- /dev/null +++ b/x11/xosd/buildlink3.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 15:00:38 wiz Exp $ +# +# This Makefile fragment is included by packages that use xosd. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +XOSD_BUILDLINK3_MK:= ${XOSD_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= xosd +.endif + +.if !empty(XOSD_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= xosd +BUILDLINK_DEPENDS.xosd+= xosd>=2.2.5 +BUILDLINK_PKGSRCDIR.xosd?= ../../x11/xosd + +.endif # XOSD_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |