pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc bl3ify, s,USE_X11BASE,USE_X11,g. Welcome to 4.0.4nb1, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9bc70be9ee93
branches: trunk
changeset: 470571:9bc70be9ee93
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Wed Mar 10 11:53:37 2004 +0000
description:
bl3ify, s,USE_X11BASE,USE_X11,g. Welcome to 4.0.4nb1, ok'ed by martti@
diffstat:
audio/xfce4-mixer/Makefile | 8 +++---
audio/xfce4-mixer/buildlink3.mk | 23 ++++++++++++++++++++
doc/CHANGES | 3 +-
graphics/xfce4-iconbox/Makefile | 5 +--
graphics/xfce4-iconbox/buildlink3.mk | 22 +++++++++++++++++++
meta-pkgs/xfce4/Makefile | 33 +++++++++++++++--------------
meta-pkgs/xfce4/Makefile.common | 11 +++++----
meta-pkgs/xfce4/buildlink3.mk | 36 ++++++++++++++++++++++++++++++++
print/xfce4-print/Makefile | 5 +--
print/xfce4-print/buildlink3.mk | 27 ++++++++++++++++++++++++
sysutils/xfce4-fm-icons/Makefile | 4 +-
sysutils/xfce4-fm-icons/buildlink3.mk | 22 +++++++++++++++++++
sysutils/xfce4-fm/Makefile | 9 +++----
sysutils/xfce4-fm/buildlink3.mk | 24 +++++++++++++++++++++
sysutils/xfce4-systray/Makefile | 7 ++---
sysutils/xfce4-systray/buildlink3.mk | 23 ++++++++++++++++++++
wm/xfce4-wm-themes/Makefile | 4 +-
wm/xfce4-wm-themes/buildlink3.mk | 22 +++++++++++++++++++
wm/xfce4-wm/Makefile | 9 +++----
wm/xfce4-wm/buildlink3.mk | 24 +++++++++++++++++++++
x11/libxfce4gui/Makefile | 7 ++---
x11/libxfce4gui/buildlink3.mk | 23 ++++++++++++++++++++
x11/libxfce4mcs/Makefile | 5 +--
x11/libxfce4mcs/buildlink3.mk | 22 +++++++++++++++++++
x11/libxfce4util/buildlink3.mk | 21 ++++++++++++++++++
x11/xfce4-desktop/Makefile | 9 +++----
x11/xfce4-desktop/buildlink3.mk | 24 +++++++++++++++++++++
x11/xfce4-gtk2-engines/Makefile | 4 +-
x11/xfce4-gtk2-engines/buildlink3.mk | 22 +++++++++++++++++++
x11/xfce4-mcs-manager/Makefile | 7 ++---
x11/xfce4-mcs-manager/buildlink3.mk | 23 ++++++++++++++++++++
x11/xfce4-mcs-plugins/Makefile | 5 +--
x11/xfce4-mcs-plugins/buildlink3.mk | 22 +++++++++++++++++++
x11/xfce4-panel/Makefile | 9 +++----
x11/xfce4-panel/buildlink3.mk | 24 +++++++++++++++++++++
x11/xfce4-themes/Makefile | 7 ++---
x11/xfce4-themes/buildlink3.mk | 23 ++++++++++++++++++++
x11/xfce4-toys/Makefile | 7 ++---
x11/xfce4-toys/buildlink3.mk | 23 ++++++++++++++++++++
x11/xfce4-trigger-launcher/Makefile | 7 ++---
x11/xfce4-trigger-launcher/buildlink3.mk | 23 ++++++++++++++++++++
x11/xfce4-utils/Makefile | 7 ++---
x11/xfce4-utils/buildlink3.mk | 23 ++++++++++++++++++++
43 files changed, 576 insertions(+), 92 deletions(-)
diffs (truncated from 1029 to 300 lines):
diff -r dedecaaae7f6 -r 9bc70be9ee93 audio/xfce4-mixer/Makefile
--- a/audio/xfce4-mixer/Makefile Wed Mar 10 11:35:47 2004 +0000
+++ b/audio/xfce4-mixer/Makefile Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 11:53:37 xtraeme Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -6,7 +6,7 @@
CATEGORIES= audio
COMMENT= XFce4 mixer plugin
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 audio/xfce4-mixer/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xfce4-mixer/buildlink3.mk Wed Mar 10 11:53:37 2004 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XFCE4_MIXER_BUILDLINK3_MK:= ${XFCE4_MIXER_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xfce4-mixer
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-mixer}
+BUILDLINK_PACKAGES+= xfce4-mixer
+
+.if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-mixer+= xfce4-mixer>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-mixer?= ../../audio/xfce4-mixer
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif # XFCE4_MIXER_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r dedecaaae7f6 -r 9bc70be9ee93 doc/CHANGES
--- a/doc/CHANGES Wed Mar 10 11:35:47 2004 +0000
+++ b/doc/CHANGES Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5184 2004/03/10 11:05:57 taca Exp $
+$NetBSD: CHANGES,v 1.5185 2004/03/10 11:53:38 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1377,3 +1377,4 @@
Updated xfce4-wm to 4.0.4 [martti 2004-03-10]
Updated xfce4-wm-themes to 4.0.4 [martti 2004-03-10]
Updated ruby-racc to 1.4.3nb1 [taca 2004-03-10]
+ Updated xfce4 to 4.0.4nb1 [xtraeme 2004-03-10]
diff -r dedecaaae7f6 -r 9bc70be9ee93 graphics/xfce4-iconbox/Makefile
--- a/graphics/xfce4-iconbox/Makefile Wed Mar 10 11:35:47 2004 +0000
+++ b/graphics/xfce4-iconbox/Makefile Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/08 08:11:41 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:53:37 xtraeme Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -6,6 +6,5 @@
CATEGORIES= graphics
COMMENT= XFce4 icon displayer
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 graphics/xfce4-iconbox/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/xfce4-iconbox/buildlink3.mk Wed Mar 10 11:53:37 2004 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XFCE4_ICONBOX_BUILDLINK3_MK:= ${XFCE4_ICONBOX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xfce4-iconbox
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-iconbox}
+BUILDLINK_PACKAGES+= xfce4-iconbox
+
+.if !empty(XFCE4_ICONBOX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-iconbox+= xfce4-iconbox>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-iconbox?= ../../graphics/xfce4-iconbox
+
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif # XFCE4_ICONBOX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r dedecaaae7f6 -r 9bc70be9ee93 meta-pkgs/xfce4/Makefile
--- a/meta-pkgs/xfce4/Makefile Wed Mar 10 11:35:47 2004 +0000
+++ b/meta-pkgs/xfce4/Makefile Wed Mar 10 11:53:37 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/10 11:53:37 xtraeme Exp $
.include "Makefile.common"
DISTNAME= xfce4-${XFCE4_VERSION}
+PKGREVISION= 1
DISTFILES= # empty
CATEGORIES= meta-pkgs
COMMENT= XFce4
@@ -15,22 +16,22 @@
do-install: # empty
# Basic stuff
-.include "../../graphics/xfce4-iconbox/buildlink2.mk"
-.include "../../print/xfce4-print/buildlink2.mk"
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
-.include "../../wm/xfce4-wm/buildlink2.mk"
-.include "../../x11/xfce4-desktop/buildlink2.mk"
-.include "../../x11/xfce4-gtk2-engines/buildlink2.mk"
-.include "../../x11/xfce4-utils/buildlink2.mk"
-.include "../../x11/xfce4-panel/buildlink2.mk"
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
# Extras
-.include "../../audio/xfce4-mixer/buildlink2.mk"
-.include "../../sysutils/xfce4-fm-icons/buildlink2.mk"
-.include "../../sysutils/xfce4-systray/buildlink2.mk"
-.include "../../wm/xfce4-wm-themes/buildlink2.mk"
-.include "../../x11/xfce4-themes/buildlink2.mk"
-.include "../../x11/xfce4-toys/buildlink2.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink2.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 meta-pkgs/xfce4/Makefile.common
--- a/meta-pkgs/xfce4/Makefile.common Wed Mar 10 11:35:47 2004 +0000
+++ b/meta-pkgs/xfce4/Makefile.common Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/03/10 11:53:37 xtraeme Exp $
MASTER_SITES= http://www.xfce.org/archive/xfce-4.0.4/src/ \
http://linux.imp.mx/xfce4/xfce_4.0.4/src/
@@ -7,9 +7,10 @@
HOMEPAGE= http://www.xfce.org/
XFCE4_VERSION= 4.0.4
+PKGREVISION= 1
-USE_BUILDLINK2= # defined
-USE_X11BASE= # defined
+USE_BUILDLINK3= # defined
+USE_X11= # defined
USE_PKGLOCALEDIR= # defined
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
@@ -23,5 +24,5 @@
PKG_CONFIG_PATH= ${BUILDLINK_DIR}/lib/pkgconfig
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 meta-pkgs/xfce4/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/xfce4/buildlink3.mk Wed Mar 10 11:53:37 2004 +0000
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xfce4
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4}
+BUILDLINK_PACKAGES+= xfce4
+
+.if !empty(XFCE4_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4+= xfce4>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
+
+.include "../../graphics/xfce4-iconbox/buildlink3.mk"
+.include "../../print/xfce4-print/buildlink3.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
+.include "../../wm/xfce4-wm/buildlink3.mk"
+.include "../../x11/xfce4-desktop/buildlink3.mk"
+.include "../../x11/xfce4-gtk2-engines/buildlink3.mk"
+.include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../sysutils/xfce4-fm-icons/buildlink3.mk"
+.include "../../sysutils/xfce4-systray/buildlink3.mk"
+.include "../../wm/xfce4-wm-themes/buildlink3.mk"
+.include "../../x11/xfce4-themes/buildlink3.mk"
+.include "../../x11/xfce4-toys/buildlink3.mk"
+.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif # XFCE4_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r dedecaaae7f6 -r 9bc70be9ee93 print/xfce4-print/Makefile
--- a/print/xfce4-print/Makefile Wed Mar 10 11:35:47 2004 +0000
+++ b/print/xfce4-print/Makefile Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/08 08:11:41 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/10 11:53:37 xtraeme Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -7,6 +7,5 @@
CATEGORIES= print
COMMENT= XFce4 print dialog
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink2.mk"
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 print/xfce4-print/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/xfce4-print/buildlink3.mk Wed Mar 10 11:53:37 2004 +0000
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+# XXX
+# XXX This file was created automatically using createbuildlink-3.3.
+# XXX After this file as been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed. Please do not commit
+# XXX unverified buildlink[23].mk files.
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XFCE4_PRINT_BUILDLINK3_MK:= ${XFCE4_PRINT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xfce4-print
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-print}
+BUILDLINK_PACKAGES+= xfce4-print
+
+.if !empty(XFCE4_PRINT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-print+= xfce4-print>=4.0.4nb1
+BUILDLINK_PKGSRCDIR.xfce4-print?= ../../print/xfce4-print
+
+.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.endif # XFCE4_PRINT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r dedecaaae7f6 -r 9bc70be9ee93 sysutils/xfce4-fm-icons/Makefile
--- a/sysutils/xfce4-fm-icons/Makefile Wed Mar 10 11:35:47 2004 +0000
+++ b/sysutils/xfce4-fm-icons/Makefile Wed Mar 10 11:53:37 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/10 07:41:16 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/10 11:53:37 xtraeme Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -7,5 +7,5 @@
CATEGORIES= sysutils
COMMENT= XFce4 filemanager icons
-.include "../../sysutils/xfce4-fm/buildlink2.mk"
+.include "../../sysutils/xfce4-fm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r dedecaaae7f6 -r 9bc70be9ee93 sysutils/xfce4-fm-icons/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xfce4-fm-icons/buildlink3.mk Wed Mar 10 11:53:37 2004 +0000
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/10 11:53:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XFCE4_FM_ICONS_BUILDLINK3_MK:= ${XFCE4_FM_ICONS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
Home |
Main Index |
Thread Index |
Old Index