From 50318fd0a3db94e40b50816a558e6feb9ed084d7 Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Thu, 30 Nov 2006 06:55:29 +0000
Subject: - new option USE_GNUSTEP_LDCONFIG - new option USE_MAKEFILE - default
 USE_GMAKE and GNUmakefile

---
 Mk/bsd.gnustep.mk | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index af975c758736..e71bdacb791f 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -134,11 +134,26 @@ GNU_ARCH=	ix86
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
+.if !defined(USE_MAKEFILE)
+USE_GMAKE=	yes
+MAKEFILE=	GNUmakefile
+.endif
+
+.if defined(ADDITIONAL_OBJCFLAGS)
+MAKE_ENV+=	ADDITIONAL_OBJCFLAGS="${ADDITIONAL_OBJCFLAGS}"
+.endif
+.if defined(ADDITIONAL_LDFLAGS)
+MAKE_ENV+=	ADDITIONAL_LDFLAGS="${ADDITIONAL_LDFLAGS}"
+.endif
+
 GNUSTEP_PREFIX?=	${LOCALBASE}/GNUstep
+DEFAULT_LIBVERSION?=	0.0.1
+
 .if defined(USE_GNUSTEP_PREFIX)
 PREFIX=		${GNUSTEP_PREFIX}
 NO_MTREE=	yes
 .endif
+
 SYSTEMDIR=	${GNUSTEP_PREFIX}/System
 SYSMAKEDIR=	${SYSTEMDIR}/Library/Makefiles
 SYSBUNDLEDIR=	${SYSTEMDIR}/Library/Bundles
@@ -146,15 +161,14 @@ SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries
 COMBOLIBDIR=	${SYSTEMDIR}/Library/Libraries
 LOCALLIBDIR=	${GNUSTEP_PREFIX}/Local/Library/Libraries
 LOCALBUNDLEDIR=	${GNUSTEP_PREFIX}/Local/Library/Bundles
+
 .if defined(WITH_GNUSTEP_DEVEL)
 PKGNAMESUFFIX?=	-devel${PKGNAMESUFFIX2}
 PLIST_SUB+=	GNUSTEP_DEVEL=""
 PLIST_SUB+=	GNUSTEP_STABLE="@comment "
-DEFAULT_LIBVERSION?=	0.0.1
 .else
 PLIST_SUB+=	GNUSTEP_DEVEL="@comment "
 PLIST_SUB+=	GNUSTEP_STABLE=""
-DEFAULT_LIBVERSION?=	0.0.1
 .endif
 
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} VERSION=${PORTVERSION}
@@ -426,4 +440,15 @@ TARGLIB!=	(cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V TARGLIB)
 
 .endif
 
+# ---------------------------------------------------------------------------
+# run ldconfig for installed shlibs
+#
+.if defined(USE_GNUSTEP_LDCONFIG)
+.for i in ${USE_GNUSTEP_LDCONFIG}
+LDCONFIG_DIRS+=	${i}
+.endfor
+INSTALLS_SHLIB=		yes
+NO_FILTER_SHLIBS=	yes
+.endif
+
 # eof
-- 
cgit