summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/sqlite/Makefile5
-rw-r--r--databases/sqlite/files/patch-ltmain.sh11
-rw-r--r--databases/sqlite/pkg-plist10
-rw-r--r--databases/sqlite2/Makefile5
-rw-r--r--databases/sqlite2/files/patch-ltmain.sh11
-rw-r--r--databases/sqlite2/pkg-plist10
6 files changed, 38 insertions, 14 deletions
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 28d5beb5b5b0..f64e10bdf3cd 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sqlite
PORTVERSION= 2.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://www.hwaci.com/sw/sqlite/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -21,6 +21,7 @@ USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_REINPLACE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
+ALL_TARGET= all libtclsqlite.la
INSTALLS_SHLIB= YES
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -51,7 +52,7 @@ post-install:
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/doc//${file} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
.endfor
.endif
diff --git a/databases/sqlite/files/patch-ltmain.sh b/databases/sqlite/files/patch-ltmain.sh
new file mode 100644
index 000000000000..a36adacb710c
--- /dev/null
+++ b/databases/sqlite/files/patch-ltmain.sh
@@ -0,0 +1,11 @@
+--- ltmain.sh.orig Fri Sep 28 10:34:45 2001
++++ ltmain.sh Fri Sep 20 15:00:05 2002
+@@ -852,7 +852,7 @@
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+- vinfo=
++ vinfo=2:0:0
+
+ # We need to know -static, to get the right output filenames.
+ for arg
diff --git a/databases/sqlite/pkg-plist b/databases/sqlite/pkg-plist
index 0a9fa1b414d9..1eb257c646eb 100644
--- a/databases/sqlite/pkg-plist
+++ b/databases/sqlite/pkg-plist
@@ -3,11 +3,11 @@ include/sqlite.h
lib/libsqlite.a
lib/libsqlite.la
lib/libsqlite.so
-lib/libsqlite.so.0
-lib/sqlite/libtclsqlite.so.0
-lib/sqlite/libtclsqlite.so
-lib/sqlite/libtclsqlite.la
+lib/libsqlite.so.2
lib/sqlite/libtclsqlite.a
+lib/sqlite/libtclsqlite.la
+lib/sqlite/libtclsqlite.so
+lib/sqlite/libtclsqlite.so.2
lib/sqlite/pkgIndex.tcl
@dirrm lib/sqlite
%%PORTDOCS%%share/doc/sqlite/arch.html
@@ -16,6 +16,7 @@ lib/sqlite/pkgIndex.tcl
%%PORTDOCS%%share/doc/sqlite/changes.html
%%PORTDOCS%%share/doc/sqlite/crosscompile.html
%%PORTDOCS%%share/doc/sqlite/download.html
+%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%share/doc/sqlite/faq.html
%%PORTDOCS%%share/doc/sqlite/index.html
%%PORTDOCS%%share/doc/sqlite/lang.html
@@ -27,5 +28,4 @@ lib/sqlite/pkgIndex.tcl
%%PORTDOCS%%share/doc/sqlite/sqlite.html
%%PORTDOCS%%share/doc/sqlite/tclsqlite.html
%%PORTDOCS%%share/doc/sqlite/vdbe.html
-%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%@dirrm share/doc/sqlite
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 28d5beb5b5b0..f64e10bdf3cd 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sqlite
PORTVERSION= 2.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= http://www.hwaci.com/sw/sqlite/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -21,6 +21,7 @@ USE_GMAKE= YES
GNU_CONFIGURE= YES
USE_REINPLACE= YES
CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints
+ALL_TARGET= all libtclsqlite.la
INSTALLS_SHLIB= YES
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -51,7 +52,7 @@ post-install:
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
.for file in ${DOCFILES}
- @${INSTALL_DATA} ${WRKSRC}/doc//${file} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
.endfor
.endif
diff --git a/databases/sqlite2/files/patch-ltmain.sh b/databases/sqlite2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..a36adacb710c
--- /dev/null
+++ b/databases/sqlite2/files/patch-ltmain.sh
@@ -0,0 +1,11 @@
+--- ltmain.sh.orig Fri Sep 28 10:34:45 2001
++++ ltmain.sh Fri Sep 20 15:00:05 2002
+@@ -852,7 +852,7 @@
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+- vinfo=
++ vinfo=2:0:0
+
+ # We need to know -static, to get the right output filenames.
+ for arg
diff --git a/databases/sqlite2/pkg-plist b/databases/sqlite2/pkg-plist
index 0a9fa1b414d9..1eb257c646eb 100644
--- a/databases/sqlite2/pkg-plist
+++ b/databases/sqlite2/pkg-plist
@@ -3,11 +3,11 @@ include/sqlite.h
lib/libsqlite.a
lib/libsqlite.la
lib/libsqlite.so
-lib/libsqlite.so.0
-lib/sqlite/libtclsqlite.so.0
-lib/sqlite/libtclsqlite.so
-lib/sqlite/libtclsqlite.la
+lib/libsqlite.so.2
lib/sqlite/libtclsqlite.a
+lib/sqlite/libtclsqlite.la
+lib/sqlite/libtclsqlite.so
+lib/sqlite/libtclsqlite.so.2
lib/sqlite/pkgIndex.tcl
@dirrm lib/sqlite
%%PORTDOCS%%share/doc/sqlite/arch.html
@@ -16,6 +16,7 @@ lib/sqlite/pkgIndex.tcl
%%PORTDOCS%%share/doc/sqlite/changes.html
%%PORTDOCS%%share/doc/sqlite/crosscompile.html
%%PORTDOCS%%share/doc/sqlite/download.html
+%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%share/doc/sqlite/faq.html
%%PORTDOCS%%share/doc/sqlite/index.html
%%PORTDOCS%%share/doc/sqlite/lang.html
@@ -27,5 +28,4 @@ lib/sqlite/pkgIndex.tcl
%%PORTDOCS%%share/doc/sqlite/sqlite.html
%%PORTDOCS%%share/doc/sqlite/tclsqlite.html
%%PORTDOCS%%share/doc/sqlite/vdbe.html
-%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%@dirrm share/doc/sqlite