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

  ports

With hat:	portmgr

3 files changed, 10 insertions, 20 deletions

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)