Second part to fix missing x-bit on pkg*install

PR:		31599

12 files changed, 224 insertions, 4 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index ebb0a3af1369..10d7d25175d5 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
 		http://www.cybernic.com/mirror/dist/httpd/ \
diff --git a/www/apache2/pkg-deinstall b/www/apache2/pkg-deinstall
new file mode 100644
index 000000000000..61ed1a6c6a38
--- /dev/null
+++ b/www/apache2/pkg-deinstall
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+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
+fi
+
+exit 0
diff --git a/www/apache2/pkg-install b/www/apache2/pkg-install
new file mode 100644
index 000000000000..e6f436365b6b
--- /dev/null
+++ b/www/apache2/pkg-install
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache2/Attic/pkg-install,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+USER=www
+GROUP=${USER}
+UID=80
+GID=${UID}
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "World Wide Web Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+
+exit 0
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index ebb0a3af1369..10d7d25175d5 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
 		http://www.cybernic.com/mirror/dist/httpd/ \
diff --git a/www/apache20/pkg-deinstall b/www/apache20/pkg-deinstall
new file mode 100644
index 000000000000..799fbf3fa6d2
--- /dev/null
+++ b/www/apache20/pkg-deinstall
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache20/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+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
+fi
+
+exit 0
diff --git a/www/apache20/pkg-install b/www/apache20/pkg-install
new file mode 100644
index 000000000000..3bb99133ae49
--- /dev/null
+++ b/www/apache20/pkg-install
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+USER=www
+GROUP=${USER}
+UID=80
+GID=${UID}
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "World Wide Web Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+
+exit 0
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index ebb0a3af1369..10d7d25175d5 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
 		http://www.cybernic.com/mirror/dist/httpd/ \
diff --git a/www/apache21/pkg-deinstall b/www/apache21/pkg-deinstall
new file mode 100644
index 000000000000..c45782a9c38c
--- /dev/null
+++ b/www/apache21/pkg-deinstall
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+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
+fi
+
+exit 0
diff --git a/www/apache21/pkg-install b/www/apache21/pkg-install
new file mode 100644
index 000000000000..8073016ebac9
--- /dev/null
+++ b/www/apache21/pkg-install
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache21/Attic/pkg-install,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+USER=www
+GROUP=${USER}
+UID=80
+GID=${UID}
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "World Wide Web Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+
+exit 0
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index ebb0a3af1369..10d7d25175d5 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
 		http://www.cybernic.com/mirror/dist/httpd/ \
diff --git a/www/apache22/pkg-deinstall b/www/apache22/pkg-deinstall
new file mode 100644
index 000000000000..b50a243a2f57
--- /dev/null
+++ b/www/apache22/pkg-deinstall
@@ -0,0 +1,20 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/www/apache22/Attic/pkg-deinstall,v 1.3 2001-10-29 20:05:37 ache Exp $
+#
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+	exit 0
+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
+fi
+
+exit 0
diff --git a/www/apache22/pkg-install b/www/apache22/pkg-install
new file mode 100644
index 000000000000..3bb99133ae49
--- /dev/null
+++ b/www/apache22/pkg-install
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+if [ "$2" != "PRE-INSTALL" ]; then
+	exit 0
+fi
+
+USER=www
+GROUP=${USER}
+UID=80
+GID=${UID}
+
+if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" \
+		-c "World Wide Web Owner"; \
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		exit 1
+	fi
+fi
+
+exit 0