SHARED_LIBS

This commit is contained in:
naddy 2006-01-08 20:56:08 +00:00
parent 003cb846ff
commit 3a8156838a
12 changed files with 63 additions and 35 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2006/01/08 17:20:11 naddy Exp $
# $OpenBSD: Makefile,v 1.21 2006/01/08 20:56:08 naddy Exp $
# $FreeBSD: Makefile,v 1.7 1997/12/01 16:50:58 pst Exp $
COMMENT= "graphical toolkit for Tcl"
DISTNAME= tk8.0.5
PKGNAME= tk-8.0.5
SHARED_LIBS= tk80 1.5
CATEGORIES= x11 x11/tk
MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_0/}
@ -27,12 +28,13 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TK_LIBRARY)/man'
SEPARATE_BUILD= concurrent
SEPARATE_BUILD= simple
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-tcl="${LOCALBASE}/lib/tcl8.0"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-tcl="${LOCALBASE}/lib/tcl8.0"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
LIBtk80_VERSION="${LIBtk80_VERSION}"
WRKSRC= ${WRKDIST}/unix

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-unix_configure,v 1.1 2006/01/08 17:20:11 naddy Exp $
$OpenBSD: patch-unix_configure,v 1.2 2006/01/08 20:56:08 naddy Exp $
--- unix/configure.orig Tue Mar 9 07:53:50 1999
+++ unix/configure Sun Jan 8 18:09:42 2006
+++ unix/configure Sun Jan 8 21:51:05 2006
@@ -880,8 +880,8 @@ fi
if test ! -d $TCL_BIN_DIR; then
{ echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
@ -21,9 +21,12 @@ $OpenBSD: patch-unix_configure,v 1.1 2006/01/08 17:20:11 naddy Exp $
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
@@ -2389,12 +2391,11 @@ if test "$ok" = "yes" -a "${SHLIB_SUFFIX
@@ -2387,14 +2389,13 @@ fi
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ TK_LIB_FILE="libtk`echo ${VERSION} | tr -d .`${DBGX}.so.${LIBtk80_VERSION}"
MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
- RANLIB=":"
else

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/10 12:37:37 espie Exp $
@lib lib/libtk80.so.1.5
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 20:56:08 naddy Exp $
@lib lib/libtk80.so.${LIBtk80_VERSION}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2004/12/19 17:27:01 alek Exp $
# $OpenBSD: Makefile,v 1.21 2006/01/08 20:56:08 naddy Exp $
COMMENT= "graphical toolkit for Tcl"
@ -6,6 +6,7 @@ VERSION= 8.3.5
DISTNAME= tk${VERSION}-src
PKGNAME= tk-${VERSION}
SHARED_LIBS= tk83 1.3
CATEGORIES= x11 x11/tk
MASTER_SITES= ${MASTER_SITE_TCLTK:=tcl8_3/}
@ -30,12 +31,13 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TK_LIBRARY)/man'
SEPARATE_BUILD= concurrent
SEPARATE_BUILD= simple
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-tcl="${LOCALBASE}/lib/tcl8.3"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-tcl="${LOCALBASE}/lib/tcl8.3"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
LIBtk83_VERSION="${LIBtk83_VERSION}"
WRKDIST= ${WRKDIR}/tk${VERSION}/unix

View File

@ -23,12 +23,12 @@
rm -rf conftest*
echo "$ac_t""yes" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.3'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBtk83_VERSION}'
else
rm -rf conftest*
echo "$ac_t""no" 1>&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.3'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBtk83_VERSION}'
fi
rm -f conftest*

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 11:46:23 espie Exp $
@lib lib/libtk83.so.1.3
@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/08 20:56:08 naddy Exp $
@lib lib/libtk83.so.${LIBtk83_VERSION}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2005/11/03 18:28:56 naddy Exp $
# $OpenBSD: Makefile,v 1.11 2006/01/08 20:56:08 naddy Exp $
COMMENT= "graphical toolkit for Tcl"
@ -6,6 +6,7 @@ VERSION= 8.4.7
DISTNAME= tk${VERSION}-src
PKGNAME= tk-${VERSION}
SHARED_LIBS= tk84 1.0
CATEGORIES= x11 x11/tk
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@ -28,13 +29,14 @@ FAKE_FLAGS= INSTALL="install -c" INSTALL_ROOT="${WRKINST}" \
UNIX_INCLUDE_INSTALL_DIR='$$(BASE_INCLUDE_DIR)/unix' \
MAN_INSTALL_DIR='$${INSTALL_ROOT}$$(TK_LIBRARY)/man'
SEPARATE_BUILD= concurrent
SEPARATE_BUILD= simple
USE_X11= Yes
AUTOCONF_VERSION=2.13
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --with-tcl="${LOCALBASE}/lib/tcl8.4"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}"
CONFIGURE_STYLE=autoconf no-autoheader
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-tcl="${LOCALBASE}/lib/tcl8.4"
CONFIGURE_ENV= PORTSDIR="${PORTSDIR}" \
LIBtk84_VERSION="${LIBtk84_VERSION}"
WRKDIST= ${WRKDIR}/tk${VERSION}/unix

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tcl_m4,v 1.4 2004/08/07 06:16:39 kevlo Exp $
$OpenBSD: patch-tcl_m4,v 1.5 2006/01/08 20:56:08 naddy Exp $
--- tcl.m4.orig Sat Aug 7 13:40:15 2004
+++ tcl.m4 Sat Aug 7 13:44:10 2004
@@ -1256,24 +1256,48 @@ dnl AC_CHECK_TOOL(AR, ar)
@ -42,7 +42,7 @@ $OpenBSD: patch-tcl_m4,v 1.4 2004/08/07 06:16:39 kevlo Exp $
+ DL_LIBS=""
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBtk84_VERSION}'
+ AC_MSG_CHECKING(for ELF)
+ AC_EGREP_CPP(yes, [
#ifdef __ELF__

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/07 06:16:41 kevlo Exp $
@lib lib/libtk84.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.4 2006/01/08 20:56:08 naddy Exp $
@lib lib/libtk84.so.${LIBtk84_VERSION}
lib/tk8.4/pkgIndex.tcl

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2004/12/19 17:27:02 alek Exp $
# $OpenBSD: Makefile,v 1.16 2006/01/08 20:56:08 naddy Exp $
COMMENT= "tk extension"
DISTNAME= Tktable2.9
PKGNAME= Tktable-2.9
SHARED_LIBS= Tktable29 1.0
CATEGORIES= x11
HOMEPAGE= http://tktable.sourceforge.net/
@ -27,6 +28,7 @@ CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.4 \
--with-tk=${PREFIX}/lib/tk8.4 \
--with-tclinclude=${PREFIX}/include/tcl8.4 \
--with-tkinclude=${PREFIX}/include/tk8.4
CONFIGURE_ENV= LIBTktable29_VERSION=${LIBTktable29_VERSION}
MAKE_ENV= DISPLAY="${DISPLAY}" XAUTHORITY="${XAUTHORITY}"
REGRESS_TARGET= test

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2006/01/08 20:56:08 naddy Exp $
--- configure.orig Sun Jan 8 21:04:29 2006
+++ configure Sun Jan 8 21:05:15 2006
@@ -8600,11 +8600,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
$EGREP "yes" >/dev/null 2>&1; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBTktable29_VERSION}'
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBTktable29_VERSION}'
fi
rm -f conftest*

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/11/24 02:35:28 kevlo Exp $
@lib lib/Tktable2.9/libTktable29.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/08 20:56:08 naddy Exp $
@lib lib/Tktable2.9/libTktable29.so.${LIBTktable29_VERSION}