openbsd-ports/www/apache-httpd/patches/patch-Makefile_in
deanna 6a36f66820 Bringing this in now so that we can work on it here. Batting tarballs
back and forth in email messages doesn't make any sense when we have a
cvs tree to work in.

So, not hooked into the package builds yet.

Original work and port name from dlg.

ok robert@, dlg@
2006-12-14 07:14:20 +00:00

37 lines
1.4 KiB
Plaintext

$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/12/14 07:14:21 deanna Exp $
--- Makefile.in.orig Sun Nov 13 16:33:15 2005
+++ Makefile.in Sun Oct 29 19:50:52 2006
@@ -45,14 +45,18 @@ install-conf:
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
- sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ sed -e 's#@@ServerRoot@@#$(rel_datadir)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@User@@#$(rel_user)#g' \
+ -e 's#@@Group@@#$(rel_group)#g' \
-e '/@@LoadModule@@/d' \
< $$i; \
else \
sed -n -e '/@@LoadModule@@/q' \
- -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@ServerRoot@@#$(rel_datadir)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@User@@#$(rel_user)#g' \
+ -e 's#@@Group@@#$(rel_group)#g' \
-e 'p' \
< $$i; \
for j in $(DSO_MODULES) "^EOL^"; do \
@@ -62,8 +66,10 @@ install-conf:
done; \
sed -e '1,/@@LoadModule@@/d' \
-e '/@@LoadModule@@/d' \
- -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@ServerRoot@@#$(rel_datadir)#g' \
-e 's#@@Port@@#$(PORT)#g' \
+ -e 's#@@User@@#$(rel_user)#g' \
+ -e 's#@@Group@@#$(rel_group)#g' \
< $$i; \
fi \
) > $(DESTDIR)$(sysconfdir)/original/$$i; \