From c6a275c4ae11f2f5cff22db5c9546f0248a00aa8 Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Wed, 7 Apr 2010 08:34:21 +0000
Subject: - Fix build when custom CFLAGS are set in make.conf

PR:		ports/144138
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
---
 x11-toolkits/xview/Makefile                      |  6 +++++-
 x11-toolkits/xview/files/patch-config+XView.tmpl | 25 +++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'x11-toolkits/xview')

diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 3987e4800912..797e3a0bf867 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -28,7 +28,7 @@ REINPLACE_ARGS=	-i ""
 USE_IMAKE=	yes
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-IMAKEINCLUDE=	"-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config"
+IMAKEINCLUDE=	"-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config"
 MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
 ALL_TARGET=	World
 SUB_FILES=	pkg-message
@@ -53,6 +53,10 @@ pre-configure:
 	  ${WRKSRC}/config/XView.cf
 	@${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \
 	  ${WRKSRC}/config/XView.tmpl
+.if ${OSVERSION} < 800090
+	@${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \
+	  ${WRKSRC}/config/XView.tmpl
+.endif
 	@${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \
 	  ${WRKSRC}/clients/olwm/screen.c
 	${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+'	\
diff --git a/x11-toolkits/xview/files/patch-config+XView.tmpl b/x11-toolkits/xview/files/patch-config+XView.tmpl
index 10f6d7adac13..998f9bf085bd 100644
--- a/x11-toolkits/xview/files/patch-config+XView.tmpl
+++ b/x11-toolkits/xview/files/patch-config+XView.tmpl
@@ -1,6 +1,6 @@
---- config/XView.tmpl.orig	Mon Sep 29 00:02:17 2003
-+++ config/XView.tmpl	Mon Sep 29 00:02:17 2003
-@@ -96,7 +96,7 @@
+--- config/XView.tmpl.orig	2010-04-07 10:28:25.000000000 +0900
++++ config/XView.tmpl	2010-04-07 10:35:36.000000000 +0900
+@@ -96,11 +96,13 @@
   *      Work around small conflict with Project.tmpl file
   */
  #if UseInstalled
@@ -9,7 +9,14 @@
  #endif
  
  #if OsHasLocale
-@@ -192,14 +192,6 @@
+-         LOCALE_DEFINES = -DOS_HAS_LOCALE
++         LOCALE_DEFINES = -DOS_HAS_LOCALE -DCOMPAT_43TTY
++#else
++         LOCALE_DEFINES = -DCOMPAT_43TTY
+ #endif
+ 
+ #if OsHasMmap
+@@ -192,14 +194,6 @@
                       AS = as
   */
  /*
@@ -24,7 +31,7 @@
   *	Temporary directory used during build process before the include
   *	files are installed.  This is just a place where symbolic links are
   *	placed to point back to the actual files in the build hierarchy to
-@@ -224,7 +216,7 @@
+@@ -224,7 +218,7 @@
   *	afterwards.
   */
  #ifndef XVIncludeDirName
@@ -33,7 +40,7 @@
  #endif
                   INCDIR = XVIncludeDirName
  /*
-@@ -356,10 +348,10 @@
+@@ -356,10 +350,10 @@
  
  #if SystemV4
               SYSV_CLIENT_LIB = -lintl -ldl
@@ -46,7 +53,7 @@
  #endif
  
  /*
-@@ -371,16 +363,16 @@
+@@ -371,16 +365,16 @@
   */
  
  #if XvI18nLevel == 4
@@ -70,7 +77,7 @@
  
  /*
   *	Define libraries for XView clients
-@@ -410,7 +402,7 @@
+@@ -410,7 +404,7 @@
   */
  #if SharedLibXView
  # ifndef SharedXViewRev
@@ -79,7 +86,7 @@
  # define SharedXViewRev 3
  #else
  # define SharedXViewRev 3.2
-@@ -449,12 +441,8 @@
+@@ -449,12 +443,8 @@
   *	Include the XView specific makefile macros.
   */
  
-- 
cgit v1.2.3