From 7bf1652bdaf99b0b755f7dcc647de352532ee515 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sun, 2 Feb 2014 14:33:37 +0000 Subject: [PATCH] - Stage support - Convert few ports to USES --- lang/open-cobol/Makefile | 3 +-- lang/phc/Makefile | 3 +-- lang/rexx-wrapper/Makefile | 1 - mail/dkfilter/Makefile | 1 - mail/libdkim/Makefile | 12 +----------- mail/libsieve/Makefile | 4 +--- mail/popa3d-before-sendmail/Makefile | 1 - mail/spamcup/Makefile | 1 - mail/xpbiff/Makefile | 1 - math/fann/Makefile | 1 - math/fftw-float/Makefile | 1 - math/minisat/Makefile | 1 - math/qd/Makefile | 6 +----- 13 files changed, 5 insertions(+), 31 deletions(-) diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile index 64210ad6e8c6..95f698e09a3d 100644 --- a/lang/open-cobol/Makefile +++ b/lang/open-cobol/Makefile @@ -12,7 +12,7 @@ COMMENT= An open-source COBOL compiler LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp USE_BDB= yes -USE_GMAKE= yes +USES= gmake USE_AUTOTOOLS= libtool USE_LDCONFIG= yes @@ -21,7 +21,6 @@ INFO= open-cobol CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} diff --git a/lang/phc/Makefile b/lang/phc/Makefile index b52e03c40d30..033342e78569 100644 --- a/lang/phc/Makefile +++ b/lang/phc/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://www.phpcompiler.org/src/archive/ MAINTAINER= eg@fbsd.lt COMMENT= A compiler for the PHP language -USE_GMAKE= yes +USES= gmake GNU_CONFIGURE= yes CFLAGS+= -fgnu89-inline @@ -19,5 +19,4 @@ post-patch: .SILENT ${REINPLACE_CMD} 's/insert/this->&/' \ ${WRKSRC}/include/phc/lib/List.h -NO_STAGE= yes .include diff --git a/lang/rexx-wrapper/Makefile b/lang/rexx-wrapper/Makefile index 2d7af1d5a5c4..db93e11e3a6e 100644 --- a/lang/rexx-wrapper/Makefile +++ b/lang/rexx-wrapper/Makefile @@ -26,5 +26,4 @@ post-patch: .SILENT ${WRKSRC}/rexxwrap.cmd @${REINPLACE_CMD} 's/-compiler=$$(CC/&:T/' ${WRKSRC}/Makefile.in -NO_STAGE= yes .include diff --git a/mail/dkfilter/Makefile b/mail/dkfilter/Makefile index 151c146222be..2db26bf9cd58 100644 --- a/mail/dkfilter/Makefile +++ b/mail/dkfilter/Makefile @@ -26,5 +26,4 @@ GROUPS= ${DKFILTER_GROUPNAME} DKFILTER_USERNAME?= dkfilter DKFILTER_GROUPNAME?= ${DKFILTER_USERNAME} -NO_STAGE= yes .include diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile index 3f478e61d8b9..b7e456563000 100644 --- a/mail/libdkim/Makefile +++ b/mail/libdkim/Makefile @@ -20,19 +20,9 @@ USE_OPENSSL= YES WRKSRC= ${WRKDIR}/${PORTNAME}/src -NO_STAGE= yes -.include - -#Check for OPENSSL 0.9.8 in BASE: If not present require PORT -.if ${OSVERSION} < 700019 -WITH_OPENSSL_PORT= yes -.endif - -.include - post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev @${SED} -e "s=%%SHLIB_MAJOR%%=${SHLIB_MAJOR}=g" \ ${FILESDIR}/Makefile > ${WRKSRC}/Makefile -.include +.include diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile index cf7acb621628..1980aa544d24 100644 --- a/mail/libsieve/Makefile +++ b/mail/libsieve/Makefile @@ -13,9 +13,7 @@ LICENSE=LGPL21 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--prefix=${PREFIX} -USE_GMAKE= yes -USES= bison +USES= bison gmake USE_LDCONFIG= yes -NO_STAGE= yes .include diff --git a/mail/popa3d-before-sendmail/Makefile b/mail/popa3d-before-sendmail/Makefile index 3da40e987fef..6e5efc554475 100644 --- a/mail/popa3d-before-sendmail/Makefile +++ b/mail/popa3d-before-sendmail/Makefile @@ -10,7 +10,6 @@ MASTERDIR?= ${.CURDIR}/../popa3d OPTIONS_DEFAULT= SMTP_AFTER_POP3 .if exists(${.CURDIR}/Makefile.local) -NO_STAGE= yes .include "${.CURDIR}/Makefile.local" .endif diff --git a/mail/spamcup/Makefile b/mail/spamcup/Makefile index 084835adc8eb..623096d309c8 100644 --- a/mail/spamcup/Makefile +++ b/mail/spamcup/Makefile @@ -24,5 +24,4 @@ PLIST_FILES= bin/spamcup.pl ${SITE_PERL_REL}/spamcup.pl \ PLIST_DIRS= ${SITE_PERL_REL}/${PERL_ARCH}/auto/Spamcup -NO_STAGE= yes .include diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile index 6bf6f0f59e87..1aaf8cbe5499 100644 --- a/mail/xpbiff/Makefile +++ b/mail/xpbiff/Makefile @@ -27,7 +27,6 @@ YOUBINBINDIR= ${PREFIX} YOUBINBINDIR= ${LOCALBASE} .endif -NO_STAGE= yes .include do-extract: diff --git a/math/fann/Makefile b/math/fann/Makefile index c2f99788bd22..a7911c43f9af 100644 --- a/math/fann/Makefile +++ b/math/fann/Makefile @@ -16,7 +16,6 @@ USES= cmake USE_ZIP= yes USE_LDCONFIG= yes -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's|/lib/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/CMakeLists.txt diff --git a/math/fftw-float/Makefile b/math/fftw-float/Makefile index a2fe621eeb24..c0049a967771 100644 --- a/math/fftw-float/Makefile +++ b/math/fftw-float/Makefile @@ -8,5 +8,4 @@ COMMENT= Fast C routines (Single Percision) FFTW_FLAVOR= float MASTERDIR= ${.CURDIR}/../../math/fftw -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/math/minisat/Makefile b/math/minisat/Makefile index 6285dd8d56d6..b4a66132ea74 100644 --- a/math/minisat/Makefile +++ b/math/minisat/Makefile @@ -13,5 +13,4 @@ USES= gmake USE_LDCONFIG= yes MAKE_ENV= prefix=${PREFIX} -NO_STAGE= yes .include diff --git a/math/qd/Makefile b/math/qd/Makefile index b45210631c5f..2b3fccf7a0e2 100644 --- a/math/qd/Makefile +++ b/math/qd/Makefile @@ -11,11 +11,7 @@ MAINTAINER= maho@FreeBSD.org COMMENT= Double-Double and Quad-Double Arithmetic GNU_CONFIGURE= yes - -NO_STAGE= yes -.include - USE_FORTRAN= yes CONFIGURE_ARGS+= --enable-shared=yes -.include +.include