cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to yaws-1.90

Browse Source
This commit is contained in:
jasper 2011-05-27 17:04:43 +00:00
parent f60265b4a5
commit 3ea2f218a5
8 changed files with 63 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/yaws/Makefile
View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2011/03/09 19:37:47 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2011/05/27 17:04:43 jasper Exp $
COMMENT-main= high performance webserver written in Erlang, libraries
COMMENT-web= high performance webserver written in Erlang, docroot
VERSION= 1.89
VERSION= 1.90
DISTNAME= yaws-${VERSION}
PKGNAME-main= yaws-${VERSION}
REVISION-main= 6
PKGNAME-web= yaws-web-${VERSION}
REVISION-web= 0
CATEGORIES= www
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -48,11 +46,8 @@ PREFIX-web= /var
ALL_TARGET= all docs
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
# Remove left-over patch file.
pre-install:
@rm -f ${WRKSRC}/www/doc.yaws.orig
@rm ${WRKSRC}/www/doc.yaws.orig
.include <bsd.port.mk>

10
www/yaws/distinfo
View File

@ -1,5 +1,5 @@
MD5 (yaws-1.89.tar.gz) = aBEIyV71zWpk0olStG1U5g==
RMD160 (yaws-1.89.tar.gz) = n8J0qd3ILMg7zurtEzdY7nHClR4=
SHA1 (yaws-1.89.tar.gz) = P2zIjrfxVPAX948a0H7/VSHnMZw=
SHA256 (yaws-1.89.tar.gz) = V3yK3eM5twA3O4O1e37KlSpBYk/PX5Y+Q5dzmd5U8XA=
SIZE (yaws-1.89.tar.gz) = 878410
MD5 (yaws-1.90.tar.gz) = wqrlpOAa1H1ElVVRyaZzMw==
RMD160 (yaws-1.90.tar.gz) = E4+w4vomI+jZemV63H1IpsAXBVI=
SHA1 (yaws-1.90.tar.gz) = lbNK6ZC+kPe7M3zRb5z6sRKzob4=
SHA256 (yaws-1.90.tar.gz) = CFFnodUnWbTQomX/C0TxXbFr+MwDXXpWS/Wxecb9ml8=
SIZE (yaws-1.90.tar.gz) = 868692

18
www/yaws/patches/patch-doc_Makefile
View File

@ -1,25 +1,23 @@
$OpenBSD: patch-doc_Makefile,v 1.1.1.1 2010/12/22 18:38:03 jasper Exp $
$OpenBSD: patch-doc_Makefile,v 1.2 2011/05/27 17:04:43 jasper Exp $
Only build and install the postscript file, as generating the
pdf file make ghostscript unhappy.
--- doc/Makefile.orig Tue Dec 21 16:03:07 2010
+++ doc/Makefile Tue Dec 21 16:03:23 2010
--- doc/Makefile.orig Wed May 25 23:33:26 2011
+++ doc/Makefile Fri May 27 19:01:26 2011
@@ -8,7 +8,7 @@ IMG_PDF = $(IMG_EPS:.eps=.pdf)
all debug:
echo "To build the docs, please use make docs before doing make install"
-docs: check yaws.ps yaws.pdf
+docs: yaws.ps# yaws.pdf
+docs: check yaws.ps #yaws.pdf
check:
@if [ -z "$(DVIPS)" ]; then \
@@ -43,6 +43,6 @@ clean:
rm -f *.ps *.dvi *.log *.aux *.pdf *.toc *.beam 2> /dev/null || true
@@ -44,5 +44,5 @@ clean:
install:
- -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
- -cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws-$(YAWS_VSN)
+ -install -d $(DESTDIR)$(PREFIX)/share/doc/yaws/
+ -cp yaws.ps $(DESTDIR)$(PREFIX)/share/doc/yaws/
-install -d $(DESTDIR)$(PREFIX)/share/doc/yaws
- -cp yaws.pdf $(DESTDIR)$(PREFIX)/share/doc/yaws
+ -cp yaws.ps $(DESTDIR)$(PREFIX)/share/doc/yaws

45
www/yaws/patches/patch-scripts_Makefile
View File

@ -1,45 +0,0 @@
$OpenBSD: patch-scripts_Makefile,v 1.2 2010/12/29 10:26:35 jasper Exp $
- Set the correct path for the logging directory in the config file.
- Don't set the hostname of the machine the package was built on.
- Install the config files to share/examples/yaws/ and we'll
@sample them later to the right location.
--- scripts/Makefile.orig Sat Sep 25 14:41:31 2010
+++ scripts/Makefile Wed Dec 29 11:23:38 2010
@@ -25,7 +25,7 @@ local_install: ../bin/yaws
cat yaws.conf.template | \
./Subst %yawsdir% "`pwd`/.." | \
./Subst %logdir% $$HOME/yaws_logs | \
- ./Subst %host% `hostname` | \
+ ./Subst %host% `FULL_HOSTNAME_HERE` | \
./Subst %port% 8000 | \
./Subst %vardir% "$(VARDIR)" | \
./Subst %docroot% `pwd`/../www | \
@@ -41,9 +41,9 @@ yaws.conf:
@echo PREFIX is $(PREFIX)
cat yaws.conf.template | \
./Subst %yawsdir% "$(PREFIX)/lib/yaws" | \
- ./Subst %logdir% "$(PREFIX)/var/log/yaws" | \
+ ./Subst %logdir% "/var/log/yaws" | \
./Subst %vardir% "$(VARDIR)" | \
- ./Subst %host% `hostname` | \
+ ./Subst %host% `FULL_HOSTNAME_HERE` | \
./Subst %port% 80 | \
./Subst %docroot% "$(VARDIR)/yaws/www" | \
./Subst %certdir% "$(ETCDIR)/yaws" | \
@@ -62,9 +62,9 @@ install: .install
then echo "Keeping old config file "; \
cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws/yaws.conf.template; \
else \
- echo "Installing $(DESTDIR)$(ETCDIR)/yaws/yaws.conf"; \
- mkdir -p $(DESTDIR)$(ETCDIR)/yaws; \
- cp yaws.conf $(DESTDIR)$(ETCDIR)/yaws/yaws.conf; \
+ echo "Installing $(DESTDIR)$(PREFIX)/share/examples/yaws/yaws.conf"; \
+ mkdir -p $(DESTDIR)$(PREFIX)/share/examples/yaws; \
+ cp yaws.conf $(DESTDIR)$(PREFIX)/share/examples/yaws/yaws.conf; \
fi
- @cp ../ssl/yaws-cert.pem $(DESTDIR)$(ETCDIR)/yaws
- @cp ../ssl/yaws-key.pem $(DESTDIR)$(ETCDIR)/yaws
+ @cp ../ssl/yaws-cert.pem $(DESTDIR)$(PREFIX)/share/examples/yaws
+ @cp ../ssl/yaws-key.pem $(DESTDIR)$(PREFIX)/share/examples/yaws

12
www/yaws/patches/patch-scripts_gen-yaws-conf Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scripts_gen-yaws-conf,v 1.1 2011/05/27 17:04:43 jasper Exp $
--- scripts/gen-yaws-conf.orig Fri May 27 18:55:53 2011
+++ scripts/gen-yaws-conf Fri May 27 18:56:03 2011
@@ -9,7 +9,7 @@ cat yaws.conf.template | \
./Subst %yawsdir% "$YAWSDIR" | \
./Subst %logdir% "$LOGDIR" | \
./Subst %vardir% "$VARDIR" | \
- ./Subst %host% `hostname` | \
+ ./Subst %host% `FULL_HOSTNAME_HERE` | \
./Subst %port% $PORT | \
./Subst %docroot% "$DOCROOT" | \
./Subst %certdir% "$CERTDIR" | \

27
www/yaws/patches/patch-scripts_regular-install Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-scripts_regular-install,v 1.1 2011/05/27 17:04:43 jasper Exp $
--- scripts/regular-install.orig Fri May 27 18:53:23 2011
+++ scripts/regular-install Fri May 27 18:55:33 2011
@@ -10,7 +10,7 @@ set -e
./Install "${PREFIX}" "${ERL}" "${WERL}" "${ETCDIR}/" \
"${VARDIR}/" "${ERLBINDIR}/" "${DESTDIR}"
-conffile="${DESTDIR}${ETCDIR}/yaws/yaws.conf"
+conffile="${DESTDIR}${PREFIX}/share/examples/yaws/yaws.conf"
if [ -f "$conffile" ]; then
echo "Keeping old config file $conffile"
cp yaws.conf "${conffile}.template"
@@ -19,11 +19,10 @@ else
if [ -n "$DESTDIR" ]; then
[ -d "$DESTDIR" ] || mkdir "$DESTDIR"
fi
- [ -d "${DESTDIR}${ETCDIR}" ] || mkdir "${DESTDIR}${ETCDIR}"
- [ -d "${DESTDIR}${ETCDIR}/yaws" ] || mkdir "${DESTDIR}${ETCDIR}/yaws"
+ [ -d "${DESTDIR}${ETCDIR}/yaws" ] || mkdir "${DESTDIR}${PREFIX}/share/examples/yaws"
cp yaws.conf "$conffile"
fi
-cp ../ssl/yaws-cert.pem "${DESTDIR}${ETCDIR}/yaws"
-cp ../ssl/yaws-key.pem "${DESTDIR}${ETCDIR}/yaws"
+cp ../ssl/yaws-cert.pem "${DESTDIR}${PREFIX}/share/examples/yaws"
+cp ../ssl/yaws-key.pem "${DESTDIR}${PREFIX}/share/examples/yaws"
exit 0

9
www/yaws/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2010/12/29 11:50:34 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2011/05/27 17:04:43 jasper Exp $
%%SHARED%%
bin/yaws
lib/pkgconfig/
@ -9,10 +9,11 @@ lib/yaws/ebin/.empty
lib/yaws/ebin/authmod_gssapi.beam
lib/yaws/ebin/haxe.beam
lib/yaws/ebin/json.beam
lib/yaws/ebin/json2.beam
lib/yaws/ebin/jsonrpc.beam
lib/yaws/ebin/mime_type_c.beam
lib/yaws/ebin/mime_types.beam
lib/yaws/ebin/yaws.app
lib/yaws/ebin/yaws.appup
lib/yaws/ebin/yaws.beam
lib/yaws/ebin/yaws_api.beam
lib/yaws/ebin/yaws_app.beam
@ -29,6 +30,7 @@ lib/yaws/ebin/yaws_html.beam
lib/yaws/ebin/yaws_jsonrpc.beam
lib/yaws/ebin/yaws_log.beam
lib/yaws/ebin/yaws_log_file_h.beam
lib/yaws/ebin/yaws_logger.beam
lib/yaws/ebin/yaws_ls.beam
lib/yaws/ebin/yaws_multipart.beam
lib/yaws/ebin/yaws_outmod.beam
@ -37,15 +39,16 @@ lib/yaws/ebin/yaws_revproxy.beam
lib/yaws/ebin/yaws_rpc.beam
lib/yaws/ebin/yaws_rss.beam
lib/yaws/ebin/yaws_sendfile.beam
lib/yaws/ebin/yaws_sendfile_compat.beam
lib/yaws/ebin/yaws_server.beam
lib/yaws/ebin/yaws_session_server.beam
lib/yaws/ebin/yaws_shaper.beam
lib/yaws/ebin/yaws_soap_lib.beam
lib/yaws/ebin/yaws_soap_srv.beam
lib/yaws/ebin/yaws_stats.beam
lib/yaws/ebin/yaws_sup.beam
lib/yaws/ebin/yaws_sup_restarts.beam
lib/yaws/ebin/yaws_ticker.beam
lib/yaws/ebin/yaws_vdir.beam
lib/yaws/ebin/yaws_websockets.beam
lib/yaws/ebin/yaws_xmlrpc.beam
lib/yaws/ebin/yaws_zlib.beam

4
www/yaws/pkg/PLIST-web
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.1.1.1 2010/12/22 18:38:03 jasper Exp $
@comment $OpenBSD: PLIST-web,v 1.2 2011/05/27 17:04:43 jasper Exp $
yaws/
yaws/ebin/
yaws/ebin/myappmod.beam
@ -26,7 +26,7 @@ yaws/www/compile_layout.dia
yaws/www/compile_layout.png
yaws/www/configuration.yaws
yaws/www/contact.yaws
yaws/www/contribs.yaws
yaws/www/contributors.txt
yaws/www/cookies.yaws
yaws/www/doc.yaws
yaws/www/dynamic.yaws