Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jun 2000 16:58:49 -0400 (EDT)
From:      adrian@ubergeeks.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/19108: tcl-Mysql tcl dependence generalization
Message-ID:  <200006072058.QAA83534@cluebie.esolstice.int>

next in thread | raw e-mail | index | archive | help

>Number:         19108
>Category:       ports
>Synopsis:       tcl-Mysql port is needlessly bound v8.0 of tcl.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 07 14:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Adrian Filipi-Martin
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
Ubergeeks Consulting
>Environment:

	3.4 RELEASE with /usr/ports cvsup'd today.

>Description:

	The tcl-Mysql port does not depend on tcl 8.0 specifically.  It can
	be used with other versions, e.g. 8.2 , yet it is not possible to 
	build the port for other versions.

>How-To-Repeat:

	cd /usr/ports/databases/tcl-Mysql
	make 

>Fix:
	
	Apply the following patch that allows you to override the tcl version
	on the command line.  This is similar to what www/p5-Apache does to
	specify alternate apache depenencies.  It also updates the default
	version to 8.2.

diff -ur tcl-Mysql/Makefile tcl-Mysql.new/Makefile
--- tcl-Mysql/Makefile	Sat Apr  8 18:49:00 2000
+++ tcl-Mysql.new/Makefile	Wed Jun  7 16:38:17 2000
@@ -4,26 +4,37 @@
 #
 # $FreeBSD: ports/databases/tcl-Mysql/Makefile,v 1.3 2000/04/08 22:49:00 mharo Exp $
 #
+.if !defined(TCL_VERSION)
+TCL_VERSION=8.2
+TCL_VERSION_SHORT=${TCL_VERSION:S/.//}
+.endif
 
 PORTNAME=	tcl-sql
 PORTVERSION=	20000114
-CATEGORIES=	databases tcl80
+CATEGORIES=	databases tcl${TCL_VERSION_SHORT}
 MASTER_SITES=	http://www.binevolve.com/~tdarugar/tcl-sql/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
-RUN_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	tclsh${TCL_VERSION}:${PORTSDIR}/lang/tcl${TCL_VERSION_SHORT}
 
+PLIST=		${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/tcl-sql/
 
 do-build:
-	cd ${WRKSRC} && ${MAKE} PREFIX="${PREFIX}" -f ${FILESDIR}/Makefile.bsd
+	cd ${WRKSRC} && ${MAKE} PREFIX="${PREFIX}" TCL_VERSION=${TCL_VERSION} \
+		TCL_VERSION_SHORT=${TCL_VERSION_SHORT} \
+		-f ${FILESDIR}/Makefile.bsd
 
-SQL_DIR=	${PREFIX}/lib/tcl8.0/sql1.0
+SQL_DIR=	${PREFIX}/lib/tcl${TCL_VERSION}/sql1.0
 
 do-install:
+	${SED} \
+		-e 's/#TCL_VERSION#/${TCL_VERSION}/g' \
+		-e 's/#TCL_VERSION_SHORT#/${TCL_VERSION_SHORT}/g' \
+		${PKGDIR}/PLIST > ${PLIST}
 	${MKDIR} ${SQL_DIR}
 	${INSTALL_DATA} ${WRKSRC}/obj/libTclMySQL.so.* ${SQL_DIR}
 	${ECHO} "package ifneeded sql 1.0 \
Only in tcl-Mysql.new: README.html
diff -ur tcl-Mysql/files/Makefile.bsd tcl-Mysql.new/files/Makefile.bsd
--- tcl-Mysql/files/Makefile.bsd	Sun Oct 31 23:15:00 1999
+++ tcl-Mysql.new/files/Makefile.bsd	Wed Jun  7 16:23:49 2000
@@ -3,8 +3,9 @@
 SHLIB_MINOR=	0
 
 SRCS	=	sql-mysql.cc sql.cc sql-manager.cc
-CFLAGS +=	-I${PREFIX}/include/tcl8.0/ -I${PREFIX}/include/mysql/
-LDADD  +=	-L${PREFIX}/lib -ltcl80
+CFLAGS +=	-I${PREFIX}/include/tcl${TCL_VERSION}/
+CFLAGS +=	-I${PREFIX}/include/mysql/
+LDADD  +=	-L${PREFIX}/lib -ltcl${TCL_VERSION_SHORT}
 LDADD  +=	-L${PREFIX}/lib/mysql -lmysqlclient
 LDADD  +=	-lgcc
 
diff -ur tcl-Mysql/pkg/PLIST tcl-Mysql.new/pkg/PLIST
--- tcl-Mysql/pkg/PLIST	Sun Oct 31 23:15:01 1999
+++ tcl-Mysql.new/pkg/PLIST	Wed Jun  7 16:39:17 2000
@@ -1,6 +1,6 @@
-lib/tcl8.0/sql1.0/libTclMySQL.so.1
-lib/tcl8.0/sql1.0/pkgIndex.tcl
-@dirrm lib/tcl8.0/sql1.0
+lib/tcl#TCL_VERSION#/sql1.0/libTclMySQL.so.1
+lib/tcl#TCL_VERSION#/sql1.0/pkgIndex.tcl
+@dirrm lib/tcl#TCL_VERSION#/sql1.0
 share/doc/tcl-MySQL/api.html
 share/doc/tcl-MySQL/sample.full.txt
 share/doc/tcl-MySQL/sample.simple.txt

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200006072058.QAA83534>