- fix plist for -DNOPORTDOCS

- install rc script via USE_RC_SUBR
- pet portlint a little
- bump PORTREVISION

Submitted by:	marck@ (maintainer)
Prompted by:	QA Tindy run

3 files changed, 12 insertions, 14 deletions

diff --git a/www/oops/Makefile b/www/oops/Makefile
index 972c43b214c4..b5bbe774fd60 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	oops
 PORTVERSION=	${OOPSVERSION}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://oops-cache.org/ \
 		ftp://kucha.ru/pub/misc/oops/
@@ -33,11 +33,13 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-MAN8=		oops.8 oopsctl.8
 OOPSVAR=	/var/run/oops
 OOPSLOG=	/var/log/oops
+.if !defined(NO_INSTALL_MANPAGES)
+MAN8=		oops.8 oopsctl.8
+.endif
 
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	oops
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
@@ -51,8 +53,9 @@ OPTIONS=	GIGABASE	"GigaBase storage" on \
 
 .if !defined(WITHOUT_GIGABASE)
 .if defined (WITH_DB4)
-BROKEN=	"Only one DB storage can be used (First)"
+BROKEN=	Only one DB storage can be used (First)
 .endif
+
 LIB_DEPENDS+=	gigabase_r.2:${PORTSDIR}/databases/gigabase
 CONFIGURE_ARGS+=	--without-DB
 .endif
@@ -62,7 +65,7 @@ CONFIGURE_ARGS+=	--without-DB
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 CONFIGURE_ARGS+=	--without-GB
 .else
-BROKEN=	"Only one DB storage can be used"
+BROKEN=	Only one DB storage can be used
 .endif
 .endif
 
@@ -84,15 +87,11 @@ CONFIGURE_ARGS+=	--with-regexp=pcre
 pre-configure:
 	@cd ${WRKSRC} && ${AUTOHEADER}
 
-post-build:
-	@${SED} -e 's=%%RC_SUBR%%=${RC_SUBR}=g;s=%%PREFIX%%=${PREFIX}=g' \
-		${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
-
 pre-install:
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${WRKSRC}/doc/oops.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/doc/oopsctl.8 ${PREFIX}/man/man8
 .endif
@@ -101,7 +100,7 @@ post-install:
 	@${CHOWN} oops ${OOPSVAR}
 	@${MKDIR} -m 750 ${OOPSLOG}
 	@${CHOWN} oops ${OOPSLOG}
-	${INSTALL_SCRIPT} ${WRKDIR}/oops.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/oops ${PREFIX}/etc/rc.d
 	@${CAT} ${PKGMESSAGE}
 
 post-clean:
diff --git a/www/oops/files/oops.sh b/www/oops/files/oops.in
index ebecacce6244..ebecacce6244 100644
--- a/www/oops/files/oops.sh
+++ b/www/oops/files/oops.in
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index b63dd14e05e2..244c5198b7d4 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -28,7 +28,6 @@ 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
 libexec/oops/accel.so
 libexec/oops/berkeley_db_api.so
 libexec/oops/custom_log.so
@@ -58,8 +57,8 @@ sbin/oopsctl
 @dirrmtry oops/logs
 @dirrmtry oops/storages
 @dirrmtry oops
-@unexec rmdir /var/log/oops 2>/dev/null || true
+@dirrmtry /var/log/oops
 @unexec rm -f /var/run/oops/oopsctl 2>/dev/null || true
 @unexec rm -f /var/run/oops/oops_statfile 2>/dev/null || true
 @unexec rm -f /var/run/oops/oops.pid 2>/dev/null || true
-@unexec rmdir /var/run/oops 2>/dev/null || true
+@dirrmtry /var/run/oops