4 files changed, 50 insertions, 43 deletions
diff --git a/devel/tcltls/files/Makefile.bsd b/devel/tcltls/files/Makefile.bsd
new file mode 100644
index 000000000000..1520e6657241
--- /dev/null
+++ b/devel/tcltls/files/Makefile.bsd
@@ -0,0 +1,50 @@
+PACKAGE		= tls
+VERSION		?= ${PORTVERSION}
+LIB		= ${PACKAGE}
+SHLIB_MAJOR	= ${VERSION:R}
+SHLIB_MINOR	= ${VERSION:E}
+
+SRCS		= tls.c tlsIO.c tlsBIO.c tlsX509.c # fixstrtod.c strncasecmp.c
+
+PREFIX		?=/usr/local
+TCL_VER		?=8.3
+
+.if exists(${PREFIX}/lib/tcl${TCL_VER}/tclConfig.sh)
+# If for some reason  the file does not exist -- make the best guess. In
+# reality, it will exist by the time we are actually doing the build, so
+# the quality of the guess does not matter. But we still try well. -mi
+TCL_STUB_LIB_SPEC!=	. ${PREFIX}/lib/tcl${TCL_VER}/tclConfig.sh; \
+		echo $$TCL_STUB_LIB_SPEC
+.else
+TCL_STUB_LIB_SPEC=	-L${PREFIX}/lib -ltclstub${TCL_VER:S/.//}
+.endif
+
+LDADD		+= ${TCL_STUB_LIB_SPEC} -L${OPENSSLLIB} -lcrypto -lssl
+
+CFLAGS		+=-I${PREFIX}/include/tcl${TCL_VER} -I${OPENSSLINC}
+CFLAGS		+=-DNDEBUG -I. -DUSE_TCL_STUBS -I${PREFIX}/include
+CFLAGS		+=-DVERSION=\"${VERSION}\" -DPACKAGE=\"${PACKAGE}\"
+
+INTERNALLIB	= don't build the useless static version
+
+all: ${SHLIB_NAME} pkgIndex.tcl
+
+pkgIndex.tcl: ${.CURDIR}/pkgIndex.tcl.in
+	${SED} -e "s#@RELPATH@#..#" -e "s#@tls_LIB_FILE@#${SHLIB_NAME}#" \
+		< ${.CURDIR}/pkgIndex.tcl.in > pkgIndex.tcl
+
+SCRIPTDIR	= lib/tls
+SCRIPTPATH	= ${PREFIX}/${SCRIPTDIR}
+SHLIBDIR	= ${PREFIX}/lib
+
+${SCRIPTPATH}:
+	${MKDIR} ${SCRIPTPATH}
+
+environ:
+	@${ECHO} SHLIB_NAME="${SHLIB_NAME}" SHLIB_LINK="${SHLIB_LINK}" \
+		SCRIPTDIR="${SCRIPTDIR}"
+
+beforeinstall: ${SCRIPTPATH}
+	${INSTALL_DATA} pkgIndex.tcl ${.CURDIR}/tls.tcl ${SCRIPTPATH}
+
+.include <bsd.lib.mk>
diff --git a/devel/tcltls/files/patch-aa b/devel/tcltls/files/patch-aa
deleted file mode 100644
index ccfa941758ad..000000000000
--- a/devel/tcltls/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure	Thu Sep  6 15:26:44 1999
-+++ configure	Thu May  4 16:49:16 2000
-@@ -534,7 +534,7 @@
- 
--if test -r "$prefix/lib/tclConfig.sh"; then
--    . $prefix/lib/tclConfig.sh
--    echo "$ac_t""using $prefix/lib/tclConfig.sh" 1>&6
-+if test -r "$TCLLIB/tclConfig.sh"; then
-+    . $TCLLIB/tclConfig.sh
-+    echo "$ac_t""using $TCLLIB/tclConfig.sh" 1>&6
- else
--    { echo "configure: error: count not find lib/tclConfig.sh in $prefix" 1>&2; exit 1; }
-+    { echo "configure: error: count not find tclConfig.sh in $TCLLIB" 1>&2; exit 1; }
- fi
-@@ -768,2 +768,3 @@
- s%@TCL_COMPAT_OBJS@%$TCL_COMPAT_OBJS%g
-+s%@TCL_VERSION@%$TCL_VERSION%g
- 
diff --git a/devel/tcltls/files/patch-ab b/devel/tcltls/files/patch-ab
deleted file mode 100644
index 55791867adfa..000000000000
--- a/devel/tcltls/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in	Sun Sep 26 18:53:29 1999
-+++ Makefile.in	Thu May  4 17:10:29 2000
-@@ -46,1 +46,1 @@
--CFLAGS = -O
-+#CFLAGS = -O
-@@ -107,3 +107,3 @@
- CC_SWITCHES =	${CFLAGS} ${SHLIB_CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
--    -I${prefix}/include ${AC_FLAGS} ${PROTO_FLAGS} \
-+    -I${prefix}/include/tcl@TCL_VERSION@ ${AC_FLAGS} ${PROTO_FLAGS} \
-     ${ENV_FLAGS} ${SSL_FLAGS} @TCL_EXTRA_FLAGS@
-@@ -140,3 +140,3 @@
- 	rm -f ${LIB_FILE}
--	@TCL_SHLIB_LD@ -o ${LIB_FILE} ${OBJS} @TCL_SHLIB_LD_LIBS@
-+	@TCL_SHLIB_LD@ -o ${LIB_FILE} ${OBJS} @TCL_SHLIB_LD_LIBS@ ${LIBS}
- 	$(RANLIB) ${LIB_FILE}
-@@ -146,1 +146,1 @@
--	( echo cd $(TOP_DIR)/tests\; source all ) | tclsh80
-+	( echo 'cd $(TOP_DIR)/tests; foreach f [glob *.tcl] { source $$f }') | tclsh@TCL_VERSION@
diff --git a/devel/tcltls/files/patch-ac b/devel/tcltls/files/patch-ac
deleted file mode 100644
index 1bb698b50905..000000000000
--- a/devel/tcltls/files/patch-ac
+++ /dev/null
@@ -1,7 +0,0 @@
---- pkgIndex.tcl.in	Mon May 24 14:51:36 1999
-+++ pkgIndex.tcl.in	Thu May  4 17:43:01 2000
-@@ -1,2 +1,2 @@
--package ifneeded @PACKAGE@ @VERSION@ [list load [file join $dir @LIB_FILE@]]
--
-+package ifneeded @PACKAGE@ @VERSION@ "load [file join $dir .. @LIB_FILE@]; \
-+	source [file join $dir tls.tcl]"