[pkgsrc/trunk]: pkgsrc/www bl3ify.

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22d7a77236f7
branches:  trunk
changeset: 469064:22d7a77236f7
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Feb 19 13:24:23 2004 +0000

description:
bl3ify.

diffstat:

 www/mozilla-gtk2/buildlink3.mk   |  28 ++++++++++++++++++++++++++++
 www/mozilla-stable/buildlink3.mk |  29 +++++++++++++++++++++++++++++
 www/mozilla/Makefile.common      |  26 +++++++++++++-------------
 www/mozilla/buildlink3.mk        |  29 +++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 13 deletions(-)

diffs (162 lines):

diff -r c6d2284a217a -r 22d7a77236f7 www/mozilla-gtk2/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-gtk2/buildlink3.mk    Thu Feb 19 13:24:23 2004 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use mozilla-gtk2.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+MOZILLA_GTK2_BUILDLINK3_MK:=   ${MOZILLA_GTK2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    mozilla-gtk2
+.endif
+
+.if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   mozilla-gtk2
+BUILDLINK_DEPENDS.mozilla-gtk2+=       mozilla-gtk2>=1.6nb1
+BUILDLINK_PKGSRCDIR.mozilla-gtk2?=     ../../www/mozilla-gtk2
+
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/libIDL/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # MOZILLA_GTK2_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r c6d2284a217a -r 22d7a77236f7 www/mozilla-stable/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla-stable/buildlink3.mk  Thu Feb 19 13:24:23 2004 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use mozilla-stable.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+MOZILLA_STABLE_BUILDLINK3_MK:= ${MOZILLA_STABLE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    mozilla-stable
+.endif
+
+.if !empty(MOZILLA_STABLE_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   mozilla-stable
+BUILDLINK_DEPENDS.mozilla-stable+=     mozilla-stable>=1.4.1nb2
+BUILDLINK_PKGSRCDIR.mozilla-stable?=   ../../www/mozilla-stable
+
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+.endif # MOZILLA_STABLE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r c6d2284a217a -r 22d7a77236f7 www/mozilla/Makefile.common
--- a/www/mozilla/Makefile.common       Thu Feb 19 13:24:17 2004 +0000
+++ b/www/mozilla/Makefile.common       Thu Feb 19 13:24:23 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2004/02/18 13:33:41 jlam Exp $
+# $NetBSD: Makefile.common,v 1.35 2004/02/19 13:24:23 jmmv Exp $
 
 MOZ_DIST_VER?= ${MOZ_VER}
 DISTNAME?=     mozilla-source-${MOZ_DIST_VER}
@@ -14,7 +14,7 @@
 BUILD_DEPENDS+=        zip>=2.3:../../archivers/zip
 
 WRKSRC=                ${WRKDIR}/mozilla
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 USE_GCC_SHLIB= yes
 USE_LANGUAGES= c c++
 USE_PERL5=     build
@@ -41,17 +41,17 @@
 
 UNLIMIT_RESOURCES=     datasize memorysize stacksize
 
-.include       "../../graphics/freetype2/buildlink2.mk"
-.include       "../../graphics/jpeg/buildlink2.mk"
-.include       "../../graphics/png/buildlink2.mk"
+.include       "../../graphics/freetype2/buildlink3.mk"
+.include       "../../graphics/jpeg/buildlink3.mk"
+.include       "../../graphics/png/buildlink3.mk"
 .ifdef MOZILLA_USE_GTK2
-.include       "../../net/libIDL/buildlink2.mk"
-.include       "../../x11/gtk2/buildlink2.mk"
+.include       "../../net/libIDL/buildlink3.mk"
+.include       "../../x11/gtk2/buildlink3.mk"
 CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
 .else
-.include       "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include       "../../net/ORBit/buildlink2.mk"
-.include       "../../x11/gtk/buildlink2.mk"
+.include       "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include       "../../net/ORBit/buildlink3.mk"
+.include       "../../x11/gtk/buildlink3.mk"
 CONFIGURE_ARGS+= --enable-default-toolkit=gtk
 .endif
 
@@ -147,7 +147,7 @@
 do-install:
        ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
 CONFIGURE_ARGS+= --without-pthreads
@@ -158,8 +158,8 @@
 .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)
 CONFIGURE_ARGS+=       --enable-xft
 # pkgconfig defaults to a "build" dependency, which is what we want.
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .endif
 
 .include "../../mk/autoconf.mk"
diff -r c6d2284a217a -r 22d7a77236f7 www/mozilla/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/mozilla/buildlink3.mk Thu Feb 19 13:24:23 2004 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/19 13:24:23 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use mozilla.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+MOZILLA_BUILDLINK3_MK:=        ${MOZILLA_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    mozilla
+.endif
+
+.if !empty(MOZILLA_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   mozilla
+BUILDLINK_DEPENDS.mozilla+=            mozilla>=1.6
+BUILDLINK_PKGSRCDIR.mozilla?=          ../../www/mozilla
+
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../net/ORBit/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+ 
+.endif # MOZILLA_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}