svn commit: r371099 - head/devel/cvsweb3

[Thomas Zander]

Author: riggs
Date: Sat Oct 18 08:45:54 2014
New Revision: 371099
URL: https://svnweb.freebsd.org/changeset/ports/371099
QAT: https://qat.redports.org/buildarchive/r371099/

Log:
  - Fix install in case share/apache dir is not created prior to installtion
  
  PR:		192943
  Submitted by:	turutani at scphys.kyoto-u.ac.jp
  Approved by:	maintainer timeout

Modified:
  head/devel/cvsweb3/Makefile
  head/devel/cvsweb3/pkg-plist

Modified: head/devel/cvsweb3/Makefile
==============================================================================
--- head/devel/cvsweb3/Makefile	Sat Oct 18 08:20:22 2014	(r371098)
+++ head/devel/cvsweb3/Makefile	Sat Oct 18 08:45:54 2014	(r371099)
@@ -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}"

Modified: head/devel/cvsweb3/pkg-plist
==============================================================================
--- head/devel/cvsweb3/pkg-plist	Sat Oct 18 08:20:22 2014	(r371098)
+++ head/devel/cvsweb3/pkg-plist	Sat Oct 18 08:45:54 2014	(r371099)
@@ -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
- at 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%%
- at dirrm %%ICONSDIR%%/cvsweb
 %%CSSDIR%%/cvsweb/cvsweb.css
- at dirrm %%CSSDIR%%/cvsweb
 share/enscript/hl/lang_cvsweb.st
 share/enscript/hl/lang_cvsweb_diff.st
- at dirrmtry %%CGIDIR%%
- at dirrmtry %%CSSDIR%%
- at dirrmtry share/apache/data
- at dirrmtry %%ICONSDIR%%
- at dirrmtry share/apache
+ at dir %%DIRPREFIX%%/data
+ at dir %%DIRPREFIX%%