- update to use new bsd.gnustep.mk

Approved by:	gurkan@linuks.mine.nu

5 files changed, 21 insertions, 30 deletions

diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 9c76c2fd960a..08a1cc19e612 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -18,24 +18,24 @@ LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 
-ETCDIR=		${LOCALBASE}/etc
 USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-procfs
 CONFIGURE_TARGET=
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_ICONV=	yes
-MAKEFILE=
+
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include/libxml2/libxml
 BREAKS_IF_PEDANTIC=	yes
 NO_FILTER_SHLIBS=	yes
 PLIST_SUB+=	LOCALBASE=${LOCALBASE}
+ETCDIR=		${LOCALBASE}/etc
 
 .if defined(WITHOUT_OPENSSL)
 CONFIGURE_ARGS+=	--disable-openssl
@@ -60,7 +60,7 @@ PATH:=	${PREFIX}/System/Tools:${PATH}
 
 post-build:
 .for i in ${MAKE_APPS}
-	(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+	(cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endfor
 
@@ -75,16 +75,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/GNUstep.sh ${ETCDIR}/rc.d/GNUstep.sh
 	${INSTALL_DATA} ${FILESDIR}/gdomap_if ${ETCDIR}
 .for i in ${INSTALL_APPS}
-	(cd ${WRKSRC}/${i}; . ${SYSMAKEDIR}/GNUstep.sh; \
+	(cd ${WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} -d ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .endfor
-	${RM} ${PREFIX}/System/Library/Libraries/libgnustep-base.so
+	${RM} ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so
 	${LN} -s libgnustep-base.so.${PORTVERSION} \
-	 ${PREFIX}/System/Library/Libraries/libgnustep-base.so
-	${RM} ${PREFIX}/System/Library/Libraries/Resources/gnustep-base/NSTimeZones/.README.swp
+		${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so
+	${RM} ${GNUSTEP_SYSTEM_LIBRARIES}/Resources/gnustep-base/NSTimeZones/.README.swp
 
 test:
-	@(cd ${WRKSRC}/Testing && . ${SYSTEMDIR}/Makefiles/GNUstep.sh; ${GMAKE})
+	@(cd ${WRKSRC}/Testing && . ${GNUSTEP_MAKEFILES}/GNUstep.sh; ${GMAKE})
 
 regression-test:	test
 
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index f9dfe3a3bbb7..b9ab393d10da 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -5,27 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnustep-guile
+PORTNAME=	guile
 PORTVERSION=	1.1.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
+PKGNAMEPREFIX=	gnustep-
 PKGNAMESUFFIX?=	${NOX11_SUFFIX}${PKGNAMESUFFIX2}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep interface to the GUILE scheme interpreter
 
 LIB_DEPENDS+=	guile.15:${PORTSDIR}/lang/guile
 
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
+
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 PLIST_SUB+=	GUILE_VER="${GUILE_VER}"
 
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index d013b99be8f1..297c1bc8f7f9 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -15,16 +15,13 @@ MASTER_SITE_SUBDIR=	libs
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A snapshot of libobjc, meant to be used with GNUstep
 
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 GNUSTEP_WITHOUT_LIBOBJC=	yes
-MAKEFILE=	GNUmakefile
-ALL_TARGET=
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
+
 NOT_FOR_ARCHS=	ia64 amd64
 
 .if !defined(GNUSTEP_WITH_BASE_GCC)
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index 4d78331b9d2b..fddbc5238222 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -15,15 +15,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep-aware scheme interpreter
 
-#WRKSRC=		${WRKDIR}/X
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=
-ALL_TARGET=
 
 post-install:
 	${RM} -f ${GNUSTEP_PREFIX}/Local/Applications/GScheme.app/Resources/library.scm~
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 74106067d9ee..53ca8c40b43c 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -15,17 +15,13 @@ DISTNAME=	StepTalk-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	The official GNUstep scripting framework
 
-WRKSRC=		${WRKDIR}/StepTalk
-USE_GMAKE=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_GUI=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-MAKEFILE=	GNUmakefile
-ALL_TARGET=
-LDCONFIG_DIRS=	${LOCALLIBDIR}
-INSTALLS_SHLIB=	yes
-#NO_FILTER_SHLIBS=	yes
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
+
+WRKSRC=		${WRKDIR}/StepTalk
 
 .include <bsd.port.mk>