From 456cec5f1f7e07484b77c8b16335959c913312db Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Mon, 26 May 2014 13:21:43 +0000 Subject: [PATCH] - Convert gmake,bzip2 to USES Approved by: portmgr --- textproc/coco/Makefile | 2 +- textproc/cwtext/Makefile | 2 +- textproc/ekhtml/Makefile | 2 +- textproc/freexl/Makefile | 3 +-- textproc/htmltolatex/Makefile | 3 +-- textproc/ibus-kmfl/Makefile | 3 +-- textproc/libcrm114/Makefile | 2 +- textproc/muse/Makefile | 2 +- textproc/ocaml-expat/Makefile | 2 +- textproc/openvanilla-modules/Makefile | 3 +-- textproc/rtfx/Makefile | 2 +- textproc/sagasu/Makefile | 3 +-- textproc/scim-openvanilla/Makefile | 3 +-- textproc/sowing/Makefile | 3 +-- textproc/tokyodystopia/Makefile | 2 +- textproc/txt2man/Makefile | 2 +- textproc/webcpp/Makefile | 2 +- textproc/word2x/Makefile | 2 +- textproc/xalan-c/Makefile | 2 +- textproc/xorg-sgml-doctools/Makefile | 3 +-- 20 files changed, 20 insertions(+), 28 deletions(-) diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile index b3c775ae899e..27dab49aa8a4 100644 --- a/textproc/coco/Makefile +++ b/textproc/coco/Makefile @@ -18,7 +18,7 @@ MANCOMPRESSED= no WRKSRC= ${WRKDIR}/mule-${MULE_VERSION}-${EMACS_VERSION} GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake EMACS_PREFIX= mule MULE_VERSION= 2.3 EMACS_VERSION= 19.34 diff --git a/textproc/cwtext/Makefile b/textproc/cwtext/Makefile index 60bf47f094d1..c1172c0cd225 100644 --- a/textproc/cwtext/Makefile +++ b/textproc/cwtext/Makefile @@ -10,7 +10,7 @@ MAINTAINER= db@FreeBSD.org COMMENT= Morse Code Generator USE_PYTHON= yes -USE_GMAKE= yes +USES= gmake MAKEFILE= makefile ALL_TARGET= ALL diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile index 6d11112596f5..ccf729a87c3f 100644 --- a/textproc/ekhtml/Makefile +++ b/textproc/ekhtml/Makefile @@ -11,7 +11,7 @@ COMMENT= El-Kabong is a speedy, yet forgiving, SAX-style HTML parser USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile index 508970d6fdb4..30780042b8fe 100644 --- a/textproc/freexl/Makefile +++ b/textproc/freexl/Makefile @@ -10,8 +10,7 @@ MAINTAINER= coder@tuxfamily.org COMMENT= Library to extract valid data from within an Excel (.xls) spreadsheet GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= iconv +USES= iconv gmake CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile index 9ca4cdebe714..470b08eb0f36 100644 --- a/textproc/htmltolatex/Makefile +++ b/textproc/htmltolatex/Makefile @@ -13,8 +13,7 @@ COMMENT= HTML to LaTeX to PDF Converter LIB_DEPENDS= GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick -USES= bison -USE_GMAKE= yes +USES= bison gmake MAKEFILE= GNUmakefile MAKE_JOBS_UNSAFE= yes MAKE_ARGS= CXX="${CXX}" \ diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile index e518775c525f..7c3061f6a482 100644 --- a/textproc/ibus-kmfl/Makefile +++ b/textproc/ibus-kmfl/Makefile @@ -17,10 +17,9 @@ LIB_DEPENDS= ibus-1.0:${PORTSDIR}/textproc/ibus \ kmflcomp.0:${PORTSDIR}/textproc/kmflcomp RUN_DEPENDS= kmflcomp:${PORTSDIR}/textproc/kmflcomp -USES= pkgconfig +USES= pkgconfig gmake USE_GNOME= glib20 -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/libcrm114/Makefile b/textproc/libcrm114/Makefile index 9f378f4df52b..085c7acb744e 100644 --- a/textproc/libcrm114/Makefile +++ b/textproc/libcrm114/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= tre:${PORTSDIR}/textproc/libtre LICENSE= LGPL3 -USE_GMAKE= yes +USES= gmake USE_LDCONFIG= yes # pass stuff to gmake diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile index 482017de0396..9ee461ea09fa 100644 --- a/textproc/muse/Makefile +++ b/textproc/muse/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An authoring and publishing environment for Emacs USE_EMACS= yes -USE_GMAKE= yes +USES= gmake INFO= muse diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile index 65094a7cc874..c10184a6cd1e 100644 --- a/textproc/ocaml-expat/Makefile +++ b/textproc/ocaml-expat/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ ocamlfind:${PORTSDIR}/devel/ocaml-findlib LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_GMAKE= yes +USES= gmake MAKE_ARGS= EXPAT_LIBDIR=${LOCALBASE}/lib \ EXPAT_INCDIR=${LOCALBASE}/include \ CAML_INCDIR=${LOCALBASE}/lib/ocaml diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile index 896eaad3c5b8..9aa65062db1c 100644 --- a/textproc/openvanilla-modules/Makefile +++ b/textproc/openvanilla-modules/Makefile @@ -15,9 +15,8 @@ COMMENT= Input method modules for OpenVanilla BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla -USES= perl5 +USES= perl5 gmake USE_AUTOTOOLS= libtool:env -USE_GMAKE= yes USE_PERL5= build OPTIONS_DEFINE= OVIMArray OVIMBig5 OVIMGeneric OVIMPOJ_Holo OVIMPhonetic OVIMRoman \ diff --git a/textproc/rtfx/Makefile b/textproc/rtfx/Makefile index 19c0aec3e7bd..7cf530dc1cd8 100644 --- a/textproc/rtfx/Makefile +++ b/textproc/rtfx/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= mba:${PORTSDIR}/devel/libmba \ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} --datarootdir=${PREFIX} -USE_GMAKE= yes +USES= gmake PLIST_FILES= bin/rtfx MAN1= rtfx.1 diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile index 2acbeea7b2e6..7b396c6fb4da 100644 --- a/textproc/sagasu/Makefile +++ b/textproc/sagasu/Makefile @@ -11,9 +11,8 @@ COMMENT= A GNOME tool to find strings in a set of files LICENSE= GPLv2 # (or later) -USES= pathfix pkgconfig gettext +USES= pathfix pkgconfig gettext gmake USE_GNOME= gnomehier libgnomeui -USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile index ce7e47e53cb5..d0584e167c83 100644 --- a/textproc/scim-openvanilla/Makefile +++ b/textproc/scim-openvanilla/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_AUTOTOOLS= libltdl WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM -USE_GMAKE= yes -USES= pkgconfig gettext iconv +USES= pkgconfig gettext iconv gmake GNU_CONFIGURE= yes CONFIGURE_ENV+= OV_MODULEDIR=${PREFIX}/lib/openvanilla/ CPPFLAGS+= -I${LOCALBASE}/include diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile index 1141d45b2673..703197672401 100644 --- a/textproc/sowing/Makefile +++ b/textproc/sowing/Makefile @@ -13,9 +13,8 @@ COMMENT= Text processing tools to generate documentation from source files BUILD_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm -USES= perl5 +USES= perl5 gmake USE_GHOSTSCRIPT=yes -USE_GMAKE= yes USE_TEX= latex dvipsk GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile index 151d73c48c57..a4f0cdfb8748 100644 --- a/textproc/tokyodystopia/Makefile +++ b/textproc/tokyodystopia/Makefile @@ -12,7 +12,7 @@ COMMENT= A full-text search system based on Tokyo Cabinet LIB_DEPENDS= tokyocabinet:${PORTSDIR}/databases/tokyocabinet GNU_CONFIGURE= yes -USE_GMAKE= yes +USES= gmake USE_LDCONFIG= yes CONFIGURE_ARGS= --libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include diff --git a/textproc/txt2man/Makefile b/textproc/txt2man/Makefile index dbb7d77a43fa..e50893d78d25 100644 --- a/textproc/txt2man/Makefile +++ b/textproc/txt2man/Makefile @@ -12,7 +12,7 @@ COMMENT= Converts flat ASCII text to man page format BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GMAKE= yes +USES= gmake INSTALL_TARGET= install prefix=${PREFIX} MAN1= bookman.1 src2man.1 txt2man.1 diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile index 8704c1c3396b..25555436f896 100644 --- a/textproc/webcpp/Makefile +++ b/textproc/webcpp/Makefile @@ -16,7 +16,7 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(WANT_FINAL) CONFIGURE_ARGS+= --enable-final -USE_GMAKE= yes +USES= gmake .endif pre-patch: diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile index f1e399d52183..bbc47ee114d6 100644 --- a/textproc/word2x/Makefile +++ b/textproc/word2x/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-zero/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Converter from MS Word to text, HTML, or LaTeX -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes MAN1= word2x.1 diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile index ec105376afd3..3e4a6cef3124 100644 --- a/textproc/xalan-c/Makefile +++ b/textproc/xalan-c/Makefile @@ -38,7 +38,7 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/xalan-c-${PORTVERSION}/c -USE_GMAKE= yes +USES= gmake MAKE_ENV+= XALANCROOT=${WRKSRC} MAKE_ENV+= XERCESCROOT=${XERCESCROOT} MAKE_JOBS_UNSAFE= diff --git a/textproc/xorg-sgml-doctools/Makefile b/textproc/xorg-sgml-doctools/Makefile index a1b576754a15..428fc9ba949a 100644 --- a/textproc/xorg-sgml-doctools/Makefile +++ b/textproc/xorg-sgml-doctools/Makefile @@ -10,7 +10,6 @@ COMMENT= Stylesheets and entities for X.Org documentation XORG_CAT= doc -USE_GMAKE= yes -USES= pathfix +USES= pathfix gmake .include