diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-22 00:06:40 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-22 00:06:40 +0000 |
commit | 0fe21ea6d5fca7cda9fe143ee6d7a007fbd1879c (patch) | |
tree | d7e18ddb966b65487032aa403f3d3adcc251615d /databases/sqlite3 | |
parent | - Patch out configure check for jpeg in WITHOUT_X11 case, it's really not (diff) |
- Update to 3.2.1
- Use OPTIONS
PR: ports/79024
Submitted by: Marcus Grando <marcus@corp.grupos.com.br>
Approved by: maintainer timeout (2 months)
Notes
Notes:
svn path=/head/; revision=135820
Diffstat (limited to 'databases/sqlite3')
-rw-r--r-- | databases/sqlite3/Makefile | 75 | ||||
-rw-r--r-- | databases/sqlite3/distinfo | 4 | ||||
-rw-r--r-- | databases/sqlite3/files/patch-Makefile.in | 24 | ||||
-rw-r--r-- | databases/sqlite3/pkg-plist | 37 |
4 files changed, 51 insertions, 89 deletions
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 5e887bc8ddba..6b177102b3bf 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -11,90 +11,85 @@ # If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84. PORTNAME= sqlite -PORTVERSION= 3.0.8 -PORTREVISION= 2 +PORTVERSION= 3.2.1 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ -DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= green@FreeBSD.org COMMENT= An SQL database engine in a C library w/ Tcl wrapper (beta) +USE_GMAKE= YES +USE_GNOME= pkgconfig +USE_LIBTOOL_VER= 15 +HAS_CONFIGURE= YES +USE_REINPLACE= YES +INSTALLS_SHLIB= YES + DOCSDIR= ${PREFIX}/share/doc/sqlite3 EXAMPLESDIR= ${PREFIX}/share/examples/sqlite3 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}3 # Defaults, for building the docs: -TCL_V= 8.4 -TCL_SHORT_V= 84 +TCL_V?= 8.4 + +OPTIONS= TCL84 "TCL wrapper for SQLITE" off -.if defined(SQLITE_WITH_TCL84) -CATEGORIES+= tcl84 -TCL_V= 8.4 -TCL_SHORT_V= 84 +.include <bsd.port.pre.mk> + +.if defined(WITH_TCL84) +CATEGORIES+= lang WITH_TCL= YES .endif .if defined(WITH_TCL) ALL_TARGET+= libtclsqlite.la -PLIST_SUB+= WITH_TCL="" +PLIST_SUB+= WITH_TCL="" +CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl${TCL_V} .else -PLIST_SUB+= WITH_TCL="@comment " +PLIST_SUB+= WITH_TCL="@comment " +CONFIGURE_ARGS= --disable-tcl .endif .if !defined(NOPORTDOCS) -BUILD_DEPENDS+= tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V} +BUILD_DEPENDS+= tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//} MAKE_ARGS+= TCLSH=tclsh${TCL_V} MAKE_ENV+= TCL_VER=${TCL_V} .endif -USE_GMAKE= YES -USE_GNOME= pkgconfig -USE_LIBTOOL_VER= 13 -GNU_CONFIGURE= YES -USE_REINPLACE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints +CONFIGURE_ARGS+= --prefix=${PREFIX} --with-hints=freebsd.hints CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -ALL_TARGET= all - -INSTALLS_SHLIB= YES +ALL_TARGET= all -WRKSRC= ${WRKDIR}/${PORTNAME} - -.include <bsd.port.pre.mk> - -DOCFILES!= ${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif post-patch: @${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \ - -e "s|\./libtool|${LIBTOOL}|g" \ - ${WRKSRC}/Makefile.in + -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_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" >>${WRKSRC}/freebsd.hints +# @${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints post-build: # Build the docs .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc + @(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc) .endif post-install: .if defined(WITH_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 + @(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ + libtclsqlite3.la ${PREFIX}/lib/sqlite/) + @${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} -.endfor + @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR} + @${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR} .endif .include <bsd.port.post.mk> diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo index b6dc05bf64ce..35919aed203d 100644 --- a/databases/sqlite3/distinfo +++ b/databases/sqlite3/distinfo @@ -1,2 +1,2 @@ -MD5 (sqlite-3.0.8.tar.gz) = b7dff1ec9bf4d08928c039b278630ba7 -SIZE (sqlite-3.0.8.tar.gz) = 1288859 +MD5 (sqlite-3.2.1.tar.gz) = ccf3831c2f67452d444c5e5e2c7ca6f0 +SIZE (sqlite-3.2.1.tar.gz) = 1351842 diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in index 12010f1afd01..b66fd8181372 100644 --- a/databases/sqlite3/files/patch-Makefile.in +++ b/databases/sqlite3/files/patch-Makefile.in @@ -1,11 +1,15 @@ ---- 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 +--- Makefile.in.orig Fri Mar 11 14:50:32 2005 ++++ Makefile.in Sat Mar 19 16:06:28 2005 +@@ -212,7 +212,7 @@ + # This is the default Makefile target. The objects listed here + # are what get build when you type just "make" with no arguments. + # +-all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la) ++all: sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la tclsqlite3) + + Makefile: $(TOP)/Makefile.in + ./config.status +@@ -611,8 +611,8 @@ $(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin $(INSTALL) -d $(DESTDIR)$(prefix)/include $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include @@ -14,5 +18,5 @@ + $(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 + tcl_install: libtclsqlite3.la + tclsh $(TOP)/tclinstaller.tcl $(VERSION) diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist index 7d8f2ea654a4..d16c8c4a4508 100644 --- a/databases/sqlite3/pkg-plist +++ b/databases/sqlite3/pkg-plist @@ -10,42 +10,5 @@ libdata/pkgconfig/sqlite3.pc %%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%%/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 -%%PORTDOCS%%%%DOCSDIR%%/formatchng.html -%%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%% |