pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7608302a3d0
branches:  trunk
changeset: 474244:a7608302a3d0
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Apr 26 22:07:06 2004 +0000

description:
Convert to buildlink3.

diffstat:

 chat/gabber/Makefile            |  18 +++++++++---------
 chat/xchat-gnome/Makefile       |   6 +++---
 chat/xchat/Makefile             |   6 +++---
 chat/xchat/Makefile.common      |  10 +++++-----
 comms/efax-gtk/Makefile         |  10 +++++-----
 devel/coconut/Makefile          |  20 +++++++++++---------
 devel/libsigc++10/Makefile      |   6 +++---
 devel/libsigc++10/buildlink3.mk |  18 ++++++++++++++++++
 misc/bbdb/Makefile              |   4 ++--
 misc/gnome-utils/Makefile       |  20 ++++++++++----------
 sysutils/gcdmaster/Makefile     |  12 ++++++------
 x11/gnome--/Makefile            |  10 +++++-----
 x11/gnome--/buildlink2.mk       |  28 ----------------------------
 x11/gnome--/buildlink3.mk       |  22 ++++++++++++++++++++++
 x11/gtk--/Makefile              |   8 ++++----
 x11/gtk--/buildlink3.mk         |  21 +++++++++++++++++++++
 x11/gtk--/distinfo              |   3 ++-
 x11/gtk--/patches/patch-ab      |  13 +++++++++++++
 18 files changed, 142 insertions(+), 93 deletions(-)

diffs (truncated from 486 to 300 lines):

diff -r 265b1fcd9fb7 -r a7608302a3d0 chat/gabber/Makefile
--- a/chat/gabber/Makefile      Mon Apr 26 21:55:51 2004 +0000
+++ b/chat/gabber/Makefile      Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.34 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=      gabber-0.8.8
 PKGREVISION=   5
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://gabber.sourceforge.net/
 COMMENT=       Gnome Jabber Client
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_DIRS+=             xdg-1.1
 USE_PKGLOCALEDIR=      YES
 USE_GNU_TOOLS+=                make
@@ -21,13 +21,13 @@
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --disable-xmms --disable-sigctest
 
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-.include "../../x11/gnome--/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../x11/gtk--/buildlink3.mk"
+.include "../../x11/gnome--/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 chat/xchat-gnome/Makefile
--- a/chat/xchat-gnome/Makefile Mon Apr 26 21:55:51 2004 +0000
+++ b/chat/xchat-gnome/Makefile Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/10/03 07:47:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/26 22:07:06 snj Exp $
 
 .include "../xchat/Makefile.common"
 
@@ -9,7 +9,7 @@
 
 CONFIGURE_ARGS+=       --enable-panel
 
-.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 chat/xchat/Makefile
--- a/chat/xchat/Makefile       Mon Apr 26 21:55:51 2004 +0000
+++ b/chat/xchat/Makefile       Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/10/03 07:43:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/26 22:07:06 snj Exp $
 
 .include "Makefile.common"
 
@@ -9,7 +9,7 @@
 
 CONFLICTS+=            xchat-gnome-[0-9]*
 
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 chat/xchat/Makefile.common
--- a/chat/xchat/Makefile.common        Mon Apr 26 21:55:51 2004 +0000
+++ b/chat/xchat/Makefile.common        Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2004/04/25 04:16:43 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.29 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=      xchat-1.8.11
 PKGREVISION=   8
@@ -18,7 +18,7 @@
 PKGDIR=                ${.CURDIR}/../xchat
 PLIST_SRC=     ${.CURDIR}/../xchat/PLIST
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_DIRS+=             gnome1-1.5
 USE_PKGLOCALEDIR=      YES
 USE_X11BASE=           YES
@@ -41,7 +41,7 @@
 
 # SSL support
 .if defined(XCHAT_USE_SSL) && ${XCHAT_USE_SSL} == "YES"
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-openssl=${SSLBASE}
 .endif
 
@@ -54,6 +54,6 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
        ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
 
-.include "../../devel/glib/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 comms/efax-gtk/Makefile
--- a/comms/efax-gtk/Makefile   Mon Apr 26 21:55:51 2004 +0000
+++ b/comms/efax-gtk/Makefile   Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:01 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=              efax-gtk-1.0.1b.src
 PKGNAME=               efax-gtk-1.0.1b
@@ -15,7 +15,7 @@
 
 WRKSRC=                        ${WRKDIR}/efax-gtk
 GNU_CONFIGURE=         YES
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_PKGINSTALL=                YES
 
 CONFIGURE_ARGS+=       --with-spooldir=/var/spool/efax
@@ -32,8 +32,8 @@
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/efax-gtk
 
-.include "../../devel/libsigc++10/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
+.include "../../devel/libsigc++10/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk--/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 devel/coconut/Makefile
--- a/devel/coconut/Makefile    Mon Apr 26 21:55:51 2004 +0000
+++ b/devel/coconut/Makefile    Mon Apr 26 22:07:06 2004 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 265b1fcd9fb7 -r a7608302a3d0 devel/libsigc++10/Makefile
--- a/devel/libsigc++10/Makefile        Mon Apr 26 21:55:51 2004 +0000
+++ b/devel/libsigc++10/Makefile        Mon Apr 26 22:07:06 2004 +0000
@@ -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 @@
 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 -r 265b1fcd9fb7 -r a7608302a3d0 devel/libsigc++10/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libsigc++10/buildlink3.mk   Mon Apr 26 22:07:06 2004 +0000
@@ -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/+$//}
diff -r 265b1fcd9fb7 -r a7608302a3d0 misc/bbdb/Makefile
--- a/misc/bbdb/Makefile        Mon Apr 26 21:55:51 2004 +0000
+++ b/misc/bbdb/Makefile        Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/30 17:09:32 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/26 22:07:06 snj Exp $
 #
 
 DISTNAME=              bbdb-2.34
@@ -13,7 +13,7 @@
 EMACS_VERSIONS_ACCEPTED=       emacs21 emacs21nox emacs20
 CONFLICTS+=            xemacs-packages
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 ALL_TARGET=            all mhe
diff -r 265b1fcd9fb7 -r a7608302a3d0 misc/gnome-utils/Makefile
--- a/misc/gnome-utils/Makefile Mon Apr 26 21:55:51 2004 +0000
+++ b/misc/gnome-utils/Makefile Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.74 2004/04/26 22:07:06 snj Exp $
 
 DISTNAME=              gnome-utils-1.4.1.2
 PKGREVISION=           9
@@ -20,7 +20,7 @@
 USE_DIRS+=             gnome1-1.5
 USE_GNU_TOOLS+=                make
 USE_X11BASE=           YES
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGLOCALEDIR=      YES
 
 GNU_CONFIGURE=         YES
@@ -29,12 +29,12 @@
 CONFIGURE_ENV+=                LOCALBASE="${LOCALBASE}"
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/gnome-objc/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-#.include "../../lang/guile14/buildlink2.mk"   # XXX: req. guile1[46] fix first
-.include "../../sysutils/libgtop/buildlink2.mk"
-.include "../../www/gtkhtml/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gnome-objc/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+#.include "../../lang/guile14/buildlink3.mk"   # XXX: req. guile1[46] fix first
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../www/gtkhtml/buildlink3.mk"
+.include "../../x11/gnome-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 265b1fcd9fb7 -r a7608302a3d0 sysutils/gcdmaster/Makefile
--- a/sysutils/gcdmaster/Makefile       Mon Apr 26 21:55:51 2004 +0000
+++ b/sysutils/gcdmaster/Makefile       Mon Apr 26 22:07:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/04/14 16:15:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/26 22:15:28 snj Exp $
 #
 
 DISTNAME=              cdrdao-1.1.7.src
@@ -16,7 +16,7 @@



Home | Main Index | Thread Index | Old Index