pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/479b2f1eb166
branches:  trunk
changeset: 469072:479b2f1eb166
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 19 15:00:38 2004 +0000

description:
Convert to buildlink3.

diffstat:

 x11/xmms-osd/Makefile    |  10 +++++-----
 x11/xosd/Makefile.common |   8 ++++----
 x11/xosd/buildlink3.mk   |  22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r e661d7d9a5a9 -r 479b2f1eb166 x11/xmms-osd/Makefile
--- a/x11/xmms-osd/Makefile     Thu Feb 19 14:59:10 2004 +0000
+++ b/x11/xmms-osd/Makefile     Thu Feb 19 15:00:38 2004 +0000
@@ -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 @@
 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 -r e661d7d9a5a9 -r 479b2f1eb166 x11/xosd/Makefile.common
--- a/x11/xosd/Makefile.common  Thu Feb 19 14:59:10 2004 +0000
+++ b/x11/xosd/Makefile.common  Thu Feb 19 15:00:38 2004 +0000
@@ -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 @@
 PATCHDIR=              ${.CURDIR}/../../x11/xosd/patches
 
 GNU_CONFIGURE=         yes
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_LIBTOOL=           yes
 USE_X11=               yes
 
@@ -23,6 +23,6 @@
 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 -r e661d7d9a5a9 -r 479b2f1eb166 x11/xosd/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xosd/buildlink3.mk    Thu Feb 19 15:00:38 2004 +0000
@@ -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/+$//}



Home | Main Index | Thread Index | Old Index