Date: Fri, 20 Apr 2007 15:43:11 +1100 (VLAST) From: Dima Panov <fluffy@ns.ael.RU> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/111928: sysutils/nut: fix plist Message-ID: <200704200443.l3K4hBb5012972@ns.ael.RU> Resent-Message-ID: <200704200450.l3K4o3md072655@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111928
>Category: ports
>Synopsis: sysutils/nut: fix plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 20 04:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ns.ael.RU 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Apr 14 11:12:17 VLAST 2007 root@ns.ael.RU:/usr/obj/usr/src/sys/AEL i386
>Description:
sysutils/nut install some html files in wrong directory, if
build with cgi support
>How-To-Repeat:
cd ${PORTSDIR}/sysutils/nut && make -DWITH_NUT_CGI install
ls /usr/local/html/*
>Fix:
Index: sysutils/nut/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/nut/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- sysutils/nut/Makefile 28 Feb 2007 01:19:04 -0000 1.35
+++ sysutils/nut/Makefile 20 Apr 2007 04:38:43 -0000
@@ -66,16 +66,23 @@
MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
.if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
CGIDIR?= share/apache/cgi-bin
+WWWDIR?= share/apache/htdocs
.else
CGIDIR?= www/cgi-bin
+WWWDIR?= www/data
.endif
CONFIGURE_ARGS+= --with-cgi --with-cgipath=${PREFIX}/${CGIDIR}/nut \
+ --with-htmlpath=${PREFIX}/${WWWDIR}/nut \
--with-gd-includes=-I${PREFIX}/include \
--with-gd-libs="-L${PREFIX}/lib -lgd"
+PLIST_SUB+= WWWFILES="${WWWDIR}/nut/"
+PLIST_SUB+= WWWDIRRM="@dirrm ${WWWDIR}/nut"
PLIST_SUB+= CGIFILES="${CGIDIR}/nut/"
PLIST_SUB+= CGIDIRRM="@dirrm ${CGIDIR}/nut"
PLIST_SUB+= CGIETC="etc/nut/"
.else
+PLIST_SUB+= WWWFILES="@comment "
+PLIST_SUB+= WWWDIRRM="@comment "
PLIST_SUB+= CGIFILES="@comment "
PLIST_SUB+= CGIDIRRM="@comment "
PLIST_SUB+= CGIETC="@comment "
Index: sysutils/nut/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/nut/pkg-plist,v
retrieving revision 1.23
diff -u -r1.23 pkg-plist
--- sysutils/nut/pkg-plist 24 Jan 2007 23:02:07 -0000 1.23
+++ sysutils/nut/pkg-plist 20 Apr 2007 04:27:12 -0000
@@ -65,6 +65,10 @@
%%CGIETC%%upsset.conf.sample
%%CGIETC%%upsstats.html.sample
%%CGIETC%%upsstats-single.html.sample
+%%WWWFILES%%bottom.html
+%%WWWFILES%%header.html
+%%WWWFILES%%index.html
+%%WWWFILES%%nut-banner.png
%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -113,3 +117,4 @@
@dirrmtry libexec/nut
@dirrmtry %%STATEDIR%%
%%CGIDIRRM%%
+%%WWWDIRRM%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704200443.l3K4hBb5012972>