[Midnightbsd-cvs] mports: bsd.mport.mk: OK this could break things.

[laffer1 at midnightbsd.org]

Log Message:
-----------
OK this could break things.

Remove that damn NO_FILTER_SHLIB hack for a.out stuff.  This will make GNUstep ports work much easier.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.69 -> r1.70)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.69
retrieving revision 1.70
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.69 -r1.70
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -425,8 +425,7 @@
 # USE_LINUX		- Set to yes to say the port needs the default linux base port.
 #				  Set to value <X>, if the port needs emulators/linux_base-<X>.
 #				  If set to "7", a dependency is registered to emulators/linux_base.
-#				  Implies appropriate settings for NO_FILTER_SHLIBS,
-#				  STRIP and STRIP_CMD.
+#				  Implies appropriate settings for STRIP and STRIP_CMD.
 # USE_LINUX_PREFIX
 #				- controls the action of PREFIX (see above). Only use this
 #				  if the port is a linux infrastructure port (e.g. contains libs
@@ -1182,7 +1181,7 @@
 
 # Get the object format.
 .if !defined(PORTOBJFORMAT)
-PORTOBJFORMAT!=		${TEST} -x /usr/bin/objformat && /usr/bin/objformat || ${ECHO_CMD} aout
+PORTOBJFORMAT?=	elf
 .endif
 
 MASTERDIR?=	${.CURDIR}
@@ -1783,8 +1782,6 @@
 STRIP_CMD=	${TRUE}
 .	endif
 
-NO_FILTER_SHLIBS=	yes
-
 # Allow the user to specify another linux_base version.
 .	if defined(OVERRIDE_LINUX_BASE_PORT)
 .		if ${USE_LINUX:L} == yes
@@ -5376,10 +5373,6 @@
 			@${ECHO_CMD} "@unexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIST}
 .		endif
 .	endif
-.	if !defined(NO_FILTER_SHLIBS)
-		@${SED} -e 's,\(/lib.*\.so\.[0-9]*\)\.[0-9]*$$,\1,' ${TMPPLIST} > ${TMPPLIST}.tmp
-		@${MV} -f ${TMPPLIST}.tmp ${TMPPLIST}
-.	endif
 # End of generate-plist
 .endif