diff options
| author | riggs <riggs@FreeBSD.org> | 2014-10-18 16:45:54 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2014-10-18 16:45:54 +0800 |
| commit | bb4a23a5132e9cda10412d1b503e224bd067f24b (patch) | |
| tree | a1273d44e7425a14ec2cb55ac3ee03e6f79ca622 | |
| parent | 940bd7126b629323244742e4bdc6e7161d78b49b (diff) | |
| download | freebsd-ports-gnome-bb4a23a5132e9cda10412d1b503e224bd067f24b.tar.gz freebsd-ports-gnome-bb4a23a5132e9cda10412d1b503e224bd067f24b.tar.zst freebsd-ports-gnome-bb4a23a5132e9cda10412d1b503e224bd067f24b.zip | |
- Fix install in case share/apache dir is not created prior to installtion
PR: 192943
Submitted by: turutani@scphys.kyoto-u.ac.jp
Approved by: maintainer timeout
| -rw-r--r-- | devel/cvsweb3/Makefile | 24 | ||||
| -rw-r--r-- | devel/cvsweb3/pkg-plist | 12 |
2 files changed, 13 insertions, 23 deletions
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile index f556b1c7a1a9..5e42af6c24e1 100644 --- a/devel/cvsweb3/Makefile +++ b/devel/cvsweb3/Makefile @@ -47,22 +47,19 @@ TITLE?= My CVS Repository # 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 @@ CONFFILES= cvsweb.conf \ 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 --git a/devel/cvsweb3/pkg-plist b/devel/cvsweb3/pkg-plist index 437c7e3f745b..9e7830b7c5e3 100644 --- a/devel/cvsweb3/pkg-plist +++ b/devel/cvsweb3/pkg-plist @@ -3,13 +3,11 @@ etc/cvsweb/cvsweb.conf-freebsd.dist etc/cvsweb/cvsweb.conf-openbsd.dist etc/cvsweb/cvsweb.conf-netbsd.dist etc/cvsweb/cvsweb.conf-ruby.dist -@dirrm etc/cvsweb %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvsweb-httpd.conf %%CGIDIR%%/cvsweb.cgi %%ICONSDIR%%/cvsweb/back.gif @@ -20,14 +18,8 @@ etc/cvsweb/cvsweb.conf-ruby.dist %%ICONSDIR%%/cvsweb/minigraph.png %%ICONSDIR%%/cvsweb/minitext.gif %%ICONSDIR%%/cvsweb/text.gif -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -@dirrm %%ICONSDIR%%/cvsweb %%CSSDIR%%/cvsweb/cvsweb.css -@dirrm %%CSSDIR%%/cvsweb share/enscript/hl/lang_cvsweb.st share/enscript/hl/lang_cvsweb_diff.st -@dirrmtry %%CGIDIR%% -@dirrmtry %%CSSDIR%% -@dirrmtry share/apache/data -@dirrmtry %%ICONSDIR%% -@dirrmtry share/apache +@dir %%DIRPREFIX%%/data +@dir %%DIRPREFIX%% |