- update for gnustep-make-2.0.0

3 files changed, 10 insertions, 3 deletions

diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index ec82d88d341d..190482998051 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -49,6 +49,8 @@ PLIST_SUB+=		BACK=xdps-${BACKVERSION}
 PLIST_SUB+=		USE_XLIB="@comment "
 BACK_SUFFIX?=		-xdps
 CONFLICTS?=		gunstep-back-0.* gunstep-back-art-0.* gunstep-back-cairo-0.*
+#ADDITIONAL_INCLUDE_DIRS+=	-I${X11BASE}/include
+#ADDITIONAL_LDFLAGS+=	-L${X11BASE}/lib
 .elif defined(WITH_GNUSTEP_LIBART)
 LIB_DEPENDS+=		art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 CONFIGURE_ARGS+=	--enable-graphics=art --with-name=art
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 3ad92f47e763..c1aeb0113974 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep-gui
 PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -42,7 +42,6 @@ EXTRA_PATCHES+=		${FILESDIR}/GNUmakefile.patch
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 BREAKS_IF_PEDANTIC=	yes
-
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 .if defined(WITHOUT_GNUSTEP_FAKEMAIN)
@@ -51,11 +50,16 @@ IGNORE=		requires procfs mounted to build or run, for details see procfs(5)
 .endif
 .endif
 
-.if defined(WITH_PORTAUDIO2)
+.if !defined(WITHOUT_PORTAUDIO2) || !defined(WITHOUT_PORTAUDIO)
 LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio2
 CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 ${PTHREAD_CFLAGS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 ${PTHREAD_LIBS}
+ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/portaudio2
+ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
+PLIST_SUB+=	WITH_PORTAUDIO=""
+.else
+PLIST_SUB+=	WITH_PORTAUDIO="@comment "
 .endif
 
 .if !defined(WITHOUT_CUPS)
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 562f81e4f822..ff425f97b1a8 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -664,6 +664,7 @@ System/Library/Services/GSspell.service/GSspell
 System/Library/Services/GSspell.service/Resources/Info-gnustep.plist
 System/Tools/gclose
 System/Tools/gcloseall
+%%WITH_PORTAUDIO%%System/Tools/gnustep_sndd
 System/Tools/gopen
 System/Tools/make_services
 System/Tools/set_show_service