cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.0.3.

Browse Source 
Move lib to ${LOCALBASE}/lib.
Port improvements for less diff churn on future port updates.
This commit is contained in:
stu 2015-05-22 04:23:29 +00:00
parent 40ed2d8ee0
commit d7429df3be
7 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
databases/tdbc/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2014/09/07 18:50:32 stu Exp $
# $OpenBSD: Makefile,v 1.5 2015/05/22 04:23:29 stu Exp $
COMMENT = Tcl Database Connectivity
DISTNAME = tdbc1.0.1
PKGNAME = tdbc-1.0.1
SHARED_LIBS = tdbc101 0.0
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>
@ -20,7 +21,10 @@ MODTCL_VERSION = 8.6
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
FAKE_FLAGS = PKG_DIR=tdbc
FAKE_FLAGS = PKG_DIR=tdbc \
pkglibdir='$$(libdir)/tcl/$$(PKG_DIR)'
SEPARATE_BUILD = Yes
USE_GROFF = Yes
CONFIGURE_STYLE = autoconf no-autoheader
@ -28,10 +32,9 @@ CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--includedir=${PREFIX}/include/tdbc \
--libdir=${MODTCL_TCLDIR} \
SHLIB_VERSION=${LIBtdbc101_VERSION}
SHLIB_VERSION=${LIBtdbc${V:S/.//g}_VERSION}
AUTOCONF_VERSION = 2.59
TEST_TARGET = test
AUTOCONF_VERSION = 2.69
TEST_TARGET = test
.include <bsd.port.mk>

4
databases/tdbc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tdbc1.0.1.tar.gz) = j4Nj7tXQUZtjHNcgPG1nO19FrbuCmCpyYYCM5QEE0Bk=
SIZE (tdbc1.0.1.tar.gz) = 189738
SHA256 (tdbc1.0.3.tar.gz) = gyhLj7g0w0Uew5S4ltTgz4SlmHSFesJf1+FqPZCVKmM=
SIZE (tdbc1.0.3.tar.gz) = 191627

25
databases/tdbc/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,25 @@
$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
@$(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; \
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
if test "x$$stub" = "xstub"; then \
- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
else \
- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
fi; \
ext=`echo $$p|sed -e "s/.*\.//"`; \
if test "x$$ext" = "xdll"; then \

4
databases/tdbc/patches/patch-configure_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_in,v 1.1.1.1 2013/02/07 05:21:19 stu Exp $
$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
@ -6,7 +6,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2013/02/07 05:21:19 stu Exp $
# 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}"
+tdbc_LIB_DIR="${libdir}/${PACKAGE_NAME}"
+eval tdbc_LIB_DIR="${libdir}/tcl/${PACKAGE_NAME}"
AC_SUBST(tdbc_LIB_DIR)
dnl TEAX_LINK_LINE(TDBC_LIB_SPEC,

9
databases/tdbc/patches/patch-pkgIndex_tcl_in Normal file
View File

@ -0,0 +1,9 @@
$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@}]} {
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@]"

4
databases/tdbc/patches/patch-tclconfig_tcl_m4
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tclconfig_tcl_m4,v 1.2 2014/09/07 18:50:32 stu Exp $
$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], [
@ -6,7 +6,7 @@ $OpenBSD: patch-tclconfig_tcl_m4,v 1.2 2014/09/07 18:50:32 stu Exp $
# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="[$]{libdir}/$1${PACKAGE_VERSION}"
+ eval pkglibdir="[$]{libdir}/$1"
+ 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}"

6
databases/tdbc/pkg/PLIST
View File

@ -1,11 +1,11 @@
@comment $OpenBSD: PLIST,v 1.2 2014/09/07 18:50:32 stu Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/05/22 04:23:29 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/tcl/tdbc/
@lib lib/tcl/tdbc/libtdbc101.so.${LIBtdbc101_VERSION}
lib/tcl/tdbc/libtdbcstub101.a
lib/tcl/tdbc/pkgIndex.tcl
lib/tcl/tdbc/tdbc.tcl
lib/tcl/tdbc/tdbcConfig.sh