diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2001-12-09 00:39:30 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2001-12-09 00:39:30 +0000 |
| commit | 676fff5a3f9d2ce80d5e39518f2efb4bc8ebd13e (patch) | |
| tree | ea2222dd367efe534c803a392a66c43a5a92d581 /www/apache13+ipv6 | |
| parent | 7357ca7c85e444c47aaf86a93b4a85178e1109b9 (diff) | |
| download | ports-676fff5a3f9d2ce80d5e39518f2efb4bc8ebd13e.tar.gz ports-676fff5a3f9d2ce80d5e39518f2efb4bc8ebd13e.zip | |
Sync with www/apache13.
Notes
Notes:
svn path=/head/; revision=51260
Diffstat (limited to 'www/apache13+ipv6')
| -rw-r--r-- | www/apache13+ipv6/Makefile | 4 | ||||
| -rw-r--r-- | www/apache13+ipv6/files/patch-ab | 7 | ||||
| -rw-r--r-- | www/apache13+ipv6/pkg-deinstall | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 683914f0aa38..ae8fc8d4e080 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -8,7 +8,7 @@ PORTNAME= apache+ipv6 PORTVERSION= 1.3.22 CATEGORIES= www ipv6 -PORTREVISION= 4 +PORTREVISION= 5 MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \ @@ -66,7 +66,7 @@ MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 pre-install: - PKG_PREFIX=${PREFIX} ./pkg-install ${PKGNAME} PRE-INSTALL + PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab index a0b5f7174245..a6d93e733362 100644 --- a/www/apache13+ipv6/files/patch-ab +++ b/www/apache13+ipv6/files/patch-ab @@ -1,5 +1,5 @@ --- Makefile.tmpl.orig Sun Oct 7 02:01:09 2001 -+++ Makefile.tmpl Sun Oct 21 23:17:01 2001 ++++ Makefile.tmpl Sun Dec 2 11:19:23 2001 @@ -270,10 +270,12 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 @@ -15,7 +15,7 @@ $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -457,33 +459,40 @@ +@@ -457,33 +459,39 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -44,7 +44,6 @@ find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ +# fi -+# $(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual + if [ ! -d $(root)$(htdocsdir)/ ]; then \ + $(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \ fi @@ -71,7 +70,7 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -522,14 +531,14 @@ +@@ -522,14 +530,14 @@ -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ diff --git a/www/apache13+ipv6/pkg-deinstall b/www/apache13+ipv6/pkg-deinstall index e2f5775f5836..deb5f9b01b60 100644 --- a/www/apache13+ipv6/pkg-deinstall +++ b/www/apache13+ipv6/pkg-deinstall @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-deinstall,v 1.1 2001-10-23 04:41:45 sumikawa Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-deinstall,v 1.2 2001-12-09 00:39:30 sumikawa Exp $ # if [ "$2" != "POST-DEINSTALL" ]; then @@ -9,12 +9,7 @@ fi USER=www if pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw userdel ${USER}; then - echo "Delete user/group \"${USER}\"." - else - echo "Deleting user/group \"${USER}\" failed..." - exit 1 - fi + echo "To delete Apache user permanently, use 'pw userdel ${USER}'" fi exit 0 |