Date: Sun, 21 Nov 2004 05:05:31 +0900 (JST) From: Norikatsu Shigemura <nork@FreeBSD.org> To: Brian Fundakowski Feldman <green@FreeBSD.org> Cc: gh@ghaering.de Subject: Re: [HEADS UP] status of databases/sqlite* is too bad. Message-ID: <200411202005.iAKK5VIE061985@sakura.ninth-nine.com> In-Reply-To: <20041120143243.GF64033@green.homeunix.org> References: <200411201420.iAKEK7q2053614@sakura.ninth-nine.com> <20041120143243.GF64033@green.homeunix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 20 Nov 2004 09:32:43 -0500 Brian Fundakowski Feldman <green@FreeBSD.org> wrote: > > If these are OK, I'll commit these change. > This is exactly what I've been planning to do but repeatedly sidetracked > by lots of Real Life events. The whole process isn't very involved, it > just needs to be done in a consistent order, and what you have proposed > looks quite correct. Thank you. I'll try to commit atomically. So order problem is none. Ah! I want to commit following patch. If I'm missed, please tell me. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: astro/roadmap/Makefile =================================================================== RCS file: /home/ncvs/ports/astro/roadmap/Makefile,v retrieving revision 1.9 diff -u -u -r1.9 Makefile --- astro/roadmap/Makefile 6 Jun 2004 22:43:49 -0000 1.9 +++ astro/roadmap/Makefile 20 Nov 2004 19:43:39 -0000 @@ -7,6 +7,7 @@ PORTNAME= roadmap PORTVERSION= 1.0.6 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= http://roadmap.digitalomaha.net/roadmap/ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/:S/./_/g}_src @@ -15,7 +16,7 @@ COMMENT= Vector-based GPS moving map LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ - sqlite.2:${PORTSDIR}/databases/sqlite + sqlite.2:${PORTSDIR}/databases/sqlite2 WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src Index: audio/xmms-imms/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/xmms-imms/Makefile,v retrieving revision 1.13 diff -u -u -r1.13 Makefile --- audio/xmms-imms/Makefile 18 Nov 2004 08:11:37 -0000 1.13 +++ audio/xmms-imms/Makefile 20 Nov 2004 19:43:43 -0000 @@ -7,7 +7,7 @@ PORTNAME= imms PORTVERSION= 1.2a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +18,7 @@ BUILD_DEPENDS= sox:${PORTSDIR}/audio/sox LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ - sqlite3:${PORTSDIR}/databases/sqlite3 \ + sqlite3:${PORTSDIR}/databases/sqlite \ pcre.0:${PORTSDIR}/devel/pcre \ fftw3f.3:${PORTSDIR}/math/fftw3-float \ tag.4:${PORTSDIR}/audio/taglib Index: databases/hk_classes/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/hk_classes/Makefile,v retrieving revision 1.14 diff -u -u -r1.14 Makefile --- databases/hk_classes/Makefile 6 Nov 2004 17:38:22 -0000 1.14 +++ databases/hk_classes/Makefile 20 Nov 2004 19:45:32 -0000 @@ -6,6 +6,7 @@ PORTNAME= hk_classes PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hk-classes Index: databases/libdbi-drivers/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/libdbi-drivers/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- databases/libdbi-drivers/Makefile 25 May 2004 09:19:40 -0000 1.4 +++ databases/libdbi-drivers/Makefile 20 Nov 2004 19:46:01 -0000 @@ -8,6 +8,7 @@ PORTNAME= libdbi-drivers PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= databases devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -41,7 +42,7 @@ .endif .if defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= SQLITE="" .else Index: databases/libgda2/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/libgda2/Makefile,v retrieving revision 1.59 diff -u -u -r1.59 Makefile --- databases/libgda2/Makefile 7 Nov 2004 19:56:26 -0000 1.59 +++ databases/libgda2/Makefile 20 Nov 2004 19:46:19 -0000 @@ -7,6 +7,7 @@ PORTNAME= libgda2 PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 @@ -164,7 +165,7 @@ .endif .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} PLIST_SUB+= SQLITE:="" .else Index: databases/py-PySQLite/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/py-PySQLite/Makefile,v retrieving revision 1.6 diff -u -u -r1.6 Makefile --- databases/py-PySQLite/Makefile 16 Oct 2004 12:14:19 -0000 1.6 +++ databases/py-PySQLite/Makefile 20 Nov 2004 19:46:25 -0000 @@ -7,6 +7,7 @@ PORTNAME= PySQLite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pysqlite @@ -17,7 +18,7 @@ COMMENT= A DB-API v2 Python library for the SQLite embedded SQL engine RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 WRKSRC= ${WRKDIR}/pysqlite EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} Index: databases/qt-sqlite-plugin/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/qt-sqlite-plugin/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- databases/qt-sqlite-plugin/Makefile 13 Aug 2004 22:46:51 -0000 1.4 +++ databases/qt-sqlite-plugin/Makefile 20 Nov 2004 19:46:31 -0000 @@ -8,6 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.3 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ ftp://ftp.silug.org/pub/qt/ \ @@ -22,7 +23,7 @@ DB= sqlite LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 \ - sqlite:${PORTSDIR}/databases/sqlite + sqlite.2:${PORTSDIR}/databases/sqlite2 USE_BZIP2= yes PLUGIN= plugins/src/sqldrivers/${DB} Index: databases/sqlite/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/sqlite/Makefile,v retrieving revision 1.23 diff -u -u -r1.23 Makefile --- databases/sqlite/Makefile 4 Jul 2004 20:57:16 -0000 1.23 +++ databases/sqlite/Makefile 20 Nov 2004 19:52:15 -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@ghaering.de -COMMENT= An SQL database engine in a C library, including a Tcl wrapper +MAINTAINER= green@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 @@ -58,28 +62,23 @@ 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 +.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 +86,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: databases/sqlite/distinfo =================================================================== RCS file: /home/ncvs/ports/databases/sqlite/distinfo,v retrieving revision 1.16 diff -u -u -r1.16 distinfo --- databases/sqlite/distinfo 4 Jul 2004 20:57:16 -0000 1.16 +++ databases/sqlite/distinfo 20 Nov 2004 18:58:05 -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: databases/sqlite/pkg-plist =================================================================== RCS file: /home/ncvs/ports/databases/sqlite/pkg-plist,v retrieving revision 1.9 diff -u -u -r1.9 pkg-plist --- databases/sqlite/pkg-plist 4 Jul 2004 20:57:16 -0000 1.9 +++ databases/sqlite/pkg-plist 20 Nov 2004 19:06:03 -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: databases/sqlite/files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/databases/sqlite/files/patch-Makefile.in,v retrieving revision 1.4 diff -u -u -r1.4 patch-Makefile.in --- databases/sqlite/files/patch-Makefile.in 4 Jul 2004 20:57:16 -0000 1.4 +++ databases/sqlite/files/patch-Makefile.in 20 Nov 2004 19:24:19 -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@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@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* + rm -f *.lo *.la *.o sqlite3@TARGET_EXEEXT@ libsqlite3.la Index: databases/sqlite/files/pkgIndex.tcl =================================================================== RCS file: /home/ncvs/ports/databases/sqlite/files/pkgIndex.tcl,v retrieving revision 1.3 diff -u -u -r1.3 pkgIndex.tcl --- databases/sqlite/files/pkgIndex.tcl 11 Jun 2003 16:26:07 -0000 1.3 +++ databases/sqlite/files/pkgIndex.tcl 20 Nov 2004 19:04:09 -0000 @@ -1 +1 @@ -package ifneeded sqlite 0.0 [list load [file join $dir libtclsqlite.so] sqlite] +package ifneeded sqlite 0.0 [list load [file join $dir libtclsqlite3.so] sqlite] Index: databases/sqlite2/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/sqlite2/Makefile,v retrieving revision 1.23 diff -u -u -r1.23 Makefile --- databases/sqlite2/Makefile 4 Jul 2004 20:57:16 -0000 1.23 +++ databases/sqlite2/Makefile 20 Nov 2004 19:52:29 -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@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: databases/sqlite2/distinfo =================================================================== RCS file: /home/ncvs/ports/databases/sqlite2/distinfo,v retrieving revision 1.16 diff -u -u -r1.16 distinfo --- databases/sqlite2/distinfo 4 Jul 2004 20:57:16 -0000 1.16 +++ databases/sqlite2/distinfo 20 Nov 2004 19:18:03 -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: databases/sqlite2/files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/databases/sqlite2/files/patch-Makefile.in,v retrieving revision 1.4 diff -u -u -r1.4 patch-Makefile.in --- databases/sqlite2/files/patch-Makefile.in 4 Jul 2004 20:57:16 -0000 1.4 +++ databases/sqlite2/files/patch-Makefile.in 20 Nov 2004 19:32:23 -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@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: databases/sqlrelay/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/sqlrelay/Makefile,v retrieving revision 1.34 diff -u -u -r1.34 Makefile --- databases/sqlrelay/Makefile 16 Oct 2004 18:59:31 -0000 1.34 +++ databases/sqlrelay/Makefile 20 Nov 2004 19:46:41 -0000 @@ -7,6 +7,7 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sqlrelay @@ -50,7 +51,7 @@ .if defined(WITH_SQLITE) && ${WITH_SQLITE:L} != no LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm \ - sqlite.2:${PORTSDIR}/databases/sqlite + sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" IF_SQLITE= "" Index: deskutils/gtkjournal/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/gtkjournal/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- deskutils/gtkjournal/Makefile 7 Nov 2004 22:36:09 -0000 1.7 +++ deskutils/gtkjournal/Makefile 20 Nov 2004 19:43:47 -0000 @@ -7,7 +7,7 @@ PORTNAME= gtkjournal PORTVERSION= 0.3.5.b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= http://linuxhelp.homeunix.com/gtkjournal/files/ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} @@ -16,7 +16,7 @@ COMMENT= Gtk+-2 journal/diary LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \ - sqlite:${PORTSDIR}/databases/sqlite \ + sqlite.2:${PORTSDIR}/databases/sqlite2 \ gtkspell:${PORTSDIR}/textproc/gtkspell2 USE_X_PREFIX= yes Index: devel/cvstrac/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/cvstrac/Makefile,v retrieving revision 1.5 diff -u -u -r1.5 Makefile --- devel/cvstrac/Makefile 16 Jun 2004 07:35:59 -0000 1.5 +++ devel/cvstrac/Makefile 20 Nov 2004 19:43:51 -0000 @@ -7,14 +7,14 @@ PORTNAME= cvstrac PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ftp://ftp.cvstrac.org/cvstrac/ MAINTAINER= bms@FreeBSD.org COMMENT= Web-Based Bug And Patch-Set Tracking System For CVS -LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_GMAKE= yes Index: devel/monotone/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/monotone/Makefile,v retrieving revision 1.3 diff -u -u -r1.3 Makefile --- devel/monotone/Makefile 19 Sep 2004 01:15:26 -0000 1.3 +++ devel/monotone/Makefile 20 Nov 2004 19:43:58 -0000 @@ -7,6 +7,7 @@ PORTNAME= monotone PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.venge.net/monotone/ \ http://norton.kettering.edu/freebsd/ @@ -47,7 +48,7 @@ CONFIGURE_ARGS= --with-bundled-lua .endif .if !defined(WITHOUT_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 .else CONFIGURE_ARGS= --with-bundled-sqlite .endif Index: dns/powerdns/Makefile =================================================================== RCS file: /home/ncvs/ports/dns/powerdns/Makefile,v retrieving revision 1.35 diff -u -u -r1.35 Makefile --- dns/powerdns/Makefile 20 Nov 2004 01:21:17 -0000 1.35 +++ dns/powerdns/Makefile 20 Nov 2004 19:44:05 -0000 @@ -7,7 +7,7 @@ PORTNAME= powerdns PORTVERSION= 2.9.16 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -71,8 +71,7 @@ .endif .if defined(WITH_SQLITE) -LIB_DEPENDS= sqlite.2:${PORTSDIR}/${SQLITE_PORT} -SQLITE_PORT?= databases/sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite CONFIGURE_MODULES+= "gsqlite" .else Index: finance/qhacc/Makefile =================================================================== RCS file: /home/ncvs/ports/finance/qhacc/Makefile,v retrieving revision 1.52 diff -u -u -r1.52 Makefile --- finance/qhacc/Makefile 12 Oct 2004 13:33:41 -0000 1.52 +++ finance/qhacc/Makefile 20 Nov 2004 19:44:14 -0000 @@ -7,6 +7,7 @@ PORTNAME= qhacc PORTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -57,7 +58,7 @@ .endif .if defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --enable-sqlite \ --with-sqlite-libs="${LOCALBASE}/lib" \ --with-sqlite-includes="${LOCALBASE}/include" Index: lang/gambas/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/gambas/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- lang/gambas/Makefile 8 Nov 2004 20:47:31 -0000 1.19 +++ lang/gambas/Makefile 20 Nov 2004 19:44:18 -0000 @@ -6,7 +6,7 @@ PORTNAME= gambas PORTVERSION= 0.99 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://gambas.sourceforge.net/ DISTNAME= ${PORTNAME}-${PORTVERSION}.RC2 @@ -81,7 +81,7 @@ WITH_SQLITE= yes .endif .if defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite-includes=${LOCALBASE}/include \ --with-sqlite-libraries=${LOCALBASE}/lib BUILD_DEPENDS+= ${LOCALBASE}/lib/libpub.a:${PORTSDIR}/devel/publib Index: mail/dspam-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/dspam-devel/Makefile,v retrieving revision 1.23 diff -u -u -r1.23 Makefile --- mail/dspam-devel/Makefile 8 Aug 2004 15:51:36 -0000 1.23 +++ mail/dspam-devel/Makefile 20 Nov 2004 19:44:28 -0000 @@ -7,7 +7,7 @@ PORTNAME= dspam-devel PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ \ http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/sources/ @@ -273,7 +273,7 @@ .if !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE) || defined(WITH_BDB)) WITH_SQLITE= on -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \ --with-sqlite-includes=${LOCALBASE}/include \ --with-sqlite-libraries=${LOCALBASE}/lib Index: net/gnunet/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gnunet/Makefile,v retrieving revision 1.45 diff -u -u -r1.45 Makefile --- net/gnunet/Makefile 20 Nov 2004 07:09:24 -0000 1.45 +++ net/gnunet/Makefile 20 Nov 2004 19:44:33 -0000 @@ -8,7 +8,7 @@ PORTNAME= gnunet PORTVERSION= 0.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} @@ -68,7 +68,7 @@ .endif .if defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-sqlite PLIST_SUB+= WITH_SQLITE="" .else Index: security/cyrus-sasl2/Makefile =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl2/Makefile,v retrieving revision 1.107 diff -u -u -r1.107 Makefile --- security/cyrus-sasl2/Makefile 25 Oct 2004 12:42:40 -0000 1.107 +++ security/cyrus-sasl2/Makefile 20 Nov 2004 19:44:43 -0000 @@ -7,7 +7,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 2.1.20 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ @@ -99,7 +99,7 @@ .endif .if defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} .else CONFIGURE_ARGS+=--without-sqlite Index: sysutils/bacula/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/bacula/Makefile,v retrieving revision 1.34 diff -u -u -r1.34 Makefile --- sysutils/bacula/Makefile 5 Aug 2004 19:26:48 -0000 1.34 +++ sysutils/bacula/Makefile 20 Nov 2004 19:44:47 -0000 @@ -7,7 +7,7 @@ PORTNAME= bacula PORTVERSION= 1.34.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= bacula @@ -93,7 +93,7 @@ DBTYPE= postgresql .else CONFIGURE_ARGS+= --with-sqlite=yes -LIB_DEPENDS+= sqlite:${PORTSDIR}/databases/sqlite +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 DBTYPE= sqlite .endif PLIST_SUB+= DBTYPE=${DBTYPE} Index: www/dpsearch/Makefile =================================================================== RCS file: /home/ncvs/ports/www/dpsearch/Makefile,v retrieving revision 1.5 diff -u -u -r1.5 Makefile --- www/dpsearch/Makefile 5 Nov 2004 13:02:21 -0000 1.5 +++ www/dpsearch/Makefile 20 Nov 2004 19:45:11 -0000 @@ -7,6 +7,7 @@ PORTNAME= dpsearch PORTVERSION= 4.26 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.dataparksearch.org/ \ http://dataparksearch.h0t.de/ @@ -119,7 +120,7 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .elif defined(WITH_DPSEARCH_SQLITE) -LIB_DEPEND+= sqlite.2:${PORTSDIR}/databases/sqlite +LIB_DEPEND+= sqlite.2:${PORTSDIR}/databases/sqlite2 CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411202005.iAKK5VIE061985>