From b15e495041a4fd2f9fafcc7d9540759c4c22a610 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 17 Sep 2013 06:28:07 +0000 Subject: Convert to new perl framework Convert from USE_GMAKE to USES=gmake --- audio/gnump3d/Makefile | 9 +++++---- audio/rebot3/Makefile | 2 +- dns/ddclient/Makefile | 3 ++- dns/dnscheckengine/Makefile | 3 ++- dns/opendnssec/Makefile | 2 +- dns/opendnssec13/Makefile | 2 +- dns/p5-Net-RBLClient/Makefile | 12 ++++-------- dns/p5-POE-Component-Resolver/Makefile | 9 +++------ games/atr3d/Makefile | 4 ++-- games/blinkensisters/Makefile | 4 ++-- games/eboard/Makefile | 4 ++-- games/fairymax/Makefile | 4 ++-- games/freecell-solver/Makefile | 4 ++-- games/gracer/Makefile | 3 ++- games/lmpc/Makefile | 4 ++-- games/stonesoup/Makefile | 5 ++--- games/wolfpack/Makefile | 4 ++-- games/xboard/Makefile | 3 ++- x11/rxvt-unicode/Makefile | 6 +++--- 19 files changed, 42 insertions(+), 45 deletions(-) diff --git a/audio/gnump3d/Makefile b/audio/gnump3d/Makefile index 22f36087f3ab..5f01b7919ba9 100644 --- a/audio/gnump3d/Makefile +++ b/audio/gnump3d/Makefile @@ -11,12 +11,13 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= jadawin@FreeBSD.org COMMENT= Streaming server for MP3, Ogg Vorbis, and other streamable audio files -RUN_DEPENDS= lame:${PORTSDIR}/audio/lame \ - sox:${PORTSDIR}/audio/sox \ - oggenc:${PORTSDIR}/audio/vorbis-tools +RUN_DEPENDS= liblame.so:${PORTSDIR}/audio/lame \ + libsox.so:${PORTSDIR}/audio/sox \ + liboggenc.so:${PORTSDIR}/audio/vorbis-tools USE_BZIP2= yes -USE_PERL5_RUN= yes +USES= perl5 +USE_PERL5= run NO_BUILD= yes USE_RC_SUBR= gnump3d SUB_LIST+= PERL=${PERL} diff --git a/audio/rebot3/Makefile b/audio/rebot3/Makefile index 5dce0f0bccb4..fb5c336976d2 100644 --- a/audio/rebot3/Makefile +++ b/audio/rebot3/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-CDDB>=0:${PORTSDIR}/audio/p5-CDDB \ p5-MP3-ID3v1Tag>=0:${PORTSDIR}/audio/p5-MP3-ID3v1Tag -USE_PERL5= yes +USES= perl5 NO_BUILD= yes MAN1= ${PORTNAME}.1 diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile index 4615a6e82d09..20b5378daf08 100644 --- a/dns/ddclient/Makefile +++ b/dns/ddclient/Makefile @@ -13,7 +13,8 @@ COMMENT= Update dynamic DNS entries LICENSE= GPLv2 USE_BZIP2= yes -USE_PERL5_RUN= yes +USES= perl5 +USE_PERL5= run NO_BUILD= yes USE_RC_SUBR= ${PORTNAME} diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile index 9ce9e32b446c..e9dc160946fe 100644 --- a/dns/dnscheckengine/Makefile +++ b/dns/dnscheckengine/Makefile @@ -25,7 +25,8 @@ BUILD_DEPENDS= p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL- p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \ p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure CONFIGURE_SCRIPT+= Makefile.PL INSTALLSITESCRIPT=${PREFIX}/libexec/dnscheck WRKSRC= ${WRKDIR}/engine diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile index 64f19d39abfa..f19581db49be 100644 --- a/dns/opendnssec/Makefile +++ b/dns/opendnssec/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= ldns:${PORTSDIR}/dns/ldns GNU_CONFIGURE= yes USE_RC_SUBR= opendnssec USE_GNOME= libxml2 -USE_PERL5= yes +USES= perl5 USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile index 6a8a0f679ab5..fd412bab3e02 100644 --- a/dns/opendnssec13/Makefile +++ b/dns/opendnssec13/Makefile @@ -17,7 +17,7 @@ LATEST_LINK= ${PORTNAME}13 GNU_CONFIGURE= yes USE_RC_SUBR= opendnssec USE_GNOME= libxml2 -USE_PERL5= yes +USES= perl5 USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/dns/p5-Net-RBLClient/Makefile b/dns/p5-Net-RBLClient/Makefile index f728687f68c6..67b09bb19c2e 100644 --- a/dns/p5-Net-RBLClient/Makefile +++ b/dns/p5-Net-RBLClient/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: p5-Net-RBLClient -# Date created: 2006-07-13 -# Whom: Gea-Suan Lin -# +# Created by: Gea-Suan Lin # $FreeBSD$ -# PORTNAME= Net-RBLClient PORTVERSION= 0.5 @@ -20,10 +16,10 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/RBLCLient-${PORTVERSION} -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN1= spamalyze.1 MAN3= Net::RBLClient.3 -.include -.include +.include diff --git a/dns/p5-POE-Component-Resolver/Makefile b/dns/p5-POE-Component-Resolver/Makefile index 7b390a8bfcf1..543c13580ae4 100644 --- a/dns/p5-POE-Component-Resolver/Makefile +++ b/dns/p5-POE-Component-Resolver/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: devel/p5-POE-Component-Resolver -# Date created: 21 February 2011 -# Whom: Jase Thew -# +# Created by: Jase Thew # $FreeBSD$ -# PORTNAME= POE-Component-Resolver PORTVERSION= 0.921 @@ -22,7 +18,8 @@ BUILD_DEPENDS= p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \ p5-Socket>=2.001:${PORTSDIR}/net/p5-Socket RUN_DEPENDS:= ${BUILD_DEPENDS} -PERL_CONFIGURE= yes +USES= perl5 +USE_PERL5= configure MAN3= POE::Component::Resolver.3 \ POE::Component::Resolver::Sidecar.3 diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile index 11faaedae2eb..5e79f49f766e 100644 --- a/games/atr3d/Makefile +++ b/games/atr3d/Makefile @@ -19,10 +19,10 @@ SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config WRKSRC= ${WRKDIR}/${PORTNAME} -USE_GMAKE= yes +USES= gmake perl5 USE_GL= glut glu USE_XORG= xmu xi x11 -USE_PERL5_BUILD=yes +USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" USE_AUTOTOOLS= automake autoconf diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile index 1bde8a421f96..66d4e1c2de89 100644 --- a/games/blinkensisters/Makefile +++ b/games/blinkensisters/Makefile @@ -11,8 +11,8 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Parallax-style 2D scrolling platform game USE_SDL= sdl image ttf -USE_PERL5_BUILD= yes -USES= cmake +USE_PERL5= build +USES= cmake perl5 CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include diff --git a/games/eboard/Makefile b/games/eboard/Makefile index 60d2d08f9639..eb8603be3f43 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -19,10 +19,10 @@ COMMENT= GTK+ chess board interface (mainly for FICS and chessd) LIB_DEPENDS= png15:${PORTSDIR}/graphics/png EXTRAS= 1pl2 2 -USES= shebangfix pkgconfig +USES= shebangfix pkgconfig perl5 USE_BZIP2= yes HAS_CONFIGURE= yes -USE_PERL5_BUILD=yes +USE_PERL5= build USE_GNOME= gtk20 SHEBANG_FILES= configure diff --git a/games/fairymax/Makefile b/games/fairymax/Makefile index f2500211de3b..0609727d0c47 100644 --- a/games/fairymax/Makefile +++ b/games/fairymax/Makefile @@ -29,8 +29,8 @@ MAN6= ${PORTNAME}.6 MLINKS= ${PORTNAME}.6 shamax.6 \ ${PORTNAME}.6 maxqi.6 -USE_GMAKE= yes -USE_PERL5_BUILD=yes +USES= gmake perl5 +USE_PERL5= build MAKE_ARGS+= INI_F=${DATADIR}/fmax.ini \ INI_Q=${DATADIR}/qmax.ini diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile index 0cb18fc1dda0..aab0e5fa28d1 100644 --- a/games/freecell-solver/Makefile +++ b/games/freecell-solver/Makefile @@ -16,8 +16,8 @@ OPTIONS_DEFINE= TCMALLOC DOCS EXAMPLES TCMALLOC_DESC= Use Google's TCMalloc USE_BZIP2= yes -USES= cmake:outsource -USE_PERL5_BUILD= yes +USES= cmake:outsource perl5 +USE_PERL5= build CMAKE_ARGS= -DFCS_WITH_TEST_SUITE:BOOL=OFF USE_LDCONFIG= yes diff --git a/games/gracer/Makefile b/games/gracer/Makefile index e0e190b8f8a7..a41340d51a57 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -17,7 +17,8 @@ LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \ tcl84.1:${PORTSDIR}/lang/tcl84 USE_GL= glut -USE_PERL5_BUILD=yes +USES= perl5 +USE_PERL5= build USE_AUTOTOOLS= autoconf213 CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ CPPFLAGS="${CPPFLAGS}" diff --git a/games/lmpc/Makefile b/games/lmpc/Makefile index 71ee96468686..6c13d9ccb476 100644 --- a/games/lmpc/Makefile +++ b/games/lmpc/Makefile @@ -14,10 +14,10 @@ COMMENT= Tool to manipulate some FPS games demo recordings LICENSE= GPLv2 -USES= gmake +USES= gmake perl5 MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes -USE_PERL5_BUILD= yes +USE_PERL5= build PORTSCOUT= limit:.*[0-9]$$ # letter-suffixed files are binaries diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index 903025b19adf..ec770c970e6d 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -15,10 +15,9 @@ LICENSE_FILE= ${WRKDIR}/stone_soup-${PORTVERSION}/licence.txt USE_SQLITE= yes USE_XZ= yes -USES= bison pkgconfig -USE_GMAKE= yes +USES= bison gmake perl5 pkgconfig USE_LUA= 5.1 -USE_PERL5_BUILD= yes +USE_PERL5= build SAVEDIR= \~/.stonesoup diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile index 48a51c310dcd..c270fa941da5 100644 --- a/games/wolfpack/Makefile +++ b/games/wolfpack/Makefile @@ -12,8 +12,8 @@ MAINTAINER= johans@FreeBSD.org COMMENT= Long term multiplayer strategy game MAKEFILE= GNUmakefile -USE_GMAKE= yes -USE_PERL5_BUILD= yes +USES= gmake perl5 +USE_PERL5= build GNU_CONFIGURE= yes BINDIR= ${PREFIX}/lib/${PORTNAME} VARDIR= ${PREFIX}/var/${PORTNAME} diff --git a/games/xboard/Makefile b/games/xboard/Makefile index e463d2565daa..c1e4997d4af8 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -29,7 +29,8 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAN6= xboard.6 INFO= xboard -USE_PERL5_BUILD=yes +USES= perl5 +USE_PERL5= build INSTALLS_ICONS= yes DATADIR= ${PREFIX}/share/games/${PORTNAME} diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index e3cd9756f949..bc319fdef0cc 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -25,7 +25,6 @@ CONFIGURE_ENV= LIBS="-lstdc++ -lutil" TIC=${LOCALBASE}/bin/tic CONFIGURE_ARGS= --enable-everything --with-term=rxvt \ --with-terminfo=${LOCALBASE}/share/misc/terminfo.db USE_BZIP2= yes -WANT_PERL= yes OPTIONS_DEFINE= PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR \ NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY \ @@ -69,10 +68,11 @@ PATCH_DEPENDS+= p5-Encode-HanExtra>=0:${PORTSDIR}/chinese/p5-Encode-HanExtra \ # disable the embedded perl interpreter .if !${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+= --disable-perl -USE_PERL5_BUILD= yes +USES+= perl5 +USE_PERL5= build PLIST_SUB= PERL="@comment " .else -USE_PERL5= yes +USES+= perl5 MAN1+= urxvt-background.1 urxvt-bell-command.1 urxvt-block-graphics-to-ascii.1 \ urxvt-clipboard-osc.1 urxvt-confirm-paste.1 urxvt-digital-clock.1 \ urxvt-example-refresh-hooks.1 urxvt-extensions.1 urxvt-keysym-list.1 \ -- cgit v1.2.3