Stop treating loadable lib as linkable lib.

This commit is contained in:
stu 2017-05-07 21:44:43 +00:00
parent 3aea76ff4f
commit a96e86275c
3 changed files with 19 additions and 21 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:33 naddy Exp $
# $OpenBSD: Makefile,v 1.31 2017/05/07 21:44:43 stu Exp $
COMMENT = table/matrix widget extension to Tcl/Tk
DOTVER = 2.10
VER = ${DOTVER:S/.//}
DISTNAME = Tktable${DOTVER}
PKGNAME = Tktable-${DOTVER}
REVISION = 3
SHARED_LIBS = Tktable${VER} 0.0
V = 2.10
DISTNAME = Tktable${V}
PKGNAME = Tktable-${V}
REVISION = 4
CATEGORIES = x11
HOMEPAGE = http://tktable.sourceforge.net/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@ -23,18 +22,17 @@ RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_DATA}"
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR} \
--with-tkinclude=${MODTK_INCDIR}
USE_GROFF = Yes
TEST_IS_INTERACTIVE = X11
TEST_TARGET = test
SUBST_VARS += TKTABLE_VER
CONFIGURE_ENV += SHLIB_VERSION=${LIBTktable${VER}_VERSION}
TEST_IS_INTERACTIVE =x11
TEST_TARGET = test
SUBST_VARS += TKTABLE_LIB
TKTABLE_LIB = libTktable${VER}
TKTABLE_VER = ${V:S/.//}
SCRIPTS_TCLSH = basic.tcl buttons.tcl command.tcl debug.tcl dynarows.tcl \
maxsize.tcl spreadsheet.tcl valid.tcl
@ -46,7 +44,7 @@ pre-configure:
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${MODTCL_TCLDIR}/tktable
${INSTALL_DATA} ${WRKBUILD}/${TKTABLE_LIB}.so.${LIBTktable${VER}_VERSION} \
${INSTALL_DATA} ${WRKBUILD}/libTktable${TKTABLE_VER}.so \
${WRKBUILD}/pkgIndex.tcl ${WRKSRC}/library/tkTable.tcl \
${WRKSRC}/library/tktable.py ${DESTDIR}${MODTCL_TCLDIR}/tktable
${INSTALL_DATA_DIR} ${PREFIX}/man/mann

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2009/03/19 12:39:08 sthen Exp $
--- configure.orig Sun Jan 25 03:55:46 2009
+++ configure Sun Jan 25 03:56:17 2009
$OpenBSD: patch-configure,v 1.4 2017/05/07 21:44:43 stu Exp $
--- configure.orig Fri Nov 14 17:42:33 2008
+++ configure Sun May 7 17:00:14 2017
@@ -7944,7 +7944,7 @@ fi
# TEA specific:
@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.3 2009/03/19 12:39:08 sthen Exp $
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
echo "$as_me:$LINENO: checking for ELF" >&5
echo $ECHO_N "checking for ELF... $ECHO_C" >&6
if test "${tcl_cv_ld_elf+set}" = set; then

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.10 2015/03/16 18:08:00 naddy Exp $
@comment $OpenBSD: PLIST,v 1.11 2017/05/07 21:44:43 stu Exp $
lib/tcl/tktable/
@lib lib/tcl/tktable/${TKTABLE_LIB}.so.${LIBTktable210_VERSION}
lib/tcl/tktable/libTktable${TKTABLE_VER}.so
lib/tcl/tktable/pkgIndex.tcl
lib/tcl/tktable/tkTable.tcl
lib/tcl/tktable/tktable.py