Attachment 146176 Details for Bug 192943 – cvsweb3.diff

[patch] cvsweb3.diff

cvsweb3.diff (text/plain), 1.76 KB, created by TsurutaniNaoki on 2014-08-23 14:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TsurutaniNaoki

Created: 2014-08-23 14:10:55 UTC

Size: 1.76 KB

patch

obsolete

>diff -urN cvsweb3.orig/Makefile cvsweb3/Makefile
>--- cvsweb3.orig/Makefile	2014-08-17 09:30:18.000000000 +0900
>+++ cvsweb3/Makefile	2014-08-23 22:42:44.000000000 +0900
>@@ -47,22 +47,19 @@
> 
> # Specify these directories in relative paths to ${PREFIX}.
> .if exists(${PREFIX}/www/cgi-bin)
>-CGIDIR?=	www/cgi-bin
>-ICONSDIR?=	www/icons
>-CSSDIR?=	www/data/css
>+DIRPREFIX=	www
>+.elif exists(${PREFIX}/www/apache24/cgi-bin)
>+DIRPREFIX=      www/apache24
> .elif exists(${PREFIX}/www/apache22/cgi-bin)
>-CGIDIR?=	www/apache22/cgi-bin
>-ICONSDIR?=	www/apache22/icons
>-CSSDIR?=	www/apache22/data/css
>+DIRPREFIX=	www/apache22
> .elif exists(${PREFIX}/apache/cgi-bin)
>-CGIDIR?=	apache/cgi-bin
>-ICONSDIR?=	apache/icons
>-CSSDIR?=	apache/data/css
>+DIRPREFIX=	apache
> .else
>-CGIDIR?=	share/apache/cgi-bin
>-ICONSDIR?=	share/apache/icons
>-CSSDIR?=	share/apache/data/css
>+DIRPREFIX=	share/apache
> .endif
>+CGIDIR?=        ${DIRPREFIX}/cgi-bin
>+ICONSDIR?=      ${DIRPREFIX}/icons
>+CSSDIR?=        ${DIRPREFIX}/data/css
> 
> CONFFILES=	cvsweb.conf \
> 		cvsweb.conf-freebsd \
>@@ -70,7 +67,8 @@
> 		cvsweb.conf-netbsd \
> 		cvsweb.conf-ruby
> 
>-PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}"
>+PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}" CSSDIR="${CSSDIR}" \
>+		DIRPREFIX="${DIRPREFIX}"
> 
> SUB_FILES=	pkg-message
> SUB_LIST=	PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}"
>diff -urN cvsweb3.orig/pkg-plist cvsweb3/pkg-plist
>--- cvsweb3.orig/pkg-plist	2014-07-28 05:12:42.000000000 +0900
>+++ cvsweb3/pkg-plist	2014-08-23 22:44:37.000000000 +0900
>@@ -28,6 +28,6 @@
> share/enscript/hl/lang_cvsweb_diff.st
> @dirrmtry %%CGIDIR%%
> @dirrmtry %%CSSDIR%%
>-@dirrmtry share/apache/data
>+@dirrmtry %%DIRPREFIX%%/data
> @dirrmtry %%ICONSDIR%%
>-@dirrmtry share/apache
>+@dirrmtry %%DIRPREFIX%%
>--- cvsweb3.diff ends here ---

Actions: View | Diff

Attachments on bug 192943: 146176