xfe-1.40: also checks older freetype2 versions (pkg/49878)

patch-xfe

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfe/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile	25 Apr 2015 14:24:56 -0000	1.48
+++ Makefile	6 May 2015 18:12:03 -0000
@@ -1,13 +1,14 @@
 # $NetBSD: Makefile,v 1.48 2015/04/25 14:24:56 tnn Exp $
 
 DISTNAME=	xfe-1.40
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://roland65.free.fr/xfe/
 COMMENT=	Fast MS-Explorer like filemanager for X
+LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
@@ -25,6 +26,7 @@
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/fox/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfe/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	15 Feb 2015 14:09:38 -0000	1.12
+++ distinfo	6 May 2015 18:12:03 -0000
@@ -4,5 +4,5 @@
 RMD160 (xfe-1.40.tar.gz) = a2add3bdac71706da9ea791d88bc96cbcdc3afb3
 Size (xfe-1.40.tar.gz) = 2574477 bytes
 SHA1 (patch-ac) = 001140df584ef01d52e0737a57e0babbc574a0b4
-SHA1 (patch-configure) = 1eb11db5286e4cf3b3829a5a2370c9d4acb2d1a5
+SHA1 (patch-configure) = 406757b915cbd266bc9e4dfd2402f6676c976ee6
 SHA1 (patch-src_main.cpp) = 2e875f4235b7e4c22ad5a0c236144bdd549fb8a1
Index: patches/patch-configure
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfe/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure	15 Feb 2015 14:09:38 -0000	1.1
+++ patches/patch-configure	6 May 2015 18:12:03 -0000
@@ -1,8 +1,24 @@
-$NetBSD: patch-configure,v 1.1 2015/02/15 14:09:38 ryoon Exp $
+$NetBSD$
+
+o Older freetype2 versions have a different path for ftheader.h, also check for
+  it in order to avoid forcing dependency to the pkgsrc version of
+  graphics/freetype2. For more information please give a look to pkg/49878.
+o test(1) does not support the "==" operator. Use the "=" operator to compare if
+  two strings are identical.
 
 --- configure.orig	2014-12-05 14:51:58.000000000 +0000
 +++ configure
-@@ -16194,7 +16194,7 @@ echo "==================================
+@@ -14233,7 +14233,9 @@ done
+ 	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+ 	fi
+ 	ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
++	ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default"
+ if test "x$ac_cv_header_config_ftheader_h" = xyes; then :
++elif test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then :
+ 
+ else
+   as_fn_error $? "\"ftheader.h not found\"" "$LINENO" 5
+@@ -16194,7 +16196,7 @@ echo "==================================
  
  
  # Warning message about Xft support