Date: Sat, 18 Mar 2006 12:00:41 GMT From: Andreas Kohn <andreas@syndrom23.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/94288: [PATCH] misc/tinderbox: OPTIONaly depend on c[v]sup Message-ID: <200603181200.k2IC0f1J051666@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/94288; it has been noted by GNATS. From: Andreas Kohn <andreas@syndrom23.de> To: bug-followup@FreeBSD.org, itetcu@people.tecnik93.com Cc: Subject: Re: ports/94288: [PATCH] misc/tinderbox: OPTIONaly depend on c[v]sup Date: Sat, 18 Mar 2006 12:59:31 +0100 --=-5nBkBW3ZFI1EyC2OFnA7 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi, I like the patch to enable cvsup/csup selection. I think the unconditional RUN_DEPENDS on cvsup needs to get removed in that case as well. The patch for MySQL is incomplete, as setup-mysql.sh would still barf about missing MySQL-ports. The attached patch also fixes that, and sets USE_APACHE=3D1.3+ to stop annoying apache2 users that apache13 is needed :) Ion-Mihai, what do you think? Regards, Andreas (Patch copy/pasted into the Mail, I cannot make evolution not send it base6= 4-encoded :/ same patch available on http://andreas.syndrom23.de/dump/tb-r2.diff ) --- tb-r2.diff begins here --- Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /storage/freebsd/cvs/ports/misc/tinderbox/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 24 Feb 2006 02:28:02 -0000 1.13 +++ Makefile 18 Mar 2006 11:38:26 -0000 @@ -6,7 +6,7 @@ =20 PORTNAME=3D tinderbox PORTVERSION=3D 2.3.0 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D misc MASTER_SITES=3D http://tinderbox.marcuscom.com/ =20 @@ -15,14 +15,15 @@ =20 RUN_DEPENDS=3D ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/securit= y/p5-Digest-MD5 \ ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \ - ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB \ - cvsup:${PORTSDIR}/net/cvsup-without-gui + ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB =20 OPTIONS=3D PGSQL "With pgsql" On \ - MYSQL "With mysql" Off + MYSQL "With mysql" Off \ + CSUP "Use csup for updates" On \ + CVSUP "Use cvsup for updates" Off =20 NO_BUILD=3D yes -USE_APACHE=3D yes +USE_APACHE=3D 1.3+ SUB_FILES=3D pkg-message PKGMESSAGE=3D ${WRKDIR}/pkg-message =20 @@ -43,7 +44,15 @@ .if defined(WITH_MYSQL) USE_PHP+=3D mysql USE_MYSQL=3D yes -RUN_DEPENDS+=3D ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databas= es/p5-DBD-mysql +RUN_DEPENDS+=3D ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databas= es/p5-DBD-mysql${MYSQL_VER} +.endif + +.if defined(WITH_CSUP) +RUN_DEPENDS+=3D csup:${PORTSDIR}/net/csup +.endif + +.if defined(WITH_CVSUP) +RUN_DEPENDS+=3D cvsup:${PORTSDIR}/net/cvsup-without-gui .endif =20 .include "${PORTSDIR}/Mk/bsd.php.mk" @@ -53,6 +62,13 @@ ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist .endfor =20 +post-patch: +.if defined(WITH_MYSQL) + ${REINPLACE_CMD} \ + -e 's,DB_MAN_PREREQS=3D.*,DB_MAN_PREREQS=3D"databases/p5-DBD-mysql${MYSQ= L_VER} databases/mysql${MYSQL_VER}-client",' \ + ${WRKSRC}/lib/setup-mysql.sh +.endif + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts --- tb-r2.diff ends here --- --=-5nBkBW3ZFI1EyC2OFnA7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQBEG/YjYucd7Ow1ygwRAu9yAJ0ab1JfwTQc3eQ3FFfsXNeFEiwhHACfe+xz uBPEOslllqpEfzr0xDqNbAo= =vUhS -----END PGP SIGNATURE----- --=-5nBkBW3ZFI1EyC2OFnA7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603181200.k2IC0f1J051666>