aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2006-06-10 03:55:24 +0800
committerdinoex <dinoex@FreeBSD.org>2006-06-10 03:55:24 +0800
commitb829031a71f22ad5bea9afe36ea14ea72070e7ae (patch)
treeab1c68964342afb1af03f9adb154c36a34dbc44d /lang
parente14d195b041b79b03501c89eee0cf6cbd7d6b272 (diff)
downloadfreebsd-ports-gnome-b829031a71f22ad5bea9afe36ea14ea72070e7ae.tar.gz
freebsd-ports-gnome-b829031a71f22ad5bea9afe36ea14ea72070e7ae.tar.zst
freebsd-ports-gnome-b829031a71f22ad5bea9afe36ea14ea72070e7ae.zip
- make sure ldconfig has been run
Diffstat (limited to 'lang')
-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}