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

  ports

With hat:	portmgr

3 files changed, 45 insertions, 90 deletions

diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index aac513cdac89..2d6131ea06e6 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -25,6 +25,7 @@ WRKSRC=		${WRKDIR}/tk8.0.5/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=${TK_LIB_FILE}
+TK_LIB_FILE=	${TK_LIB}.${SHLIB_MAJOR}
 PKGINSTALL=	${PKGDIR}/pkg-install.wish
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
 
@@ -278,12 +279,6 @@ MLINKS=	3DBorder.3 Tk_Get3DBorder.3 \
 
 .endif
 
-.if ${PORTOBJFORMAT} == "elf"
-TK_LIB_FILE=	${TK_LIB}.${SHLIB_MAJOR}
-.else
-TK_LIB_FILE=	${TK_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/\.[3n]/&.gz/g' ${WRKSRC}/mkLinks
 
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index d7c144aeae94..f21fd5a7f706 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -9,7 +9,7 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -1788,15 +1788,20 @@
+@@ -1788,15 +1788,15 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
    
@@ -23,13 +23,8 @@
  		LDFLAGS=""
  		LD_SEARCH_FLAGS=""
 -		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+          if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
 +		SHLIB_LD="ld -shared -x -soname \$@"
-+	  else
-+		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+		SHLIB_LD="ld -Bshareable -x"
-+	  fi
  	    
  else
    echo "$ac_t""no" 1>&6
diff --git a/x11-toolkits/tkstep80/files/patch-aa b/x11-toolkits/tkstep80/files/patch-aa
index 26bee7f5f387..4714dd6bff74 100644
--- a/x11-toolkits/tkstep80/files/patch-aa
+++ b/x11-toolkits/tkstep80/files/patch-aa
@@ -1,78 +1,43 @@
-*** configure.orig	Mon Apr 19 21:28:50 1999
---- configure	Mon Apr 19 21:30:27 1999
-***************
-*** 891,904 ****
-    withval="$with_tcl"
-    TCL_BIN_DIR=$withval
-  else
-!   TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
-  fi
-  
-  if test ! -d $TCL_BIN_DIR; then
-      { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
-  fi
-! if test ! -f $TCL_BIN_DIR/Makefile; then
-!     { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-  fi
-  
-  #--------------------------------------------------------------------
---- 891,904 ----
-    withval="$with_tcl"
-    TCL_BIN_DIR=$withval
-  else
-!   TCL_BIN_DIR=${prefix}/lib/tcl8.0
-  fi
-  
-  if test ! -d $TCL_BIN_DIR; then
-      { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
-  fi
-! if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
-!     { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
-  fi
-  
-  #--------------------------------------------------------------------
-***************
-*** 936,943 ****
-  DL_LIBS=$TCL_DL_LIBS
-  LD_FLAGS=$TCL_LD_FLAGS
-  CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
-! CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
-  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
-  
-  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
-  
---- 936,944 ----
-  DL_LIBS=$TCL_DL_LIBS
-  LD_FLAGS=$TCL_LD_FLAGS
-  CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
-! CFLAGS_OPTIMIZE=$CFLAGS
-  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
-+ TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
-  
-  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
-  
-***************
-*** 2480,2487 ****
-  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
-      TK_SHARED_BUILD=1
-      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-!     eval "TK_LIB_FILE=libtk${STEP}${TCL_SHARED_LIB_SUFFIX}"
-!     MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-      RANLIB=":"
-  else
-      TK_SHARED_BUILD=0
---- 2481,2494 ----
-  if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
-      TK_SHARED_BUILD=1
-      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-!     if [ "$PORTOBJFORMAT" = "elf" ]; then
-!        eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1"
-!        MAKE_LIB="\${SHLIB_LD} -soname ${TK_LIB_FILE} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-!     else
-!        eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1.4"
-!        MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
-!     fi
-! 
-      RANLIB=":"
-  else
-      TK_SHARED_BUILD=0
+--- configure.orig	Sat Jan 27 02:05:59 2007
++++ configure	Sat Jan 27 02:08:22 2007
+@@ -891,14 +891,14 @@
+   withval="$with_tcl"
+   TCL_BIN_DIR=$withval
+ else
+-  TCL_BIN_DIR=`cd ../../tcl8.0$TK_PATCH_LEVEL/unix; pwd`
++  TCL_BIN_DIR=${prefix}/lib/tcl8.0
+ fi
+ 
+ if test ! -d $TCL_BIN_DIR; then
+     { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; }
+ fi
+-if test ! -f $TCL_BIN_DIR/Makefile; then
+-    { echo "configure: error: There's no Makefile in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
++if test ! -f $TCL_BIN_DIR/tclConfig.sh; then
++    { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR;  perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; }
+ fi
+ 
+ #--------------------------------------------------------------------
+@@ -936,8 +936,9 @@
+ DL_LIBS=$TCL_DL_LIBS
+ LD_FLAGS=$TCL_LD_FLAGS
+ CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG
+-CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
++CFLAGS_OPTIMIZE=$CFLAGS
+ EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
++TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
+ 
+ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
+ 
+@@ -2480,8 +2481,9 @@
+ if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
+     TK_SHARED_BUILD=1
+     TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
+-    eval "TK_LIB_FILE=libtk${STEP}${TCL_SHARED_LIB_SUFFIX}"
+-    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    eval "TK_LIB_FILE=libtkstep`echo ${VERSION} | tr -d .`.so.1"
++    MAKE_LIB="\${SHLIB_LD} -soname ${TK_LIB_FILE} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++
+     RANLIB=":"
+ else
+     TK_SHARED_BUILD=0