diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2007-09-28 05:14:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2007-09-28 05:14:15 +0000 |
| commit | bc874c016a4b1e4d2ad69618743aaeccbc2b62bc (patch) | |
| tree | 8e49a418fdcac47e00c3746b58220cef7ad94216 /lang/tcl86 | |
| parent | 261cebcdacdc16bc44151ddece3a6d91b3c68027 (diff) | |
Notes
Diffstat (limited to 'lang/tcl86')
| -rw-r--r-- | lang/tcl86/Makefile | 11 | ||||
| -rw-r--r-- | lang/tcl86/distinfo | 6 | ||||
| -rw-r--r-- | lang/tcl86/files/patch-unix-configure | 20 | ||||
| -rw-r--r-- | lang/tcl86/pkg-plist | 4 |
4 files changed, 16 insertions, 25 deletions
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile index 81874c85ebb0..79cbc4975f91 100644 --- a/lang/tcl86/Makefile +++ b/lang/tcl86/Makefile @@ -6,19 +6,18 @@ # PORTNAME= tcl -PORTVERSION= 8.5.a.6 -PORTREVISION= 2 +PORTVERSION= 8.5.b.1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} -DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src +DISTNAME= ${PORTNAME}${PORTVERSION:S/.b./b/}-src MAINTAINER= mm@FreeBSD.org COMMENT= Tool Command Language (development version) PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.a./a/}/unix +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix ALL_TARGET= all USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -54,8 +53,8 @@ BROKEN= does not compile on ia64 . endif . if exists(${TCLSH}) TCL_PATCHLEVEL!= ${ECHO_CMD} "puts \$$tcl_patchLevel" | ${TCLSH} -. if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.a./a/} -IGNORE= version mismatch - installing ${PORTVERSION:S/.a./a/} over installed ${TCL_PATCHLEVEL} +. if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.b./b/} +IGNORE= version mismatch - installing ${PORTVERSION:S/.b./b/} over installed ${TCL_PATCHLEVEL} . endif .endif diff --git a/lang/tcl86/distinfo b/lang/tcl86/distinfo index 2dc3a45224a9..eb4fcb908474 100644 --- a/lang/tcl86/distinfo +++ b/lang/tcl86/distinfo @@ -1,3 +1,3 @@ -MD5 (tcl8.5a6-src.tar.gz) = 2759f9517898e2928d3a4bf6831a7eaa -SHA256 (tcl8.5a6-src.tar.gz) = 16f6d0c48f766560789e91ac79b07aa3c3adc2ef7159dd2fe7e4ceff370636ac -SIZE (tcl8.5a6-src.tar.gz) = 4231357 +MD5 (tcl8.5b1-src.tar.gz) = 52cd1e2df2f6d1c6508ea502ff776663 +SHA256 (tcl8.5b1-src.tar.gz) = 1b85f2589ccd84c3131be560a94f1af86aa4deb0fbf8747ba16553cd27410832 +SIZE (tcl8.5b1-src.tar.gz) = 4285527 diff --git a/lang/tcl86/files/patch-unix-configure b/lang/tcl86/files/patch-unix-configure index 81d45a42a74e..2ee97ec6e969 100644 --- a/lang/tcl86/files/patch-unix-configure +++ b/lang/tcl86/files/patch-unix-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed Jan 17 13:10:49 2007 -+++ configure Wed Jan 17 13:00:27 2007 -@@ -6467,7 +6467,7 @@ +--- configure.orig 2007-09-24 17:46:44.000000000 +0200 ++++ configure 2007-09-27 20:24:15.000000000 +0200 +@@ -6615,7 +6615,7 @@ LDFLAGS_ARCH="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" @@ -9,24 +9,16 @@ ECHO_VERSION='`echo ${VERSION}`' TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g -@@ -7275,25 +7275,26 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ SHLIB_LD="${CC} -shared" -+ TCL_SHLIB_LD_EXTRAS="-soname \$@" - SHLIB_LD_LIBS='${LIBS}' +@@ -7490,20 +7490,20 @@ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -export-dynamic" + LDFLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} if test "${TCL_THREADS}" = "1" ; then -- # The -pthread needs to go in the CFLAGS, not LIBS -+ # The -pthread needs to go in the LDFLAGS, not LIBS + # The -pthread needs to go in the CFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` - CFLAGS="$CFLAGS -pthread" - LDFLAGS="$LDFLAGS -pthread" diff --git a/lang/tcl86/pkg-plist b/lang/tcl86/pkg-plist index ea9029376100..847b941dea8e 100644 --- a/lang/tcl86/pkg-plist +++ b/lang/tcl86/pkg-plist @@ -813,9 +813,9 @@ lib/tcl%%TCL_VER%%/tclIndex lib/tcl%%TCL_VER%%/word.tcl lib/tcl8/8.4/http-2.5.3.tm lib/tcl8/8.4/platform/shell-1.1.3.tm -lib/tcl8/8.4/platform-1.0.2.tm +lib/tcl8/8.4/platform-1.0.3.tm lib/tcl8/8.5/msgcat-1.4.2.tm -lib/tcl8/8.5/tcltest-2.3a1.tm +lib/tcl8/8.5/tcltest-2.3b1.tm %%INSTMAN%%%%DATADIR%%/man.macros %%INSTMAN%%@dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US |