ports/97433: misc/tinderbox: Fix OPTIONS check; portlint(1)

[Shaun Amott]

>Number:         97433
>Category:       ports
>Synopsis:       misc/tinderbox: Fix OPTIONS check; portlint(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 17 23:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:

>Description:

- OPTIONS checking is broken for things like 'make describe'
- Move man pages from pkg-plist -> MAN1 while here.

>How-To-Repeat:

% make -C /usr/ports/misc/tinderbox describe | awk -F'|' '{print $11}'
/usr/ports/www/apache13
                         ^- No PostgreSQL :(

>Fix:

--- tinderbox.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/tinderbox/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	12 May 2006 13:48:12 -0000	1.14
+++ Makefile	17 May 2006 22:57:31 -0000
@@ -26,6 +26,9 @@
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
+		tc-configJail.1 tc-configTinderd.1 tc-init.1
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_PGSQL) && defined(WITHOUT_MYSQL)
@@ -34,7 +37,7 @@
 
 USE_PHP=	session
 
-.if defined(WITH_PGSQL)
+.if !defined(WITHOUT_PGSQL)
 USE_PGSQL=	yes
 USE_PHP+=	pgsql
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/tinderbox/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	12 Feb 2006 20:37:47 -0000	1.6
+++ pkg-plist	17 May 2006 22:57:31 -0000
@@ -24,12 +24,6 @@
 tinderbox/scripts/lib/tinderbox_shlib.sh
 tinderbox/scripts/lib/tinderlib.pl
 tinderbox/scripts/makemake
-tinderbox/scripts/man/man1/tc-configCcache.1
-tinderbox/scripts/man/man1/tc-configDistfile.1
-tinderbox/scripts/man/man1/tc-configGet.1
-tinderbox/scripts/man/man1/tc-configJail.1
-tinderbox/scripts/man/man1/tc-configTinderd.1
-tinderbox/scripts/man/man1/tc-init.1
 tinderbox/scripts/mkbuild
 tinderbox/scripts/mkjail
 tinderbox/scripts/pnohang.c
--- tinderbox.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: