RUN_DEPENDS on www/apache-httpd,-common to get the icons.
This commit is contained in:
ajacoutot
parent
31c647ab8a
commit
4a5d201453
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2015/02/06 15:54:33 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2015/07/17 23:58:25 ajacoutot Exp $
|
||||
|
||||
COMMENT= OpenBSD improved and secured version of Apache 1.3
|
||||
|
||||
DISTNAME= apache-httpd-openbsd-1.3.20140502
|
||||
REVISION= 3
|
||||
REVISION= 4
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= https://github.com/fobser/apache-httpd-openbsd
|
||||
@ -20,6 +20,8 @@ NO_TEST= Yes
|
||||
MAKE_FILE= Makefile.bsd-wrapper
|
||||
MAKE_FLAGS= MANDIR=${PREFIX}/man/man
|
||||
|
||||
RUN_DEPENDS= www/apache-httpd,-common
|
||||
|
||||
do-configure:
|
||||
@${SUBST_CMD} ${WRKSRC}/config.layout ${WRKSRC}/Makefile.bsd-wrapper
|
||||
|
||||
@ -27,5 +29,7 @@ post-install:
|
||||
.for i in httpd.conf mime.types magic
|
||||
mv ${WRKINST}/var/www/conf/$i{,.default}
|
||||
.endfor
|
||||
# remove conflicts with www/apache-httpd
|
||||
rm -rf ${WRKINST}/var/www/{cgi-bin,icons}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2014/07/27 10:51:37 kili Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2015/07/17 23:58:25 ajacoutot Exp $
|
||||
%%SHARED%%
|
||||
bin/dbmmanage
|
||||
@bin bin/htdigest
|
||||
@ -250,11 +250,6 @@ share/doc/apache-httpd-openbsd/vhosts/vhosts-in-depth.html
|
||||
share/doc/apache-httpd-openbsd/vhosts/virtual-host.html
|
||||
@rcscript ${RCDIR}/apache
|
||||
@cwd /var/www
|
||||
cgi-bin/
|
||||
@mode 000
|
||||
cgi-bin/printenv
|
||||
cgi-bin/test-cgi
|
||||
@mode
|
||||
conf/
|
||||
conf/httpd.conf.default
|
||||
@sample conf/httpd.conf
|
||||
@ -264,223 +259,3 @@ conf/mime.types.default
|
||||
@sample conf/mime.types
|
||||
conf/modules/
|
||||
conf/modules.sample/
|
||||
icons/
|
||||
icons/README
|
||||
icons/a.gif
|
||||
icons/a.png
|
||||
icons/alert.black.gif
|
||||
icons/alert.black.png
|
||||
icons/alert.red.gif
|
||||
icons/alert.red.png
|
||||
icons/apache_pb.gif
|
||||
icons/apache_pb.png
|
||||
icons/back.gif
|
||||
icons/back.png
|
||||
icons/ball.gray.gif
|
||||
icons/ball.gray.png
|
||||
icons/ball.red.gif
|
||||
icons/ball.red.png
|
||||
icons/binary.gif
|
||||
icons/binary.png
|
||||
icons/binhex.gif
|
||||
icons/binhex.png
|
||||
icons/blank.gif
|
||||
icons/blank.png
|
||||
icons/bomb.gif
|
||||
icons/bomb.png
|
||||
icons/box1.gif
|
||||
icons/box1.png
|
||||
icons/box2.gif
|
||||
icons/box2.png
|
||||
icons/broken.gif
|
||||
icons/broken.png
|
||||
icons/burst.gif
|
||||
icons/burst.png
|
||||
icons/c.gif
|
||||
icons/c.png
|
||||
icons/comp.blue.gif
|
||||
icons/comp.blue.png
|
||||
icons/comp.gray.gif
|
||||
icons/comp.gray.png
|
||||
icons/compressed.gif
|
||||
icons/compressed.png
|
||||
icons/continued.gif
|
||||
icons/continued.png
|
||||
icons/dir.gif
|
||||
icons/dir.png
|
||||
icons/diskimg.gif
|
||||
icons/diskimg.png
|
||||
icons/down.gif
|
||||
icons/down.png
|
||||
icons/dvi.gif
|
||||
icons/dvi.png
|
||||
icons/f.gif
|
||||
icons/f.png
|
||||
icons/folder.gif
|
||||
icons/folder.open.gif
|
||||
icons/folder.open.png
|
||||
icons/folder.png
|
||||
icons/folder.sec.gif
|
||||
icons/folder.sec.png
|
||||
icons/forward.gif
|
||||
icons/forward.png
|
||||
icons/generic.gif
|
||||
icons/generic.png
|
||||
icons/generic.red.gif
|
||||
icons/generic.red.png
|
||||
icons/generic.sec.gif
|
||||
icons/generic.sec.png
|
||||
icons/hand.right.gif
|
||||
icons/hand.right.png
|
||||
icons/hand.up.gif
|
||||
icons/hand.up.png
|
||||
icons/icon.sheet.gif
|
||||
icons/icon.sheet.png
|
||||
icons/image1.gif
|
||||
icons/image1.png
|
||||
icons/image2.gif
|
||||
icons/image2.png
|
||||
icons/image3.gif
|
||||
icons/image3.png
|
||||
icons/index.gif
|
||||
icons/index.png
|
||||
icons/layout.gif
|
||||
icons/layout.png
|
||||
icons/left.gif
|
||||
icons/left.png
|
||||
icons/link.gif
|
||||
icons/link.png
|
||||
icons/movie.gif
|
||||
icons/movie.png
|
||||
icons/p.gif
|
||||
icons/p.png
|
||||
icons/patch.gif
|
||||
icons/patch.png
|
||||
icons/pdf.gif
|
||||
icons/pdf.png
|
||||
icons/pie0.gif
|
||||
icons/pie0.png
|
||||
icons/pie1.gif
|
||||
icons/pie1.png
|
||||
icons/pie2.gif
|
||||
icons/pie2.png
|
||||
icons/pie3.gif
|
||||
icons/pie3.png
|
||||
icons/pie4.gif
|
||||
icons/pie4.png
|
||||
icons/pie5.gif
|
||||
icons/pie5.png
|
||||
icons/pie6.gif
|
||||
icons/pie6.png
|
||||
icons/pie7.gif
|
||||
icons/pie7.png
|
||||
icons/pie8.gif
|
||||
icons/pie8.png
|
||||
icons/portal.gif
|
||||
icons/portal.png
|
||||
icons/ps.gif
|
||||
icons/ps.png
|
||||
icons/quill.gif
|
||||
icons/quill.png
|
||||
icons/right.gif
|
||||
icons/right.png
|
||||
icons/screw1.gif
|
||||
icons/screw1.png
|
||||
icons/screw2.gif
|
||||
icons/screw2.png
|
||||
icons/script.gif
|
||||
icons/script.png
|
||||
icons/small/
|
||||
icons/small/README.txt
|
||||
icons/small/back.gif
|
||||
icons/small/back.png
|
||||
icons/small/binary.gif
|
||||
icons/small/binary.png
|
||||
icons/small/binhex.gif
|
||||
icons/small/binhex.png
|
||||
icons/small/blank.gif
|
||||
icons/small/blank.png
|
||||
icons/small/broken.gif
|
||||
icons/small/broken.png
|
||||
icons/small/burst.gif
|
||||
icons/small/burst.png
|
||||
icons/small/comp1.gif
|
||||
icons/small/comp1.png
|
||||
icons/small/comp2.gif
|
||||
icons/small/comp2.png
|
||||
icons/small/compressed.gif
|
||||
icons/small/compressed.png
|
||||
icons/small/continued.gif
|
||||
icons/small/continued.png
|
||||
icons/small/dir.gif
|
||||
icons/small/dir.png
|
||||
icons/small/dir2.gif
|
||||
icons/small/dir2.png
|
||||
icons/small/doc.gif
|
||||
icons/small/doc.png
|
||||
icons/small/forward.gif
|
||||
icons/small/forward.png
|
||||
icons/small/generic.gif
|
||||
icons/small/generic.png
|
||||
icons/small/generic2.gif
|
||||
icons/small/generic2.png
|
||||
icons/small/generic3.gif
|
||||
icons/small/generic3.png
|
||||
icons/small/image.gif
|
||||
icons/small/image.png
|
||||
icons/small/image2.gif
|
||||
icons/small/image2.png
|
||||
icons/small/index.gif
|
||||
icons/small/index.png
|
||||
icons/small/key.gif
|
||||
icons/small/key.png
|
||||
icons/small/movie.gif
|
||||
icons/small/movie.png
|
||||
icons/small/patch.gif
|
||||
icons/small/patch.png
|
||||
icons/small/ps.gif
|
||||
icons/small/ps.png
|
||||
icons/small/rainbow.gif
|
||||
icons/small/rainbow.png
|
||||
icons/small/sound.gif
|
||||
icons/small/sound.png
|
||||
icons/small/sound2.gif
|
||||
icons/small/sound2.png
|
||||
icons/small/tar.gif
|
||||
icons/small/tar.png
|
||||
icons/small/text.gif
|
||||
icons/small/text.png
|
||||
icons/small/transfer.gif
|
||||
icons/small/transfer.png
|
||||
icons/small/unknown.gif
|
||||
icons/small/unknown.png
|
||||
icons/small/uu.gif
|
||||
icons/small/uu.png
|
||||
icons/sound1.gif
|
||||
icons/sound1.png
|
||||
icons/sound2.gif
|
||||
icons/sound2.png
|
||||
icons/sphere1.gif
|
||||
icons/sphere1.png
|
||||
icons/sphere2.gif
|
||||
icons/sphere2.png
|
||||
icons/tar.gif
|
||||
icons/tar.png
|
||||
icons/tex.gif
|
||||
icons/tex.png
|
||||
icons/text.gif
|
||||
icons/text.png
|
||||
icons/transfer.gif
|
||||
icons/transfer.png
|
||||
icons/unknown.gif
|
||||
icons/unknown.png
|
||||
icons/up.gif
|
||||
icons/up.png
|
||||
icons/uu.gif
|
||||
icons/uu.png
|
||||
icons/uuencoded.gif
|
||||
icons/uuencoded.png
|
||||
icons/world1.gif
|
||||
icons/world1.png
|
||||
icons/world2.gif
|
||||
icons/world2.png
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: apache.rc,v 1.1 2014/07/27 10:51:37 kili Exp $
|
||||
# $OpenBSD: apache.rc,v 1.2 2015/07/17 23:58:25 ajacoutot Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/sbin/httpd"
|
||||
|
||||
@ -8,8 +8,4 @@ daemon="${TRUEPREFIX}/sbin/httpd"
|
||||
|
||||
pexp="httpd: parent.*"
|
||||
|
||||
rc_pre() {
|
||||
rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
|
||||
}
|
||||
|
||||
rc_cmd $1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user