- Remove support for a.out format and PORTOBJFORMAT variable from individual

  ports

With hat:	portmgr

18 files changed, 93 insertions, 153 deletions

diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 0a246b73605a..4c32bc231343 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -31,16 +31,11 @@ post-patch:
 do-build:
 	( cd ${WRKSRC} ; make World -f Makefile.ini )
 
-.include <bsd.port.pre.mk>
-
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so
-.endif
 	${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a
 	@${MKDIR} ${PREFIX}/include/wnn6/wnn
 	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn6/wnn
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 4883ade5f1c9..18916ad4b980 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -32,15 +32,10 @@ post-patch:
 do-build:
 	( cd ${WRKSRC} ; make World -f Makefile.ini )
 
-.include <bsd.port.pre.mk>
-
 post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libwnn7.so.1.0 ${PREFIX}/lib/libwnn7.so
-.endif
 	@${MKDIR} ${PREFIX}/include/wnn7/wnn
 	@${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn7/wnn
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index 3f9e166bf2fe..b6a5e8500d17 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -23,20 +23,15 @@ CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
 		--with-tkinclude=${PREFIX}/include/tk8.0jp
 
 NO_MAN_INSTALL=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-BROKEN=		"Incomplete pkg-plist"
-.endif
-
-post-install:
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libexpect530jp.so.1.2 ${PREFIX}/lib/libexpect530jp.so
+BROKEN=		Incomplete pkg-plist
 .endif
 
 test:
-	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test 
+	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.post.mk>
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa
index e24642184c93..43b5317456dc 100644
--- a/japanese/expect/files/patch-aa
+++ b/japanese/expect/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Aug 19 01:52:07 1999
-+++ Makefile.in	Tue Aug 31 13:40:29 1999
+--- Makefile.in.orig	Wed Aug 18 18:52:07 1999
++++ Makefile.in	Sat Jan 27 01:48:56 2007
 @@ -24,7 +24,7 @@
  TCL_LIBRARY = @TCL_LIBRARY@
  
@@ -94,7 +94,7 @@
  
  # install Expect library
  # This is done before the install target because the libraries have to be
-@@ -347,21 +349,25 @@
+@@ -347,21 +349,23 @@
  #   Local copy is pkgIndex rather than pkgIndex.tcl because pkgIndex.tcl.in
  #   is too long for some filesystems, sigh.
  install_shared_lib: $(EXP_LIB_FILES)
@@ -114,9 +114,7 @@
 -	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
 -	  $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
 +	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_SHARED_LIB_FILE) ; \
-+	  if [ "${PORTOBJFORMAT}X" = "elfX" ] ; then \
-+	    (cd $(LIB_INSTALL_DIR) ; ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`) \
-+	  fi; \
++	  (cd $(LIB_INSTALL_DIR) ; ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`) ; \
 +	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
  	else true; fi
  
@@ -129,7 +127,7 @@
  
  # Build Expect with TestCenter
  expect.tc: exp_main_exp.o $(OFILES) 
-@@ -375,13 +381,13 @@
+@@ -375,13 +379,13 @@
  # together.  I could fix it by testing all the libraries (again, in Expect's
  # configure) separately for Expectk, but as far as I know, it doesn't hurt
  # anything here, so I'm not worrying about it.
@@ -150,15 +148,12 @@
  
  # Build Expectk with TestCenter
  expectk.tc: exp_main_tk.o $(OFILES) 
-@@ -401,24 +407,28 @@
+@@ -401,24 +405,24 @@
  expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
  $(EXP_SHARED_LIB_FILE): $(OFILES)
  	-rm -f $(EXP_SHARED_LIB_FILE)
-+.if ${PORTOBJFORMAT} == "aout"
- 	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+.else
+-	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
 +	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) -Wl,-soname,$(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+.endif
 +	ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`
  
  .PHONY: install-info install info
@@ -187,7 +182,7 @@
  # install Expect's public include files
  #	$(INSTALL_DATA) expect_cf.h $(includedir)
  	$(INSTALL_DATA) $(srcdir)/expect.h $(includedir)
-@@ -433,21 +443,16 @@
+@@ -433,21 +437,16 @@
  	TCL_LIBRARY=$(TCL_LIBRARY) ; \
  	export TCL_LIBRARY ; \
  	   if $(LOCAL_EXPECT) $(srcdir)/fixcat ; then \
@@ -211,7 +206,7 @@
  
  $(SCRIPT_LIST):
  	TCL_LIBRARY=$(TCL_LIBRARY) ; \
-@@ -457,27 +462,21 @@
+@@ -457,27 +456,21 @@
  # Delete all the installed files that the `install' target creates
  # (but not the noninstalled files such as `make all' creates)
  uninstall:
@@ -242,7 +237,7 @@
  	done
  
  ###################################
-@@ -528,7 +527,7 @@
+@@ -528,7 +521,7 @@
  # delete all files from current directory that are created by "make"
  clean:
  	-rm -rf *~ *.o shared core \
@@ -251,7 +246,7 @@
  		dumb exho devtty \
  		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
  		$(SCRIPT_LIST)
-@@ -544,7 +543,7 @@
+@@ -544,7 +537,7 @@
  # because most people don't have to worry about them
  mostlyclean:
  	-rm -rf *~ *.o shared core \
@@ -260,7 +255,7 @@
  		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
  	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
  
-@@ -685,7 +684,7 @@
+@@ -685,7 +678,7 @@
  expect-$(VERSION).tar.gz:	expect-$(VERSION).tar
  	gzip -fc expect-$(VERSION).tar > $@
  
@@ -269,7 +264,7 @@
  	rm -f .tmp
  	echo "set objdir" `pwd` > .tmp
  	if [ "$(srcdir)" = "." ] ; then \
-@@ -695,7 +694,7 @@
+@@ -695,7 +688,7 @@
  	echo "source all" >> .tmp
  	rootme=`pwd`; export rootme; \
  	srcdir=${srcdir} ; export srcdir ; \
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa
index f58a3046be8e..1356b0fdb948 100644
--- a/japanese/libslang/files/patch-aa
+++ b/japanese/libslang/files/patch-aa
@@ -20,35 +20,24 @@
      cat >> confdefs.h <<\EOF
  #define HAVE_DLOPEN 1
  EOF
-@@ -1943,7 +1943,11 @@
+@@ -1943,7 +1943,7 @@
  
  ELFLIB="lib\$(THIS_LIB).so"
  ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
 -ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
-+if test $PORTOBJFORMAT = elf; then
-+  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
-+else
-+  ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
-+fi
++ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
  
  case "$host_os" in
    *linux* )
-@@ -2032,6 +2036,19 @@
+@@ -2032,6 +2036,12 @@
       ELFLIB_MAJOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).dylib"
       ELFLIB_MAJOR_MINOR="lib$(THIS_LIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION).dylib"
       ;;
 +  *freebsd* )
-+     if [ $PORTOBJFORMAT = elf ]; then
 +       ELF_CC="\$(CC)"
 +       ELF_CFLAGS="\$(CFLAGS) -fPIC"
 +       ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
 +       ELF_LINK_CMD="\$(ELF_LINK)"
-+     else
-+       ELF_CC="\$(CC)"
-+       ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+       ELF_LINK="ld -Bshareable -x"
-+       ELF_LINK_CMD="\$(ELF_LINK)"
-+     fi
 +     ;;
    * )
      echo "Note: ELF compiler for host_os=$host_os may be wrong"
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index edb7caad490b..8836daadf1ac 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -51,11 +51,7 @@ JPERL_VER=	5.005
 JPERL_VER_PL=	03
 JPERL_VERSION=	${JPERL_VER}${JPERL_VER_PL}
 JPERL_ARCH=	${ARCH}-freebsd
-.if ${PORTOBJFORMAT} == "aout"
-PERL_SHLIBVER=	1.0
-.else
 PERL_SHLIBVER=	1
-.endif
 PLIST_SUB=	JPERL_VERSION=${JPERL_VERSION} JPERL_VER=${JPERL_VER} \
 		JPERL_ARCH=${JPERL_ARCH}
 
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}"
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 1d32ddf5c7cf..3fd93b0f268c 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOTOOLS=	autoconf:213
 USE_XLIB=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
@@ -55,9 +55,6 @@ pre-install:
 
 post-install:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} install
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtk42jp.so.1.0 ${PREFIX}/lib/libtk42jp.so
-.endif
 	@${ECHO_MSG} "**********"
 	@${ECHO_MSG} "IMPORTANT:"
 	@${ECHO_MSG} "**********"
@@ -68,9 +65,9 @@ post-install:
 	@${ECHO_MSG} "conflicting with another version of Tcl/Tks."
 
 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/tk42/files/patch-ab b/japanese/tk42/files/patch-ab
index d4d4de916649..357e762323ec 100644
--- a/japanese/tk42/files/patch-ab
+++ b/japanese/tk42/files/patch-ab
@@ -34,13 +34,11 @@
  
  # To turn off the security checks that disallow incoming sends when
  # the X server appears to be insecure, reverse the comments on the
-@@ -291,6 +293,9 @@
+@@ -291,6 +293,7 @@
  	rm -f @TK_LIB_FILE@
  	@MAKE_LIB@
  	$(RANLIB) @TK_LIB_FILE@
-+.if ${PORTOBJFORMAT}X == elfX
 +	ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`
-+.endif
  
  wish: $(WISH_OBJS) $(TK_LIB_FILE)
  	$(CC) @LD_FLAGS@ $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ $(LIBS) \
@@ -59,13 +57,11 @@
  
  # Note: before running ranlib below, must cd to target directory because
  # some ranlibs write to current directory, and this might not always be
-@@ -332,13 +337,18 @@
+@@ -332,13 +337,16 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+.if ${PORTOBJFORMAT}X == elfX
 +	@(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
-+.endif
  	@echo "Installing wish"
  	@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
  	@echo "Installing tkConfig.sh"
diff --git a/japanese/tk42/files/patch-ac b/japanese/tk42/files/patch-ac
index 0f17b95d3da5..117a42c2f244 100644
--- a/japanese/tk42/files/patch-ac
+++ b/japanese/tk42/files/patch-ac
@@ -1,5 +1,5 @@
---- ./unix/configure.in.ORIG	Sun Sep 20 16:37:42 1998
-+++ ./unix/configure.in	Sun Sep 20 16:51:27 1998
+--- unix/configure.in.orig	Fri Jan 26 23:59:53 2007
++++ unix/configure.in	Sat Jan 27 00:00:06 2007
 @@ -34,12 +34,12 @@
  #--------------------------------------------------------------------
  
@@ -16,19 +16,16 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -298,7 +298,11 @@
+@@ -298,7 +298,7 @@
  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}"
-+    if test "X$PORTOBJFORMAT" = "Xelf"; then
+-    MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 +    MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} -Wl,-soname,${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+    else
-     MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+    fi
      RANLIB=":"
  else
      TK_SHLIB_CFLAGS=""
-@@ -330,6 +334,7 @@
+@@ -330,6 +330,7 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index b1431332fc6c..8a5b98425609 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -61,16 +61,12 @@ post-install:
 		Incompat80jp ${DOCSDIR}; \
 	 )
 .endif
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so
-	${RANLIB} ${PREFIX}/lib/libtk80jp.so
-.endif
 	@${CAT}	${PKGMESSAGE}
 
 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/tk80/files/patch-aa b/japanese/tk80/files/patch-aa
index 82dc04a6b408..06dc2548c6e3 100644
--- a/japanese/tk80/files/patch-aa
+++ b/japanese/tk80/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Apr  9 15:58:13 2001
-+++ configure.in	Mon Apr  9 16:00:47 2001
+--- configure.in.orig	Sat Jan 27 00:02:17 2007
++++ configure.in	Sat Jan 27 00:02:49 2007
 @@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
  TK_PATCH_LEVEL=".5"
@@ -28,19 +28,16 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -575,7 +578,11 @@
+@@ -575,7 +574,7 @@
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
-+    if test "X$PORTOBJFORMAT" = "Xelf"; then
+-    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
 +    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-S,-soname=\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-+    else
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-+    fi
      RANLIB=":"
  else
      TK_SHARED_BUILD=0
-@@ -584,7 +591,7 @@
+@@ -584,7 +583,7 @@
      MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}"
  fi
  
@@ -49,7 +46,7 @@
  eval "TK_LIB_FILE=${TK_LIB_FILE}"
  
  # Note:  in the following variable, it's important to use the absolute
-@@ -617,10 +624,12 @@
+@@ -617,10 +616,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
@@ -62,7 +59,7 @@
  AC_SUBST(TK_BUILD_LIB_SPEC)
  AC_SUBST(TK_CC_SEARCH_FLAGS)
  AC_SUBST(TK_LD_SEARCH_FLAGS)
-@@ -637,4 +646,4 @@
+@@ -637,4 +638,4 @@
  AC_SUBST(XLIBSW)
  AC_SUBST(TK_SHARED_BUILD)
  AC_SUBST(X11_IMAKE_FLAGS)
diff --git a/japanese/tk80/files/patch-ab b/japanese/tk80/files/patch-ab
index 01e90423d674..754201961c85 100644
--- a/japanese/tk80/files/patch-ab
+++ b/japanese/tk80/files/patch-ab
@@ -76,13 +76,11 @@
  all: wish
  
  # The following target is configured by autoconf to generate either
-@@ -326,6 +337,14 @@
+@@ -326,6 +337,12 @@
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
-+.if ${PORTOBJFORMAT}X == elfX
 +	ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`
-+.endif
 +
 +$(TK_STATIC_LIB_FILE): $(OBJS)
 +	rm -f $(TK_STATIC_LIB_FILE)
@@ -107,13 +105,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -395,13 +414,22 @@
+@@ -395,13 +414,20 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+.if ${PORTOBJFORMAT}X == elfX
 +	@(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
-+.endif
 +	@echo "Installing $(TK_STATIC_LIB_FILE)"
 +	@$(INSTALL_DATA) $(TK_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE)
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_STATIC_LIB_FILE))
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 8c0f744ae7b4..33e3df853cb8 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -60,7 +60,6 @@ post-install:
 	cd ${TOPDIR}/tkstepjp; \
 	${INSTALL_DATA} changes.TkSTEPjp ${PORTDOCDIR}
 .endif
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
diff --git a/japanese/tkstep80/files/patch-aa b/japanese/tkstep80/files/patch-aa
index 3f1b387133db..353575f832ef 100644
--- a/japanese/tkstep80/files/patch-aa
+++ b/japanese/tkstep80/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.in.orig	Wed Sep  6 15:36:32 2000
-+++ configure.in	Wed Sep  6 15:39:22 2000
+--- configure.in.orig	Sat Jan 27 00:08:20 2007
++++ configure.in	Sat Jan 27 00:08:41 2007
 @@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
  TK_PATCH_LEVEL=".5"
@@ -28,19 +28,16 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -586,7 +589,11 @@
+@@ -586,7 +585,7 @@
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      eval "TK_LIB_FILE=libtk${STEP}${TCL_SHARED_LIB_SUFFIX}"
-+    if test "X$PORTOBJFORMAT" = "Xelf"; then
+-    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
 +    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-+    else
-     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-+    fi
      RANLIB=":"
  else
      TK_SHARED_BUILD=0
-@@ -700,10 +707,12 @@
+@@ -700,10 +699,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
diff --git a/japanese/tkstep80/files/patch-ab b/japanese/tkstep80/files/patch-ab
index 03d56ec46d0d..87ff5b721946 100644
--- a/japanese/tkstep80/files/patch-ab
+++ b/japanese/tkstep80/files/patch-ab
@@ -48,13 +48,11 @@
  #TK_LIB_FILE = libtk.a
  
  TK_LIB_FLAG = @TK_LIB_FLAG@
-@@ -335,6 +342,14 @@
+@@ -335,6 +342,12 @@
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
-+.if ${PORTOBJFORMAT}X == elfX
 +	ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`
-+.endif
 +
 +$(TK_STATIC_LIB_FILE): $(OBJS)
 +	rm -f $(TK_STATIC_LIB_FILE)
@@ -79,13 +77,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -404,13 +419,22 @@
+@@ -404,13 +419,20 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
-+.if ${PORTOBJFORMAT}X == elfX
 +	@(cd $(LIB_INSTALL_DIR); ln -sf ${TK_LIB_FILE} `echo ${TK_LIB_FILE} | sed 's/\.so.*$$/.so/'`)
-+.endif
 +	@echo "Installing $(TK_STATIC_LIB_FILE)"
 +	@$(INSTALL_DATA) $(TK_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE)
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_STATIC_LIB_FILE))