Date: Sun, 28 Jul 2013 11:36:01 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323820 - head/www/quickie Message-ID: <201307281136.r6SBa1CT026111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun Jul 28 11:36:00 2013 New Revision: 323820 URL: http://svnweb.freebsd.org/changeset/ports/323820 Log: - Fix some really brain-damaged build logic, to make port jobs-safe - Tighten Makefile header and COMMENT line - Convert to OptionsNG and clean it up a bit while I am here Reported by: pointyhat-west Modified: head/www/quickie/Makefile Modified: head/www/quickie/Makefile ============================================================================== --- head/www/quickie/Makefile Sun Jul 28 10:58:11 2013 (r323819) +++ head/www/quickie/Makefile Sun Jul 28 11:36:00 2013 (r323820) @@ -1,54 +1,54 @@ -# New ports collection makefile for: quickie -# Date Created: 2006-05-16 -# Whom: Shaun Amott <shaun@inerd.com> -# +# Created by: Shaun Amott <shaun@inerd.com> # $FreeBSD$ -# PORTNAME= quickie PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://${PORTNAME}.sourceforge.net/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +EXTRACT_ONLY:= ${DISTFILES} MAINTAINER= ports@FreeBSD.org -COMMENT= A small footprint, fast Wiki engine written in C++ +COMMENT= Small footprint, fast Wiki engine written in C++ GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --sysconfdir=${PREFIX}/etc \ +CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc \ --localstatedir=${DATADIR} +USE_PERL5_BUILD= yes + +SUB_FILES= pkg-message MAN1= quickie-config.1 quickie_prime.1 quickie.1 quickie_svt.1 \ quickie_license.1 quickie_post_install.1 +PORTDOCS= ${DISTNAME}.pdf -SUB_FILES= pkg-message +OPTIONS_DEFINE= CGI DOCS +CGI_DESC= Install CGI binary -PORTDOCS= ${DISTNAME}.pdf +.include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.pdf -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= ${DISTNAME}.pdf .endif -.include <bsd.port.pre.mk> - post-patch: @${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/lib @${REINPLACE_CMD} -e 's|output_html_quote::name()|name()|' \ ${WRKSRC}/lib/output/html_quote.h @${REINPLACE_CMD} -e 's|input_uudecode::read_inner|read_inner|' \ ${WRKSRC}/lib/input/uudecode.h +# Fix -jX builds: tell compiler to generate files in the right place + @${PERL} -0pi -e 's/(\$$\(CXX\).*?\s+-c\s+.*?) \ + \s+mv\s+\S+/$$1 -o/sgx' ${WRKSRC}/Makefile.in pre-install: - @${MKDIR} ${DATADIR}/admin - @${MKDIR} ${DATADIR}/manual + @${MKDIR} ${DATADIR}/admin ${DATADIR}/manual post-install: @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR} -.if !defined(WITHOUT_CGICOPY) - @if [ -d ${PREFIX}/www/cgi-bin/ ]; then \ +.if ${PORT_OPTIONS:MCGI} + @if [ -d ${PREFIX}/www/cgi-bin ]; then \ if [ ! -f ${PREFIX}/www/cgi-bin/${PORTNAME} ]; then \ ${ECHO_MSG} "===> Copying CGI binary..." ; \ ${CP} -p ${PREFIX}/bin/${PORTNAME} ${PREFIX}/www/cgi-bin/${PORTNAME} ; \ @@ -56,11 +56,13 @@ post-install: fi ; \ fi .endif + @${ECHO_MSG} @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.pdf ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307281136.r6SBa1CT026111>