Upgrade to 1.5.22

PR:		34929
Submitted by:	maintainer

7 files changed, 26 insertions, 98 deletions

diff --git a/www/oops/Makefile b/www/oops/Makefile
index 16a33f53410..3d673b4153a 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -6,23 +6,29 @@
 #
 
 PORTNAME=	oops
-PORTVERSION=	1.5.18
+PORTVERSION=	1.5.22
 CATEGORIES=	www
 MASTER_SITES=	http://zipper.paco.net/~igor/oops/
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-LIB_DEPENDS=	gigabase_r.2:${PORTSDIR}/databases/gigabase
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
+CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${PREFIX}/etc/oops \
-		--localstatedir=/var/run \
+		--localstatedir=${OOPSVAR} \
 		--libdir=${PREFIX}/libexec/oops \
 		--enable-oops-user=oops \
-		--without-DB
+		--enable-large-files
 
 MAN8=		oops.8 oopsctl.8
+OOPSVAR=	/var/run/oops
+
+pre-fetch:
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.oops
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@@ -30,17 +36,23 @@ pre-install:
 .include <bsd.port.pre.mk>
 
 post-install:
+.if !defined(NOPORTDOCS)
 	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
+.endif
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@ ${ECHO} "------------------------------------------------------------"
 	@ ${ECHO} "Sample of configuration file placed at ${PREFIX}/etc/oops !"
 	@ ${ECHO} "Copy oops.cfg.sample to oops.cfg, then run server..."
 	@ ${ECHO} "------------------------------------------------------------"
+	@${MKDIR} ${OOPSVAR}
+	@${CHMOD} 750 ${OOPSVAR}
+	@${CHOWN} oops ${OOPSVAR}
+
+	${ECHO} "Installing ${PREFIX}/etc/rc.d/oops.sh.sample startup file."
+	${INSTALL_SCRIPT} -m 751 ${FILESDIR}/oops.sh ${PREFIX}/etc/rc.d/oops.sh.sample
 
-	@if [ ! -f ${PREFIX}/etc/rc.d/oops.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/oops.sh startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/oops.sh ${PREFIX}/etc/rc.d/oops.sh; \
-	fi
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .include <bsd.port.post.mk>
diff --git a/www/oops/distinfo b/www/oops/distinfo
index 0893c71b9a3..96b483fc72a 100644
--- a/www/oops/distinfo
+++ b/www/oops/distinfo
@@ -1 +1 @@
-MD5 (oops-1.5.18.tar.gz) = 80ab824699588a59087b7745d72b5fc4
+MD5 (oops-1.5.22.tar.gz) = bd6f743fb4abc6cf08ae310b1927b211
diff --git a/www/oops/files/oops.sh b/www/oops/files/oops.sh
index 1e25698806f..4a2d70ac590 100644
--- a/www/oops/files/oops.sh
+++ b/www/oops/files/oops.sh
@@ -8,12 +8,12 @@ fi
 case "$1" in
 start)
 	if [ -x ${PREFIX}/sbin/oopsctl ]; then
-		${PREFIX}/sbin/oopsctl start 2>&1 > /dev/null; echo -n ' oops'
+		${PREFIX}/sbin/oopsctl $1 2>&1 > /dev/null; echo -n ' oops'
 	fi
 	;;
 stop)
 	if [ -x ${PREFIX}/sbin/oopsctl ]; then
-		${PREFIX}/sbin/oopsctl -s /tmp/oopsctl stop
+		${PREFIX}/sbin/oopsctl $1
 	fi
 	;;
 *)
diff --git a/www/oops/files/patch-aa b/www/oops/files/patch-aa
index a8b75be97a1..e69de29bb2d 100644
--- a/www/oops/files/patch-aa
+++ b/www/oops/files/patch-aa
@@ -1,63 +0,0 @@
---- src/Makefile.in.orig	Mon Mar 19 00:32:47 2001
-+++ src/Makefile.in	Mon Mar 19 00:36:54 2001
-@@ -53,51 +53,15 @@
- 
- install: all mkinstalldirs
- 	$(INSTALL) oops ${OOPS_SBINDIR}
--	if [ -f ${OOPS_SYSCONFDIR}/oops.cfg ]; then\
--		$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample ;\
--	   else\
--		$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/err_template.html ]; then\
--		$(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample ;\
--	   else\
--		$(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/auth_template.html ]; then\
--		$(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample ;\
--	   else\
--		$(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/passwd ]; then\
--		$(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample ;\
--	   else\
--		$(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/redir_rules ]; then\
--		$(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample ;\
--	   else\
--		$(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/redir_template.html ]; then\
--		$(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample ;\
--	   else\
--		$(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/accel_maps ]; then\
--		$(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample ;\
--	   else\
--		$(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/select.sql ]; then\
--		$(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample ;\
--	   else\
--		$(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql ;\
--	fi
--	if [ -f ${OOPS_SYSCONFDIR}/acl_local_networks ]; then\
--		$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample ;\
--	   else\
--		$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks ;\
--	fi
-+	$(INSTALL_DATA) oops.cfg ${OOPS_SYSCONFDIR}/oops.cfg.sample
-+	$(INSTALL_DATA) err_template.html ${OOPS_SYSCONFDIR}/err_template.html.sample
-+	$(INSTALL_DATA) auth_template.html ${OOPS_SYSCONFDIR}/auth_template.html.sample
-+	$(INSTALL_DATA) passwd ${OOPS_SYSCONFDIR}/passwd.sample
-+	$(INSTALL_DATA) redir_rules ${OOPS_SYSCONFDIR}/redir_rules.sample
-+	$(INSTALL_DATA) redir_template.html ${OOPS_SYSCONFDIR}/redir_template.html.sample
-+	$(INSTALL_DATA) accel_maps ${OOPS_SYSCONFDIR}/accel_maps.sample
-+	$(INSTALL_DATA) select.sql ${OOPS_SYSCONFDIR}/select.sql.sample
-+	$(INSTALL_DATA) acl_local_networks ${OOPS_SYSCONFDIR}/acl_local_networks.sample
- 	if test "X@SOFLAGS@" != "X"; then \
- 	for m in modules/*so ; do \
- 		$(INSTALL) $$m ${OOPS_LIBDIR} ; \
diff --git a/www/oops/files/patch-ab b/www/oops/files/patch-ab
index 382e2c593ea..e69de29bb2d 100644
--- a/www/oops/files/patch-ab
+++ b/www/oops/files/patch-ab
@@ -1,11 +0,0 @@
---- src/oops.cfg.in.orig	Wed Dec 13 20:10:58 2000
-+++ src/oops.cfg.in	Wed Dec 13 20:11:24 2000
-@@ -519,7 +519,7 @@
- 
- module oopsctl {
- 	# path to oopsctl unix socket
--	socket_path	@OOPS_LOCALSTATEDIR@/oopsctl
-+	socket_path	/tmp/oopsctl
- 	# time to auto-refresh page (seconds)
-         html_refresh    300
- }
diff --git a/www/oops/files/patch-ac b/www/oops/files/patch-ac
index 9536db81096..e69de29bb2d 100644
--- a/www/oops/files/patch-ac
+++ b/www/oops/files/patch-ac
@@ -1,10 +0,0 @@
---- src/environment.h.orig	Wed Dec 13 17:33:19 2000
-+++ src/environment.h	Wed Dec 13 17:33:40 2000
-@@ -55,7 +55,7 @@
- #include	<thread.h>
- #endif
- #include	<pthread.h>
--#if	!defined(HAVE_PTHREAD_RWLOCK_INIT)
-+#if	!defined(HAVE_PTHREAD_RWLOCK_INIT) && !defined(FREEBSD)
- #include	"rwlock.h"
- #endif
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index 84da25589f5..8d61dc387dc 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -12,7 +12,7 @@ etc/oops/select.sql.sample
 etc/oops/tables/koi-alt.tab
 etc/oops/tables/koi-iso.tab
 etc/oops/tables/koi-win.tab
-etc/rc.d/oops.sh
+etc/rc.d/oops.sh.sample
 libexec/oops/accel.so
 libexec/oops/berkeley_db_api.so
 libexec/oops/custom_log.so