View | Details | Raw Unified | Return to bug 79024 | Differences between
and this patch

Collapse All | Expand All

(-)sqlite3/Makefile (-38 / +34 lines)
Lines 11-100 Link Here
11
# If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84.
11
# If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84.
12
12
13
PORTNAME=	sqlite
13
PORTNAME=	sqlite
14
PORTVERSION=	3.0.8
14
PORTVERSION=	3.1.6
15
PORTREVISION=	2
15
PORTREVISION=	0
16
CATEGORIES=	databases
16
CATEGORIES=	databases
17
MASTER_SITES=	http://www.sqlite.org/
17
MASTER_SITES=	http://www.sqlite.org/
18
DISTNAME=	${PORTNAME}-${PORTVERSION}
19
18
20
MAINTAINER=	green@FreeBSD.org
19
MAINTAINER=	green@FreeBSD.org
21
COMMENT=	An SQL database engine in a C library w/ Tcl wrapper (beta)
20
COMMENT=	An SQL database engine in a C library w/ Tcl wrapper (beta)
22
21
22
USE_GMAKE=		YES
23
USE_GNOME=		pkgconfig
24
USE_LIBTOOL_VER=	15
25
HAS_CONFIGURE=		YES
26
USE_REINPLACE=		YES
27
INSTALLS_SHLIB=		YES
28
23
DOCSDIR=	${PREFIX}/share/doc/sqlite3
29
DOCSDIR=	${PREFIX}/share/doc/sqlite3
24
EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
30
EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
25
LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
31
LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
26
32
27
# Defaults, for building the docs:
33
# Defaults, for building the docs:
28
TCL_V=		8.4
34
TCL_V?=		8.4
29
TCL_SHORT_V=	84
35
36
OPTIONS=	TCL84	"TCL wrapper for SQLITE" off
30
37
31
.if defined(SQLITE_WITH_TCL84)
38
.include <bsd.port.pre.mk>
32
CATEGORIES+=	tcl84
39
33
TCL_V=		8.4
40
.if !defined(WITHOUT_TCL84)
34
TCL_SHORT_V=	84
41
CATEGORIES+=	lang
35
WITH_TCL=	YES
42
WITH_TCL=	YES
36
.endif
43
.endif
37
44
38
.if defined(WITH_TCL)
45
.if defined(WITH_TCL)
39
ALL_TARGET+=	libtclsqlite.la
46
ALL_TARGET+=	libtclsqlite.la
40
PLIST_SUB+=     WITH_TCL=""
47
PLIST_SUB+=     WITH_TCL=""
48
CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
41
.else
49
.else
42
PLIST_SUB+=     WITH_TCL="@comment "
50
PLIST_SUB+=     WITH_TCL="@comment "
51
CONFIGURE_ARGS=	--disable-tcl
43
.endif
52
.endif
44
53
45
.if !defined(NOPORTDOCS)
54
.if !defined(NOPORTDOCS)
46
BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
55
BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
47
MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
56
MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
48
MAKE_ENV+=	TCL_VER=${TCL_V}
57
MAKE_ENV+=	TCL_VER=${TCL_V}
49
.endif
58
.endif
50
59
51
USE_GMAKE=	YES
60
CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-hints=freebsd.hints
52
USE_GNOME=	pkgconfig
53
USE_LIBTOOL_VER=	13
54
GNU_CONFIGURE=	YES
55
USE_REINPLACE=	YES
56
CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
57
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
61
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
58
ALL_TARGET=	all
62
ALL_TARGET=		all
59
60
INSTALLS_SHLIB=	YES
61
63
62
WRKSRC=		${WRKDIR}/${PORTNAME}
64
.if !defined(NOPORTDOCS)
63
65
PORTDOCS=	*
64
.include <bsd.port.pre.mk>
66
.endif
65
66
DOCFILES!=	${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist
67
67
68
post-patch:
68
post-patch:
69
	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
69
	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
70
			 -e "s|\./libtool|${LIBTOOL}|g" \
70
		-e "s|\./libtool|${LIBTOOL}|g" ${WRKSRC}/Makefile.in
71
			 ${WRKSRC}/Makefile.in
72
	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
71
	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
73
	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
72
	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" >>${WRKSRC}/freebsd.hints
74
	#@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
73
#	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
75
74
76
post-build:
75
post-build:
77
	# Build the docs
76
	# Build the docs
78
.if !defined(NOPORTDOCS)
77
.if !defined(NOPORTDOCS)
79
	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
78
	@(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc)
80
.endif
79
.endif
81
80
82
post-install:
81
post-install:
83
.if defined(WITH_TCL)
82
.if defined(WITH_TCL)
84
	@${MKDIR} ${PREFIX}/lib/sqlite
83
	@${MKDIR} ${PREFIX}/lib/sqlite
85
	cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
84
	@(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
86
	    libtclsqlite3.la ${PREFIX}/lib/sqlite/
85
	    libtclsqlite3.la ${PREFIX}/lib/sqlite/)
87
	@${RM} ${PREFIX}/lib/sqlite/libtclsqlite3.la
86
	@${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
88
	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
87
	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
89
	${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
90
.endif
88
.endif
91
.if !defined(NOPORTDOCS)
89
.if !defined(NOPORTDOCS)
92
	@${MKDIR} ${DOCSDIR}
90
	@${MKDIR} ${DOCSDIR}
93
.for file in ${DOCFILES}
91
	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
94
	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
95
.endfor
96
	@${MKDIR} ${EXAMPLESDIR}
92
	@${MKDIR} ${EXAMPLESDIR}
97
	${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
93
	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
98
.endif
94
.endif
99
95
100
.include <bsd.port.post.mk>
96
.include <bsd.port.post.mk>
(-)sqlite3/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (sqlite-3.0.8.tar.gz) = b7dff1ec9bf4d08928c039b278630ba7
1
MD5 (sqlite-3.1.6.tar.gz) = 34e77a82ca7c1a7f5ff00a1939075fa8
2
SIZE (sqlite-3.0.8.tar.gz) = 1288859
2
SIZE (sqlite-3.1.6.tar.gz) = 1337475
(-)sqlite3/files/patch-Makefile.in (-10 / +14 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	Thu Oct  7 00:03:05 2004
1
--- Makefile.in.orig	Fri Mar 11 14:50:32 2005
2
+++ Makefile.in	Thu Dec 23 17:17:22 2004
2
+++ Makefile.in	Sat Mar 19 16:06:28 2005
3
@@ -543,12 +543,13 @@
3
@@ -212,7 +212,7 @@
4
 install:	sqlite3 libsqlite3.la sqlite3.h
4
 # This is the default Makefile target.  The objects listed here
5
 	$(INSTALL) -d $(DESTDIR)$(libdir)
5
 # are what get build when you type just "make" with no arguments.
6
 	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
6
 #
7
+	rm $(DESTDIR)$(exec_prefix)/lib/libsqlite3.la
7
-all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
8
 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
8
+all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la tclsqlite3)
9
 
10
 Makefile: $(TOP)/Makefile.in
11
 	./config.status
12
@@ -611,8 +611,8 @@
9
 	$(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
13
 	$(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
10
 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
14
 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
11
 	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
15
 	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
Lines 14-18 Link Here
14
+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
18
+	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
15
+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
19
+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
16
 
20
 
17
 clean:	
21
 tcl_install:	libtclsqlite3.la
18
 	rm -f *.lo *.la *.o sqlite3@TARGET_EXEEXT@ libsqlite3.la
22
 	tclsh $(TOP)/tclinstaller.tcl $(VERSION)
(-)sqlite3/pkg-plist (-37 lines)
Lines 10-51 Link Here
10
%%WITH_TCL%%lib/sqlite/libtclsqlite3.a
10
%%WITH_TCL%%lib/sqlite/libtclsqlite3.a
11
%%WITH_TCL%%lib/sqlite/pkgIndex.tcl
11
%%WITH_TCL%%lib/sqlite/pkgIndex.tcl
12
%%WITH_TCL%%@dirrm lib/sqlite
12
%%WITH_TCL%%@dirrm lib/sqlite
13
%%PORTDOCS%%%%DOCSDIR%%/affinity.html
14
%%PORTDOCS%%%%DOCSDIR%%/arch.html
15
%%PORTDOCS%%%%DOCSDIR%%/arch2.gif
16
%%PORTDOCS%%%%DOCSDIR%%/c_interface.html
17
%%PORTDOCS%%%%DOCSDIR%%/capi3.html
18
%%PORTDOCS%%%%DOCSDIR%%/capi3ref.html
19
%%PORTDOCS%%%%DOCSDIR%%/changes.html
20
%%PORTDOCS%%%%DOCSDIR%%/conflict.html
21
%%PORTDOCS%%%%DOCSDIR%%/copyright-release.html
22
%%PORTDOCS%%%%DOCSDIR%%/copyright-release.pdf
23
%%PORTDOCS%%%%DOCSDIR%%/copyright.html
24
%%PORTDOCS%%%%DOCSDIR%%/datatype3.html
25
%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
26
%%PORTDOCS%%%%DOCSDIR%%/docs.html
27
%%PORTDOCS%%%%DOCSDIR%%/download.html
28
%%PORTDOCS%%%%DOCSDIR%%/faq.html
29
%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
30
%%PORTDOCS%%%%DOCSDIR%%/formatchng.html
31
%%PORTDOCS%%%%DOCSDIR%%/index.html
32
%%PORTDOCS%%%%DOCSDIR%%/lang.html
33
%%PORTDOCS%%%%DOCSDIR%%/lemon.html
34
%%PORTDOCS%%%%DOCSDIR%%/lockingv3.html
35
%%PORTDOCS%%%%DOCSDIR%%/mingw.html
36
%%PORTDOCS%%%%DOCSDIR%%/nulls.html
37
%%PORTDOCS%%%%DOCSDIR%%/oldnews.html
38
%%PORTDOCS%%%%DOCSDIR%%/omitted.html
39
%%PORTDOCS%%%%DOCSDIR%%/opcode.html
40
%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
41
%%PORTDOCS%%%%DOCSDIR%%/report1.txt
42
%%PORTDOCS%%%%DOCSDIR%%/speed.html
43
%%PORTDOCS%%%%DOCSDIR%%/sqlite.gif
44
%%PORTDOCS%%%%DOCSDIR%%/sqlite.html
45
%%PORTDOCS%%%%DOCSDIR%%/support.html
46
%%PORTDOCS%%%%DOCSDIR%%/tclsqlite.html
47
%%PORTDOCS%%%%DOCSDIR%%/vdbe.html
48
%%PORTDOCS%%%%DOCSDIR%%/version3.html
49
%%PORTDOCS%%@dirrm %%DOCSDIR%%
50
%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
13
%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
51
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
14
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

Return to bug 79024