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

  ports

With hat:	portmgr

90 files changed, 267 insertions, 722 deletions

diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 4cafac78aca9..42f5c0fced28 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -19,6 +19,7 @@ COMMENT=	File archiver (binary port)
 IA32_BINARY_PORT=	YES
 RESTRICTED=	only unmodified original package can be distributed
 NO_BUILD=	yes
+STRIP=
 WRKSRC=		${WRKDIR}/rar
 PLIST_FILES=	bin/rar lib/default.sfx etc/rarfiles.lst man/cat1/rar.1
 PORTDOCS=	technote.txt license.txt whatsnew.txt order.htm \
@@ -34,10 +35,6 @@ IGNORE=	is unsupported on versions prior to FreeBSD 5.3
 LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
 .endif
 
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
 do-install:
 .if !defined(WITH_STATIC)
 	${INSTALL_PROGRAM} ${WRKSRC}/rar ${TARGETDIR}/bin/rar
diff --git a/audio/gsm/files/patch-ab b/audio/gsm/files/patch-ab
index eba4d10a6672..3408bd032c02 100644
--- a/audio/gsm/files/patch-ab
+++ b/audio/gsm/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Apr 26 12:14:26 2006
-+++ Makefile	Fri Aug 11 13:46:15 2006
+--- Makefile.orig	Wed Apr 26 15:14:26 2006
++++ Makefile	Thu Jan 25 22:12:30 2007
 @@ -43,8 +43,8 @@
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
@@ -51,7 +51,7 @@
  
  #
  #    You shouldn't have to configure below this line if you're porting.
-@@ -129,18 +132,23 @@
+@@ -129,18 +132,19 @@
  # DEBUG	= -DNDEBUG
  ######### Remove -DNDEBUG to enable assertions.
  
@@ -70,15 +70,11 @@
 -LIBGSM	= $(LIB)/libgsm.a
 -
 +LIBGSM	= libgsm.a
-+.if ${PORTOBJFORMAT} == elf
 +SOLIBGSM	= libgsm.so.1
-+.else
-+SOLIBGSM	= libgsm.so.1.1
-+.endif
  TOAST	= $(BIN)/toast
  UNTOAST	= $(BIN)/untoast
  TCAT	= $(BIN)/tcat
-@@ -257,13 +265,15 @@
+@@ -257,13 +261,15 @@
  # Install targets
  
  GSM_INSTALL_TARGETS =	\
@@ -95,7 +91,7 @@
  TOAST_INSTALL_TARGETS =	\
  		$(TOAST_INSTALL_BIN)/toast		\
  		$(TOAST_INSTALL_BIN)/tcat		\
-@@ -277,9 +287,12 @@
+@@ -277,9 +283,12 @@
  		$(CC) $(CFLAGS) $?
  		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  
@@ -109,7 +105,7 @@
  		@-echo $(ROOT): Done.
  
  tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +312,32 @@
+@@ -299,24 +308,28 @@
  
  # The basic API: libgsm
  
@@ -118,11 +114,7 @@
 -		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
 -		$(RANLIB) $(LIBGSM)
 +$(LIB)/$(SOLIBGSM): $(LIB) $(GSM_OBJECTS:S/o$/so/g)
-+.if ${PORTOBJFORMAT} == elf
 +		$(CC) -o $@ -shared -Wl,-soname,$(SOLIBGSM) $(GSM_OBJECTS:S/o$/so/g)
-+.else
-+		ld -Bshareable -o $@ $(GSM_OBJECTS:S/o$/so/g)
-+.endif
 +		(cd $(LIB); $(LN) -sf $(SOLIBGSM) `echo $(SOLIBGSM) | sed 's/\.so.*$$/.so/'`)
 +
 +$(LIB)/$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
@@ -152,7 +144,7 @@
  
  
  # The local bin and lib directories
-@@ -342,62 +363,67 @@
+@@ -342,62 +355,67 @@
  
  gsmuninstall:
  		-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then	\
@@ -232,18 +224,19 @@
 -		-rm $@
 -		cp $? $@
 -		chmod 444 $@
-+		$(RM) $@
-+		${BSD_INSTALL_DATA} $? $@
- 
+-
 -$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
 -		-rm $@
 -		cp $? $@
 -		chmod 444 $@
++		$(RM) $@
++		${BSD_INSTALL_DATA} $? $@
+ 
 +$(GSM_INSTALL_LIB)/$(LIBGSM):	$(LIB)/$(LIBGSM)
 +		$(RM) $@
 +		${BSD_INSTALL_DATA} $? $@
 +		$(RANLIB) $@
- 
++
 +$(GSM_INSTALL_LIB)/$(SOLIBGSM):    $(LIB)/$(SOLIBGSM)
 +		$(RM) $@
 +		${BSD_INSTALL_DATA} $? $@
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 09bcecfbc51e..d02156397e1b 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -29,6 +29,7 @@ INTERFACE?=	emacs
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+LDFLAGS=	-export-dynamic
 USE_GMAKE=	yes
 .if !${INTERFACE} == "emacs" && !${INTERFACE} == "slang"
 USE_XLIB=	yes
@@ -96,10 +97,6 @@ CONFIGURE_ENV+=	SHLD="${CC} -shared ${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-LDFLAGS+=-export-dynamic
-.endif
-
 EUCJP_LOCALE=	ja_JP.eucJP
 PLIST_SUB+=	EUCJP_LOCALE=${EUCJP_LOCALE}
 
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index c0ee2cef2b56..d3a3cc823c54 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -34,7 +34,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*'	\
 CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
 CONFIGURE_ARGS+=--program-transform-name= --enable-network
 CPPFLAGS+=	-I${LOCALBASE}/include/libarc
-CONFIGURE_ENV+=	"CPPFLAGS=${CPPFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS=-export-dynamic
 
 PLIST_SUB=	EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \
 		ELISPDIR=share/emacs/site-lisp
@@ -85,10 +85,6 @@ CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
 CONFIGURE_ARGS+=--enable-audio=oss,vorbis
 .endif
 
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_ENV+=	LDFLAGS=-export-dynamic
-.endif
-
 pre-install:
 	@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
 
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 3d55bcb3b0bb..d89f24a53d60 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -16,19 +16,12 @@ MAINTAINER=	hoek@FreeBSD.org
 COMMENT=	A library for uu/xx/Base64/BinHex/yEnc de-/encoding
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN3=		uulib.3
 
 ALL_TARGET=	libuu.a	libuu.so.${VERSION}
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
 VERSION=	3
-.else
-VERSION=	3.1
-.endif
 
 DOCFILES=	COPYING HISTORY doc/Makefile doc/README doc/binhex.fig \
 		doc/library.ltx doc/structure.fig doc/td-v1.c doc/td-v2.c \
@@ -54,4 +47,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa
index d817e59957d2..e825439457a3 100644
--- a/deskutils/xopps/files/patch-aa
+++ b/deskutils/xopps/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jan 18 13:22:35 1997
-+++ Makefile	Sat Jan  8 00:42:51 2000
+--- Makefile.orig	Fri Jan 17 23:22:35 1997
++++ Makefile	Thu Jan 25 22:14:35 2007
 @@ -142,19 +142,19 @@
  # Installation locations (edit to suit your system)
  #
@@ -26,7 +26,7 @@
  SFOCDIR = /SFOC/$(SFOCVER)
  TPSDIR = /TPS/$(SFOCVER)
  BLDDIR = .
-@@ -163,27 +163,30 @@
+@@ -163,27 +163,28 @@
  LOCAL_INCL = ../../lib_incl_local
  GLOBAL_INCL = ../../lib_incl_global
  SYSDEFS = $(MACHDEFS) -D$(MACH) -DRELEASE='"$(RELEASE)"' $(DEFINES)
@@ -62,14 +62,12 @@
 -LIBS = -lXm -lXt -lX11
 -SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
 +LIBS = -lXm -lXext -lXt -lX11 ${MOTIFLIB}
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBS+= -Wl,-rpath,$(X11BASE)/lib
-+.endif
 +#SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
  FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH)
  
  LINT = lint
-@@ -237,12 +240,13 @@
+@@ -237,12 +238,13 @@
  	$(HELP) $(DRAWINGS)
  
  install:
diff --git a/devel/libslang/files/patch-configure b/devel/libslang/files/patch-configure
index 854673fd5a0a..eec2e732377e 100644
--- a/devel/libslang/files/patch-configure
+++ b/devel/libslang/files/patch-configure
@@ -1,6 +1,6 @@
 --- configure.orig	Sun Jan 26 07:31:27 2003
 +++ configure	Fri Feb 21 17:21:25 2003
-@@ -2034,6 +2034,18 @@
+@@ -2034,6 +2034,14 @@
       ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib"
       ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib"
       ;;
@@ -8,11 +8,7 @@
 +    ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
 +    ELF_CC="\$(CC)"
 +    ELF_CFLAGS="\$(CFLAGS) -fPIC"
-+    if [ $PORTOBJFORMAT = elf ]; then
-+      ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
-+    else
-+      ELF_LINK="ld -Bshareable -x"
-+    fi
++    ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)"
 +    ELF_LINK_CMD="\$(ELF_LINK)"
 +    ELF_DEP_LIBS="\$(DL_LIB) -lm"
 +    ;;
diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile
index 437fc6479ec7..8e5a52ee19b7 100644
--- a/devel/linuxthreads/Makefile
+++ b/devel/linuxthreads/Makefile
@@ -25,9 +25,6 @@ USE_PERL5_BUILD=true
 # This port only works on i386 right now.
 ONLY_FOR_ARCHS=	i386
 
-.if ${OSVERSION} < 400015
-BROKEN="Requires FreeBSD 4.0 or newer"
-.endif
 .if ${OSVERSION} >= 500035
 USING_GCC3=true
 MAKE_ENV+= USING_GCC3=true
@@ -223,8 +220,8 @@ pre-su-install:
 .endif
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m /usr/lib
+	${LDCONFIG} -m ${PREFIX}/lib
+	${LDCONFIG} -m /usr/lib
 	${CAT} ${PKGMESSAGE}
 
 #	@sh ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index d621cf5449f3..5bd4f4fd17ce 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -18,12 +18,7 @@ COMMENT=	Nintendo Entertainment System emlator for X
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
 STRIP=
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin
@@ -32,4 +27,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/CART.NES ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.pal ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-aa
index 2dee6673ca6e..5ab8f9a01388 100644
--- a/games/3dc/files/patch-aa
+++ b/games/3dc/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu Apr 11 09:23:53 1996
-+++ Makefile	Sat Sep 26 23:22:52 1998
+--- Makefile.orig	Thu Apr 11 16:23:53 1996
++++ Makefile	Fri Jan 26 23:23:12 2007
 @@ -13,7 +13,7 @@
  # If your system doesn't have a unique define already, define one here.
  
@@ -9,7 +9,7 @@
  # OSF/Digital Unix/HPUX
  #CONFIGS=-fPIC -DHAVE_UNISTD_H -DHAVE_ULIMIT_H
  # Sun
-@@ -27,19 +27,22 @@
+@@ -27,19 +27,19 @@
  #   can send me opinions at mailto:paulh@euristix.ie
  PREFS=-DUNDO_ANY_MOVE
  
@@ -29,10 +29,7 @@
  # appear much but it looks much better when it does.
  # Linux
 -LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
-+LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
-+.if ${PORTOBJFORMAT} == "elf"
-+LDLIBS+=-Wl,-rpath,${X11BASE}/lib
-+.endif
++LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${X11BASE}/lib
  # Sun
  #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm
  
diff --git a/games/xbomb/files/patch-aa b/games/xbomb/files/patch-aa
index 8507b8b3798b..26c5356a4dab 100644
--- a/games/xbomb/files/patch-aa
+++ b/games/xbomb/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Jan 21 06:02:46 1996
-+++ Makefile	Tue Jan 18 00:00:00 2000
-@@ -12,33 +12,30 @@
+--- Makefile.orig	Sat Jan 20 16:02:46 1996
++++ Makefile	Thu Jan 25 22:20:42 2007
+@@ -12,33 +12,28 @@
  # for conditions under which this file may be redistributed.
  #
  
@@ -17,9 +17,7 @@
 -
 -COMPILE=$(CC) -c $(CFLAGS)
 +XLIB=-L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 -lcompat
-+.if ${PORTOBJFORMAT} == "elf"
 +XLIB+=	-Wl,-rpath,${X11BASE}/lib
-+.endif
  
  LINK=$(CC)
  
@@ -42,7 +40,7 @@
  xbomb.o   : xbomb.c   xbomb.h
  xwindow.o : xwindow.c xbomb.h icon.h
  hiscore.o : hiscore.c xbomb.h
-@@ -51,10 +48,10 @@
+@@ -51,10 +46,10 @@
  ########
  
  install :
diff --git a/games/xminehunter/files/patch-aa b/games/xminehunter/files/patch-aa
index 79d778a6375a..19500eb99265 100644
--- a/games/xminehunter/files/patch-aa
+++ b/games/xminehunter/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Jul 22 01:11:34 1996
-+++ Makefile	Tue Oct 13 20:41:49 1998
-@@ -1,9 +1,11 @@
+--- Makefile.orig	Mon Jul 22 02:11:34 1996
++++ Makefile	Thu Jan 25 22:22:22 2007
+@@ -1,9 +1,9 @@
 -INSTALL_BIN_PATH = /usr/local/bin
 -INSTALL_SCORE_PATH = /usr/local/lib/xminehunter
 -
@@ -11,9 +11,7 @@
  
 +INCLUDES = -I${X11BASE}/include
 +LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXpm -lXext -lX11
-+.if ${PORTOBJFORMAT} == "elf"
 +LIBS+= -Wl,-rpath,${X11BASE}/lib
-+.endif
  
  CC = g++
  
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index c349ff29bed3..62585ac54bf5 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Lossless compression for bi-level images such as scanned pages, faxes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	jbgtopbm.1 pbmtojbg.1
 
diff --git a/graphics/jbigkit/files/patch-aa b/graphics/jbigkit/files/patch-aa
index 0377d047e905..bea5e3195a1d 100644
--- a/graphics/jbigkit/files/patch-aa
+++ b/graphics/jbigkit/files/patch-aa
@@ -36,7 +36,7 @@
  
  clean:
  	rm -f *~ core
-@@ -36,3 +36,27 @@
+@@ -36,3 +36,22 @@
  	  gzip -9f jbigkit-$(VERSION).tar )
  	mv ../jbigkit-$(VERSION).tar.gz $(HOME)/public_html/download/
  	cp CHANGES $(HOME)/public_html/jbigkit/
@@ -57,10 +57,5 @@
 +	${BSD_INSTALL_DATA} libjbig/jbig.h ${PREFIX}/include
 +	mkdir -p ${PREFIX}/lib
 +	${BSD_INSTALL_DATA} libjbig/libjbig.a ${PREFIX}/lib
-+.if ${PORTOBJFORMAT} == elf
 +	${BSD_INSTALL_DATA} libjbig/libjbig.so.1 ${PREFIX}/lib
 +	ln -sf libjbig.so.1 ${PREFIX}/lib/libjbig.so
-+.else
-+	${BSD_INSTALL_DATA} libjbig/libjbig.so.1.1 ${PREFIX}/lib
-+	ln -sf libjbig.so.1.1 ${PREFIX}/lib/libjbig.so
-+.endif
diff --git a/graphics/jbigkit/files/patch-ab b/graphics/jbigkit/files/patch-ab
index 4f5889f3085f..85547868035a 100644
--- a/graphics/jbigkit/files/patch-ab
+++ b/graphics/jbigkit/files/patch-ab
@@ -1,6 +1,6 @@
 --- libjbig/Makefile.orig	Fri Apr 10 20:33:27 1998
 +++ libjbig/Makefile	Wed Sep 16 11:57:16 1998
-@@ -5,9 +5,16 @@
+@@ -5,9 +5,12 @@
  CC = gcc
  
  # Options for the compiler: A high optimization level is suggested
@@ -9,28 +9,20 @@
  
 -all: libjbig.a tstcodec
 +JBIGLIB=libjbig.a
-+.if ${PORTOBJFORMAT} == elf
 +SOJBIGLIB=libjbig.so.1
-+.else
-+SOJBIGLIB=libjbig.so.1.1
-+.endif
 +
 +all: libjbig.a $(SOJBIGLIB)
  
  tstcodec: tstcodec.c jbig.c jbig.h jbig_tab.o
  	$(CC) $(CFLAGS) -o tstcodec -DTEST_CODEC tstcodec.c jbig.c \
-@@ -18,10 +25,25 @@
+@@ -18,10 +25,21 @@
  	ar rc libjbig.a jbig.o jbig_tab.o
  	ranlib libjbig.a
  
 +$(SOJBIGLIB): jbig.so jbig_tab.so
 +	rm -f ${.TARGET}
-+.if ${PORTOBJFORMAT} == elf
 +	$(CC) -o ${.TARGET} -shared -Wl,-soname,${.TARGET} ${.ALLSRC}         
 +	ln -sf ${.TARGET} `echo ${.TARGET} | sed 's/\.so.*$$/.so/'`
-+.else
-+	ld -Bshareable -o ${.TARGET} ${.ALLSRC}
-+.endif
 +	
  jbig.o: jbig.c jbig.h
  
diff --git a/graphics/juno-2/Makefile b/graphics/juno-2/Makefile
index 2a625fce5117..86c18d5a1001 100644
--- a/graphics/juno-2/Makefile
+++ b/graphics/juno-2/Makefile
@@ -36,25 +36,12 @@ EXAMPLESDIR=	${PREFIX}/share/examples/Juno
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 6d09ef4c1ffe..b46d041bfd08 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	A C/FORTRAN library for drawing graphs on a variety of display devices
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+
 USE_XLIB=	yes
 USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
@@ -23,14 +24,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-VERSION=	5
-.else
-VERSION=	5.2
-.endif
-
 WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
 FC=		gfortran42
 F77=		gfortran42
 MAKE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
@@ -38,7 +33,7 @@ MAKE_ARGS+=	X11BASE="${X11BASE}"
 
 post-install:
 .for f in libcpgplot.so libpgplot.so
-	${LN} -sf $f.${VERSION} ${PREFIX}/lib/$f
+	${LN} -sf $f.5 ${PREFIX}/lib/$f
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/graphics/urt/files/patch-config::urt b/graphics/urt/files/patch-config::urt
index e38fc0f8d0a5..262d91126a6b 100644
--- a/graphics/urt/files/patch-config::urt
+++ b/graphics/urt/files/patch-config::urt
@@ -138,7 +138,7 @@
  #endif
  
  #ifdef SUNRASTER|SUNTOOLS|TAAC1
-@@ -216,9 +219,12 @@
+@@ -216,9 +219,10 @@
  
  #ifdef TIFF
  # Location of tiff library and include files.  Relative to URT root directory.
@@ -148,9 +148,7 @@
 +##defpath TIFFDIR
 +INCTIFF = -I${LOCALBASE}/include
 +LIBTIFF = -L${LOCALBASE}/lib -ltiff
-+.if ${PORTOBJFORMAT} == "elf"
 +LIBTIFF +=-Wl,-rpath,${LOCALBASE}/lib
-+.endif
  #endif
  
  #ifdef X10
diff --git a/graphics/urt/files/patch-lib::makefile.src b/graphics/urt/files/patch-lib::makefile.src
index dfb6034e5d5e..8d5f8a6cb2b5 100644
--- a/graphics/urt/files/patch-lib::makefile.src
+++ b/graphics/urt/files/patch-lib::makefile.src
@@ -1,6 +1,6 @@
 --- lib/makefile.src.orig	Thu Mar  5 04:32:53 1992
 +++ lib/makefile.src	Sat Dec 28 00:41:59 2002
-@@ -26,7 +26,14 @@
+@@ -26,7 +26,10 @@
  	vaxshort.o \
  	$(OPT_OBJS)
  
@@ -8,15 +8,11 @@
 +SOOBJS = $(OBJS:.o=.so)
 +
 +LIBANAME = librle.a
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBSONAME = librle.so.1
-+.else
-+LIBSONAME = librle.so.1.0
-+.endif
  
  # Just rebuild the object files.
  objs: $(OBJS)
-@@ -37,40 +44,46 @@
+@@ -37,40 +44,40 @@
  # Do nothing if $(DEST) is empty (or not defined)
  install: buildlib
  	@sh -c "if test '$(DEST)x' != x ; then \
@@ -74,15 +70,9 @@
 +	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so
 +	$(LD) -X -r $*.so
 +
-+.if $(PORTOBJFORMAT) == "elf"
 +$(LIBSONAME): $(SOOBJS)
 +	-rm -f $@
 +	ld -shared -soname $@ -o $@ $(SOOBJS)
-+.else
-+$(LIBSONAME): $(SOOBJS)
-+	-rm -f $@
-+	ld -Bshareable -o $@ $(SOOBJS)
-+.endif
  
  # Clean up installed stuff and binaries
  pristine: clean
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))
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index 10822eeb7943..ddc5b2636c9c 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -10,10 +10,12 @@ PORTVERSION=	${JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nate/JDK1.1
+DISTFILES=	jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Java Development Kit 1.1
 
+LIB_DEPENDS=	c.3:${PORTSDIR}/misc/compat3x
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 NO_CDROM=	"License doesn't allow distribution with fee"
@@ -26,15 +28,6 @@ PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 WRKSRC=		${WRKDIR}/jdk${JDK_VERSION}
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-DISTFILES=	jdk${JDK_VERSION}_AOUT.V1999-11-9.tar.gz
-.else
-LIB_DEPENDS+=	c.3:${PORTSDIR}/misc/compat3x
-DISTFILES=	jdk${JDK_VERSION}_ELF.V1999-11-9.tar.gz
-.endif
-
 post-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
@@ -48,4 +41,4 @@ do-install:
 post-install:
 	${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # JDK${JDK_VERSION}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/java/jre/Makefile b/java/jre/Makefile
index b1f8db0e93b5..f8dd3a6f099d 100644
--- a/java/jre/Makefile
+++ b/java/jre/Makefile
@@ -13,10 +13,12 @@ MASTER_SITES=	ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/ \
 		ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
 		http://www.freebsd.org/java/
 MASTER_SITE_SUBDIR=	patrick
+DISTFILES=	jre${JRE_VERSION}i_ELF.V1999-11-9.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standard Java Platform for running Java programs
 
+LIB_DEPENDS=	c.3:${PORTSDIR}/misc/compat3x
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 NO_CDROM=	"License doesn't allow distribution with fee"
@@ -38,15 +40,6 @@ STRIPFILES=	bin/i386/green_threads/jre \
 		lib/i386/green_threads/libsysresource.so \
 		lib/i386/green_threads/libzip.so
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-DISTFILES=	jre${JRE_VERSION}i_AOUT.V1999-11-9.tar.gz
-.else
-LIB_DEPENDS+=	c.3:${PORTSDIR}/misc/compat3x
-DISTFILES=	jre${JRE_VERSION}i_ELF.V1999-11-9.tar.gz
-.endif
-
 do-build:
 	@for file in ${STRIPFILES}; do \
 		${STRIP_CMD} ${WRKSRC}/$$file; \
@@ -67,4 +60,4 @@ do-install:
 post-install:
 	${LOCALBASE}/bin/registervm "${PREFIX}/jre${JRE_VERSION}/bin/java # JRE${JRE_VERSION}"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 5016cccd22d7..788e966d20a3 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -21,6 +21,7 @@ RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanya
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
+USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" LOCALBASE="${LOCALBASE}"
diff --git a/korean/eterm/pkg-plist b/korean/eterm/pkg-plist
index 545fd8c5f704..1ca843f95fb2 100644
--- a/korean/eterm/pkg-plist
+++ b/korean/eterm/pkg-plist
@@ -11,8 +11,6 @@ lib/libmej.a
 lib/libmej.la
 lib/libmej.so
 lib/libmej.so.8
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/Eterm/pix/014.png
 share/Eterm/pix/backwave.jpg
 share/Eterm/pix/button1.jpg
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 6320057650be..57f63c5f9c97 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -26,14 +26,10 @@ DEPRECATED=	This port is no longer in use by anything in the ports collection.
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
-BROKEN=		"Does not compile on alpha"
+BROKEN=		Does not compile on alpha
 .endif
 
-.if ${PORTOBJFORMAT} == "elf"
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
-.else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
-.endif
 CONFIGURE_ENV+=		OSVERSION=${OSVERSION}
 PLIST_SUB=	GNUHOST=${CONFIGURE_TARGET}
 .if ${OSVERSION} < 600011
@@ -48,7 +44,7 @@ MAN1=		cccp28.1 g++28.1 gcc28.1
 INFO=		cpp gcc
 
 pre-everything::
-	@${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
+	@${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}"
 
 pre-patch:
 	@${MV} ${WRKSRC}/config/i386/freebsd.h ${WRKSRC}/config/i386/freebsd-aout.h
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index af70d35aa1cb..d5088108d79e 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -30,7 +30,7 @@ IGNORE=	Cannot install: you have the 'USE_GCC' variable defined either in enviro
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == alpha)
-BROKEN=			"Does not compile on alpha"
+BROKEN=			Does not compile on alpha
 WITHOUT_CPU_CFLAGS=	yes
 .endif
 
@@ -42,15 +42,10 @@ GCC_REV=	${DISTNAME:S/gcc-//g:S/.test3//g}
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 LIBSTDCPP_REV=	2100
 
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
-.else
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
-.endif
-
 PLIST_SUB+=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
 		--with-gxx-include-dir=${TARGLIB}/include/g++
 #CONFIGURE_ARGS+=	--program-suffix=-295
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index e2c7167d769b..bb756e709a3b 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -38,15 +38,11 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
-.else
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
-.endif
 
 WITHOUT_CPU_CFLAGS=true
 GCC_REV=	${PORTVERSION:C/\.0$//}
diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 1d08c7e53ad1..58f8b5456c10 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -39,25 +39,12 @@ USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		Not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index 2982eabef8bf..80359a2eec6d 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -36,25 +36,12 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		Not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/lang/pm3-m3tk/Makefile b/lang/pm3-m3tk/Makefile
index 9ae2a967ebec..eb2e6ec1fefc 100644
--- a/lang/pm3-m3tk/Makefile
+++ b/lang/pm3-m3tk/Makefile
@@ -32,25 +32,12 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		Not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/lang/pm3-net/Makefile b/lang/pm3-net/Makefile
index 810f258eabf1..474f50e3fe8e 100644
--- a/lang/pm3-net/Makefile
+++ b/lang/pm3-net/Makefile
@@ -36,25 +36,12 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		Not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/lang/pm3-netobj/Makefile b/lang/pm3-netobj/Makefile
index 274641600262..5fc13303c5c5 100644
--- a/lang/pm3-netobj/Makefile
+++ b/lang/pm3-netobj/Makefile
@@ -39,25 +39,12 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		Not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index e3c994414637..62f0705edf63 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -38,12 +38,6 @@ TCL_LIB=	libtcl80.so
 
 MANCOMPRESSED=	yes
 
-.if ${PORTOBJFORMAT} == "elf"
-TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}
-.else
-TCL_LIB_FILE=	${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-
 post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 	@${CP} ${FILESDIR}/makefile     ${WRKSRC}
@@ -58,7 +52,7 @@ pre-build:
 	   OSVERSION=${OSVERSION}
 
 post-install:
-	${LN} -sf ${TCL_LIB_FILE} ${PREFIX}/lib/${TCL_LIB}
+	${LN} -sf ${TCL_LIB}.${SHLIB_MAJOR} ${PREFIX}/lib/${TCL_LIB}
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
diff --git a/lang/tcl80/files/patch-ab b/lang/tcl80/files/patch-ab
index ab7c767146ea..36f9ea1b7c31 100644
--- a/lang/tcl80/files/patch-ab
+++ b/lang/tcl80/files/patch-ab
@@ -1,15 +1,11 @@
---- configure.orig	Mon Mar  8 22:51:26 1999
-+++ configure	Thu Apr 29 11:13:56 1999
-@@ -4097,15 +4097,23 @@
+--- configure.orig	Tue Mar  9 07:51:26 1999
++++ configure	Sat Jan 27 00:40:27 2007
+@@ -4097,14 +4097,14 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
 -	    SHLIB_LD="ld -Bshareable -x"
-+	    if [ "$PORTOBJFORMAT" = "elf" ]; then
-+		SHLIB_LD="ld -shared -x -soname \$@"
-+	    else
-+		SHLIB_LD="ld -Bshareable -x"
-+	    fi
++	    SHLIB_LD="ld -shared -x -soname \$@"
  	    SHLIB_LD_LIBS=""
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
@@ -17,13 +13,7 @@
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
 -	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
--	
-+	    if [ "$PORTOBJFORMAT" = "elf" ]; then
-+		TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
-+	    else
-+		TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.5'
-+	    fi
-+
++	    TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
+ 	
  else
    echo "$ac_t""no" 1>&6
- 
diff --git a/lang/tcl81-thread/files/patch-ab b/lang/tcl81-thread/files/patch-ab
index 332fcbb2d5e1..cfb20e671ed8 100644
--- a/lang/tcl81-thread/files/patch-ab
+++ b/lang/tcl81-thread/files/patch-ab
@@ -23,7 +23,7 @@
    else
       echo "configure: warning: "Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..."" 1>&2
    fi
-@@ -4330,14 +4329,19 @@
+@@ -4330,14 +4329,14 @@
    echo "$ac_t""yes" 1>&6
    
  	    SHLIB_CFLAGS="-fpic"
@@ -35,13 +35,8 @@
  	    LD_FLAGS=""
  	    LD_SEARCH_FLAGS=""
 -	    TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+        if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
 +            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
 +            SHLIB_LD="ld -shared -x -soname \$@"
-+        else
-+            TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
-+            SHLIB_LD="ld -Bshareable -x"
-+        fi
  	
  else
    echo "$ac_t""no" 1>&6
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab
index b4b6a5a660f4..ed0e1646d0a9 100644
--- a/lang/tcl82/files/patch-ab
+++ b/lang/tcl82/files/patch-ab
@@ -18,7 +18,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
-@@ -4922,16 +4922,21 @@
+@@ -4922,16 +4922,16 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -33,14 +33,9 @@
  		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'
 +		TCL_SHLIB_LD_EXTRAS="-soname \$@"
 +		SHLIB_LD="ld -shared -x"
-+	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/mail/cclient/Makefile b/mail/cclient/Makefile
index cb119596f396..e57f4caf10cd 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -20,7 +20,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Mark Crispin's C-client mail access routines
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 ALL_TARGET=	bsf
 .if defined(WITHOUT_SSL)
 MAKE_ARGS+=	SSLTYPE=none
@@ -43,10 +43,6 @@ PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}.0
-.endif
-
 post-patch:
 .for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file}
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index d1c72f6fe8cc..de2e3b67231e 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -86,7 +86,7 @@
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -801,23 +806,35 @@
+@@ -801,23 +806,31 @@
  
  # Build it!
  
@@ -102,11 +102,7 @@
  	@$(SH) ARCHIVE
  
 +$(SHLIBNAME): $(SOFILES)
-+.if $(PORTOBJFORMAT) == "elf"
 +	ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
-+.else
-+	ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
-+.endif
 +	ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
 +
 +.c.so: osdep.h
diff --git a/mail/coolmail/files/patch-aa b/mail/coolmail/files/patch-aa
index 7d6c667c6d6e..62e88e6d91db 100644
--- a/mail/coolmail/files/patch-aa
+++ b/mail/coolmail/files/patch-aa
@@ -1,6 +1,6 @@
 --- Makefile.orig	Thu Jan 11 11:55:40 1996
 +++ Makefile	Mon Oct 12 17:55:05 1998
-@@ -22,31 +22,40 @@
+@@ -22,31 +22,38 @@
  # your linker where to find the libraries it will need, and BINDIR and
  # MANDIR specify the places to install the binary executable and manpage
  # files for coolmail when you type `make install'.
@@ -32,9 +32,7 @@
  
  LIBS  = $(LIB_DIRS) -lXt -lX11 -lm -lXext
 -COPTS = $(CFLAGS) $(AUDIO)
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBS += -Wl,-rpath,$(X11BASE)/lib
-+.endif
 +COPTS = $(CFLAGS) $(AUDIO) $(MAILDIR)
  
  all: coolmail
diff --git a/mail/faces/files/Makefile.compface b/mail/faces/files/Makefile.compface
index 684a4cf7fc1e..8fd2c1c71b62 100644
--- a/mail/faces/files/Makefile.compface
+++ b/mail/faces/files/Makefile.compface
@@ -33,13 +33,8 @@ EXECUTABLE	= $(BINDIR)/$(NAME)
 UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
 LIBNAME		= lib$(NAME).a
 SHLIB_MAJOR	= 1
-SHLIB_MINOR	= 0
 LIB		= $(NAME)
-.if ${PORTOBJFORMAT} == "elf"
 SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR)
-.else
-SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-.endif
 NOPROFILE	= ''
 LIBRARY		= $(LIBDIR)
 MAN1DIR		= $(MANDIR)/man1
diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index d57fe091cb1a..26aa6f291569 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -33,8 +33,6 @@ MAKE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 
 PORTDOCS=	fft.doc.gz
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	${GUNZIP_CMD} $(WRKSRC)/*.f.gz
 
@@ -48,8 +46,5 @@ post-install:
 	-${GZIP_CMD} ${GZIP} ${WRKSRC}/fft.doc
 	${CP} $(WRKSRC)/fft.doc.gz ${DOCSDIR}
 .endif
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libbihar.so.2 ${PREFIX}/lib/libbihar.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index bf735b1b7478..d4767617fa03 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -22,7 +22,7 @@ USE_GCC=	4.2+
 
 DIST_SUBDIR=	lapack
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		${WRKDIR}/PLIST
 
 MANCOMPRESSED=	maybe
@@ -235,11 +235,7 @@ do-install:
 .if !defined(NO_PROFILE)
 	${INSTALL_DATA} ${WRKSRC}/SRC/liblapack_p.a ${PREFIX}/lib
 .endif
-.if ${PORTOBJFORMAT} == "elf"
 	${LN} -sf liblapack.so.4 ${PREFIX}/lib/liblapack.so
-.else
-	${LN} -sf liblapack.so.4.0 ${PREFIX}/lib/liblapack.so
-.endif
 	${INSTALL_MAN} ${WRKDIR}/blas/man/manl/*.l ${PREFIX}/man/manl
 	${INSTALL_MAN} ${WRKDIR}/man/manl/[a-c]*.l ${PREFIX}/man/manl
 	${INSTALL_MAN} ${WRKDIR}/man/manl/[d-l]*.l ${PREFIX}/man/manl
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index bb888416f71d..e1647bcbda71 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -14,12 +14,10 @@ DISTNAME=	ranlib.c
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Library of Routines for Random Number Generation
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -28,8 +26,5 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index bb888416f71d..e1647bcbda71 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -14,12 +14,10 @@ DISTNAME=	ranlib.c
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Library of Routines for Random Number Generation
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -28,8 +26,5 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index bb888416f71d..e1647bcbda71 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -14,12 +14,10 @@ DISTNAME=	ranlib.c
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Library of Routines for Random Number Generation
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
 
@@ -28,8 +26,5 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/ranlib
 	@${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/ranlib
 .endif
-.if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libranlib.so.1.0 ${PREFIX}/lib/libranlib.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mbone/vic/files/patch-configure.in b/mbone/vic/files/patch-configure.in
index a603fa09b660..4d687b5fd931 100644
--- a/mbone/vic/files/patch-configure.in
+++ b/mbone/vic/files/patch-configure.in
@@ -1,16 +1,19 @@
---- configure.in.org	Mon May  7 15:30:01 2001
-+++ configure.in	Mon May  7 15:31:32 2001
-@@ -72,8 +72,7 @@
- if test -r /usr/include/linux/videodev.h ; then
- 	V_OBJ_GRABBER="video/grabber-video4linux.o $V_OBJ_GRABBER"
+--- configure.in.orig	Thu Jul 10 16:55:43 2003
++++ configure.in	Sat Jan 27 01:57:23 2007
+@@ -76,12 +76,6 @@
+                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
+         fi
  fi
 -#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
 -if test -r /usr/local/lib/libspigot.a ; then
-+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
- 	V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
- 	V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
- 	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
-@@ -249,6 +248,7 @@
+-	V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
+-	V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
+-	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
+-fi
+ if test "$qcamdir" != "" ; then
+ 	V_OBJ_GRABBER="video/grabber-qcam.o $V_OBJ_GRABBER"
+ 	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I$qcamdir"
+@@ -254,6 +248,7 @@
  	else
  		V_DEFINE="$V_DEFINE -DFreeBSD"
  	fi
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 4f865b3f9338..83a0ce98bbd0 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -17,16 +17,11 @@ COMMENT=	A shared drawing (whiteboard) tool using multicast
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
+STRIP=
 
 # ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 USE_GHOSTSCRIPT_RUN=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
@@ -45,4 +40,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/xpns/files/patch-aa b/misc/xpns/files/patch-aa
index 2eeaaeba199f..761738ab4a17 100644
--- a/misc/xpns/files/patch-aa
+++ b/misc/xpns/files/patch-aa
@@ -1,6 +1,6 @@
 --- makefile.orig	Wed Jul 14 20:05:14 1993
 +++ makefile	Fri Aug 11 02:02:40 2000
-@@ -7,19 +7,21 @@
+@@ -7,19 +7,19 @@
  #I 	= -I/usr/include
  
  #------------------------------------------
@@ -14,9 +14,7 @@
 +I 	= -I$(X11BASE)/include
  
 +L 	= -L$(X11BASE)/lib -lXaw -lXmu -lXt -lXext -lX11 -lm
-+.if $(PORTOBJFORMAT) == "elf"
 +L	+=-Wl,-rpath,$(X11BASE)/lib
-+.endif
  
  #------------------------------------------
  #  COMPILER UND LINKER
diff --git a/multimedia/vic/files/patch-configure.in b/multimedia/vic/files/patch-configure.in
index a603fa09b660..4d687b5fd931 100644
--- a/multimedia/vic/files/patch-configure.in
+++ b/multimedia/vic/files/patch-configure.in
@@ -1,16 +1,19 @@
---- configure.in.org	Mon May  7 15:30:01 2001
-+++ configure.in	Mon May  7 15:31:32 2001
-@@ -72,8 +72,7 @@
- if test -r /usr/include/linux/videodev.h ; then
- 	V_OBJ_GRABBER="video/grabber-video4linux.o $V_OBJ_GRABBER"
+--- configure.in.orig	Thu Jul 10 16:55:43 2003
++++ configure.in	Sat Jan 27 01:57:23 2007
+@@ -76,12 +76,6 @@
+                 V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o"
+         fi
  fi
 -#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
 -if test -r /usr/local/lib/libspigot.a ; then
-+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then
- 	V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
- 	V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
- 	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
-@@ -249,6 +248,7 @@
+-	V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER"
+-	V_LIB_GRABBER="$V_LIB_GRABBER -lspigot"
+-	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include"
+-fi
+ if test "$qcamdir" != "" ; then
+ 	V_OBJ_GRABBER="video/grabber-qcam.o $V_OBJ_GRABBER"
+ 	V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I$qcamdir"
+@@ -254,6 +248,7 @@
  	else
  		V_DEFINE="$V_DEFINE -DFreeBSD"
  	fi
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 651c7075912b..f47eeb8bbc17 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Mozilla LDAP sdk
 WRKSRC=			${WRKDIR}/mozilla
 MAKEFILE=	${WRKSRC}/directory/ldapsdk.mk
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_PERL5=	yes
 
 MAKE_ENV+=	MOZILLA_CLIENT=1 NO_MDUPDATE=1 MOZ_LDAP_SDK=1
@@ -54,7 +55,6 @@ do-install:
 	${LN} -sf ${INSTALL_DIR}/include/mozldap.h ${PREFIX}/include
 
 post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@echo
 	@echo 'PLEASE NOTE (2000/8/23):'
 	@echo '     The mozilla lber and ldap libraries now are installed'
diff --git a/net/ldapsdk/pkg-plist b/net/ldapsdk/pkg-plist
index 82a7b328e472..b6c0af498448 100644
--- a/net/ldapsdk/pkg-plist
+++ b/net/ldapsdk/pkg-plist
@@ -19,5 +19,3 @@ lib/libmozldap.so.1
 lib/libmozldap.so
 lib/libmozlber.a
 lib/libmozldap.a
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m /usr/local/lib
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/net/pathchar/Makefile b/net/pathchar/Makefile
index 483507aa25a7..3d4c5a7a7109 100644
--- a/net/pathchar/Makefile
+++ b/net/pathchar/Makefile
@@ -25,13 +25,6 @@ ONLY_FOR_ARCHS=	i386
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAN8=		pathchar.8
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-DISTNAME=	pathchar-a0-freebsd-2.2
-PORTVERSION=	a0
-.endif
-
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
@@ -49,4 +42,4 @@ do-install:
 		${PREFIX}/share/doc/pathchar
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 4f865b3f9338..83a0ce98bbd0 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -17,16 +17,11 @@ COMMENT=	A shared drawing (whiteboard) tool using multicast
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
+STRIP=
 
 # ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do.
 USE_GHOSTSCRIPT_RUN=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-STRIP=
-.endif
-
 pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
 	@${ECHO} ""
@@ -45,4 +40,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa
index 756ef0f0d9bc..68521926a3af 100644
--- a/print/asprint/files/patch-aa
+++ b/print/asprint/files/patch-aa
@@ -1,6 +1,6 @@
 --- makefile.orig	Fri Mar 14 19:34:48 1997
 +++ makefile	Wed Jun 21 02:59:31 2000
-@@ -1,18 +1,19 @@
+@@ -1,18 +1,17 @@
  .KEEP_STATE:
  
 -CFLAGS = -O2
@@ -10,9 +10,7 @@
 +CFLAGS ?= -O2
 +CC ?= gcc
 +XLIB = -L$(X11BASE)/lib  -lXaw -lXmu -lXt
-+.if $(PORTOBJFORMAT) == "elf"
 +XLIB+= -Wl,-rpath,$(X11BASE)/lib
-+.endif
  OBJS = asprint.o
 -INCS = 
 -
diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 0c354f6957da..0e031593f711 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -46,25 +46,12 @@ USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-L2=		.so.${SOVERSION}.0
-TARGET=		FreeBSD2
-INST_TARGET=	freebsd-2
-WORDSIZE=	32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
 L2=		.so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET=		FreeBSD3
-INST_TARGET=	freebsd-3
-.else
 TARGET=		FreeBSD4
 INST_TARGET=	freebsd-4
-.endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE=		not supported on older versions of FreeBSD/Alpha
-.endif
 CFLAGS+=	-mieee
 L2=		.so.${SOVERSION}
 TARGET=		FBSD_ALPHA
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index ac6a2128acac..812bd17279c0 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -122,13 +122,6 @@ post-install:
 .endfor
 .endif
 
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index ac6a2128acac..812bd17279c0 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -122,13 +122,6 @@ post-install:
 .endfor
 .endif
 
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index ac6a2128acac..812bd17279c0 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -122,13 +122,6 @@ post-install:
 .endfor
 .endif
 
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index ac6a2128acac..812bd17279c0 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -122,13 +122,6 @@ post-install:
 .endfor
 .endif
 
-# fixup packing list (no libs without version numbers in aout case)
-.if ${PORTOBJFORMAT} == "aout"
-	${ECHO_MSG} "Fixing packing list for a.out"
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${GREP} -v '\.so$$' ${TMPPLIST}.new > ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6e988b708710..6f31810316d9 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -60,6 +60,7 @@ PLIST_SUB+=		OPENSSL_STABLE="@comment "
 CONFLICTS?=		openssl-beta-0.* openssl-stable-0.*
 .endif
 
+MAKE_ARGS+=		WHOLE_ARCHIVE_FLAG=--whole-archive
 MAKE_ENV+=		MANPREFIX=${MANPREFIX}
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
 NOPRECIOUSSOFTMAKEVARS=	Too many _MLINKS for fetch
@@ -882,12 +883,6 @@ MLINKS+=	\
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=-Bforcearchive
-.else
-MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
-.endif
-
 OPENSSL_BASE_SONAME!=	readlink ${DESTDIR}/usr/lib/libcrypto.so || true
 OPENSSL_SHLIBVER_BASE=	${OPENSSL_BASE_SONAME:E}
 OPENSSL_BASE_SOPATH=	${OPENSSL_BASE_SONAME:H}
diff --git a/www/cgihtml/files/Makefile b/www/cgihtml/files/Makefile
index 907544c6a9fa..10ce3c33e774 100644
--- a/www/cgihtml/files/Makefile
+++ b/www/cgihtml/files/Makefile
@@ -1,13 +1,9 @@
+# $FreeBSD$
 # Makefile for cgihtml libraries
 
 LIB = cgihtml
 MAJ = 1
-MIN = 0
-.if ($(PORTOBJFORMAT) == "elf")
 SHLIB_VER = $(MAJ)
-.else
-SHLIB_VER = $(MAJ).$(MIN)
-.endif
 
 OBJS = string-lib.o cgi-llist.o cgi-lib.o html-lib.o
 HDRS =	${OBJS:.o=.h}
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 9f6666c74d8b..e6c7953f78e7 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -21,7 +21,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib
 USE_PERL5_BUILD=yes
-MAKE_ENV=	objformat=${PORTOBJFORMAT}
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/www/qdecoder/Makefile b/www/qdecoder/Makefile
index 51bdf6b2f59a..b66b870aecad 100644
--- a/www/qdecoder/Makefile
+++ b/www/qdecoder/Makefile
@@ -14,10 +14,10 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	CGI library for C/C++ language programming
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	${MKDIR} ${PREFIX}/share/doc/qDecoder
 .for doc in AUTHORS DISCLAIMER README REFERENCE qDecoder.jpg
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/qDecoder
@@ -31,5 +31,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.html ${PREFIX}/share/examples/qDecoder
 	${INSTALL_DATA} ${WRKSRC}/examples/*.in ${PREFIX}/share/examples/qDecoder
 
-
 .include <bsd.port.mk>
diff --git a/www/qdecoder/pkg-plist b/www/qdecoder/pkg-plist
index f6b21f7fb4b7..213c180a5bec 100644
--- a/www/qdecoder/pkg-plist
+++ b/www/qdecoder/pkg-plist
@@ -1,10 +1,7 @@
 include/qDecoder.h
 lib/libqDecoder.a
+lib/libqDecoder.so
 lib/libqDecoder.so.2
-@exec ln -sf %f %B/libqDecoder.so
-@unexec rm -f %B/libqDecoder.so
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/doc/qDecoder/AUTHORS
 share/doc/qDecoder/DISCLAIMER
 share/doc/qDecoder/README
diff --git a/www/ump/Makefile b/www/ump/Makefile
index 46a869fdcca7..5ae864f3e37c 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -38,6 +38,7 @@ TIMIDITY_VERSION=	2.13.2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ump --with-default-path=${LOCALBASE}/share/timidity
+CONFIGURE_ENV=	LDFLAGS=-export-dynamic
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
@@ -64,10 +65,6 @@ CONFIGURE_ARGS+=	--enable-audio=oss,esd
 CONFIGURE_ARGS+=	--enable-audio=oss
 .endif
 
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_ENV=	LDFLAGS=-export-dynamic
-.endif
-
 post-extract:
 	@${MKDIR} ${WRKSRC}/ump
 	@for f in ${ZDIST:C/:.*$//}; do \
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
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa
index 4666f3385e8f..a9e723ad4b0c 100644
--- a/x11-wm/wm2/files/patch-aa
+++ b/x11-wm/wm2/files/patch-aa
@@ -1,12 +1,10 @@
 --- Makefile.orig	Fri Mar 21 12:12:30 1997
 +++ Makefile	Tue Jan 28 17:53:41 2003
-@@ -1,9 +1,12 @@
+@@ -1,9 +1,10 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
 +LIBS	=  -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBS	+= -Wl,-rpath,$(PREFIX)/lib
-+.endif
  
 -CC	= gcc
 -CCC	= gcc
diff --git a/x11/9term/files/patch-ad b/x11/9term/files/patch-ad
index 78905da2cbad..4a9f0f3cc3f4 100644
--- a/x11/9term/files/patch-ad
+++ b/x11/9term/files/patch-ad
@@ -1,6 +1,6 @@
 --- 9term/Makefile.orig	Mon Mar 14 13:50:54 1994
 +++ 9term/Makefile	Fri Feb 11 10:18:21 2000
-@@ -11,27 +11,31 @@
+@@ -11,27 +11,29 @@
  #	Define RISCOS for Mips RISC/os
  #	Define BSDPTYS for BSD-style pty support
  #	Define POSIXPTYS for POSIX ptys
@@ -32,9 +32,7 @@
 -
 +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a
 +XLIBS= -lXt -lX11 -L${X11BASE}/lib
-+.if $(PORTOBJFORMAT) == "elf"
 +XLIBS+=-Wl,-rpath,$(X11BASE)/lib
-+.endif
  OBJECTS=9term.o command.o display.o pty.o
  
  $(TARGET): $(OBJECTS)
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 0929225a7f08..e9290056c615 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -111,20 +111,4 @@ pre-configure:
 pre-install:
 	${MKDIR} ${X11BASE}
 
-post-install:
-.if ${PORTOBJFORMAT} == "aout"
-.for lib in PEX5 SM XIE Xi Xmu Xt oldX XThrStub
-	${LN} -sf lib${lib}.so.6.0 ${PREFIX}/lib/lib${lib}.so
-.endfor
-.for lib in X11 Xaw Xtst
-	${LN} -sf lib${lib}.so.6.1 ${PREFIX}/lib/lib${lib}.so
-.endfor
-.for lib in Xp
-	${LN} -sf lib${lib}.so.6.2 ${PREFIX}/lib/lib${lib}.so
-.endfor
-.for lib in ICE Xext
-	${LN} -sf lib${lib}.so.6.3 ${PREFIX}/lib/lib${lib}.so
-.endfor
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab
index c09a022ded94..08ad036d4c93 100644
--- a/x11/libdnd/files/patch-ab
+++ b/x11/libdnd/files/patch-ab
@@ -1,19 +1,13 @@
 --- Makefile.in.orig	Thu May 22 21:18:22 1997
 +++ Makefile.in	Sat Sep 26 21:59:37 1998
-@@ -13,6 +13,16 @@
+@@ -13,6 +13,10 @@
  RANLIB = @RANLIB@
  
  LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@
-+.if $(PORTOBJFORMAT) == "elf"
 +LIBS+=		-Wl,-rpath,$(X11BASE)/lib
 +SHLDFLAGS=	-shared -x -soname $@
 +DNDLIB=		libDnd.so.1
 +DNDPLUSLIB=	libDnd++.so.1
-+.else
-+SHLDFLAGS=	-Bshareable -x
-+DNDLIB=		libDnd.so.1.0
-+DNDPLUSLIB=	libDnd++.so.1.0
-+.endif
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa
index 551b99b67aeb..0183076a064c 100644
--- a/x11/libsx/files/patch-aa
+++ b/x11/libsx/files/patch-aa
@@ -28,14 +28,11 @@
  
  #
  # libraries we need to link with...
-@@ -83,5 +83,7 @@
+@@ -83,5 +83,5 @@
  #
  LIBSX  = ../src/libsx.a
  #LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
 -LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
 -
 +LIBS   =  $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib
-+.if ${PORTOBJFORMAT} == "elf"
 +LIBS+=	-Wl,-rpath,${X11BASE}/lib
-+.endif
-\ No newline at end of file