Update to 1.0.4.

This commit is contained in:
stu 2017-05-10 01:22:33 +00:00
parent b5d8df9f92
commit b82d3d5001
8 changed files with 54 additions and 55 deletions

View File

@ -1,14 +1,15 @@
# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:23 naddy Exp $
# $OpenBSD: Makefile,v 1.7 2017/05/10 01:22:33 stu Exp $
COMMENT = Tcl Database Connectivity
COMMENT = Tcl Database Connectivity
V = 1.0.3
DISTNAME = tdbc${V}
PKGNAME = tdbc-${V}
SHARED_LIBS = tdbc${V:S/.//g} 0.0
CATEGORIES = databases
HOMEPAGE = http://tdbc.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
V = 1.0.4
DISTNAME = tdbc${V}
PKGNAME = tdbc-${V}
SHARED_LIBS = tdbc${V:S/.//g} 0.0
CATEGORIES = databases
HOMEPAGE = http://tdbc.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
# BSD
PERMIT_PACKAGE_CDROM = Yes
@ -27,13 +28,12 @@ FAKE_FLAGS = PKG_DIR=tdbc \
SEPARATE_BUILD = Yes
USE_GROFF = Yes
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \
--includedir=${PREFIX}/include/tdbc \
SHLIB_VERSION=${LIBtdbc${V:S/.//g}_VERSION}
AUTOCONF_VERSION = 2.69
TEST_TARGET = test
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (tdbc1.0.3.tar.gz) = gyhLj7g0w0Uew5S4ltTgz4SlmHSFesJf1+FqPZCVKmM=
SIZE (tdbc1.0.3.tar.gz) = 191627
SHA256 (tdbc1.0.4.tar.gz) = kX//rz1kSDQU1WU6yuLDSMB8VE5a1vbiQue0inM8T2c=
SIZE (tdbc1.0.4.tar.gz) = 190929

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-Makefile_in,v 1.1 2015/05/22 04:23:29 stu Exp $
--- Makefile.in.orig Fri May 15 21:12:01 2015
+++ Makefile.in Fri May 15 21:12:29 2015
@@ -408,15 +408,15 @@ install-lib-binaries: binaries
$OpenBSD: patch-Makefile_in,v 1.2 2017/05/10 01:22:33 stu Exp $
--- Makefile.in.orig Mon Oct 19 10:52:13 2015
+++ Makefile.in Sat Apr 15 13:57:44 2017
@@ -417,15 +417,15 @@ install-lib-binaries: binaries
@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
@list='$(lib_BINARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
if test "x$$stub" = "xstub"; then \
- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-configure,v 1.1 2017/05/10 01:22:33 stu Exp $
--- configure.orig Thu Jan 28 13:05:47 2016
+++ configure Sat Apr 15 13:54:14 2017
@@ -8995,8 +8995,7 @@ tdbc_SRC_DIR=`cd "${tdbc_SRC_DIR}"; $CYGPATH $(pwd)`
# Develop a fully qualified path for where .tcl files for the tdbc package
# appear at run time.
-eval tdbc_LIB_DIR="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
-tdbc_LIB_DIR=`cd "${tdbc_LIB_DIR}"; $CYGPATH $(pwd)`
+eval tdbc_LIB_DIR="${libdir}/tcl/${PACKAGE_NAME}"
# Make the export configuration for the TDBC package
@@ -9007,7 +9006,7 @@ tdbc_LIB_DIR=`cd "${tdbc_LIB_DIR}"; $CYGPATH $(pwd)`
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/tdbc${PACKAGE_VERSION}"
+ eval pkglibdir="${libdir}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval tdbc_LIB_FLAG="-ltdbc${PACKAGE_VERSION}${DBGX}"
eval tdbc_STUB_LIB_FLAG="-ltdbcstub${PACKAGE_VERSION}${DBGX}"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure_in,v 1.2 2015/05/22 04:23:29 stu Exp $
--- configure.in.orig Fri Dec 28 16:58:15 2012
+++ configure.in Fri Dec 28 16:58:30 2012
@@ -203,7 +203,7 @@ TEAX_INCLUDE_LINE(tdbc_BUILD_INCLUDE_SPEC, [${tdbc_SRC
# Develop a fully qualified path for where .tcl files for the tdbc package
# appear at run time.
-tdbc_LIB_DIR="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
+eval tdbc_LIB_DIR="${libdir}/tcl/${PACKAGE_NAME}"
AC_SUBST(tdbc_LIB_DIR)
dnl TEAX_LINK_LINE(TDBC_LIB_SPEC,

View File

@ -1,9 +1,10 @@
$OpenBSD: patch-pkgIndex_tcl_in,v 1.1 2015/05/22 04:23:29 stu Exp $
--- pkgIndex.tcl.in.orig Fri May 15 21:11:42 2015
+++ pkgIndex.tcl.in Fri May 15 21:11:54 2015
@@ -9,4 +9,4 @@ if {[catch {package present Tcl @TCL_VERSION_REQ@}]} {
$OpenBSD: patch-pkgIndex_tcl_in,v 1.2 2017/05/10 01:22:33 stu Exp $
--- pkgIndex.tcl.in.orig Sat Apr 15 14:08:19 2017
+++ pkgIndex.tcl.in Sat Apr 15 14:09:32 2017
@@ -8,5 +8,5 @@ if {[catch {package present Tcl @TCL_VERSION_REQ@}]} {
}
package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \
"package require TclOO @TCLOO_VERSION_REQ@-;\
[list source [file join $dir @PACKAGE_NAME@.tcl]]\;\
- [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@]"
+ [list load [file join $dir .. .. @PKG_LIB_FILE@] @PACKAGE_NAME@]"
- [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@]\;\
+ [list load [file join $dir .. .. @PKG_LIB_FILE@] @PACKAGE_NAME@]\;\
[list source [file join $dir @PACKAGE_NAME@.tcl]]"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tclconfig_tcl_m4,v 1.3 2015/05/22 04:23:29 stu Exp $
--- tclconfig/tcl.m4.orig Thu Aug 14 13:25:28 2014
+++ tclconfig/tcl.m4 Sat Sep 6 21:06:25 2014
@@ -4069,7 +4069,7 @@ AC_DEFUN([TEA_EXPORT_CONFIG], [
#--------------------------------------------------------------------
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="[$]{libdir}/$1${PACKAGE_VERSION}"
+ eval pkglibdir="[$]{libdir}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval $1_LIB_FLAG="-l$1${PACKAGE_VERSION}${DBGX}"
eval $1_STUB_LIB_FLAG="-l$1stub${PACKAGE_VERSION}${DBGX}"

View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2015/05/22 04:23:29 stu Exp $
@comment $OpenBSD: PLIST,v 1.4 2017/05/10 01:22:33 stu Exp $
include/tdbc/
include/tdbc/tdbc.h
include/tdbc/tdbcDecls.h
include/tdbc/tdbcInt.h
@lib lib/libtdbc103.so.${LIBtdbc103_VERSION}
lib/libtdbcstub103.a
@lib lib/libtdbc104.so.${LIBtdbc104_VERSION}
lib/libtdbcstub104.a
lib/tcl/tdbc/
lib/tcl/tdbc/pkgIndex.tcl
lib/tcl/tdbc/tdbc.tcl