ports/75257: repocopy request databases/sqlite to database/sqlite[23].
Norikatsu Shigemura
nork at FreeBSD.org
Sun Dec 19 14:50:22 UTC 2004
>Number: 75257
>Category: ports
>Synopsis: repocopy request databases/sqlite to databases/sqlite[23]
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 19 14:50:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Norikatsu Shigemura
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
Ensure Technorogy LTD.
>Environment:
System: FreeBSD nadesico.ninth-nine.com 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Wed Dec 15 19:19:08 JST 2004 nork at nadesico.ninth-nine.com:/devel/obj/export/home/nork/p4/src/sys/NADESICO i386
>Description:
databases/sqlite3 is not repo-copied from databases/sqlite
and is committed by green at . This is not good. And
databases/sqlite2 was removed, so please repo-copy, too.
(portmgr)
1. Repocopy from databases/sqlite to databases/sqlite3 after
removing the present databases/sqlite3.
2. Repocopy from databases/sqlite to databases/sqlite2.
(nork)
3. Update databases/sqlite3. Remove databases/sqlite.
4. All is done. I'll update sqlite* and related ports (depending
on sqlite*) to adopt databases/sqlite2 and databases/sqlite3.
Please repocopy following port.
ports/databases/sqlite(ORIGINAL) to ports/databases/sqlite2(OVERWRITE)
ports/databases/sqlite(ORIGINAL) to ports/databases/sqlite3(OVERWRITE)
>How-To-Repeat:
N/A
>Fix:
Index: sqlite2/Makefile
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite2/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- sqlite2/Makefile 4 Jul 2004 20:57:16 -0000 1.23
+++ sqlite2/Makefile 19 Dec 2004 14:31:56 -0000
@@ -12,13 +12,17 @@
# SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84.
PORTNAME= sqlite
-PORTVERSION= 2.8.14
+PORTVERSION= 2.8.15
CATEGORIES= databases
MASTER_SITES= http://www.sqlite.org/
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= gh at ghaering.de
-COMMENT= An SQL database engine in a C library, including a Tcl wrapper
+COMMENT= An SQL database engine in a C library w/ Tcl wrapper
+
+DOCSDIR= ${PREFIX}/share/doc/sqlite2
+EXAMPLESDIR= ${PREFIX}/share/examples/sqlite2
+LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2
# Defaults, for building the docs:
TCL_V= 8.4
@@ -66,20 +70,15 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-DOCFILES= arch.html arch.png c_interface.html changes.html \
- conflict.html datatypes.html download.html faq.html \
- fileformat.html formatchng.html index.html lang.html \
- lemon.html mingw.html nulls.html omitted.html \
- opcode.html quickstart.html report1.txt speed.html \
- sqlite.html tclsqlite.html vdbe.html
+.include <bsd.port.pre.mk>
post-patch:
- ${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
- -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
+ @${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
+ -e "s|\./libtool|${LIBTOOL}|g" \
${WRKSRC}/Makefile.in
- ${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
- ${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
- #${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
+ @${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
+ @${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
+ #@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
post-build:
# Build the docs
@@ -87,6 +86,8 @@
cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
.endif
+DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist
+
post-install:
.if defined(WITH_TCL)
cd ${WRKSRC} && ${GMAKE} install-tcl
@@ -95,11 +96,10 @@
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
.endfor
@${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-
+ ${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sqlite2/distinfo
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite2/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- sqlite2/distinfo 4 Jul 2004 20:57:16 -0000 1.16
+++ sqlite2/distinfo 19 Dec 2004 14:31:56 -0000
@@ -1,2 +1,2 @@
-MD5 (sqlite-2.8.14.tar.gz) = 113ce31cc31e0ab671bab590122e272a
-SIZE (sqlite-2.8.14.tar.gz) = 955231
+MD5 (sqlite-2.8.15.tar.gz) = 0afa73e107bd106031d046c8ca6a94ab
+SIZE (sqlite-2.8.15.tar.gz) = 963232
Index: sqlite2/files/patch-Makefile.in
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite2/files/patch-Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile.in
--- sqlite2/files/patch-Makefile.in 4 Jul 2004 20:57:16 -0000 1.4
+++ sqlite2/files/patch-Makefile.in 19 Dec 2004 14:31:56 -0000
@@ -1,14 +1,5 @@
---- Makefile.in.orig Fri Mar 26 23:16:32 2004
-+++ Makefile.in Sun Jun 20 13:22:21 2004
-@@ -33,7 +33,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = %%LIBTOOL%%
- RELEASE = @ALLOWRELEASE@
-
- # libtool compile/link/install
+--- Makefile.in.orig Sat Mar 27 08:16:32 2004
++++ Makefile.in Sun Nov 21 04:32:00 2004
@@ -188,12 +188,12 @@
libsqlite.la: $(LIBOBJ)
@@ -24,94 +15,6 @@
sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h
$(LTLINK) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-@@ -372,67 +372,67 @@
- ./testfixture $(TOP)/test/quick.test
-
- index.html: $(TOP)/www/index.tcl last_change
-- tclsh $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html
-+ $(TCLSH) $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html
-
- sqlite.html: $(TOP)/www/sqlite.tcl
-- tclsh $(TOP)/www/sqlite.tcl >sqlite.html
-+ $(TCLSH) $(TOP)/www/sqlite.tcl >sqlite.html
-
- c_interface.html: $(TOP)/www/c_interface.tcl
-- tclsh $(TOP)/www/c_interface.tcl >c_interface.html
-+ $(TCLSH) $(TOP)/www/c_interface.tcl >c_interface.html
-
- changes.html: $(TOP)/www/changes.tcl
-- tclsh $(TOP)/www/changes.tcl >changes.html
-+ $(TCLSH) $(TOP)/www/changes.tcl >changes.html
-
- lang.html: $(TOP)/www/lang.tcl
-- tclsh $(TOP)/www/lang.tcl >lang.html
-+ $(TCLSH) $(TOP)/www/lang.tcl >lang.html
-
- vdbe.html: $(TOP)/www/vdbe.tcl
-- tclsh $(TOP)/www/vdbe.tcl >vdbe.html
-+ $(TCLSH) $(TOP)/www/vdbe.tcl >vdbe.html
-
- arch.html: $(TOP)/www/arch.tcl
-- tclsh $(TOP)/www/arch.tcl >arch.html
-+ $(TCLSH) $(TOP)/www/arch.tcl >arch.html
-
- arch.png: $(TOP)/www/arch.png
- cp $(TOP)/www/arch.png .
-
- opcode.html: $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c
-- tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
-+ $(TCLSH) $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
-
- mingw.html: $(TOP)/www/mingw.tcl
-- tclsh $(TOP)/www/mingw.tcl >mingw.html
-+ $(TCLSH) $(TOP)/www/mingw.tcl >mingw.html
-
- tclsqlite.html: $(TOP)/www/tclsqlite.tcl
-- tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html
-+ $(TCLSH) $(TOP)/www/tclsqlite.tcl >tclsqlite.html
-
- speed.html: $(TOP)/www/speed.tcl
-- tclsh $(TOP)/www/speed.tcl >speed.html
-+ $(TCLSH) $(TOP)/www/speed.tcl >speed.html
-
- faq.html: $(TOP)/www/faq.tcl
-- tclsh $(TOP)/www/faq.tcl >faq.html
-+ $(TCLSH) $(TOP)/www/faq.tcl >faq.html
-
- formatchng.html: $(TOP)/www/formatchng.tcl
-- tclsh $(TOP)/www/formatchng.tcl >formatchng.html
-+ $(TCLSH) $(TOP)/www/formatchng.tcl >formatchng.html
-
- conflict.html: $(TOP)/www/conflict.tcl
-- tclsh $(TOP)/www/conflict.tcl >conflict.html
-+ $(TCLSH) $(TOP)/www/conflict.tcl >conflict.html
-
- download.html: $(TOP)/www/download.tcl
-- tclsh $(TOP)/www/download.tcl >download.html
-+ $(TCLSH) $(TOP)/www/download.tcl >download.html
-
- omitted.html: $(TOP)/www/omitted.tcl
-- tclsh $(TOP)/www/omitted.tcl >omitted.html
-+ $(TCLSH) $(TOP)/www/omitted.tcl >omitted.html
-
- datatypes.html: $(TOP)/www/datatypes.tcl
-- tclsh $(TOP)/www/datatypes.tcl >datatypes.html
-+ $(TCLSH) $(TOP)/www/datatypes.tcl >datatypes.html
-
- quickstart.html: $(TOP)/www/quickstart.tcl
-- tclsh $(TOP)/www/quickstart.tcl >quickstart.html
-+ $(TCLSH) $(TOP)/www/quickstart.tcl >quickstart.html
-
- fileformat.html: $(TOP)/www/fileformat.tcl
-- tclsh $(TOP)/www/fileformat.tcl >fileformat.html
-+ $(TCLSH) $(TOP)/www/fileformat.tcl >fileformat.html
-
- nulls.html: $(TOP)/www/nulls.tcl
-- tclsh $(TOP)/www/nulls.tcl >nulls.html
-+ $(TCLSH) $(TOP)/www/nulls.tcl >nulls.html
-
-
- # Files to be published on the website.
@@ -466,13 +466,19 @@
install: sqlite libsqlite.la sqlite.h
@@ -127,8 +30,8 @@
$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
-+ $(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig;
-+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig;
++ $(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
++ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
+
+install-tcl: libtclsqlite.la
+ $(INSTALL) -d $(prefix)/lib/sqlite
Index: sqlite3/Makefile
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- sqlite3/Makefile 4 Jul 2004 20:57:16 -0000 1.23
+++ sqlite3/Makefile 19 Dec 2004 14:33:17 -0000
@@ -12,13 +12,17 @@
# SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84.
PORTNAME= sqlite
-PORTVERSION= 2.8.14
+PORTVERSION= 3.0.8
CATEGORIES= databases
MASTER_SITES= http://www.sqlite.org/
DISTNAME= ${PORTNAME}-${PORTVERSION}
-MAINTAINER= gh at ghaering.de
-COMMENT= An SQL database engine in a C library, including a Tcl wrapper
+MAINTAINER= green at FreeBSD.org
+COMMENT= An SQL database engine in a C library w/ Tcl wrapper (beta)
+
+DOCSDIR= ${PREFIX}/share/doc/sqlite3
+EXAMPLESDIR= ${PREFIX}/share/examples/sqlite3
+LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3
# Defaults, for building the docs:
TCL_V= 8.4
@@ -39,10 +43,7 @@
.endif
.if defined(WITH_TCL)
-LIB_DEPENDS+= tcl${TCL_SHORT_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
-PLIST_SUB+= WITH_TCL=""
-.else
-PLIST_SUB+= WITH_TCL="@comment "
+ALL_TARGET+= libtclsqlite.la
.endif
.if !defined(NOPORTDOCS)
@@ -58,28 +59,20 @@
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
ALL_TARGET= all
-#.if defined(WITH_TCL)
-#ALL_TARGET+= libtclsqlite.la
-#.endif
INSTALLS_SHLIB= YES
WRKSRC= ${WRKDIR}/${PORTNAME}
-DOCFILES= arch.html arch.png c_interface.html changes.html \
- conflict.html datatypes.html download.html faq.html \
- fileformat.html formatchng.html index.html lang.html \
- lemon.html mingw.html nulls.html omitted.html \
- opcode.html quickstart.html report1.txt speed.html \
- sqlite.html tclsqlite.html vdbe.html
+.include <bsd.port.pre.mk>
post-patch:
- ${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
- -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
+ @${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
+ -e "s|\./libtool|${LIBTOOL}|g" \
${WRKSRC}/Makefile.in
- ${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
- ${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
- #${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
+ @${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
+ @${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
+ #@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
post-build:
# Build the docs
@@ -87,19 +80,24 @@
cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
.endif
+DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist
+
post-install:
.if defined(WITH_TCL)
- cd ${WRKSRC} && ${GMAKE} install-tcl
+ @${MKDIR} ${PREFIX}/lib/sqlite
+ cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
+ libtclsqlite3.la ${PREFIX}/lib/sqlite/
+ @${RM} ${PREFIX}/lib/sqlite/libtclsqlite3.la
${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
+ ${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
.endif
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
.endfor
@${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-
+ ${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: sqlite3/distinfo
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- sqlite3/distinfo 4 Jul 2004 20:57:16 -0000 1.16
+++ sqlite3/distinfo 19 Dec 2004 14:33:17 -0000
@@ -1,2 +1,2 @@
-MD5 (sqlite-2.8.14.tar.gz) = 113ce31cc31e0ab671bab590122e272a
-SIZE (sqlite-2.8.14.tar.gz) = 955231
+MD5 (sqlite-3.0.8.tar.gz) = b7dff1ec9bf4d08928c039b278630ba7
+SIZE (sqlite-3.0.8.tar.gz) = 1288859
Index: sqlite3/pkg-plist
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite3/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- sqlite3/pkg-plist 4 Jul 2004 20:57:16 -0000 1.9
+++ sqlite3/pkg-plist 19 Dec 2004 14:33:17 -0000
@@ -1,18 +1,29 @@
-bin/sqlite
-include/sqlite.h
-lib/libsqlite.a
-lib/libsqlite.so
-lib/libsqlite.so.2
-libdata/pkgconfig/sqlite.pc
-%%WITH_TCL%%lib/sqlite/libtclsqlite.so
+bin/sqlite3
+%%WITH_TCL%%bin/tclsqlite3
+include/sqlite3.h
+lib/libsqlite3.a
+lib/libsqlite3.so
+lib/libsqlite3.so.8
+libdata/pkgconfig/sqlite3.pc
+%%WITH_TCL%%lib/sqlite/libtclsqlite3.so.8
+%%WITH_TCL%%lib/sqlite/libtclsqlite3.so
+%%WITH_TCL%%lib/sqlite/libtclsqlite3.a
%%WITH_TCL%%lib/sqlite/pkgIndex.tcl
%%WITH_TCL%%@dirrm lib/sqlite
+%%PORTDOCS%%%%DOCSDIR%%/affinity.html
%%PORTDOCS%%%%DOCSDIR%%/arch.html
-%%PORTDOCS%%%%DOCSDIR%%/arch.png
+%%PORTDOCS%%%%DOCSDIR%%/arch2.gif
%%PORTDOCS%%%%DOCSDIR%%/c_interface.html
+%%PORTDOCS%%%%DOCSDIR%%/capi3.html
+%%PORTDOCS%%%%DOCSDIR%%/capi3ref.html
%%PORTDOCS%%%%DOCSDIR%%/changes.html
%%PORTDOCS%%%%DOCSDIR%%/conflict.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright-release.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright-release.pdf
+%%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/datatype3.html
%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs.html
%%PORTDOCS%%%%DOCSDIR%%/download.html
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
@@ -20,16 +31,21 @@
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/lang.html
%%PORTDOCS%%%%DOCSDIR%%/lemon.html
+%%PORTDOCS%%%%DOCSDIR%%/lockingv3.html
%%PORTDOCS%%%%DOCSDIR%%/mingw.html
%%PORTDOCS%%%%DOCSDIR%%/nulls.html
+%%PORTDOCS%%%%DOCSDIR%%/oldnews.html
%%PORTDOCS%%%%DOCSDIR%%/omitted.html
%%PORTDOCS%%%%DOCSDIR%%/opcode.html
%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
%%PORTDOCS%%%%DOCSDIR%%/report1.txt
%%PORTDOCS%%%%DOCSDIR%%/speed.html
+%%PORTDOCS%%%%DOCSDIR%%/sqlite.gif
%%PORTDOCS%%%%DOCSDIR%%/sqlite.html
+%%PORTDOCS%%%%DOCSDIR%%/support.html
%%PORTDOCS%%%%DOCSDIR%%/tclsqlite.html
%%PORTDOCS%%%%DOCSDIR%%/vdbe.html
+%%PORTDOCS%%%%DOCSDIR%%/version3.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
Index: sqlite3/files/patch-Makefile.in
===================================================================
RCS file: /FreeBSD/sqlite/ncvs/ports/databases/sqlite3/files/patch-Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile.in
--- sqlite3/files/patch-Makefile.in 4 Jul 2004 20:57:16 -0000 1.4
+++ sqlite3/files/patch-Makefile.in 19 Dec 2004 14:33:17 -0000
@@ -1,138 +1,18 @@
---- Makefile.in.orig Fri Mar 26 23:16:32 2004
-+++ Makefile.in Sun Jun 20 13:22:21 2004
-@@ -33,7 +33,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = %%LIBTOOL%%
- RELEASE = @ALLOWRELEASE@
-
- # libtool compile/link/install
-@@ -188,12 +188,12 @@
-
- libsqlite.la: $(LIBOBJ)
- $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
-- -version-info "8:6:8"
-+ -version-info "2:0:0"
-
- libtclsqlite.la: tclsqlite.lo libsqlite.la
- $(LTLINK) -o libtclsqlite.la tclsqlite.lo \
- libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
-- -version-info "8:6:8"
-+ -version-info "2:0:0"
-
- sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h
- $(LTLINK) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-@@ -372,67 +372,67 @@
- ./testfixture $(TOP)/test/quick.test
-
- index.html: $(TOP)/www/index.tcl last_change
-- tclsh $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html
-+ $(TCLSH) $(TOP)/www/index.tcl `cat $(TOP)/VERSION` >index.html
-
- sqlite.html: $(TOP)/www/sqlite.tcl
-- tclsh $(TOP)/www/sqlite.tcl >sqlite.html
-+ $(TCLSH) $(TOP)/www/sqlite.tcl >sqlite.html
-
- c_interface.html: $(TOP)/www/c_interface.tcl
-- tclsh $(TOP)/www/c_interface.tcl >c_interface.html
-+ $(TCLSH) $(TOP)/www/c_interface.tcl >c_interface.html
-
- changes.html: $(TOP)/www/changes.tcl
-- tclsh $(TOP)/www/changes.tcl >changes.html
-+ $(TCLSH) $(TOP)/www/changes.tcl >changes.html
-
- lang.html: $(TOP)/www/lang.tcl
-- tclsh $(TOP)/www/lang.tcl >lang.html
-+ $(TCLSH) $(TOP)/www/lang.tcl >lang.html
-
- vdbe.html: $(TOP)/www/vdbe.tcl
-- tclsh $(TOP)/www/vdbe.tcl >vdbe.html
-+ $(TCLSH) $(TOP)/www/vdbe.tcl >vdbe.html
-
- arch.html: $(TOP)/www/arch.tcl
-- tclsh $(TOP)/www/arch.tcl >arch.html
-+ $(TCLSH) $(TOP)/www/arch.tcl >arch.html
-
- arch.png: $(TOP)/www/arch.png
- cp $(TOP)/www/arch.png .
-
- opcode.html: $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c
-- tclsh $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
-+ $(TCLSH) $(TOP)/www/opcode.tcl $(TOP)/src/vdbe.c >opcode.html
-
- mingw.html: $(TOP)/www/mingw.tcl
-- tclsh $(TOP)/www/mingw.tcl >mingw.html
-+ $(TCLSH) $(TOP)/www/mingw.tcl >mingw.html
-
- tclsqlite.html: $(TOP)/www/tclsqlite.tcl
-- tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html
-+ $(TCLSH) $(TOP)/www/tclsqlite.tcl >tclsqlite.html
-
- speed.html: $(TOP)/www/speed.tcl
-- tclsh $(TOP)/www/speed.tcl >speed.html
-+ $(TCLSH) $(TOP)/www/speed.tcl >speed.html
-
- faq.html: $(TOP)/www/faq.tcl
-- tclsh $(TOP)/www/faq.tcl >faq.html
-+ $(TCLSH) $(TOP)/www/faq.tcl >faq.html
-
- formatchng.html: $(TOP)/www/formatchng.tcl
-- tclsh $(TOP)/www/formatchng.tcl >formatchng.html
-+ $(TCLSH) $(TOP)/www/formatchng.tcl >formatchng.html
-
- conflict.html: $(TOP)/www/conflict.tcl
-- tclsh $(TOP)/www/conflict.tcl >conflict.html
-+ $(TCLSH) $(TOP)/www/conflict.tcl >conflict.html
-
- download.html: $(TOP)/www/download.tcl
-- tclsh $(TOP)/www/download.tcl >download.html
-+ $(TCLSH) $(TOP)/www/download.tcl >download.html
-
- omitted.html: $(TOP)/www/omitted.tcl
-- tclsh $(TOP)/www/omitted.tcl >omitted.html
-+ $(TCLSH) $(TOP)/www/omitted.tcl >omitted.html
-
- datatypes.html: $(TOP)/www/datatypes.tcl
-- tclsh $(TOP)/www/datatypes.tcl >datatypes.html
-+ $(TCLSH) $(TOP)/www/datatypes.tcl >datatypes.html
-
- quickstart.html: $(TOP)/www/quickstart.tcl
-- tclsh $(TOP)/www/quickstart.tcl >quickstart.html
-+ $(TCLSH) $(TOP)/www/quickstart.tcl >quickstart.html
-
- fileformat.html: $(TOP)/www/fileformat.tcl
-- tclsh $(TOP)/www/fileformat.tcl >fileformat.html
-+ $(TCLSH) $(TOP)/www/fileformat.tcl >fileformat.html
-
- nulls.html: $(TOP)/www/nulls.tcl
-- tclsh $(TOP)/www/nulls.tcl >nulls.html
-+ $(TCLSH) $(TOP)/www/nulls.tcl >nulls.html
-
-
- # Files to be published on the website.
-@@ -466,13 +466,19 @@
-
- install: sqlite libsqlite.la sqlite.h
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-- $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+ $(INSTALL) .libs/libsqlite.a $(exec_prefix)/lib
-+ $(INSTALL) .libs/libsqlite.so $(exec_prefix)/lib
-+ $(INSTALL) .libs/libsqlite.so.2 $(exec_prefix)/lib
+--- Makefile.in.orig Thu Oct 7 00:03:05 2004
++++ Makefile.in Sun Nov 21 04:23:54 2004
+@@ -543,12 +543,13 @@
+ install: sqlite3 libsqlite3.la sqlite3.h
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
++ rm $(DESTDIR)$(exec_prefix)/lib/libsqlite3.la
$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
-- $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
-+ $(INSTALL) .libs/sqlite $(exec_prefix)/bin
+ $(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
$(INSTALL) -d $(DESTDIR)$(prefix)/include
- $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
-- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
-- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
-+ $(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig;
-+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig;
-+
-+install-tcl: libtclsqlite.la
-+ $(INSTALL) -d $(prefix)/lib/sqlite
-+ $(INSTALL) .libs/libtclsqlite.so $(prefix)/lib/sqlite
+ $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
+- $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;
+- $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig;
++ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig
++ $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig
clean:
- rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
+ rm -f *.lo *.la *.o sqlite3 at TARGET_EXEEXT@ libsqlite3.la
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list