From c02cba49bd6c454e73f15ee0cc27803d1f2ad324 Mon Sep 17 00:00:00 2001
From: Alexander Langer <alex@FreeBSD.org>
Date: Wed, 19 Jul 2000 10:02:25 +0000
Subject: [PATCH] - Update RA-part to 29.5. - Add ru- PKGNAMEPREFIX - improve
 PLIST_SUB hack for WITH_SUEXEC

PR:		19976
Submitted by:	maintainer
---
 russian/apache13-modssl/Makefile           | 8 +++++---
 russian/apache13-modssl/distinfo           | 2 +-
 russian/apache13-modssl/files/rc.apache.sh | 2 +-
 russian/apache13-modssl/pkg-plist          | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile
index 7826a97c8e2e..f527ff3861cb 100644
--- a/russian/apache13-modssl/Makefile
+++ b/russian/apache13-modssl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION= 	${VERSION_APACHE}+${RA_VERSION}+${VERSION_MODSSL}
+PKGNAMEPREFIX=	ru-
 CATEGORIES=	russian www security
 MASTER_SITES=	ftp://ftp.lexa.ru/pub/apache-rus/ \
 		ftp://ftp.lexa.ru/pub/apache-rus/old-versions/ \
@@ -34,7 +35,7 @@ USE_OPENSSL=	RSA
 
 VERSION_APACHE=	1.3.12
 VERSION_MODSSL=	2.6.5
-RA_VERSION=	29.4
+RA_VERSION=	29.5
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
@@ -63,10 +64,8 @@ CONFIGURE_ARGS+=--enable-suexec \
 		--suexec-uidmin=50000 \
 		--suexec-gidmin=60000
 MAN8+=		suexec.8
-PLIST_SUB=	SUEXEC=sbin/suexec
 .else
 	@${ECHO} "Define WITH_SUEXEC to build with suexec support."
-PLIST_SUB=	SUEXEC=
 .endif
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
@@ -116,5 +115,8 @@ post-install:
 		${SED} -e "s#!!PREFIX!!#${PREFIX}#g" < ${FILESDIR}/rc.apache.sh > ${PREFIX}/etc/rc.d/apache.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \
 	fi
+.if defined(WITH_SUEXEC)
+	@${ECHO} "sbin/suexec" >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/russian/apache13-modssl/distinfo b/russian/apache13-modssl/distinfo
index 0a5a345a022d..511a7cd9df4e 100644
--- a/russian/apache13-modssl/distinfo
+++ b/russian/apache13-modssl/distinfo
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.12rusPL29.4.tar.gz) = 6faff4c99520c65954e1530a15eacd25
+MD5 (apache_1.3.12rusPL29.5.tar.gz) = 3f005a1a35fa04ee57159855aba1e087
 MD5 (mod_ssl-2.6.5-1.3.12.tar.gz) = 1b7e28c23e0235540df0549b243fac19
diff --git a/russian/apache13-modssl/files/rc.apache.sh b/russian/apache13-modssl/files/rc.apache.sh
index f8f244e5046f..5ea30f522c40 100644
--- a/russian/apache13-modssl/files/rc.apache.sh
+++ b/russian/apache13-modssl/files/rc.apache.sh
@@ -2,7 +2,7 @@
 
 case $1 in
 start)
-	!!PREFIX!!/sbin/apachectl start
+	!!PREFIX!!/sbin/apachectl startssl
 	echo -n ' apache'
     ;;
 
diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist
index 9c3d1c57f3d3..6fd3f6e6c465 100644
--- a/russian/apache13-modssl/pkg-plist
+++ b/russian/apache13-modssl/pkg-plist
@@ -209,7 +209,6 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-%%SUEXEC%%
 share/doc/apache/apache_pb.gif
 share/doc/apache/ra-powered.gif
 @exec mkdir -p %D/www