summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Zverev <az@FreeBSD.org>2013-09-12 17:55:41 +0000
committerAndrej Zverev <az@FreeBSD.org>2013-09-12 17:55:41 +0000
commit184fe8daa42501edf954dd180c45af4c0ac1b31a (patch)
tree3c4966978dcdbf09071760438b6641e1107e1d97
parentFix build with libc++ (diff)
- convert to the new perl5 framework
- convert USE_GMAKE to Uses Reviewed by: kwm@ Approved by: kwm@ (gnome@)
Notes
Notes: svn path=/head/; revision=327099
-rw-r--r--devel/glib20/Makefile3
-rw-r--r--devel/libical/Makefile4
-rw-r--r--devel/libsigc++20/Makefile4
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--irc/xchat/Makefile6
-rw-r--r--math/gnumeric/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile4
-rw-r--r--www/webkit-gtk3/Makefile4
-rw-r--r--x11-toolkits/gtk12/Makefile3
-rw-r--r--x11-toolkits/gtk20/Makefile5
-rw-r--r--x11-toolkits/gtk30/Makefile4
11 files changed, 17 insertions, 26 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4030736d8183..8c1748d3db6b 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -25,10 +25,9 @@ LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre \
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-USES= gettext gmake iconv pathfix pkgconfig shebangfix
+USES= gettext gmake iconv pathfix pkgconfig shebangfix perl5
USE_GNOME= ltverhack
USE_PYTHON= 2.5+
-USE_PERL5= yes
CONFIGURE_ARGS= --enable-static \
--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
--disable-man --without-xml-catalog \
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 8da88b6b691b..54dd980e7da3 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES= SF/freeassociation/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= An implementation of the IETF Calendaring and Scheduling protocols
+USES= gmake perl5
+USE_PERL5= build
USE_GNOME= gnomehack ltverhack
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index fc012dbdca5b..6a675904acfb 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -14,10 +14,10 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_AUTOTOOLS= libtool
USE_XZ= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
LATEST_LINK= libsigc++20
USE_LDCONFIG= yes
-USES= gmake pathfix
+USES= gmake pathfix perl5
GNU_CONFIGURE= yes
PLIST_SUB= VERSION="2.0" API_VERSION="2.0"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index a7ddc018a26e..ede683db57bb 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -25,12 +25,10 @@ RUN_DEPENDS= p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
USE_BZIP2= yes
USE_GCC= any
-USE_GMAKE= yes
WANT_GNOME= yes
USE_GNOME= gnomehack desktopfileutils intlhack libxslt
-USES= gettext
+USES= gettext gmake perl5
GNU_CONFIGURE= yes
-USE_PERL5= yes
INSTALLS_ICONS= yes
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 2a5ad963e59e..d69b00f328cc 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -18,14 +18,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= xchat-1* xchat-systray-plugin-[0-9]*
USE_BZIP2= yes
-USE_GMAKE= yes
-USES= gettext pkgconfig
+USES= gettext pkgconfig gmake
USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CONFIGURE_ARGS= --enable-ipv6
-WANT_PERL= yes
OPTIONS_DEFINE= DBUS NOTIFY PERL PYTHON SOCKS TCL
OPTIONS_DEFAULT=DBUS GTKSPELL PERL
@@ -66,7 +64,7 @@ RUN_DEPENDS+= notify-send:${PORTSDIR}/devel/libnotify \
.endif
.if ${PORT_OPTIONS:MPERL}
-USE_PERL5= yes
+USES+= perl5
CONFIGURE_ARGS+=--enable-perl
PLIST_SUB+= PERL=""
.else
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 10025993d16b..ca40baa0a726 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -45,7 +45,7 @@ PERL_DESC= Support Perl as extension language
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MPERL}
-USE_PERL5= yes
+USES+= perl5
PLIST_SUB+= PERL=""
.else
CONFIGURE_ARGS+= --without-perl
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 70a06a024a13..6517cd76d1e0 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -25,12 +25,10 @@ USE_XZ= yes
USE_PYTHON_BUILD= yes
USE_GSTREAMER= yes
USE_XORG= xt
-USES= bison pkgconfig gettext
-USE_GMAKE= yes
+USES= bison gmake pkgconfig gettext perl5
USE_AUTOTOOLS= libtool
USE_GNOME= gtk20 libxslt ltverhack
USE_SQLITE= yes
-USE_PERL5= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index e843652b7b9d..f5c619f0363f 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -24,12 +24,10 @@ LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \
USE_XZ= yes
USE_GSTREAMER= yes
USE_XORG= xt
-USES= bison pkgconfig gettext
-USE_GMAKE= yes
+USES= bison gmake pkgconfig gettext perl5
USE_AUTOTOOLS= libtool
USE_GNOME= gtk30 libxslt ltverhack
USE_SQLITE= yes
-USE_PERL5= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index cfed9cf5a557..baf7c40ff754 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -13,7 +13,8 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
USE_XORG= x11 ice xext sm inputproto xi
USE_GNOME= glib12
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 5fe36b60937c..0ab5b4626bda 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -29,12 +29,11 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
python:${PORTSDIR}/lang/python
-USE_GMAKE= yes
-USE_PERL5_BUILD=yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USES= gettext pkgconfig
+USES= gettext gmake pkgconfig perl5
+USE_PERL5= build
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-static --with-xinput=yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 8f6d77fd5b00..486a6bec00d5 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -26,13 +26,13 @@ BUILD_DEPENDS+= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
-USE_PERL5_BUILD=yes
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
USE_GNOME= atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
# introspection:build
-USES= gettext gmake pathfix pkgconfig
+USES= gettext gmake pathfix pkgconfig perl5
+USE_PERL5= build
USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
CONFIGURE_ARGS= --enable-gtk2-dependency --disable-packagekit