diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-01-30 10:25:34 +0000 |
| commit | 2df76eb0a73bb59d817aa60758a5f10e3e544c3b (patch) | |
| tree | 07e10c49034b87755dafb03956ad93c5363e0bb7 /lang/tcl80 | |
| parent | 1c97f613254a72e0ae97ea8d817ebe38096d6949 (diff) | |
| download | ports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.tar.gz ports-2df76eb0a73bb59d817aa60758a5f10e3e544c3b.zip | |
Notes
Diffstat (limited to 'lang/tcl80')
| -rw-r--r-- | lang/tcl80/Makefile | 8 | ||||
| -rw-r--r-- | lang/tcl80/files/patch-ab | 22 |
2 files changed, 7 insertions, 23 deletions
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile index e3c994414637..62f0705edf63 100644 --- a/lang/tcl80/Makefile +++ b/lang/tcl80/Makefile @@ -38,12 +38,6 @@ TCL_LIB= libtcl80.so MANCOMPRESSED= yes -.if ${PORTOBJFORMAT} == "elf" -TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR} -.else -TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR} -.endif - post-configure: @${CP} ${FILESDIR}/Makefile.lib ${WRKSRC} @${CP} ${FILESDIR}/makefile ${WRKSRC} @@ -58,7 +52,7 @@ pre-build: OSVERSION=${OSVERSION} post-install: - ${LN} -sf ${TCL_LIB_FILE} ${PREFIX}/lib/${TCL_LIB} + ${LN} -sf ${TCL_LIB}.${SHLIB_MAJOR} ${PREFIX}/lib/${TCL_LIB} .if exists(${PKGINSTALL}) ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif diff --git a/lang/tcl80/files/patch-ab b/lang/tcl80/files/patch-ab index ab7c767146ea..36f9ea1b7c31 100644 --- a/lang/tcl80/files/patch-ab +++ b/lang/tcl80/files/patch-ab @@ -1,15 +1,11 @@ ---- configure.orig Mon Mar 8 22:51:26 1999 -+++ configure Thu Apr 29 11:13:56 1999 -@@ -4097,15 +4097,23 @@ +--- configure.orig Tue Mar 9 07:51:26 1999 ++++ configure Sat Jan 27 00:40:27 2007 +@@ -4097,14 +4097,14 @@ echo "$ac_t""yes" 1>&6 SHLIB_CFLAGS="-fpic" - SHLIB_LD="ld -Bshareable -x" -+ if [ "$PORTOBJFORMAT" = "elf" ]; then -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ SHLIB_LD="ld -Bshareable -x" -+ fi ++ SHLIB_LD="ld -shared -x -soname \$@" SHLIB_LD_LIBS="" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" @@ -17,13 +13,7 @@ LD_FLAGS="" LD_SEARCH_FLAGS="" - TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -- -+ if [ "$PORTOBJFORMAT" = "elf" ]; then -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1' -+ else -+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.5' -+ fi -+ ++ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1' + else echo "$ac_t""no" 1>&6 - |