Add a new option MANPAGES to allow man pages to be supressed. [0]

Remove USE_GCC=4.2+ as all supported versions have an acceptable version
of gcc by default.[0]

Remove the long unused MAINTAINER_MODE variable.

Submitted by:	tijl [0]

2 files changed, 28 insertions, 35 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 4feaf0253026..61208acb4719 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.4.r${SVN_REV}
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -16,18 +17,13 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
 BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-.if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
+.if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash
 .endif
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
-.endif
 
 CONFLICTS=	llvm-[23]* llvm31-[3]*
 
 GNU_CONFIGURE=	yes
-USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -41,36 +37,31 @@ MAKE_ARGS+=		REQUIRES_RTTI=1
 LIBNAME=		libLLVM-${DISTVERSION:C/\.r[0-9]*//}svn.so
 
 CONFIGURE_ARGS+=	--enable-bindings=none
+CONFIGURE_ARGS+=	--enable-optimized
 CONFIGURE_ARGS+=	--program-suffix=${DISTVERSION:C/\.r[0-9]*//}svn
 
-OPTIONS_DEFINE=	ASSERTS DOCS LTOPLUGIN
+OPTIONS_DEFINE=	ASSERTS DOCS LTOPLUGIN MANPAGES
 
 ASSERTS_DESC=	Enable assertions (thread unsafe)
 LTOPLUGIN_DESC=	Build LTO plugin (requires gold)
 
-MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
-		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
-		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
-		llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
-MLINKS=		lit.1 llvm-lit.1
+OPTIONS_DEFAULT=	MANPAGES
 
 LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
 .include <bsd.port.options.mk>
 
-.if defined(MAINTAINER_MODE)
-CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--enable-optimized
-.endif
-
 .if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--enable-assertions
 .else
 CONFIGURE_ARGS+=	--disable-assertions
 .endif
 
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-docs
 .else
@@ -84,6 +75,14 @@ CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		lib/LLVMgold.so
 .endif
 
+.if ${PORT_OPTIONS:MMANPAGES}
+MAN1=		bugpoint.1 lit.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
+		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
+		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
+		llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1
+MLINKS=		lit.1 llvm-lit.1
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if !defined(SVN_REV)
@@ -133,7 +132,9 @@ pre-configure:
 	cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC}
 
 post-build:
+.if ${PORT_OPTIONS:MMANPAGES}
 	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
+.endif
 .if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
 .endif
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 7baaa5efa0ec..1b95748e3419 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clang
 PORTVERSION=	3.4.r${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -33,16 +33,12 @@ INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
 BUILD_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
 RUN_DEPENDS+=	llvm-devel>=${PORTVERSION}:${PORTSDIR}/devel/llvm-devel
-.if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
+.if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
-.endif
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GCC=	4.2+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
@@ -59,16 +55,20 @@ OPTIONS_DEFINE=	ASSERTS DOCS MIPS_FPHACK
 ASSERTS_DESC=	Enable assertions (thread unsafe)
 MIPS_FPHACK_DESC=	MIPS long double hack (breaks ABI)
 
+CONFIGURE_ARGS+=	--enable-optimized
+
 MAN1=		clang.1
 
 PLIST_SUB+=	CLANG_RELEASE=${CLANG_RELEASE}
 
 .include <bsd.port.options.mk>
 
-.if defined(MAINTAINER_MODE)
-CONFIGURE_ARGS+=	--with-f2c=${LOCALBASE}
+.if ${PORT_OPTIONS:MASSERTS}
+CONFIGURE_ARGS+=	--enable-assertions
+RELTYPE=		Release+Asserts
 .else
-CONFIGURE_ARGS+=	--enable-optimized
+CONFIGURE_ARGS+=	--disable-assertions
+RELTYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -77,14 +77,6 @@ CONFIGURE_ARGS+=	--enable-docs
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
-.if ${PORT_OPTIONS:MASSERTS}
-CONFIGURE_ARGS+=	--enable-assertions
-RELTYPE=		Release+Asserts
-.else
-CONFIGURE_ARGS+=	--disable-assertions
-RELTYPE=		Release
-.endif
-
 .if ${PORT_OPTIONS:MMIPS_FPHACK}
 EXTRA_PATCHES=	${FILESDIR}/mips-long-double-hack.diff
 .endif