summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-07-16 01:19:06 +0000
committerjlam <jlam@pkgsrc.org>2005-07-16 01:19:06 +0000
commit3e474a90d85b83de40c67c12687951e9d8d925ae (patch)
treefb130b4b27029c9f82bb28dd306abe9510817ec8 /x11
parenta20960acbebade3471260a264615c3573cf14d1f (diff)
downloadpkgsrc-3e474a90d85b83de40c67c12687951e9d8d925ae.tar.gz
Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is: USE_TOOLS+= perl # build-time USE_TOOLS+= perl:run # run-time Also remove some places where perl5/buildlink3.mk was being included by a package Makefile, but all that the package wanted was the Perl executable.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-server/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile5
-rw-r--r--x11/gnome-panel/Makefile5
-rw-r--r--x11/gnome-session/Makefile5
-rw-r--r--x11/gnome2-terminal/Makefile5
-rw-r--r--x11/gtk/Makefile5
-rw-r--r--x11/gtk2-chtheme/Makefile5
-rw-r--r--x11/gtkmm/Makefile5
-rw-r--r--x11/gtkmm24/Makefile5
-rw-r--r--x11/gtksourceview/Makefile5
-rw-r--r--x11/kdelibs3/Makefile4
-rw-r--r--x11/xkbset/Makefile4
-rw-r--r--x11/xorg-server/Makefile4
13 files changed, 26 insertions, 35 deletions
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index d7c2939921f..59fe0ea766f 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:26 jlam Exp $
DISTNAME= ${DISTFILES}
PKGNAME= XFree86-server-${XF_VER}
@@ -43,7 +43,7 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile."
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "NetBSD"
-USE_PERL5= build # Yeah, we need this :-)
+USE_TOOLS+= perl # Yeah, we need this :-)
.endif
post-install:
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b903a634d28..1c67cbc22c6 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/06 18:01:37 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-desktop-2.10.2
@@ -15,8 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= yes
+USE_TOOLS+= gmake perl:run
USE_LIBTOOL= yes
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 14934526034..c3070ecc5e2 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/06/29 09:30:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-panel-2.10.2
@@ -12,8 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 9d0d687c7d2..6e13f1e35fa 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-session-2.10.0
@@ -18,8 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
-USE_PERL5= build
+USE_TOOLS+= gmake perl
USE_LIBTOOL= yes
MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}"
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 6cf94fc5fe6..c0e806ef35a 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gnome-terminal-2.10.0
@@ -15,11 +15,10 @@ BUILD_USES_MSGFMT= YES
CONFLICTS= gnome-core-[0-9]*
-USE_PERL5= build
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_LIBTOOL= YES
GCONF2_SCHEMAS= gnome-terminal.schemas
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index f9b9c14364a..d74273e3222 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.110 2005/07/16 01:19:26 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 8
@@ -18,9 +18,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
-USE_PERL5= build
USE_X11BASE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gdk.pc.in
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index d4f02e23035..99807c9d8b5 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:27 jlam Exp $
#
DISTNAME= gtk-chtheme-0.3.1
@@ -11,9 +11,8 @@ MAINTAINER= kirtai@users.sourceforge.net
HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/
COMMENT= GTK+2 theme changer with preview
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
REPLACE_PERL= replace
-USE_PERL5= build
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 03096cc817c..b65dab3e7f4 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gtkmm-2.2.12
@@ -12,8 +12,7 @@ COMMENT= C++ interface to Gtk+ v2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
-USE_PERL5= YES
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= atk/atkmm-1.0.pc.in
diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile
index 3e84382aebe..15b26115db9 100644
--- a/x11/gtkmm24/Makefile
+++ b/x11/gtkmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:26 jlam Exp $
DISTNAME= gtkmm-2.4.8
PKGNAME= gtkmm24-2.4.8
@@ -10,10 +10,9 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gtkmm.org/
COMMENT= C++ interface to Gtk+ v2
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl:run
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_PERL5= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index f0d5e6f406e..f370b2b9b11 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:26 jlam Exp $
#
DISTNAME= gtksourceview-1.2.0
@@ -14,9 +14,8 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_PERL5= build
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake perl
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index bb51d1eee2f..8bc923f6f45 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2005/06/26 23:46:11 markd Exp $
+# $NetBSD: Makefile,v 1.89 2005/07/16 01:19:27 jlam Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGREVISION= 1
@@ -10,7 +10,7 @@ COMMENT= Support libraries for the KDE integrated X11 desktop
CONFLICTS+= koffice3<=1.1.1
USE_DIRS+= xdg-1.2
-USE_PERL5= run
+USE_TOOLS+= perl:run
USE_PKGINSTALL= YES
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 6846c3a6bde..cf46ca1ee57 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:32 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:27 jlam Exp $
#
DISTNAME= xkbset-0.3
@@ -10,8 +10,8 @@ MAINTAINER= hubertf@NetBSD.org
HOMEPAGE= http://www.math.missouri.edu/~stephen/software/#xkbset
COMMENT= Manages XKB features of the X window system
-USE_PERL5= build
USE_X11BASE= yes
+USE_TOOLS+= perl
REPLACE_PERL= mskacc-gui
.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 7d8ca477188..38851def342 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:27 jlam Exp $
DISTNAME= ${DISTFILES}
PKGNAME= xorg-server-${XORG_VER}
@@ -47,7 +47,7 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile."
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "NetBSD"
-USE_PERL5= build # Yeah, we need this :-)
+USE_TOOLS+= perl # Yeah, we need this :-)
.endif
.if ${OPSYS} == "Darwin"