- Remove a.out support

4 files changed, 22 insertions, 42 deletions

diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index b48d786689ba..7ead22d50e80 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--enable-shared
 RANLIB=		ranlib
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg-install.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg-deinstall.tclsh
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -58,20 +58,15 @@ post-install:
 		Incompat80jp ${PREFIX}/share/doc/tcl${VERSION}jp; \
 	 )
 .endif
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libtcl80jp.so.1.5 ${PREFIX}/lib/libtcl80jp.so
-	${RANLIB} ${PREFIX}/lib/libtcl80jp.a
-.endif
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .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/tcl80/files/patch-aa b/japanese/tcl80/files/patch-aa
index 918febe41c58..6dbc950eee5d 100644
--- a/japanese/tcl80/files/patch-aa
+++ b/japanese/tcl80/files/patch-aa
@@ -1,19 +1,11 @@
---- configure.in.orig	Thu Apr  5 14:51:27 2001
-+++ configure.in	Thu Apr  5 15:08:05 2001
-@@ -851,15 +851,21 @@
-     NetBSD-*|FreeBSD-*|OpenBSD-*)
+--- configure.in.orig	Fri Jan 26 23:51:23 2007
++++ configure.in	Fri Jan 26 23:53:05 2007
+@@ -852,14 +852,14 @@
  	# Not available on all versions:  check for include file.
  	AC_CHECK_HEADER(dlfcn.h, [
-+	# FreeBSD-current supports elf format, now.
-+	    if test "X$PORTOBJFORMAT" = "Xelf"; then
-+	       SHLIB_LD='${CC} -shared -Wl,-x'
-+	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-+	    else
-+	       SHLIB_LD="ld -Bshareable -x"
-+	       TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.5'
-+	    fi
  	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD='${CC} -shared -Wl,-x'
  	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
@@ -21,10 +13,11 @@
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
 -	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
++	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
  	], [
  	    SHLIB_CFLAGS=""
  	    SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1222,6 +1228,7 @@
+@@ -1222,6 +1222,7 @@
  if test "$TCL_UNSHARED_LIB_SUFFIX" = "" ; then
      TCL_UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
  fi
@@ -32,7 +25,7 @@
  AC_ARG_ENABLE(shared,
      [  --enable-shared         build libtcl as a shared library],
      [tcl_ok=$enableval], [tcl_ok=no])
-@@ -1230,10 +1237,15 @@
+@@ -1230,10 +1231,11 @@
      TCL_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
      eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
@@ -41,15 +34,11 @@
  	MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
      else
 -	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+        if test "X$PORTOBJFORMAT" = "Xelf"; then
-+	   MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} -Wl,-S,-soname=${TCL_LIB_FILE} ${SHLIB_LD_LIBS}"
-+	else
-+	   MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
-+	fi
++	MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} -Wl,-S,-soname=${TCL_LIB_FILE} ${SHLIB_LD_LIBS}"
  	RANLIB=":"
      fi
  else
-@@ -1272,8 +1284,9 @@
+@@ -1272,8 +1274,9 @@
  # so that the backslashes quoting the DBX braces are dropped.
  
  # Trick to replace DBGX with TCL_DBGX
@@ -60,7 +49,7 @@
  
  VERSION='${VERSION}'
  eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
-@@ -1313,6 +1326,7 @@
+@@ -1313,6 +1316,7 @@
  AC_SUBST(TCL_BUILD_LIB_SPEC)
  AC_SUBST(TCL_LD_SEARCH_FLAGS)
  AC_SUBST(TCL_LIB_FILE)
@@ -68,7 +57,7 @@
  AC_SUBST(TCL_LIB_FLAG)
  AC_SUBST(TCL_LIB_SPEC)
  AC_SUBST(TCL_LIB_VERSIONS_OK)
-@@ -1327,4 +1341,4 @@
+@@ -1327,4 +1331,4 @@
  AC_SUBST(TCL_UNSHARED_LIB_SUFFIX)
  AC_SUBST(TCL_VERSION)
  
diff --git a/japanese/tcl80/files/patch-ab b/japanese/tcl80/files/patch-ab
index f7b5266eae34..66f09ff35f43 100644
--- a/japanese/tcl80/files/patch-ab
+++ b/japanese/tcl80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Wed Dec  8 10:58:58 1999
-+++ Makefile.in	Wed Dec  8 10:59:06 1999
+--- Makefile.in.orig	Fri Jan 26 23:51:22 2007
++++ Makefile.in	Fri Jan 26 23:53:48 2007
 @@ -55,11 +55,16 @@
  BIN_INSTALL_DIR =	$(INSTALL_ROOT)$(exec_prefix)/bin
  
@@ -48,13 +48,11 @@
  
  # The following target is configured by autoconf to generate either
  # a shared library or non-shared library for Tcl.
-@@ -344,6 +354,14 @@
+@@ -344,6 +354,12 @@
  	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
 +
 +${TCL_STATIC_LIB_FILE}: ${OBJS}
 +	rm -f ${TCL_STATIC_LIB_FILE}
@@ -63,7 +61,7 @@
  
  # Make target which outputs the list of the .o contained in the Tcl lib
  # usefull to build a single big shared library containing Tcl and other
-@@ -432,13 +450,13 @@
+@@ -432,13 +448,13 @@
  	cd dltest; if test -f configure; then ./configure; else \
  	    $(DLTEST_DIR)/configure; fi
  
@@ -79,13 +77,11 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -451,15 +469,23 @@
+@@ -451,15 +467,21 @@
  	@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 $(TCL_STATIC_LIB_FILE)"
 +	@$(INSTALL_DATA) $(TCL_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_STATIC_LIB_FILE)
@@ -106,7 +102,7 @@
  	    do \
  	    if [ ! -d $$i ] ; then \
  		echo "Making directory $$i"; \
-@@ -477,8 +503,15 @@
+@@ -477,8 +499,15 @@
  		else true; \
  		fi; \
  	    done;
@@ -124,7 +120,7 @@
  	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -506,30 +539,37 @@
+@@ -506,30 +535,37 @@
  	@cd $(TOP_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
diff --git a/japanese/tcl80/pkg-plist b/japanese/tcl80/pkg-plist
index 7f4c708c0e12..c48fc4846134 100644
--- a/japanese/tcl80/pkg-plist
+++ b/japanese/tcl80/pkg-plist
@@ -1,6 +1,6 @@
 bin/tclsh8.0jp
 lib/libtcl80jp.a
-lib/libtcl80jp.so.1.5
+lib/libtcl80jp.so.1
 lib/libtcl80jp.so
 include/tcl8.0jp/tcl.h
 include/tcl8.0jp/generic/tcl.h