3 files changed, 44 insertions, 40 deletions

diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index 2174bedc365b..34efc39a0ca6 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Japanized Tcl (Tool Command Language)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOTOOLS=	autoconf:213
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg-install.tclsh
@@ -57,17 +57,14 @@ pre-install:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
 
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtcl76jp.so.1.0 ${PREFIX}/lib/libtcl76jp.so
-.endif
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
-	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test
+	cd ${WRKSRC} && ${MAKE} test
 
 install-man:
-	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} install-man
+	cd ${WRKSRC} && ${MAKE} install-man
 
 .include <bsd.port.post.mk>
diff --git a/japanese/tcl76/files/patch-aa b/japanese/tcl76/files/patch-aa
index ea4b612c931f..5c1a620aa778 100644
--- a/japanese/tcl76/files/patch-aa
+++ b/japanese/tcl76/files/patch-aa
@@ -20,13 +20,11 @@
  
  # To disable ANSI-C procedure prototypes reverse the comment characters
  # on the following lines:
-@@ -305,6 +307,9 @@
+@@ -305,6 +307,7 @@
  	rm -f ${TCL_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TCL_LIB_FILE}
-+.if ${PORTOBJFORMAT}X == elfX
 +	ln -sf ${TCL_LIB_FILE} `echo ${TCL_LIB_FILE} | sed 's/\.so.*$$/.so/'`
-+.endif
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
  	${CC} @LD_FLAGS@ ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
@@ -39,13 +37,11 @@
  
  # Note: before running ranlib below, must cd to target directory because
  # some ranlibs write to current directory, and this might not always be
-@@ -385,15 +390,19 @@
+@@ -385,15 +390,17 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
-+.if ${PORTOBJFORMAT}X == elfX
 +	@(cd $(LIB_INSTALL_DIR); ln -sf ${TCL_LIB_FILE} `echo ${TCL_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
-+.endif
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@echo "Installing tclsh"
  	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
diff --git a/japanese/tcl76/files/patch-ad b/japanese/tcl76/files/patch-ad
index f6d6fcec1e4e..1950b12418fa 100644
--- a/japanese/tcl76/files/patch-ad
+++ b/japanese/tcl76/files/patch-ad
@@ -1,36 +1,47 @@
---- configure.in.orig	Tue Sep 15 08:14:13 1998
-+++ configure.in	Tue Sep 15 08:17:43 1998
-@@ -647,7 +647,20 @@
- 	LD_FLAGS="-Wl,-Bexport"
+--- configure.in.orig	Fri Jan 26 23:46:36 2007
++++ configure.in	Fri Jan 26 23:47:56 2007
+@@ -648,31 +648,15 @@
  	LD_SEARCH_FLAGS=""
  	;;
--    NetBSD-*|FreeBSD-*|OpenBSD-*)
-+    NetBSD-*|FreeBSD-*|OpenBSD-*)
-+	if test "X$PORTOBJFORMAT" = "Xelf"; then
-+	    SHLIB_CFLAGS="-fpic"
-+	    SHLIB_LD='${CC} -shared -Wl,-x'
-+	    SHLIB_SEARCH_FLAGS='-Wl,-soname,${TCL_LIB_FILE}'
-+	    SHLIB_SUFFIX=".so"
-+	    DL_OBJS="tclLoadDl.o"
-+	    DL_LIBS=""
-+	    LD_FLAGS=""
-+	    LD_SEARCH_FLAGS=""
-+	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
-+	    TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.a'
-+	    TCL_LIB_VERSIONS_OK=nodots
-+        else
- 	# Not available on all versions:  check for include file.
- 	AC_CHECK_HEADER(dlfcn.h, [
- 	    SHLIB_CFLAGS="-fpic"
-@@ -675,6 +688,7 @@
- 	TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
+     NetBSD-*|FreeBSD-*|OpenBSD-*)
+-	# Not available on all versions:  check for include file.
+-	AC_CHECK_HEADER(dlfcn.h, [
+-	    SHLIB_CFLAGS="-fpic"
+-	    SHLIB_LD="ld -Bshareable -x"
+-	    SHLIB_LD_LIBS=""
+-	    SHLIB_SUFFIX=".so"
+-	    DL_OBJS="tclLoadDl2.o"
+-	    DL_LIBS=""
+-	    LD_FLAGS=""
+-	    LD_SEARCH_FLAGS=""
+-	], [
+-	    SHLIB_CFLAGS=""
+-	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
+-	    SHLIB_LD_LIBS='${LIBS}'
+-	    SHLIB_SUFFIX="..o"
+-	    DL_OBJS="tclLoadAout.o"
+-	    DL_LIBS=""
+-	    LD_FLAGS=""
+-	    LD_SEARCH_FLAGS=""
+-	])
+-
+-	# FreeBSD doesn't handle version numbers with dots.  Also, have to
+-	# append a dummy version number to .so file names.
+-
+-	TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
++	SHLIB_CFLAGS="-fpic"
++	SHLIB_LD='${CC} -shared -Wl,-x'
++	SHLIB_SEARCH_FLAGS='-Wl,-soname,${TCL_LIB_FILE}'
++	SHLIB_SUFFIX=".so"
++	DL_OBJS="tclLoadDl.o"
++	DL_LIBS=""
++	LD_FLAGS=""
++	LD_SEARCH_FLAGS=""
++	TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
  	TCL_UNSHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.a'
  	TCL_LIB_VERSIONS_OK=nodots
-+	fi
  	;;
-     NEXTSTEP-*)
- 	SHLIB_CFLAGS=""
-@@ -1012,7 +1026,7 @@
+@@ -1012,7 +996,7 @@
      TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
      eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"