Tue Dec 8 10:20:44 2009 UTC ()
Correctly build the module using the libtool approach. It worked more by
luck than intentional before. Bump revision.


(joerg)
diff -r1.22 -r1.23 pkgsrc/databases/tcl-fbsql/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/databases/tcl-fbsql/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/databases/tcl-fbsql/files/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/databases/tcl-fbsql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/tcl-fbsql/Makefile 2008/03/03 15:21:07 1.22
+++ pkgsrc/databases/tcl-fbsql/Makefile 2009/12/08 10:20:43 1.23
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.22 2008/03/03 15:21:07 jlam Exp $ 1# $NetBSD: Makefile,v 1.23 2009/12/08 10:20:43 joerg Exp $
2 2
3DISTNAME= fbsql.c 3DISTNAME= fbsql.c
4PKGNAME= tcl-fbsql-1.06 4PKGNAME= tcl-fbsql-1.06
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= http://www.fastbase.co.nz/fbsql/ 7MASTER_SITES= http://www.fastbase.co.nz/fbsql/
8EXTRACT_SUFX= 8EXTRACT_SUFX=
9 9
10MAINTAINER= bouyer@NetBSD.org 10MAINTAINER= bouyer@NetBSD.org
11HOMEPAGE= http://www.fastbase.co.nz/fbsql/index.html 11HOMEPAGE= http://www.fastbase.co.nz/fbsql/index.html
12COMMENT= Tcl interface to MySQL 12COMMENT= Tcl interface to MySQL
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16WRKSRC= ${WRKDIR}/src 16WRKSRC= ${WRKDIR}/src
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18DIST_SUBDIR= ${PKGNAME_NOREV} 18DIST_SUBDIR= ${PKGNAME_NOREV}
19INSTALLATION_DIRS= lib/tcl 19INSTALLATION_DIRS= lib/tcl
20 20
21do-extract: 21do-extract:
22 ${MKDIR} ${WRKSRC} 22 ${MKDIR} ${WRKSRC}
23 ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ 23 ${CP} ${FILESDIR}/Makefile ${WRKSRC}/
24 ${CP} ${_DISTDIR}/fbsql.c ${WRKSRC}/ 24 ${CP} ${_DISTDIR}/fbsql.c ${WRKSRC}/
25 25
26do-install: 26do-install:
27 ${INSTALL_LIB} ${WRKSRC}/fbsql.so ${DESTDIR}${PREFIX}/lib/tcl 27 libtool --mode=install ${INSTALL_LIB} ${WRKSRC}/fbsql.la ${DESTDIR}${PREFIX}/lib/tcl
28 28
29.include "../../mk/mysql.buildlink3.mk" 29.include "../../mk/mysql.buildlink3.mk"
30.include "../../lang/tcl/buildlink3.mk" 30.include "../../lang/tcl/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/tcl-fbsql/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/tcl-fbsql/PLIST 2003/03/07 16:17:49 1.1.1.1
+++ pkgsrc/databases/tcl-fbsql/PLIST 2009/12/08 10:20:44 1.2
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/07 16:17:49 bouyer Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/12/08 10:20:44 joerg Exp $
2lib/tcl/fbsql.so 2lib/tcl/fbsql.la
cvs diff -r1.1.1.1 -r1.2 pkgsrc/databases/tcl-fbsql/files/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/tcl-fbsql/files/Makefile 2003/03/07 16:17:49 1.1.1.1
+++ pkgsrc/databases/tcl-fbsql/files/Makefile 2009/12/08 10:20:44 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1MYSQLLIBDIR = ${PREFIX}/lib/mysql 1MYSQLLIBDIR = ${PREFIX}/lib/mysql
2MYSQLINCDIR = ${PREFIX}/include/mysql 2MYSQLINCDIR = ${PREFIX}/include/mysql
3 3
4PIC = -fPIC 4PIC = -fPIC
5INCLUDES = -I${PREFIX}/include/tcl -I$(MYSQLINCDIR) 5INCLUDES = -I${PREFIX}/include/tcl -I$(MYSQLINCDIR)
6CFLAGS += -Wall $(PIC) $(INCLUDES) 6CFLAGS += -Wall $(PIC) $(INCLUDES)
7 7
8LDFLAGS = -lz $(MYSQLLIBDIR)/libmysqlclient.la 8LDFLAGS = -lz $(MYSQLLIBDIR)/libmysqlclient.la -L$(PREFIX)/lib -ltcl
9 9
10all: fbsql.so  10all: fbsql.la
11 11
12fbsql.lo: fbsql.c 12fbsql.lo: fbsql.c
13 $(LIBTOOL) --mode=compile ${CC} ${CFLAGS} -c fbsql.c 13 $(LIBTOOL) --mode=compile ${CC} ${CFLAGS} -c fbsql.c
14fbsql.so: fbsql.lo 14fbsql.la: fbsql.lo
15 $(LIBTOOL) --mode=link ${CC} -shared -o $@ fbsql.lo $(LDFLAGS) 15 $(LIBTOOL) --mode=link ${CC} -module -rpath ${PREFIX}/lib/tcl -o fbsql.la fbsql.lo $(LDFLAGS)
16 16
17clean: 17clean:
18 -rm -f core *.o fbsql.so 18 -rm -f core *.o fbsql.so