summaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authordwcjr <dwcjr@FreeBSD.org>2002-09-02 13:21:36 +0000
committerdwcjr <dwcjr@FreeBSD.org>2002-09-02 13:21:36 +0000
commit32050a0afb1edf97bbca4696e5fa611012fc575b (patch)
tree0d1a9a416eb51de4147576654d3b8e74d50eb5dc /databases
parent5ce3fad6b5342d19b9a04ef07d57ead707a24302 (diff)
downloadFreeBSD-ports-32050a0afb1edf97bbca4696e5fa611012fc575b.zip
FreeBSD-ports-32050a0afb1edf97bbca4696e5fa611012fc575b.tar.gz
Fixup from previous commit
Bump PORTREVISION Submitted by: maintainer
Diffstat (limited to 'databases')
-rw-r--r--databases/sqlite/Makefile5
-rw-r--r--databases/sqlite/files/example.tcl14
-rw-r--r--databases/sqlite/files/patch-makefile34
-rw-r--r--databases/sqlite/pkg-plist14
-rw-r--r--databases/sqlite2/Makefile5
-rw-r--r--databases/sqlite2/files/example.tcl14
-rw-r--r--databases/sqlite2/files/patch-makefile34
-rw-r--r--databases/sqlite2/pkg-plist14
8 files changed, 116 insertions, 18 deletions
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 132e4d5..28d5beb 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sqlite
PORTVERSION= 2.7.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.hwaci.com/sw/sqlite/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -45,10 +46,10 @@ post-build:
cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} doc
post-install:
- ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/
+ ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-# @${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
+ @${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
.for file in ${DOCFILES}
@${INSTALL_DATA} ${WRKSRC}/doc//${file} ${DOCSDIR}
.endfor
diff --git a/databases/sqlite/files/example.tcl b/databases/sqlite/files/example.tcl
new file mode 100644
index 0000000..765c3f9
--- /dev/null
+++ b/databases/sqlite/files/example.tcl
@@ -0,0 +1,14 @@
+package require sqlite
+
+if {$argc!=2} {
+ puts stderr "Usage: %s DATABASE SQL-STATEMENT"
+ exit 1
+}
+sqlite db [lindex $argv 0]
+db eval [lindex $argv 1] x {
+ foreach v $x(*) {
+ puts "$v = $x($v)"
+ }
+ puts ""
+}
+db close
diff --git a/databases/sqlite/files/patch-makefile b/databases/sqlite/files/patch-makefile
new file mode 100644
index 0000000..e6eb78a
--- /dev/null
+++ b/databases/sqlite/files/patch-makefile
@@ -0,0 +1,34 @@
+diff -r -C 3 ../sqlite.orig/Makefile.in ./Makefile.in
+*** ../sqlite.orig/Makefile.in Sat Aug 31 18:29:58 2002
+--- ./Makefile.in Mon Sep 2 00:51:27 2002
+***************
+*** 310,322 ****
+ mkdir -p doc
+ mv $(DOC) doc
+
+! install: sqlite libsqlite.la sqlite.h
+ $(INSTALL) -d $(exec_prefix)/lib
+ $(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
+ $(INSTALL) -d $(exec_prefix)/bin
+ $(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
+ $(INSTALL) -d $(prefix)/include
+ $(INSTALL) -m 0644 sqlite.h $(prefix)/include
+
+ clean:
+ rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h
+--- 310,324 ----
+ mkdir -p doc
+ mv $(DOC) doc
+
+! install: sqlite libsqlite.la sqlite.h libtclsqlite.la
+ $(INSTALL) -d $(exec_prefix)/lib
+ $(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
+ $(INSTALL) -d $(exec_prefix)/bin
+ $(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
+ $(INSTALL) -d $(prefix)/include
+ $(INSTALL) -m 0644 sqlite.h $(prefix)/include
++ mkdir -p $(prefix)/lib/sqlite
++ $(LIBTOOL) $(INSTALL) libtclsqlite.la $(prefix)/lib/sqlite
+
+ clean:
+ rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h
diff --git a/databases/sqlite/pkg-plist b/databases/sqlite/pkg-plist
index 9109d35..0a9fa1b 100644
--- a/databases/sqlite/pkg-plist
+++ b/databases/sqlite/pkg-plist
@@ -4,12 +4,12 @@ lib/libsqlite.a
lib/libsqlite.la
lib/libsqlite.so
lib/libsqlite.so.0
-@comment lib/sqlite/libtclsqlite.so.0
-@comment lib/sqlite/libtclsqlite.so
-@comment lib/sqlite/libtclsqlite.la
-@comment lib/sqlite/libtclsqlite.a
-@comment lib/sqlite/pkgIndex.tcl
-@comment @dirrm lib/sqlite
+lib/sqlite/libtclsqlite.so.0
+lib/sqlite/libtclsqlite.so
+lib/sqlite/libtclsqlite.la
+lib/sqlite/libtclsqlite.a
+lib/sqlite/pkgIndex.tcl
+@dirrm lib/sqlite
%%PORTDOCS%%share/doc/sqlite/arch.html
%%PORTDOCS%%share/doc/sqlite/arch.png
%%PORTDOCS%%share/doc/sqlite/c_interface.html
@@ -27,5 +27,5 @@ lib/libsqlite.so.0
%%PORTDOCS%%share/doc/sqlite/sqlite.html
%%PORTDOCS%%share/doc/sqlite/tclsqlite.html
%%PORTDOCS%%share/doc/sqlite/vdbe.html
-@comment %%PORTDOCS%%share/doc/sqlite/example.tcl
+%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%@dirrm share/doc/sqlite
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 132e4d5..28d5beb 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sqlite
PORTVERSION= 2.7.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.hwaci.com/sw/sqlite/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -45,10 +46,10 @@ post-build:
cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} doc
post-install:
- ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/
+ ${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-# @${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
+ @${INSTALL_DATA} ${FILESDIR}/example.tcl ${DOCSDIR}
.for file in ${DOCFILES}
@${INSTALL_DATA} ${WRKSRC}/doc//${file} ${DOCSDIR}
.endfor
diff --git a/databases/sqlite2/files/example.tcl b/databases/sqlite2/files/example.tcl
new file mode 100644
index 0000000..765c3f9
--- /dev/null
+++ b/databases/sqlite2/files/example.tcl
@@ -0,0 +1,14 @@
+package require sqlite
+
+if {$argc!=2} {
+ puts stderr "Usage: %s DATABASE SQL-STATEMENT"
+ exit 1
+}
+sqlite db [lindex $argv 0]
+db eval [lindex $argv 1] x {
+ foreach v $x(*) {
+ puts "$v = $x($v)"
+ }
+ puts ""
+}
+db close
diff --git a/databases/sqlite2/files/patch-makefile b/databases/sqlite2/files/patch-makefile
new file mode 100644
index 0000000..e6eb78a
--- /dev/null
+++ b/databases/sqlite2/files/patch-makefile
@@ -0,0 +1,34 @@
+diff -r -C 3 ../sqlite.orig/Makefile.in ./Makefile.in
+*** ../sqlite.orig/Makefile.in Sat Aug 31 18:29:58 2002
+--- ./Makefile.in Mon Sep 2 00:51:27 2002
+***************
+*** 310,322 ****
+ mkdir -p doc
+ mv $(DOC) doc
+
+! install: sqlite libsqlite.la sqlite.h
+ $(INSTALL) -d $(exec_prefix)/lib
+ $(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
+ $(INSTALL) -d $(exec_prefix)/bin
+ $(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
+ $(INSTALL) -d $(prefix)/include
+ $(INSTALL) -m 0644 sqlite.h $(prefix)/include
+
+ clean:
+ rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h
+--- 310,324 ----
+ mkdir -p doc
+ mv $(DOC) doc
+
+! install: sqlite libsqlite.la sqlite.h libtclsqlite.la
+ $(INSTALL) -d $(exec_prefix)/lib
+ $(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
+ $(INSTALL) -d $(exec_prefix)/bin
+ $(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
+ $(INSTALL) -d $(prefix)/include
+ $(INSTALL) -m 0644 sqlite.h $(prefix)/include
++ mkdir -p $(prefix)/lib/sqlite
++ $(LIBTOOL) $(INSTALL) libtclsqlite.la $(prefix)/lib/sqlite
+
+ clean:
+ rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h
diff --git a/databases/sqlite2/pkg-plist b/databases/sqlite2/pkg-plist
index 9109d35..0a9fa1b 100644
--- a/databases/sqlite2/pkg-plist
+++ b/databases/sqlite2/pkg-plist
@@ -4,12 +4,12 @@ lib/libsqlite.a
lib/libsqlite.la
lib/libsqlite.so
lib/libsqlite.so.0
-@comment lib/sqlite/libtclsqlite.so.0
-@comment lib/sqlite/libtclsqlite.so
-@comment lib/sqlite/libtclsqlite.la
-@comment lib/sqlite/libtclsqlite.a
-@comment lib/sqlite/pkgIndex.tcl
-@comment @dirrm lib/sqlite
+lib/sqlite/libtclsqlite.so.0
+lib/sqlite/libtclsqlite.so
+lib/sqlite/libtclsqlite.la
+lib/sqlite/libtclsqlite.a
+lib/sqlite/pkgIndex.tcl
+@dirrm lib/sqlite
%%PORTDOCS%%share/doc/sqlite/arch.html
%%PORTDOCS%%share/doc/sqlite/arch.png
%%PORTDOCS%%share/doc/sqlite/c_interface.html
@@ -27,5 +27,5 @@ lib/libsqlite.so.0
%%PORTDOCS%%share/doc/sqlite/sqlite.html
%%PORTDOCS%%share/doc/sqlite/tclsqlite.html
%%PORTDOCS%%share/doc/sqlite/vdbe.html
-@comment %%PORTDOCS%%share/doc/sqlite/example.tcl
+%%PORTDOCS%%share/doc/sqlite/example.tcl
%%PORTDOCS%%@dirrm share/doc/sqlite
OpenPOWER on IntegriCloud