Attachment 145989 Details for Bug 192814 – www_quickie.diff

[patch] www_quickie.diff

www_quickie.diff (text/plain), 3.41 KB, created by tkato432 on 2014-08-18 18:45:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-18 18:45:34 UTC

Size: 3.41 KB

patch

obsolete

>diff -urN /usr/ports/www/quickie/Makefile www/quickie/Makefile
>--- /usr/ports/www/quickie/Makefile	2014-06-21 17:41:46.000000000 +0900
>+++ www/quickie/Makefile	2014-09-19 00:00:00.000000000 +0900
>@@ -5,34 +5,34 @@
> 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 @@
> 		\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>
>diff -urN /usr/ports/www/quickie/pkg-plist www/quickie/pkg-plist
>--- /usr/ports/www/quickie/pkg-plist	2014-06-21 17:41:46.000000000 +0900
>+++ www/quickie/pkg-plist	2014-09-19 00:00:00.000000000 +0900
>@@ -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,10 @@
> %%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%%
>+@group
>+@owner

Actions: View | Diff

Attachments on bug 192814: 145989