diff options
| author | itetcu <itetcu@FreeBSD.org> | 2006-05-12 13:48:12 +0000 |
|---|---|---|
| committer | itetcu <itetcu@FreeBSD.org> | 2006-05-12 13:48:12 +0000 |
| commit | 2a0ba7b958de50fc2cc9fc3c9d3e8fd61942a719 (patch) | |
| tree | 5307ee9c4925c0b78e3e29418ec48b63d711f029 | |
| parent | c8fcb2d2850aca87dfde5140cda037341766289f (diff) | |
| download | FreeBSD-ports-2a0ba7b958de50fc2cc9fc3c9d3e8fd61942a719.zip FreeBSD-ports-2a0ba7b958de50fc2cc9fc3c9d3e8fd61942a719.tar.gz | |
Depend on the right databases/p5-DBD-mysql
Don't restrict Apache version to 1.3
The csup change won't work now, and the port should be updated - as promised by
the maintainer 3 weeks ago.
PR: ports/94288
Submitted by: itetcu (me), maintainer
Reviewed by: maintianer, jmelo, sem
Approved by: maintaner, lawrance (mentor)
| -rw-r--r-- | misc/tinderbox/Makefile | 13 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox-devel/Makefile | 13 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/Makefile | 13 |
3 files changed, 30 insertions, 9 deletions
diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile index 6c2fc05..57f2fbc 100644 --- a/misc/tinderbox/Makefile +++ b/misc/tinderbox/Makefile @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -22,7 +22,7 @@ OPTIONS= PGSQL "With pgsql" On \ MYSQL "With mysql" Off NO_BUILD= yes -USE_APACHE= yes +USE_APACHE= 1.3+ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -43,7 +43,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P .if defined(WITH_MYSQL) USE_PHP+= mysql USE_MYSQL= yes -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} .endif .include "${PORTSDIR}/Mk/bsd.php.mk" @@ -53,6 +53,13 @@ post-extract: ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist .endfor +post-patch: +.if defined(WITH_MYSQL) + ${REINPLACE_CMD} \ + -e 's,DB_MAN_PREREQS=.*,DB_MAN_PREREQS="databases/p5-DBD-mysql${MYSQL_VER} databases/mysql${MYSQL_VER}-client",' \ + ${WRKSRC}/lib/setup-mysql.sh +.endif + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile index 6c2fc05..57f2fbc 100644 --- a/ports-mgmt/tinderbox-devel/Makefile +++ b/ports-mgmt/tinderbox-devel/Makefile @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -22,7 +22,7 @@ OPTIONS= PGSQL "With pgsql" On \ MYSQL "With mysql" Off NO_BUILD= yes -USE_APACHE= yes +USE_APACHE= 1.3+ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -43,7 +43,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P .if defined(WITH_MYSQL) USE_PHP+= mysql USE_MYSQL= yes -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} .endif .include "${PORTSDIR}/Mk/bsd.php.mk" @@ -53,6 +53,13 @@ post-extract: ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist .endfor +post-patch: +.if defined(WITH_MYSQL) + ${REINPLACE_CMD} \ + -e 's,DB_MAN_PREREQS=.*,DB_MAN_PREREQS="databases/p5-DBD-mysql${MYSQL_VER} databases/mysql${MYSQL_VER}-client",' \ + ${WRKSRC}/lib/setup-mysql.sh +.endif + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile index 6c2fc05..57f2fbc 100644 --- a/ports-mgmt/tinderbox/Makefile +++ b/ports-mgmt/tinderbox/Makefile @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= http://tinderbox.marcuscom.com/ @@ -22,7 +22,7 @@ OPTIONS= PGSQL "With pgsql" On \ MYSQL "With mysql" Off NO_BUILD= yes -USE_APACHE= yes +USE_APACHE= 1.3+ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -43,7 +43,7 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P .if defined(WITH_MYSQL) USE_PHP+= mysql USE_MYSQL= yes -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} .endif .include "${PORTSDIR}/Mk/bsd.php.mk" @@ -53,6 +53,13 @@ post-extract: ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist .endfor +post-patch: +.if defined(WITH_MYSQL) + ${REINPLACE_CMD} \ + -e 's,DB_MAN_PREREQS=.*,DB_MAN_PREREQS="databases/p5-DBD-mysql${MYSQL_VER} databases/mysql${MYSQL_VER}-client",' \ + ${WRKSRC}/lib/setup-mysql.sh +.endif + do-install: ${MKDIR} ${PREFIX}/tinderbox/scripts ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts |
