Bug 97433 - misc/tinderbox: update to 2.3.1
Summary: misc/tinderbox: update to 2.3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ion-Mihai "IOnut" Tetcu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-05-18 00:20 UTC by Shaun Amott
Modified: 2006-06-11 23:26 UTC (History)
0 users

See Also:


Attachments
tinderbox.diff (1.47 KB, patch)
2006-05-18 00:20 UTC, Shaun Amott
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Shaun Amott 2006-05-18 00:20:13 UTC
- 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 :(
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2006-05-18 00:24:11 UTC
Responsible Changed
From-To: freebsd-ports-bugs->itetcu

itetcu@ wants to have these
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2006-05-18 00:24:21 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback
Comment 3 Sam Lawrance 2006-05-18 00:29:26 UTC
Quoting Shaun Amott <shaun@inerd.com>:

> +MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
> +		tc-configJail.1 tc-configTinderd.1 tc-init.1
> +

...

> -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

Does it packaged correctly with these changes?
Comment 4 Shaun Amott 2006-05-18 00:42:43 UTC
On Thu, May 18, 2006 at 09:29:26AM +1000, Sam Lawrance wrote:
> 
> Quoting Shaun Amott <shaun@inerd.com>:
> 
> >+MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 
> >\
> >+		tc-configJail.1 tc-configTinderd.1 tc-init.1
> >+
> 
> ...
> 
> >-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
> 
> Does it packaged correctly with these changes?
> 

Nope. The manpages need to be copied over to the standard location. I
removed this from my patch, but forgot that the other changes relied on
it.

Man pages in non-standard places are annoying. I'll leave it to the
maintainer to decide whether or not this is a good idea.

-- 
Shaun Amott [ PGP: 0x6B387A9A ]
    Scientia Est Potentia.
Comment 5 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-05-18 06:34:28 UTC
Any chance you could submit an update for this port ?  :)
Maintainer is MIA for the last month or so.

Thanks,

-- 
IOnut - Un^d^dregistered ;) FreeBSD "user"
  "Intellectual Property" is   nowhere near as valuable   as "Intellect"

BOFH excuse #178:
short leg on process table

Comment 6 Shaun Amott 2006-05-18 11:23:11 UTC
On Thu, May 18, 2006 at 08:34:28AM +0300, Ion-Mihai IOnut Tetcu wrote:
> Any chance you could submit an update for this port ?  :)
> Maintainer is MIA for the last month or so.

Update below. Tinderbox tested. ;)


-----tinderbox.diff starts 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	18 May 2006 10:17:13 -0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/misc/tinderbox/Makefile,v 1.14 2006/05/12 13:48:12 itetcu Exp $
 
 PORTNAME=	tinderbox
-PORTVERSION=	2.3.0
-PORTREVISION=	2
+PORTVERSION=	2.3.1
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -26,6 +25,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 +36,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
@@ -65,6 +67,7 @@
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
 
 post-install:
-	${CAT} ${PKGMESSAGE}
+	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/misc/tinderbox/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	11 Feb 2006 01:26:22 -0000	1.2
+++ distinfo	18 May 2006 10:17:13 -0000
@@ -1,3 +1,3 @@
-MD5 (tinderbox-2.3.0.tar.gz) = 4bd33a1ac8a31ec3e62b42f5307a587d
-SHA256 (tinderbox-2.3.0.tar.gz) = a3062b98688ac50ac3c50c94f1f3a27334bfb2479f8d83cabb0f8b263dc7fba7
-SIZE (tinderbox-2.3.0.tar.gz) = 118046
+MD5 (tinderbox-2.3.1.tar.gz) = f92ff04fa6fef815b6238e164e019752
+SHA256 (tinderbox-2.3.1.tar.gz) = fbeb316c039196c4509231dce374759476a7aa836be333dc8c1656fed71e87b0
+SIZE (tinderbox-2.3.1.tar.gz) = 120573
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	18 May 2006 10:17:13 -0000
@@ -48,8 +48,10 @@
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-2.1.0_to_2.1.1.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-2.1.1_to_2.2.0.sql
 tinderbox/scripts/upgrade/mig_mysql_tinderbox-2.2.0_to_2.3.0.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-2.3.0_to_2.3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.1.1_to_2.2.0.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.2.0_to_2.3.0.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.0_to_2.3.1.sql
 tinderbox/scripts/upgrade/mig_shlib.sh
 tinderbox/scripts/www-exp/core/Build.php
 tinderbox/scripts/www-exp/core/BuildPortsQueue.php
-----tinderbox.diff ends here-----

-- 
Shaun Amott [ PGP: 0x6B387A9A ]
    Scientia Est Potentia.
Comment 7 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-05-18 11:39:03 UTC
State Changed
From-To: feedback->open

patch received, thanks
Comment 8 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-05-19 09:05:45 UTC
State Changed
From-To: open->feedback

Ask for maintainer approval.
Comment 9 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-06-04 19:54:50 UTC
State Changed
From-To: feedback->open

Maintainer time-out
Comment 10 Ion-Mihai "IOnut" Tetcu freebsd_committer freebsd_triage 2006-06-11 23:26:39 UTC
State Changed
From-To: open->closed

New port added, with minor changes. Thanks!