From 8d7e99571b06de14e13764258f99eadd80968dce Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 8 Apr 2006 15:14:44 +0000
Subject: - cleanup after gcc updates no hacks for ldconfig needed

---
 lang/gnustep-base/Makefile         | 7 +------
 lang/gnustep-base/files/GNUstep.sh | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'lang/gnustep-base')

diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 0b7630c64e7c..383cd5a17e1a 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -58,11 +58,6 @@ EXTRA_PATCHES+=	${FILESDIR}/NSFileManager.m.patch
 
 PATH:=	${PREFIX}/System/Tools:${PATH}
 
-.if !defined(GNUSTEP_WITH_BASE_GCC)
-pre-configure:
-	${LDCONFIG} -m ${TARGLIB}
-.endif
-
 post-build:
 .for i in ${MAKE_APPS}
 	(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
@@ -71,7 +66,7 @@ post-build:
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" \
-		-e "s=%%TARGLIB%%=${TARGLIB}=" ${FILESDIR}/GNUstep.sh \
+		${FILESDIR}/GNUstep.sh \
 		> ${WRKSRC}/GNUstep.sh
 
 post-install:
diff --git a/lang/gnustep-base/files/GNUstep.sh b/lang/gnustep-base/files/GNUstep.sh
index 7ecd9905c4fc..6c9eaccb8736 100644
--- a/lang/gnustep-base/files/GNUstep.sh
+++ b/lang/gnustep-base/files/GNUstep.sh
@@ -8,7 +8,6 @@ GNUSTEP_SYSTEM_ROOT="${PREFIX}/GNUstep/System"
 case "$1" in
 start)
 	if [ -e ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ]; then
-		ldconfig -m %%TARGLIB%%
 		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
 		rm -f ${PIDFILE}
 		opentool gdomap -a ${IFFILE} -I ${PIDFILE}
-- 
cgit v1.2.3