From 26035dafd378e594059ae46adef746b1187e7133 Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Tue, 24 Dec 2002 21:49:20 +0000
Subject: - Fix build of old variant

---
 x11-toolkits/gnustep-gui/Makefile                  |  5 ++++-
 x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c | 14 ++++++++++++++
 x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c | 14 --------------
 3 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c
 delete mode 100644 x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 1e9c7de..5afcd7b 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -33,6 +33,7 @@ LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 BREAKS_IF_PEDANTIC=	yes
 .if defined(GNUSTEP_GUI_DEVEL)
+EXTRA_PATCHES=	${FILESDIR}/extra-pa_unix_oss.c
 PLIST_SUB+=	DEVEL=""
 PLIST_SUB+=	NODEVEL="@comment "
 .else
@@ -52,7 +53,7 @@ CONFIGURE_TARGET=
 USE_GMAKE=	yes
 MAKEFILE=
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
-MAKE_FLAGS+=	ADDITIONAL_LIB_DIRS=/usr/local/lib to core/gui/Source/GNUmakefile.preamble
+MAKE_FLAGS+=	ADDITIONAL_LIB_DIRS=/usr/local/lib
 NO_MTREE=	yes
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-tiff-include=${LOCALBASE}/include
@@ -75,11 +76,13 @@ post-extract:
 	@${CP} ${PREFIX}/System/Makefiles/${file} ${WRKSRC}
 .endfor
 
+.if defined(GNUSTEP_GUI_DEVEL)
 pre-configure:
 	@ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed
 	${SED} -e "s=-lphread=${PTHREAD_LIBS}=" -e "s;CFLAGS =;CFLAGS+=;" \
 		-e "s;-Wall;-Wall ${PTHREAD_CFLAGS:S=""==};" \
 		${EXTRA_FIX}.sed > ${EXTRA_FIX}
+.endif
 
 do-configure:
 	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c b/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c
new file mode 100644
index 0000000..4a88b41
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c
@@ -0,0 +1,14 @@
+--- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig	Wed Oct  2 05:34:54 2002
++++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c	Mon Dec  2 09:21:34 2002
+@@ -110,7 +110,11 @@
+ #ifdef __linux__
+ #include <linux/soundcard.h>
+ #else
++#ifdef __FreeBSD__
++#include <sys/soundcard.h>
++#else
+ #include <machine/soundcard.h> /* JH20010905 */
++#endif
+ #endif
+ 
+ #include "portaudio.h"
diff --git a/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c b/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c
deleted file mode 100644
index 4a88b41..0000000
--- a/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig	Wed Oct  2 05:34:54 2002
-+++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c	Mon Dec  2 09:21:34 2002
-@@ -110,7 +110,11 @@
- #ifdef __linux__
- #include <linux/soundcard.h>
- #else
-+#ifdef __FreeBSD__
-+#include <sys/soundcard.h>
-+#else
- #include <machine/soundcard.h> /* JH20010905 */
-+#endif
- #endif
- 
- #include "portaudio.h"
-- 
cgit v1.1