aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2006-06-10 03:55:24 +0800
committerDirk Meyer <dinoex@FreeBSD.org>2006-06-10 03:55:24 +0800
commit2995a979d591af1e3030e489c211d5881684b5fe (patch)
tree9dec6d974eb99372f9d9e8b4e5c353b2b9114d6f
parente8ddb15662b0a471c62504a2ca956642988b52ef (diff)
downloadfreebsd-ports-gnome-2995a979d591af1e3030e489c211d5881684b5fe.tar.gz
freebsd-ports-gnome-2995a979d591af1e3030e489c211d5881684b5fe.tar.zst
freebsd-ports-gnome-2995a979d591af1e3030e489c211d5881684b5fe.zip
- make sure ldconfig has been run
-rw-r--r--lang/gnustep-base/Makefile10
-rw-r--r--lang/gnustep-base/files/GNUstep.sh1
2 files changed, 10 insertions, 1 deletions
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index d22372368c6b..6f1aa6e701ad 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-base
PORTVERSION= 1.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel
MASTER_SITES= ${MASTER_SITE_GNUSTEP}
MASTER_SITE_SUBDIR= core
@@ -59,6 +59,13 @@ EXTRA_PATCHES+= ${FILESDIR}/NSFileManager.m.patch
PATH:= ${PREFIX}/System/Tools:${PATH}
+.if defined(GNUSTEP_WITH_BASE_GCC)
+LDCONFIG_GCC=
+.else
+GCCSH!= (cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V RC_D_SH)
+LDCONFIG_GCC= ${LOCALBASE}/${GCCSH}
+.endif
+
post-build:
.for i in ${MAKE_APPS}
(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
@@ -67,6 +74,7 @@ post-build:
post-extract:
@${SED} -e "s=%%PREFIX%%=${LOCALBASE}=" \
+ -e "s=%%LDCONFIG_GCC%%=${LDCONFIG_GCC}=" \
${FILESDIR}/GNUstep.sh \
> ${WRKSRC}/GNUstep.sh
diff --git a/lang/gnustep-base/files/GNUstep.sh b/lang/gnustep-base/files/GNUstep.sh
index 6c9eaccb8736..2d749beba400 100644
--- a/lang/gnustep-base/files/GNUstep.sh
+++ b/lang/gnustep-base/files/GNUstep.sh
@@ -7,6 +7,7 @@ GNUSTEP_SYSTEM_ROOT="${PREFIX}/GNUstep/System"
case "$1" in
start)
+ %%LDCONFIG_GCC%%
if [ -e ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ]; then
. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh
rm -f ${PIDFILE}