From owner-svn-ports-head@FreeBSD.ORG Fri Jul 18 16:31:50 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D27891D; Fri, 18 Jul 2014 16:31:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3ED32628; Fri, 18 Jul 2014 16:31:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6IGVnmJ058670; Fri, 18 Jul 2014 16:31:49 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6IGVnLG058668; Fri, 18 Jul 2014 16:31:49 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407181631.s6IGVnLG058668@svn.freebsd.org> From: Adam Weinberger Date: Fri, 18 Jul 2014 16:31:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362217 - head/www/middleman X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jul 2014 16:31:50 -0000 Author: adamw Date: Fri Jul 18 16:31:49 2014 New Revision: 362217 URL: http://svnweb.freebsd.org/changeset/ports/362217 QAT: https://qat.redports.org/buildarchive/r362217/ Log: Unbreak build by setting MAKE_JOBS_UNSAFE. While here, use OPTIONS helpers and @sample. Modified: head/www/middleman/Makefile head/www/middleman/pkg-plist Modified: head/www/middleman/Makefile ============================================================================== --- head/www/middleman/Makefile Fri Jul 18 16:17:33 2014 (r362216) +++ head/www/middleman/Makefile Fri Jul 18 16:31:49 2014 (r362217) @@ -16,6 +16,10 @@ SYSLOG_DESC= Enable syslog support DEBUG_DESC= Enable debugging support MTIME_DESC= Enable mtime support +SYSLOG_CONFIGURE_ON= --enable-syslog +DEBUG_CONFIGURE_ON= --enable-debug +MTIME_CONFIGURE_ON= --enable-mtime + WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes USES= gmake @@ -23,19 +27,7 @@ USES= gmake CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread -.include - -.if ${PORT_OPTIONS:MSYSLOG} -CONFIGURE_ARGS+= --enable-syslog -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif - -.if ${PORT_OPTIONS:MMTIME} -CONFIGURE_ARGS+= --enable-mtime -.endif +MAKE_JOBS_UNSAFE= yes MMAN_CACHE= /var/cache/mman PLIST_SUB+= MMAN_CACHE=${MMAN_CACHE} @@ -52,7 +44,7 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/mman.8 ${STAGEDIR}${MANPREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/mman ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/config.xml \ - ${STAGEDIR}${PREFIX}/etc/mman.xml.dist + ${STAGEDIR}${PREFIX}/etc/mman.xml.sample ${INSTALL_DATA} ${WRKSRC}/scripts/mman.init \ ${STAGEDIR}${PREFIX}/etc/rc.d/mman.sh.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/www/middleman/pkg-plist ============================================================================== --- head/www/middleman/pkg-plist Fri Jul 18 16:17:33 2014 (r362216) +++ head/www/middleman/pkg-plist Fri Jul 18 16:31:49 2014 (r362217) @@ -1,6 +1,6 @@ bin/mman -etc/rc.d/mman.sh.sample -etc/mman.xml.dist +@sample etc/rc.d/mman.sh.sample +@sample etc/mman.xml.sample man/man8/mman.8.gz %%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/filter.pl