2 files changed, 24 insertions, 8 deletions

diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index f315e90979db..e940b9a35c1b 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep
 .if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION=	1.7.1
+PORTVERSION=	1.7.2
 .else
 PORTVERSION=	1.6.0
 .endif
@@ -29,7 +29,6 @@ NO_MTREE=	yes
 NO_BUILD=	yes
 SYSTEMDIR=	${PREFIX}/System
 SYSMAKEDIR=	${SYSTEMDIR}/Makefiles
-COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
 BUNDLEDIR=	${SYSTEMDIR}/Library/Bundles
 GNUSTEP_MAKE_PORT?=	devel/gnustep-make
 GNUSTEP_BASE_PORT?=	lang/gnustep-base
@@ -44,13 +43,16 @@ GNU_ARCH=	ix86
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 
+COMBOPATH=	${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 .if defined(WITH_GNUSTEP_DEVEL)
-SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
+SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries
+COMBOLIBDIR=	${SYSLIBDIR}
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle
 .else
 SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
-.endif
-COMBOPATH=	${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
+COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+.endif
 
 do-install:	# empty
 
diff --git a/devel/gnustep/bsd.gnustep.mk b/devel/gnustep/bsd.gnustep.mk
index efbc987e1013..db3ffd5027fe 100644
--- a/devel/gnustep/bsd.gnustep.mk
+++ b/devel/gnustep/bsd.gnustep.mk
@@ -66,11 +66,12 @@ SYSTEMDIR=	${PREFIX}/System
 SYSMAKEDIR=	${SYSTEMDIR}/Makefiles
 COMBOPATH=	${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
 .if defined(WITH_GNUSTEP_DEVEL)
-SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR=	${SYSTEMDIR}/Library/Libraries/${COMBOPATH}
-LOCALLIBDIR=	${PREFIX}/Local/Library/Libraries/${COMBOPATH}
+SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries
+COMBOLIBDIR=	${SYSTEMDIR}/Library/Libraries
+LOCALLIBDIR=	${PREFIX}/Local/Library/Libraries
 PLIST_SUB+=	SYSTEMLIBRARY="System/Library"
 PLIST_SUB+=	LOCALLIBRARY="Local/Library"
+PLIST_SUB+=	NOFLAT=""
 PLIST_SUB+=	GNUSTEP_DEVEL=""
 PLIST_SUB+=	GNUSTEP_STABLE="@comment "
 PKGNAMESUFFIX?=	-devel
@@ -80,6 +81,7 @@ COMBOLIBDIR=	${SYSTEMDIR}/Libraries/${COMBOPATH}
 LOCALLIBDIR=	${PREFIX}/Local/Libraries/${COMBOPATH}
 PLIST_SUB+=	SYSTEMLIBRARY="System"
 PLIST_SUB+=	LOCALLIBRARY="Local"
+PLIST_SUB+=	NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
 PLIST_SUB+=	GNUSTEP_DEVEL="@comment "
 PLIST_SUB+=	GNUSTEP_STABLE=""
 .else
@@ -126,7 +128,11 @@ USE_GNUSTEP_XLIB=yes
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle
+.else
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
+.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=back
 .endif
 
@@ -137,7 +143,11 @@ MAKE_FLAGS+=	GUI_BACKEND_LIB=back
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
 
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-xdps.bundle
+.else
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
+.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=xdps
 .endif
 
@@ -148,7 +158,11 @@ MAKE_FLAGS+=	GUI_BACKEND_LIB=xdps
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
 
+.if defined(WITH_GNUSTEP_DEVEL)
+BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-art.bundle
+.else
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
+.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=art
 .endif