From 212168ca712cf37c686c08778456950759e309e2 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 14 Feb 2014 16:25:16 +0000 Subject: [PATCH] - Remove now useless bmake/fmake check - Convert USE_GMAKE to USES --- mail/maildrop/Makefile | 5 +---- sysutils/liburcu/Makefile | 6 +----- textproc/grap/Makefile | 4 +--- x11/wmappl/Makefile | 5 +---- x11/xdialog/Makefile | 6 +----- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index bdeae6d5ee73..ae14352fd4e2 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -20,10 +20,7 @@ COMMENT= Mail delivery agent (MDA) with filtering abilities LICENSE= GPLv3 USE_BZIP2= yes -USES= iconv shebangfix perl5 -.if defined(.PARSEDIR) -USES+= gmake -.endif +USES= iconv shebangfix perl5 gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-syslog=1 \ --enable-use-flock=1 \ diff --git a/sysutils/liburcu/Makefile b/sysutils/liburcu/Makefile index 4d9f3237b3c8..274212e1225d 100644 --- a/sysutils/liburcu/Makefile +++ b/sysutils/liburcu/Makefile @@ -14,17 +14,13 @@ LICENSE= LGPL21 PORTDOCS= ChangeLog README cds-api.txt rcu-api.txt uatomic-api.txt -USES= pathfix +USES= pathfix gmake USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} -.if defined(.PARSEDIR) -USE_GMAKE= yes -.endif - regression-test: build @cd ${WRKSRC} && ${MAKE} check diff --git a/textproc/grap/Makefile b/textproc/grap/Makefile index 6e58b244844f..5074533c8d53 100644 --- a/textproc/grap/Makefile +++ b/textproc/grap/Makefile @@ -14,9 +14,7 @@ CONFIGURE_ARGS=--with-freebsd-ports OPTIONS_DEFINE= DOCS EXAMPLES -.if defined(.PARSEDIR) -USE_GMAKE= yes -.endif +USES= gmake CONFLICTS_INSTALL=heirloom-doctools-[0-9]* diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile index 202c51275627..e94e78bda94b 100644 --- a/x11/wmappl/Makefile +++ b/x11/wmappl/Makefile @@ -18,10 +18,7 @@ EXPIRATION_DATE= 2014-03-10 GNU_CONFIGURE= yes USE_XORG= xpm x11 xext sm ice MAKE_ENV= DATADIR="${DATADIR}" - -.if defined(.PARSEDIR) -USES+= gmake -.endif +USES= gmake OPTIONS_DEFINE= DOCS diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile index f988785cde41..4bdc2ba0a84c 100644 --- a/x11/xdialog/Makefile +++ b/x11/xdialog/Makefile @@ -14,14 +14,10 @@ COMMENT= A drop in replacement for the "dialog" or "cdialog" programs USE_BZIP2= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes - +USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(.PARSEDIR) -USES= gmake -.endif - OPTIONS_DEFINE= DOCS NLS .include