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

- fix another instance of putting the hostname of build machine in a config file

Browse Source 
- let -main depend -web, instead of the other way around, this allows for no futher tweaks to run yaws

prompted/ok aja@
This commit is contained in:
jasper 2010-12-29 10:26:35 +00:00
parent 9145731ac1
commit 52b0f8c41d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/yaws/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2010/12/29 10:15:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2010/12/29 10:26:35 jasper Exp $
COMMENT-main= high performance webserver written in Erlang, libraries
COMMENT-web= high performance webserver written in Erlang, docroot
@ -6,7 +6,7 @@ COMMENT-web= high performance webserver written in Erlang, docroot
VERSION= 1.89
DISTNAME= yaws-${VERSION}
PKGNAME-main= yaws-${VERSION}
REVISION-main= 1
REVISION-main= 2
PKGNAME-web= yaws-web-${VERSION}
CATEGORIES= www
@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --disable-pam \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
RUN_DEPENDS-web= ${BASE_PKGPATH},-main
RUN_DEPENDS-main= ${BASE_PKGPATH},-web
USE_GMAKE= Yes

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

@ -1,4 +1,4 @@
$OpenBSD: patch-scripts_Makefile,v 1.1.1.1 2010/12/22 18:38:03 jasper Exp $
$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.
@ -6,7 +6,7 @@ $OpenBSD: patch-scripts_Makefile,v 1.1.1.1 2010/12/22 18:38:03 jasper Exp $
@sample them later to the right location.
--- scripts/Makefile.orig Sat Sep 25 14:41:31 2010
+++ scripts/Makefile Tue Dec 21 19:42:53 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`/.." | \
@ -16,15 +16,18 @@ $OpenBSD: patch-scripts_Makefile,v 1.1.1.1 2010/12/22 18:38:03 jasper Exp $
./Subst %port% 8000 | \
./Subst %vardir% "$(VARDIR)" | \
./Subst %docroot% `pwd`/../www | \
@@ -41,7 +41,7 @@ yaws.conf:
@@ -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% `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; \