5 files changed, 48 insertions, 11 deletions

diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index c2e52224e812..a0fdfb6c4ad2 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -14,11 +14,15 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-RUN_DEPENDS=	${PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \
-		${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc \
-		${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \
-		${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui \
-		${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+RUN_DEPENDS=	${PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make
+RUN_DEPENDS+=	${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc
+RUN_DEPENDS+=	${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+RUN_DEPENDS+=	${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
+.if defined(GNUSTEP_GUI_DEVEL)
+RUN_DEPENDS+=	${XGPSBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+.else
+RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+.endif
 
 PREFIX=		${LOCALBASE}/GNUstep
 NO_BUILD=	yes
@@ -38,6 +42,7 @@ GNU_ARCH=	${MACHINE_ARCH}
 SYSTEMDIR=	${LOCALBASE}/GNUstep/System
 SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
 COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
+BACKBUNDLEDIR=	${SYSTEMDIR}/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
 XGPSBUNDLEDIR=	${SYSTEMDIR}/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
 
 do-install:	# empty
diff --git a/devel/projectcenter.app/Makefile b/devel/projectcenter.app/Makefile
index 3e58c1869718..d4410d2794f3 100644
--- a/devel/projectcenter.app/Makefile
+++ b/devel/projectcenter.app/Makefile
@@ -13,8 +13,13 @@ DISTNAME=	ProjectCenter-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+.if defined(GNUSTEP_GUI_DEVEL)
+BUILD_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+RUN_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+.else
 BUILD_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
 RUN_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+.endif
 
 PREFIX=		${LOCALBASE}/GNUstep
 WRKSRC=		${WRKDIR}/ProjectCenter
@@ -25,6 +30,7 @@ MAKE_ENV=	ADDITIONAL_INCLUDE_DIRS="-I${WRKSRC}" \
 ALL_TARGET=
 NO_MTREE=	yes
 
+BACKBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 
 .include <bsd.port.pre.mk>
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 7df54a85733f..581213989d76 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -12,17 +12,27 @@ MASTER_SITES=	http://www.gnustep.it/enrico/gshisen/
 
 MAINTAINER=	dinoex@FreeBSD.org
 
+.if defined(GNUSTEP_GUI_DEVEL)
+BUILD_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+RUN_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+.else
 BUILD_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
 RUN_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+.endif
 
 PREFIX=		${LOCALBASE}/GNUstep
 WRKSRC=		${WRKDIR}/GShisen
 USE_GMAKE=	yes
 MAKEFILE=
+.if defined(GNUSTEP_GUI_DEVEL)
+MAKE_FLAGS=	GUI_BACKEND_LIB=back
+.else
 MAKE_FLAGS=	GUI_BACKEND_LIB=xgps
+.endif
 ALL_TARGET=
 NO_MTREE=	yes
 
+BACKBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 
 .include <bsd.port.pre.mk>
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index dbbdd76b9266..de290e14284d 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -14,21 +14,31 @@ DISTNAME=	GNUMail-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 
-BUILD_DEPENDS=	${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps \
-		${LOCALLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libPantomime.so:${PORTSDIR}/mail/pantomime
-RUN_DEPENDS=	${XGPSBUNDLEDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps \
-		${LOCALLIBDIR}/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/libPantomime.so:${PORTSDIR}/mail/pantomime
+.if defined(GNUSTEP_GUI_DEVEL)
+BUILD_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+RUN_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+.else
+BUILD_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+RUN_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+.endif
+BUILD_DEPENDS+=	${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime
+RUN_DEPENDS+=	${LOCALLIBDIR}/libPantomime.so:${PORTSDIR}/mail/pantomime
 
 PREFIX=		${LOCALBASE}/GNUstep
 WRKSRC=		${WRKDIR}/GNUMail
 USE_GMAKE=	yes
 MAKEFILE=
+.if defined(GNUSTEP_GUI_DEVEL)
+MAKE_FLAGS=	GUI_BACKEND_LIB=back
+.else
 MAKE_FLAGS=	GUI_BACKEND_LIB=xgps
+.endif
 ALL_TARGET=
 NO_MTREE=	yes
 
-XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle
-LOCALLIBDIR=	${PREFIX}/Local/Libraries
+BACKBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+LOCALLIBDIR=	${PREFIX}/Local/Libraries/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 9c4391f3f66e..fed7abe360e2 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -15,8 +15,13 @@ DISTNAME=	Pantomime-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 
+.if defined(GNUSTEP_GUI_DEVEL)
+BUILD_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+RUN_DEPENDS=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+.else
 BUILD_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
 RUN_DEPENDS=	${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps
+.endif
 
 PREFIX=		${LOCALBASE}/GNUstep
 WRKSRC=		${WRKDIR}/Pantomime
@@ -25,6 +30,7 @@ MAKEFILE=	GNUmakefile
 ALL_TARGET=
 NO_MTREE=	yes
 
+BACKBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 XGPSBUNDLEDIR=	${PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 
 .include <bsd.port.pre.mk>