diff options
| author | Norikatsu Shigemura <nork@FreeBSD.org> | 2004-12-23 08:25:47 +0000 |
|---|---|---|
| committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2004-12-23 08:25:47 +0000 |
| commit | 617938836df905824ac0214a5f379bd18495a18d (patch) | |
| tree | 5942cea4112b665ee12f56e68f624378791cef22 | |
| parent | ac8dacab33e1a208353d4fd86b8e764dde1df4d0 (diff) | |
| download | ports-617938836df905824ac0214a5f379bd18495a18d.tar.gz ports-617938836df905824ac0214a5f379bd18495a18d.zip | |
Notes
43 files changed, 188 insertions, 528 deletions
@@ -1361,3 +1361,4 @@ lang/gcc34|lang/gcc-ooo|2004-12-15|finished repocopy and required by OOo port print/pxfonts||2004-12-19|already included in the teTeX distribution print/txfonts||2004-12-19|already included in the teTeX distribution audio/juk|multimedia/kdemultimedia3|2004-12-22|juk has been integrated into kdemultimedia3 +databases/sqlite|databases/sqlite2|2004-12-23|port renamed diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile index 8671a421d68d..678e5969e3c3 100644 --- a/astro/roadmap/Makefile +++ b/astro/roadmap/Makefile @@ -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 @@ MAINTAINER= nick@netdot.net 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 diff --git a/databases/Makefile b/databases/Makefile index 21cdab92f70a..599360a41abf 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -323,7 +323,7 @@ SUBDIR += ruby-sqlite SUBDIR += ruby-sqlrelay SUBDIR += slony1 - SUBDIR += sqlite + SUBDIR += sqlite2 SUBDIR += sqlite3 SUBDIR += sqlrelay SUBDIR += sqsh diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index 629168df3f95..802d0657bf3a 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -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 @@ PLIST_SUB+= PGSQL="@comment " .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 diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index f8213425ceda..a801be2962ad 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -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 @@ -165,7 +166,7 @@ PLIST_SUB+= ODBC:="@comment " .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 diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index f8213425ceda..a801be2962ad 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -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 @@ -165,7 +166,7 @@ PLIST_SUB+= ODBC:="@comment " .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 diff --git a/databases/py-PySQLite/Makefile b/databases/py-PySQLite/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-PySQLite/Makefile +++ b/databases/py-PySQLite/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-PySQLite10/Makefile b/databases/py-PySQLite10/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-PySQLite10/Makefile +++ b/databases/py-PySQLite10/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-PySQLite11/Makefile b/databases/py-PySQLite11/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-PySQLite11/Makefile +++ b/databases/py-PySQLite11/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-PySQLite2/Makefile b/databases/py-PySQLite2/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-PySQLite2/Makefile +++ b/databases/py-PySQLite2/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-pysqlite20/Makefile b/databases/py-pysqlite20/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-pysqlite20/Makefile +++ b/databases/py-pysqlite20/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-pysqlite21/Makefile b/databases/py-pysqlite21/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-pysqlite21/Makefile +++ b/databases/py-pysqlite21/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-pysqlite22/Makefile b/databases/py-pysqlite22/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-pysqlite22/Makefile +++ b/databases/py-pysqlite22/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/py-pysqlite23/Makefile b/databases/py-pysqlite23/Makefile index 48ff9b41a8ea..5db968912c46 100644 --- a/databases/py-pysqlite23/Makefile +++ b/databases/py-pysqlite23/Makefile @@ -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 @@ MAINTAINER= gh@ghaering.de 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} diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile index 2acddef94975..17a9c386ba03 100644 --- a/databases/qt-sqlite-plugin/Makefile +++ b/databases/qt-sqlite-plugin/Makefile @@ -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 @@ COMMENT= A plugin for QT to connect to SQLite-Databases 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} diff --git a/databases/ruby-dbd_sqlite/Makefile b/databases/ruby-dbd_sqlite/Makefile index 04c5547d3ca9..f435af45fa37 100644 --- a/databases/ruby-dbd_sqlite/Makefile +++ b/databases/ruby-dbd_sqlite/Makefile @@ -7,6 +7,7 @@ PORTNAME= dbd_sqlite PORTVERSION= ${RUBY_DBI_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ${RUBY_DBI_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_DBI_MASTER_SITE_SUBDIR} @@ -17,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= SQLite driver for DBI-for-Ruby -LIB_DEPENDS= sqlite.2:${.CURDIR}/../sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite RUN_DEPENDS= ${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR} USE_RUBY= yes diff --git a/databases/ruby-sqlite/Makefile b/databases/ruby-sqlite/Makefile index e15082239aa7..a801abe33013 100644 --- a/databases/ruby-sqlite/Makefile +++ b/databases/ruby-sqlite/Makefile @@ -7,6 +7,7 @@ PORTNAME= sqlite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}-ruby @@ -17,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to the SQLite DB engine -LIB_DEPENDS= sqlite.2:${.CURDIR}/../sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/ruby-sqlite3/Makefile b/databases/ruby-sqlite3/Makefile index e15082239aa7..a801abe33013 100644 --- a/databases/ruby-sqlite3/Makefile +++ b/databases/ruby-sqlite3/Makefile @@ -7,6 +7,7 @@ PORTNAME= sqlite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}-ruby @@ -17,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to the SQLite DB engine -LIB_DEPENDS= sqlite.2:${.CURDIR}/../sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile index e15082239aa7..a801abe33013 100644 --- a/databases/rubygem-sqlite3-ruby/Makefile +++ b/databases/rubygem-sqlite3-ruby/Makefile @@ -7,6 +7,7 @@ PORTNAME= sqlite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}-ruby @@ -17,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to the SQLite DB engine -LIB_DEPENDS= sqlite.2:${.CURDIR}/../sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile index e15082239aa7..a801abe33013 100644 --- a/databases/rubygem-sqlite3/Makefile +++ b/databases/rubygem-sqlite3/Makefile @@ -7,6 +7,7 @@ PORTNAME= sqlite PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= databases ruby MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}-ruby @@ -17,7 +18,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org COMMENT= Ruby interface to the SQLite DB engine -LIB_DEPENDS= sqlite.2:${.CURDIR}/../sqlite +LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/databases/sqlite/distinfo b/databases/sqlite/distinfo deleted file mode 100644 index d7da79b7fe0a..000000000000 --- a/databases/sqlite/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (sqlite-2.8.14.tar.gz) = 113ce31cc31e0ab671bab590122e272a -SIZE (sqlite-2.8.14.tar.gz) = 955231 diff --git a/databases/sqlite/files/patch-Makefile.in b/databases/sqlite/files/patch-Makefile.in deleted file mode 100644 index 59b3aabecbb9..000000000000 --- a/databases/sqlite/files/patch-Makefile.in +++ /dev/null @@ -1,138 +0,0 @@ ---- 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 - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin -- $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin -+ $(INSTALL) .libs/sqlite $(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 - - clean: - rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* diff --git a/databases/sqlite/Makefile b/databases/sqlite2/Makefile index 4fd903e360ea..9e67e4b7b354 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite2/Makefile @@ -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,17 @@ 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> + +DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist 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 @@ -95,11 +96,10 @@ post-install: .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> diff --git a/databases/sqlite2/distinfo b/databases/sqlite2/distinfo new file mode 100644 index 000000000000..2aaf0ac35d2f --- /dev/null +++ b/databases/sqlite2/distinfo @@ -0,0 +1,2 @@ +MD5 (sqlite-2.8.15.tar.gz) = 0afa73e107bd106031d046c8ca6a94ab +SIZE (sqlite-2.8.15.tar.gz) = 963232 diff --git a/databases/sqlite/files/example.tcl b/databases/sqlite2/files/example.tcl index 765c3f9ba715..765c3f9ba715 100644 --- a/databases/sqlite/files/example.tcl +++ b/databases/sqlite2/files/example.tcl diff --git a/databases/sqlite2/files/patch-Makefile.in b/databases/sqlite2/files/patch-Makefile.in new file mode 100644 index 000000000000..ef0acb3153d6 --- /dev/null +++ b/databases/sqlite2/files/patch-Makefile.in @@ -0,0 +1,41 @@ +--- 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) + $(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 \ +@@ -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 + $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin +- $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin ++ $(INSTALL) .libs/sqlite $(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 + + clean: + rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* diff --git a/databases/sqlite/files/pkgIndex.tcl b/databases/sqlite2/files/pkgIndex.tcl index d96e27a1bc55..d96e27a1bc55 100644 --- a/databases/sqlite/files/pkgIndex.tcl +++ b/databases/sqlite2/files/pkgIndex.tcl diff --git a/databases/sqlite/pkg-descr b/databases/sqlite2/pkg-descr index 3cdcbd6b2daf..3cdcbd6b2daf 100644 --- a/databases/sqlite/pkg-descr +++ b/databases/sqlite2/pkg-descr diff --git a/databases/sqlite/pkg-plist b/databases/sqlite2/pkg-plist index aa4afe667438..aa4afe667438 100644 --- a/databases/sqlite/pkg-plist +++ b/databases/sqlite2/pkg-plist diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index aa3b9201e7c6..6f9dd668b4d9 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -8,8 +8,7 @@ # By default, this port depends on TCL for building docs. If you want to build # without TCL (and thus get no docs), define NOPORTDOCS. -# If you want to build the TCL wrapper, you have to choose between -# SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84. +# If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84. PORTNAME= sqlite PORTVERSION= 3.0.8 @@ -22,7 +21,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper (beta) DOCSDIR= ${PREFIX}/share/doc/sqlite3 EXAMPLESDIR= ${PREFIX}/share/examples/sqlite3 -NO_LATEST_LINK= yes +LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3 # Defaults, for building the docs: TCL_V= 8.4 @@ -36,10 +35,7 @@ WITH_TCL= YES .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) @@ -55,21 +51,22 @@ USE_REINPLACE= YES 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+= libtclsqlite3.la tclsqlite3 -.endif INSTALLS_SHLIB= YES WRKSRC= ${WRKDIR}/${PORTNAME} +.include <bsd.port.pre.mk> + +DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist + 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 @@ -77,8 +74,6 @@ post-build: cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc .endif -DOCFILES= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2 }' < pkg-plist - post-install: .if defined(WITH_TCL) @${MKDIR} ${PREFIX}/lib/sqlite @@ -90,12 +85,11 @@ post-install: .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - for f in `${DOCFILES}`; do \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${f} ${DOCSDIR}; \ - done +.for file in ${DOCFILES} + ${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> diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in index 803351731bc3..12010f1afd01 100644 --- a/databases/sqlite3/files/patch-Makefile.in +++ b/databases/sqlite3/files/patch-Makefile.in @@ -1,144 +1,18 @@ ---- Makefile.in.orig Wed Oct 6 12:03:05 2004 -+++ Makefile.in Tue Nov 30 21:55:09 2004 -@@ -34,7 +34,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = /usr/local/bin/libtool13 - RELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install -@@ -396,25 +396,25 @@ - # Rules used to build documentation - # - arch.html: $(TOP)/www/arch.tcl -- tclsh $(TOP)/www/arch.tcl >arch.html -+ $(TCLSH) $(TOP)/www/arch.tcl >arch.html - - arch2.gif: $(TOP)/www/arch2.gif - cp $(TOP)/www/arch2.gif . - - 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 - - capi3.html: $(TOP)/www/capi3.tcl -- tclsh $(TOP)/www/capi3.tcl >capi3.html -+ $(TCLSH) $(TOP)/www/capi3.tcl >capi3.html - - capi3ref.html: $(TOP)/www/capi3ref.tcl -- tclsh $(TOP)/www/capi3ref.tcl >capi3ref.html -+ $(TCLSH) $(TOP)/www/capi3ref.tcl >capi3ref.html - - changes.html: $(TOP)/www/changes.tcl -- tclsh $(TOP)/www/changes.tcl >changes.html -+ $(TCLSH) $(TOP)/www/changes.tcl >changes.html - - copyright.html: $(TOP)/www/copyright.tcl -- tclsh $(TOP)/www/copyright.tcl >copyright.html -+ $(TCLSH) $(TOP)/www/copyright.tcl >copyright.html - - copyright-release.html: $(TOP)/www/copyright-release.html - cp $(TOP)/www/copyright-release.html . -@@ -426,77 +426,77 @@ - cp $(TOP)/www/common.tcl . - - conflict.html: $(TOP)/www/conflict.tcl -- tclsh $(TOP)/www/conflict.tcl >conflict.html -+ $(TCLSH) $(TOP)/www/conflict.tcl >conflict.html - - datatypes.html: $(TOP)/www/datatypes.tcl -- tclsh $(TOP)/www/datatypes.tcl >datatypes.html -+ $(TCLSH) $(TOP)/www/datatypes.tcl >datatypes.html - - datatype3.html: $(TOP)/www/datatype3.tcl -- tclsh $(TOP)/www/datatype3.tcl >datatype3.html -+ $(TCLSH) $(TOP)/www/datatype3.tcl >datatype3.html - - docs.html: $(TOP)/www/docs.tcl -- tclsh $(TOP)/www/docs.tcl >docs.html -+ $(TCLSH) $(TOP)/www/docs.tcl >docs.html - - download.html: $(TOP)/www/download.tcl - mkdir -p doc -- tclsh $(TOP)/www/download.tcl >download.html -+ $(TCLSH) $(TOP)/www/download.tcl >download.html - - faq.html: $(TOP)/www/faq.tcl -- tclsh $(TOP)/www/faq.tcl >faq.html -+ $(TCLSH) $(TOP)/www/faq.tcl >faq.html - - fileformat.html: $(TOP)/www/fileformat.tcl -- tclsh $(TOP)/www/fileformat.tcl >fileformat.html -+ $(TCLSH) $(TOP)/www/fileformat.tcl >fileformat.html - - formatchng.html: $(TOP)/www/formatchng.tcl -- tclsh $(TOP)/www/formatchng.tcl >formatchng.html -+ $(TCLSH) $(TOP)/www/formatchng.tcl >formatchng.html - - index.html: $(TOP)/www/index.tcl last_change -- tclsh $(TOP)/www/index.tcl >index.html -+ $(TCLSH) $(TOP)/www/index.tcl >index.html - - lang.html: $(TOP)/www/lang.tcl -- tclsh $(TOP)/www/lang.tcl >lang.html -+ $(TCLSH) $(TOP)/www/lang.tcl >lang.html - - lockingv3.html: $(TOP)/www/lockingv3.tcl -- tclsh $(TOP)/www/lockingv3.tcl >lockingv3.html -+ $(TCLSH) $(TOP)/www/lockingv3.tcl >lockingv3.html - - oldnews.html: $(TOP)/www/oldnews.tcl -- tclsh $(TOP)/www/oldnews.tcl >oldnews.html -+ $(TCLSH) $(TOP)/www/oldnews.tcl >oldnews.html - - omitted.html: $(TOP)/www/omitted.tcl -- tclsh $(TOP)/www/omitted.tcl >omitted.html -+ $(TCLSH) $(TOP)/www/omitted.tcl >omitted.html - - 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 - - nulls.html: $(TOP)/www/nulls.tcl -- tclsh $(TOP)/www/nulls.tcl >nulls.html -+ $(TCLSH) $(TOP)/www/nulls.tcl >nulls.html - - quickstart.html: $(TOP)/www/quickstart.tcl -- tclsh $(TOP)/www/quickstart.tcl >quickstart.html -+ $(TCLSH) $(TOP)/www/quickstart.tcl >quickstart.html - - speed.html: $(TOP)/www/speed.tcl -- tclsh $(TOP)/www/speed.tcl >speed.html -+ $(TCLSH) $(TOP)/www/speed.tcl >speed.html - - sqlite.gif: $(TOP)/art/SQLite.gif - cp $(TOP)/art/SQLite.gif sqlite.gif - - sqlite.html: $(TOP)/www/sqlite.tcl -- tclsh $(TOP)/www/sqlite.tcl >sqlite.html -+ $(TCLSH) $(TOP)/www/sqlite.tcl >sqlite.html - - support.html: $(TOP)/www/support.tcl -- tclsh $(TOP)/www/support.tcl >support.html -+ $(TCLSH) $(TOP)/www/support.tcl >support.html - - tclsqlite.html: $(TOP)/www/tclsqlite.tcl -- tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html -+ $(TCLSH) $(TOP)/www/tclsqlite.tcl >tclsqlite.html - - vdbe.html: $(TOP)/www/vdbe.tcl -- tclsh $(TOP)/www/vdbe.tcl >vdbe.html -+ $(TCLSH) $(TOP)/www/vdbe.tcl >vdbe.html - - version3.html: $(TOP)/www/version3.tcl -- tclsh $(TOP)/www/version3.tcl >version3.html -+ $(TCLSH) $(TOP)/www/version3.tcl >version3.html - - - # Files to be published on the website. +--- Makefile.in.orig Thu Oct 7 00:03:05 2004 ++++ Makefile.in Thu Dec 23 17:17:22 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) sqlite3 $(DESTDIR)$(exec_prefix)/bin + $(INSTALL) -d $(DESTDIR)$(prefix)/include + $(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 sqlite3@TARGET_EXEEXT@ libsqlite3.la diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile index aa3b9201e7c6..6f9dd668b4d9 100644 --- a/databases/sqlite34/Makefile +++ b/databases/sqlite34/Makefile @@ -8,8 +8,7 @@ # By default, this port depends on TCL for building docs. If you want to build # without TCL (and thus get no docs), define NOPORTDOCS. -# If you want to build the TCL wrapper, you have to choose between -# SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84. +# If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84. PORTNAME= sqlite PORTVERSION= 3.0.8 @@ -22,7 +21,7 @@ COMMENT= An SQL database engine in a C library w/ Tcl wrapper (beta) DOCSDIR= ${PREFIX}/share/doc/sqlite3 EXAMPLESDIR= ${PREFIX}/share/examples/sqlite3 -NO_LATEST_LINK= yes +LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3 # Defaults, for building the docs: TCL_V= 8.4 @@ -36,10 +35,7 @@ WITH_TCL= YES .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) @@ -55,21 +51,22 @@ USE_REINPLACE= YES 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+= libtclsqlite3.la tclsqlite3 -.endif INSTALLS_SHLIB= YES WRKSRC= ${WRKDIR}/${PORTNAME} +.include <bsd.port.pre.mk> + +DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist + 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 @@ -77,8 +74,6 @@ post-build: cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc .endif -DOCFILES= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2 }' < pkg-plist - post-install: .if defined(WITH_TCL) @${MKDIR} ${PREFIX}/lib/sqlite @@ -90,12 +85,11 @@ post-install: .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - for f in `${DOCFILES}`; do \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${f} ${DOCSDIR}; \ - done +.for file in ${DOCFILES} + ${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> diff --git a/databases/sqlite34/files/patch-Makefile.in b/databases/sqlite34/files/patch-Makefile.in index 803351731bc3..12010f1afd01 100644 --- a/databases/sqlite34/files/patch-Makefile.in +++ b/databases/sqlite34/files/patch-Makefile.in @@ -1,144 +1,18 @@ ---- Makefile.in.orig Wed Oct 6 12:03:05 2004 -+++ Makefile.in Tue Nov 30 21:55:09 2004 -@@ -34,7 +34,7 @@ - exec_prefix = @exec_prefix@ - libdir = @libdir@ - INSTALL = @INSTALL@ --LIBTOOL = ./libtool -+LIBTOOL = /usr/local/bin/libtool13 - RELEASE = @ALLOWRELEASE@ - - # libtool compile/link/install -@@ -396,25 +396,25 @@ - # Rules used to build documentation - # - arch.html: $(TOP)/www/arch.tcl -- tclsh $(TOP)/www/arch.tcl >arch.html -+ $(TCLSH) $(TOP)/www/arch.tcl >arch.html - - arch2.gif: $(TOP)/www/arch2.gif - cp $(TOP)/www/arch2.gif . - - 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 - - capi3.html: $(TOP)/www/capi3.tcl -- tclsh $(TOP)/www/capi3.tcl >capi3.html -+ $(TCLSH) $(TOP)/www/capi3.tcl >capi3.html - - capi3ref.html: $(TOP)/www/capi3ref.tcl -- tclsh $(TOP)/www/capi3ref.tcl >capi3ref.html -+ $(TCLSH) $(TOP)/www/capi3ref.tcl >capi3ref.html - - changes.html: $(TOP)/www/changes.tcl -- tclsh $(TOP)/www/changes.tcl >changes.html -+ $(TCLSH) $(TOP)/www/changes.tcl >changes.html - - copyright.html: $(TOP)/www/copyright.tcl -- tclsh $(TOP)/www/copyright.tcl >copyright.html -+ $(TCLSH) $(TOP)/www/copyright.tcl >copyright.html - - copyright-release.html: $(TOP)/www/copyright-release.html - cp $(TOP)/www/copyright-release.html . -@@ -426,77 +426,77 @@ - cp $(TOP)/www/common.tcl . - - conflict.html: $(TOP)/www/conflict.tcl -- tclsh $(TOP)/www/conflict.tcl >conflict.html -+ $(TCLSH) $(TOP)/www/conflict.tcl >conflict.html - - datatypes.html: $(TOP)/www/datatypes.tcl -- tclsh $(TOP)/www/datatypes.tcl >datatypes.html -+ $(TCLSH) $(TOP)/www/datatypes.tcl >datatypes.html - - datatype3.html: $(TOP)/www/datatype3.tcl -- tclsh $(TOP)/www/datatype3.tcl >datatype3.html -+ $(TCLSH) $(TOP)/www/datatype3.tcl >datatype3.html - - docs.html: $(TOP)/www/docs.tcl -- tclsh $(TOP)/www/docs.tcl >docs.html -+ $(TCLSH) $(TOP)/www/docs.tcl >docs.html - - download.html: $(TOP)/www/download.tcl - mkdir -p doc -- tclsh $(TOP)/www/download.tcl >download.html -+ $(TCLSH) $(TOP)/www/download.tcl >download.html - - faq.html: $(TOP)/www/faq.tcl -- tclsh $(TOP)/www/faq.tcl >faq.html -+ $(TCLSH) $(TOP)/www/faq.tcl >faq.html - - fileformat.html: $(TOP)/www/fileformat.tcl -- tclsh $(TOP)/www/fileformat.tcl >fileformat.html -+ $(TCLSH) $(TOP)/www/fileformat.tcl >fileformat.html - - formatchng.html: $(TOP)/www/formatchng.tcl -- tclsh $(TOP)/www/formatchng.tcl >formatchng.html -+ $(TCLSH) $(TOP)/www/formatchng.tcl >formatchng.html - - index.html: $(TOP)/www/index.tcl last_change -- tclsh $(TOP)/www/index.tcl >index.html -+ $(TCLSH) $(TOP)/www/index.tcl >index.html - - lang.html: $(TOP)/www/lang.tcl -- tclsh $(TOP)/www/lang.tcl >lang.html -+ $(TCLSH) $(TOP)/www/lang.tcl >lang.html - - lockingv3.html: $(TOP)/www/lockingv3.tcl -- tclsh $(TOP)/www/lockingv3.tcl >lockingv3.html -+ $(TCLSH) $(TOP)/www/lockingv3.tcl >lockingv3.html - - oldnews.html: $(TOP)/www/oldnews.tcl -- tclsh $(TOP)/www/oldnews.tcl >oldnews.html -+ $(TCLSH) $(TOP)/www/oldnews.tcl >oldnews.html - - omitted.html: $(TOP)/www/omitted.tcl -- tclsh $(TOP)/www/omitted.tcl >omitted.html -+ $(TCLSH) $(TOP)/www/omitted.tcl >omitted.html - - 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 - - nulls.html: $(TOP)/www/nulls.tcl -- tclsh $(TOP)/www/nulls.tcl >nulls.html -+ $(TCLSH) $(TOP)/www/nulls.tcl >nulls.html - - quickstart.html: $(TOP)/www/quickstart.tcl -- tclsh $(TOP)/www/quickstart.tcl >quickstart.html -+ $(TCLSH) $(TOP)/www/quickstart.tcl >quickstart.html - - speed.html: $(TOP)/www/speed.tcl -- tclsh $(TOP)/www/speed.tcl >speed.html -+ $(TCLSH) $(TOP)/www/speed.tcl >speed.html - - sqlite.gif: $(TOP)/art/SQLite.gif - cp $(TOP)/art/SQLite.gif sqlite.gif - - sqlite.html: $(TOP)/www/sqlite.tcl -- tclsh $(TOP)/www/sqlite.tcl >sqlite.html -+ $(TCLSH) $(TOP)/www/sqlite.tcl >sqlite.html - - support.html: $(TOP)/www/support.tcl -- tclsh $(TOP)/www/support.tcl >support.html -+ $(TCLSH) $(TOP)/www/support.tcl >support.html - - tclsqlite.html: $(TOP)/www/tclsqlite.tcl -- tclsh $(TOP)/www/tclsqlite.tcl >tclsqlite.html -+ $(TCLSH) $(TOP)/www/tclsqlite.tcl >tclsqlite.html - - vdbe.html: $(TOP)/www/vdbe.tcl -- tclsh $(TOP)/www/vdbe.tcl >vdbe.html -+ $(TCLSH) $(TOP)/www/vdbe.tcl >vdbe.html - - version3.html: $(TOP)/www/version3.tcl -- tclsh $(TOP)/www/version3.tcl >version3.html -+ $(TCLSH) $(TOP)/www/version3.tcl >version3.html - - - # Files to be published on the website. +--- Makefile.in.orig Thu Oct 7 00:03:05 2004 ++++ Makefile.in Thu Dec 23 17:17:22 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) sqlite3 $(DESTDIR)$(exec_prefix)/bin + $(INSTALL) -d $(DESTDIR)$(prefix)/include + $(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 sqlite3@TARGET_EXEEXT@ libsqlite3.la diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index f2fd2faf9a3d..4c86b9e5f033 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -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 @@ OPTIONS= MSQL "Build MSQL connection" off \ .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= "" diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile index 28e416a7325d..0998d195532a 100644 --- a/deskutils/gtkjournal/Makefile +++ b/deskutils/gtkjournal/Makefile @@ -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 @@ MAINTAINER= adamw@FreeBSD.org 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 diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile index 50d516fdfcd9..d08d685525f3 100644 --- a/devel/cvstrac/Makefile +++ b/devel/cvstrac/Makefile @@ -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 diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 4628b666f86b..5183c32b9314 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -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 @@ LIB_DEPENDS+= lua.5:${PORTSDIR}/lang/lua 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 diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 781e181d2d25..b522b29e984d 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -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 @@ PLIST_SUB+= WITHLDAP="@comment " .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 diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 781e181d2d25..b522b29e984d 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -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 @@ PLIST_SUB+= WITHLDAP="@comment " .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 diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 2cbc200b906c..8348e0de24d1 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -6,7 +6,7 @@ PORTNAME= gambas PORTVERSION= 0.99 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= http://gambas.sourceforge.net/ DISTNAME= ${PORTNAME}-${PORTVERSION}.RC5 @@ -89,7 +89,7 @@ PLIST_SUB+= PGSQL="@comment " 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 diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 48e06154b27e..47f4bb49f219 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= dspam-devel PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE} +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/sources/ DISTFILES= ${PORTNAME}.${PORTVERSION}.tar.gz @@ -338,7 +339,7 @@ DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE) # DBDRV_COUNT==!(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 diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 862da622055f..e09df1ecd549 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -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%/ \ @@ -98,7 +98,7 @@ CONFIGURE_ARGS+=--without-pgsql .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 diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile index 3a9b5cf51c34..074099d1bf3e 100644 --- a/www/dpsearch/Makefile +++ b/www/dpsearch/Makefile @@ -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 @@ USE_MYSQL= yes 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 |