3 files changed, 8 insertions, 20 deletions

diff --git a/devel/tcl-memchan/files/Makefile.bsd b/devel/tcl-memchan/files/Makefile.bsd
index e5435a0ca9c4..c2f7338e2edf 100644
--- a/devel/tcl-memchan/files/Makefile.bsd
+++ b/devel/tcl-memchan/files/Makefile.bsd
@@ -1,6 +1,5 @@
-LIB=	Memchan
-SHLIB_MAJOR=	2
-SHLIB_MINOR=	2
+LIBNAME=	Memchan
+SHLIB_NAME=	lib${LIBNAME}.so.2
 
 .PATH:	${.CURDIR}/generic
 
@@ -17,16 +16,13 @@ CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} \
 
 LDADD=		-L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}
 
-INTERNALLIB	= don't build the useless static version
-NOPROFILE	= don't care for profiling
-
-all: ${SHLIB_NAME} pkgIndex.tcl test
+all: pkgIndex.tcl test
 
 pkgIndex.tcl:
-	echo 'package ifneeded ${LIB} ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	echo 'package ifneeded ${LIBNAME} ${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		[list load [file join $$dir $(SHLIB_NAME)]]' > pkgIndex.tcl
 
-DIR             = lib/tcl${TCL_VER}/${LIB}
+DIR             = lib/tcl${TCL_VER}/${LIBNAME}
 SHLIBDIR        = ${PREFIX}/${DIR}
 MANDIR          = ${PREFIX}/man/man
 
@@ -43,7 +39,7 @@ beforeinstall: ${SHLIBDIR} pkgIndex.tcl
 
 test:	${SHLIB_NAME} pkgIndex.tcl
 	echo '	set auto_path ${.OBJDIR}; cd ${.CURDIR}/tests; \
-		package require ${LIB} ${SHLIB_MAJOR}.${SHLIB_MINOR}; \
+		package require ${LIBNAME} ${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 		if {[catch {source all} msg]} { \
 			puts stderr $msg; exit -1 \
 		}' | ${LOCALBASE}/bin/tclsh${TCL_VER}
diff --git a/devel/tcl-neo/files/Makefile.bsd b/devel/tcl-neo/files/Makefile.bsd
index 5eadcd046d7c..4ce127da1d3d 100644
--- a/devel/tcl-neo/files/Makefile.bsd
+++ b/devel/tcl-neo/files/Makefile.bsd
@@ -14,11 +14,7 @@ SRCS=		neoXcrypt.c neoPkgInit.c neoXwww.c neoXgeneral.c \
 		neoXcute.c neoXcomma.c neoXkdebug.c neoCbuf.c \
 		neoXlist.c neoXdb.c # neoXldap.c
 
-LIB=		neo82
-SHLIB_MAJOR=	1
-SHLIB_MINOR=	0
-INTERNALLIB=	Yes, don't need the static version
-NOPROFILE=	YES, don't need the profiled version
+SHLIB_NAME=	libneo82.so.1
 
 LDADD+=		-lcrypt -L${PREFIX}/lib -ltcl83 -lm -lmd -ldb2 # -ldap -llber
 
diff --git a/devel/tcltls/files/Makefile.bsd b/devel/tcltls/files/Makefile.bsd
index 1520e6657241..11622730b1fb 100644
--- a/devel/tcltls/files/Makefile.bsd
+++ b/devel/tcltls/files/Makefile.bsd
@@ -1,8 +1,6 @@
 PACKAGE		= tls
 VERSION		?= ${PORTVERSION}
-LIB		= ${PACKAGE}
-SHLIB_MAJOR	= ${VERSION:R}
-SHLIB_MINOR	= ${VERSION:E}
+SHLIB_NAME	= lib${PACKAGE}.so.${VERSION:R}
 
 SRCS		= tls.c tlsIO.c tlsBIO.c tlsX509.c # fixstrtod.c strncasecmp.c
 
@@ -25,8 +23,6 @@ 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