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

  ports

With hat:	portmgr

3 files changed, 11 insertions, 22 deletions

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))