Date: Wed, 20 Aug 2014 18:07:09 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365497 - head/www/quickie Message-ID: <201408201807.s7KI79i2038715@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Wed Aug 20 18:07:09 2014 New Revision: 365497 URL: http://svnweb.freebsd.org/changeset/ports/365497 QAT: https://qat.redports.org/buildarchive/r365497/ Log: www/quickie: support stage PR: 5851 Submitted by: tkato432 yahoo com Modified: head/www/quickie/Makefile head/www/quickie/pkg-plist Modified: head/www/quickie/Makefile ============================================================================== --- head/www/quickie/Makefile Wed Aug 20 18:06:05 2014 (r365496) +++ head/www/quickie/Makefile Wed Aug 20 18:07:09 2014 (r365497) @@ -5,34 +5,34 @@ PORTNAME= quickie PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= http://${PORTNAME}.sourceforge.net/ +MASTER_SITES= SF \ + http://quickie.sourceforge.net/:pdf DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY:= ${DISTFILES} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Small footprint, fast Wiki engine written in C++ -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc \ - --localstatedir=${DATADIR} +LICENSE= GPLv2 # (or later) + USES= perl5 USE_PERL5= build patch +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ + --localstatedir=${DATADIR} +MAKE_ENV= RPM_BUILD_ROOT="${STAGEDIR}" 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 -OPTIONS_DEFINE= CGI DOCS -CGI_DESC= Install CGI binary +OPTIONS_DEFINE= CGI DOCS +OPTIONS_SUB= yes -NO_STAGE= yes -.include <bsd.port.options.mk> +CGI_DESC= Install CGI binary +DOCS_DISTFILES= ${DISTNAME}.pdf:pdf -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${DISTNAME}.pdf -.endif +.include <bsd.port.options.mk> post-patch: @${CP} ${FILESDIR}/freebsd.h ${WRKSRC}/lib @@ -45,26 +45,18 @@ post-patch: \s+mv\s+\S+/$$1 -o/sgx' ${WRKSRC}/Makefile.in pre-install: - @${MKDIR} ${DATADIR}/admin ${DATADIR}/manual +.for i in admin manual + @${MKDIR} ${STAGEDIR}${DATADIR}/${i} +.endfor post-install: - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR} .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} ; \ - ${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/www/cgi-bin/${PORTNAME} ; \ - fi ; \ - fi + @${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin + ${LN} -sf ${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/www/cgi-bin .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.pdf ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${DISTDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/www/quickie/pkg-plist ============================================================================== --- head/www/quickie/pkg-plist Wed Aug 20 18:06:05 2014 (r365496) +++ head/www/quickie/pkg-plist Wed Aug 20 18:07:09 2014 (r365497) @@ -1,9 +1,16 @@ -@unexec bin="%D/bin/quickie"; cgi="%D/www/cgi-bin/quickie"; if cmp -s $bin $cgi; then rm -f $cgi; fi bin/quickie bin/quickie-config bin/quickie_post_install bin/quickie_prime bin/quickie_svt +man/man1/quickie.1.gz +man/man1/quickie-config.1.gz +man/man1/quickie_license.1.gz +man/man1/quickie_post_install.1.gz +man/man1/quickie_prime.1.gz +man/man1/quickie_svt.1.gz +@owner www +@group www %%DATADIR%%/admin/default.css %%DATADIR%%/admin/external.png %%DATADIR%%/admin/quickie.png @@ -49,6 +56,8 @@ bin/quickie_svt %%DATADIR%%/sidebar.wiki %%DATADIR%%/square_brackets.referred_to_by %%DATADIR%%/square_brackets.unlink_on_create +%%CGI%%www/cgi-bin/quickie +%%CGI%%@dirrmtry www/cgi-bin @dirrm %%DATADIR%%/manual @dirrm %%DATADIR%%/admin @dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408201807.s7KI79i2038715>