Update to 3.2.8

Reorganize Makefile

Notified by:	edwin Version Check

6 files changed, 60 insertions, 70 deletions

diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index e3d88d36c600..0c84e6203704 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -8,23 +8,27 @@
 
 # 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 define SQLITE_WITH_TCL84.
+# If you want to build the TCL wrapper, you have to define WITH_TCLWRAPPER=yes.
 
 PORTNAME=	sqlite
-PORTVERSION=	3.2.7
+PORTVERSION=	3.2.8
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
-USE_GMAKE=		YES
-USE_GNOME=		pkgconfig
+USE_GMAKE=	YES
+USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	libtool:15
-HAS_CONFIGURE=		YES
-USE_REINPLACE=		YES
-INSTALLS_SHLIB=		YES
+HAS_CONFIGURE=	YES
+USE_REINPLACE=	YES
+INSTALLS_SHLIB=	YES
 
+CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/sqlite3
 EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
@@ -34,42 +38,33 @@ TCL_V?=		8.4
 MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
 MAKE_ENV+=	TCL_VER=${TCL_V}
 
-OPTIONS=	TCL84	"TCL wrapper for SQLITE" off
+OPTIONS=	TCLWRAPPER	"TCL wrapper for SQLITE" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TCL84)
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
+.endif
+
+.if defined(WITH_TCLWRAPPER)
 CATEGORIES+=	lang
 WITH_TCL=	YES
 .endif
 
 .if defined(WITH_TCL)
-ALL_TARGET+=	libtclsqlite.la
-PLIST_SUB+=	WITH_TCL=""
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
+PLIST_SUB+=		WITH_TCL=""
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
 .else
-PLIST_SUB+=	WITH_TCL="@comment "
-CONFIGURE_ARGS=	--disable-tcl
-.endif
-
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
-.endif
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-ALL_TARGET=		all
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
+PLIST_SUB+=		WITH_TCL="@comment "
+CONFIGURE_ARGS+=	--disable-tcl
 .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" -e "s|\$${HAVE_TCL:1=tcl_install}||" \
+		${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_V:S/.//}\"" >>${WRKSRC}/freebsd.hints
-#	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
 
 post-build:
 .if !defined(NOPORTDOCS)
@@ -81,15 +76,15 @@ post-install:
 .if defined(WITH_TCL)
 	@${MKDIR} ${PREFIX}/lib/sqlite
 	@(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
-	    libtclsqlite3.la ${PREFIX}/lib/sqlite/)
+		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}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index f5fcdb7cd0e8..a4aab0e69f3d 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.2.7.tar.gz) = 34c92821b3b46380f192c0aaf2b2b217
-SHA256 (sqlite-3.2.7.tar.gz) = c6576eab65d34300116ceb1c82e393c685fd0ffa7baa1ea6b1fa30ea031910df
-SIZE (sqlite-3.2.7.tar.gz) = 1521075
+MD5 (sqlite-3.2.8.tar.gz) = 9f2c014aaa46565b8163e047166a5686
+SHA256 (sqlite-3.2.8.tar.gz) = a3904084070eb0f628c3275e041c9444ae9eb26ce739ffcccf78d4b88c1753a6
+SIZE (sqlite-3.2.8.tar.gz) = 1521504
diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist
index d16c8c4a4508..4c9676e2cdce 100644
--- a/databases/sqlite3/pkg-plist
+++ b/databases/sqlite3/pkg-plist
@@ -10,5 +10,5 @@ libdata/pkgconfig/sqlite3.pc
 %%WITH_TCL%%lib/sqlite/libtclsqlite3.a
 %%WITH_TCL%%lib/sqlite/pkgIndex.tcl
 %%WITH_TCL%%@dirrm lib/sqlite
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/example.tcl
+@dirrm %%EXAMPLESDIR%%
diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index e3d88d36c600..0c84e6203704 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -8,23 +8,27 @@
 
 # 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 define SQLITE_WITH_TCL84.
+# If you want to build the TCL wrapper, you have to define WITH_TCLWRAPPER=yes.
 
 PORTNAME=	sqlite
-PORTVERSION=	3.2.7
+PORTVERSION=	3.2.8
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
-USE_GMAKE=		YES
-USE_GNOME=		pkgconfig
+USE_GMAKE=	YES
+USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	libtool:15
-HAS_CONFIGURE=		YES
-USE_REINPLACE=		YES
-INSTALLS_SHLIB=		YES
+HAS_CONFIGURE=	YES
+USE_REINPLACE=	YES
+INSTALLS_SHLIB=	YES
 
+CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/sqlite3
 EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
@@ -34,42 +38,33 @@ TCL_V?=		8.4
 MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
 MAKE_ENV+=	TCL_VER=${TCL_V}
 
-OPTIONS=	TCL84	"TCL wrapper for SQLITE" off
+OPTIONS=	TCLWRAPPER	"TCL wrapper for SQLITE" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TCL84)
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
+.endif
+
+.if defined(WITH_TCLWRAPPER)
 CATEGORIES+=	lang
 WITH_TCL=	YES
 .endif
 
 .if defined(WITH_TCL)
-ALL_TARGET+=	libtclsqlite.la
-PLIST_SUB+=	WITH_TCL=""
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
+PLIST_SUB+=		WITH_TCL=""
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
 .else
-PLIST_SUB+=	WITH_TCL="@comment "
-CONFIGURE_ARGS=	--disable-tcl
-.endif
-
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
-.endif
-
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-ALL_TARGET=		all
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
+PLIST_SUB+=		WITH_TCL="@comment "
+CONFIGURE_ARGS+=	--disable-tcl
 .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" -e "s|\$${HAVE_TCL:1=tcl_install}||" \
+		${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_V:S/.//}\"" >>${WRKSRC}/freebsd.hints
-#	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
 
 post-build:
 .if !defined(NOPORTDOCS)
@@ -81,15 +76,15 @@ post-install:
 .if defined(WITH_TCL)
 	@${MKDIR} ${PREFIX}/lib/sqlite
 	@(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
-	    libtclsqlite3.la ${PREFIX}/lib/sqlite/)
+		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}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqlite34/distinfo b/databases/sqlite34/distinfo
index f5fcdb7cd0e8..a4aab0e69f3d 100644
--- a/databases/sqlite34/distinfo
+++ b/databases/sqlite34/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.2.7.tar.gz) = 34c92821b3b46380f192c0aaf2b2b217
-SHA256 (sqlite-3.2.7.tar.gz) = c6576eab65d34300116ceb1c82e393c685fd0ffa7baa1ea6b1fa30ea031910df
-SIZE (sqlite-3.2.7.tar.gz) = 1521075
+MD5 (sqlite-3.2.8.tar.gz) = 9f2c014aaa46565b8163e047166a5686
+SHA256 (sqlite-3.2.8.tar.gz) = a3904084070eb0f628c3275e041c9444ae9eb26ce739ffcccf78d4b88c1753a6
+SIZE (sqlite-3.2.8.tar.gz) = 1521504
diff --git a/databases/sqlite34/pkg-plist b/databases/sqlite34/pkg-plist
index d16c8c4a4508..4c9676e2cdce 100644
--- a/databases/sqlite34/pkg-plist
+++ b/databases/sqlite34/pkg-plist
@@ -10,5 +10,5 @@ libdata/pkgconfig/sqlite3.pc
 %%WITH_TCL%%lib/sqlite/libtclsqlite3.a
 %%WITH_TCL%%lib/sqlite/pkgIndex.tcl
 %%WITH_TCL%%@dirrm lib/sqlite
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/example.tcl
+@dirrm %%EXAMPLESDIR%%