summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/coconut/Makefile20
-rw-r--r--devel/libsigc++10/Makefile6
-rw-r--r--devel/libsigc++10/buildlink3.mk18
3 files changed, 32 insertions, 12 deletions
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 8e19dd4cd99..ee4609fbd11 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/04/25 22:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/04/26 22:07:06 snj Exp $
#
DISTNAME= coconut-0.3.0
@@ -13,11 +13,12 @@ COMMENT= Objective-C library for Unix-like systems
BUILD_DEPENDS+= papaya>=0.1.7:../../devel/papaya
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_LIBTOOL= YES
USE_X11= YES
GNU_CONFIGURE= YES
CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY
+MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe="
pre-configure:
cd ${WRKSRC} && \
@@ -25,11 +26,12 @@ pre-configure:
${SED} < configure.old > configure \
's|^\(INCLUDE_DIR_LIST=\).*|\1"${PREFIX}/include ${X11PREFIX}/include"|'
-.include "../../graphics/gtkglext/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../net/gnet1/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/gtkglext/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/gnet1/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsigc++10/Makefile b/devel/libsigc++10/Makefile
index 927ff8c56c3..163296db5da 100644
--- a/devel/libsigc++10/Makefile
+++ b/devel/libsigc++10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/05 08:00:08 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/26 22:07:06 snj Exp $
DISTNAME= libsigc++-1.0.4
PKGREVISION= 1
@@ -10,13 +10,13 @@ MAINTAINER= bsieker@freenet.de
HOMEPAGE= http://libsigc.sourceforge.net/
COMMENT= Type-safe callback system for C++ programs
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/scripts/ltconfig
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
CONFIGURE_ARGS+= --disable-threads
diff --git a/devel/libsigc++10/buildlink3.mk b/devel/libsigc++10/buildlink3.mk
new file mode 100644
index 00000000000..ff821620065
--- /dev/null
+++ b/devel/libsigc++10/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 22:07:06 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+LIBSIGCXX10_BUILDLINK3_MK:= ${LIBSIGCXX10_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= libsigcxx10
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibsigcxx10}
+BUILDLINK_PACKAGES+= libsigcxx10
+
+.if !empty(LIBSIGCXX10_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libsigcxx10+= libsigc++10>=1.0.4nb1
+BUILDLINK_PKGSRCDIR.libsigcxx10?= ../../devel/libsigc++10
+.endif # LIBSIGCXX10_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}